diff --git a/idl_tool_2/test/unittest/BUILD.gn b/idl_tool_2/test/unittest/BUILD.gn index 914d842e2da4a19ca5f6db87236fa09a862f5bb7..61f63a4d11af3b23954214be5723252c8be5496e 100644 --- a/idl_tool_2/test/unittest/BUILD.gn +++ b/idl_tool_2/test/unittest/BUILD.gn @@ -26,40 +26,10 @@ config("idl_tool_2_test_config") { common_sources = [ "${IDL_DIR}/codegen/SA/sa_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_array_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_boolean_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_byte_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_char_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_cstring_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_double_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_enum_type_emitter.cpp", "${IDL_DIR}/codegen/SA/type/sa_fd_type_emitter.cpp", "${IDL_DIR}/codegen/SA/type/sa_fdsan_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_float_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_int_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_interface_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_long_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_map_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_orderedmap_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_ptr_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_rawdata_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_seq_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_set_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_short_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_string_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_struct_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_u16string_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_uchar_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_uint_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_ulong_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_union_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_ushort_type_emitter.cpp", - "${IDL_DIR}/lexer/lexer.cpp", - "${IDL_DIR}/lexer/token.cpp", - "${IDL_DIR}/util/file.cpp", "${IDL_DIR}/util/light_refcount_base.cpp", "${IDL_DIR}/util/logger.cpp", - "${IDL_DIR}/util/options.cpp", "${IDL_DIR}/util/string_builder.cpp", "${IDL_DIR}/util/string_helper.cpp", "${IDL_DIR}/util/string_pool.cpp", @@ -117,7 +87,7 @@ group("unittest") { testonly = true deps = [ ":SaTypeEmitterTest", - ":IdlTool2UtilOptionsTest", + #":IdlTool2UtilOptionsTest", ":IdlTool2UtilStringTest", "sa_type_emitter_test:unittest", ] diff --git a/idl_tool_2/test/unittest/sa_type_emitter_test/BUILD.gn b/idl_tool_2/test/unittest/sa_type_emitter_test/BUILD.gn index 3467f7026af8a5a3fd75692d22b429476d712ac8..6165c35f2fc91a5fc802c64c58d43112da4fae21 100644 --- a/idl_tool_2/test/unittest/sa_type_emitter_test/BUILD.gn +++ b/idl_tool_2/test/unittest/sa_type_emitter_test/BUILD.gn @@ -25,26 +25,8 @@ config("idl_tool_2_test_config") { } common_sources = [ - "${IDL_DIR}/codegen/SA/sa_code_emitter.cpp", "${IDL_DIR}/codegen/SA/sa_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_array_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_boolean_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_byte_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_char_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_cstring_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_double_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_enum_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_fd_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_fdsan_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_float_type_emitter.cpp", "${IDL_DIR}/codegen/SA/type/sa_int_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_interface_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_long_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_map_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_orderedmap_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_ptr_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_rawdata_type_emitter.cpp", - "${IDL_DIR}/codegen/SA/type/sa_seq_type_emitter.cpp", "${IDL_DIR}/codegen/SA/type/sa_set_type_emitter.cpp", "${IDL_DIR}/codegen/SA/type/sa_short_type_emitter.cpp", "${IDL_DIR}/codegen/SA/type/sa_string_type_emitter.cpp", @@ -55,15 +37,10 @@ common_sources = [ "${IDL_DIR}/codegen/SA/type/sa_ulong_type_emitter.cpp", "${IDL_DIR}/codegen/SA/type/sa_union_type_emitter.cpp", "${IDL_DIR}/codegen/SA/type/sa_ushort_type_emitter.cpp", - "${IDL_DIR}/lexer/lexer.cpp", - "${IDL_DIR}/lexer/token.cpp", - "${IDL_DIR}/util/file.cpp", "${IDL_DIR}/util/light_refcount_base.cpp", "${IDL_DIR}/util/logger.cpp", - "${IDL_DIR}/util/options.cpp", "${IDL_DIR}/util/string_builder.cpp", "${IDL_DIR}/util/string_helper.cpp", - "${IDL_DIR}/util/string_pool.cpp", ] ohos_unittest("SaUshortTypeEmitterTest") { diff --git a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_set_type_emitter_test.cpp b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_set_type_emitter_test.cpp index 55280ec318865a6ee5dcf90a9dca96dd5de3f01f..93abf24e41b2f93b25376e56f76a62816e306b16 100644 --- a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_set_type_emitter_test.cpp +++ b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_set_type_emitter_test.cpp @@ -85,6 +85,8 @@ HWTEST_F(SaSetTypeEmitterTest, EmitCppType_001, Level1) EXPECT_EQ(ret, "const std::set&"); ret = emitter.EmitCppType(TypeMode::PARAM_OUT); EXPECT_EQ(ret, "std::set&"); + ret = emitter.EmitCppType(static_cast(-1)); + EXPECT_EQ(ret, "unknown type"); DTEST_LOG << "EmitCppType_001 end" << std::endl; } diff --git a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_short_type_emitter_test.cpp b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_short_type_emitter_test.cpp index ebe7dd051c0b4341f77ced9a1b57e99973dfe122..b57df107068f5950b51b11644c603dafd1f8c467 100644 --- a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_short_type_emitter_test.cpp +++ b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_short_type_emitter_test.cpp @@ -80,6 +80,8 @@ HWTEST_F(SaShortTypeEmitterTest, EmitCppType_001, Level1) EXPECT_EQ(ret, "short"); ret = emitter.EmitCppType(TypeMode::PARAM_OUT); EXPECT_EQ(ret, "short&"); + ret = emitter.EmitCppType(static_cast(-1)); + EXPECT_EQ(ret, "unknown type"); DTEST_LOG << "EmitCppType_001 end" << std::endl; } diff --git a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_string_type_emitter_test.cpp b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_string_type_emitter_test.cpp index e108535141643a2e455b613e9372d601032dd244..d836df93ea5cd452073bb4049413ed20a04baf01 100644 --- a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_string_type_emitter_test.cpp +++ b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_string_type_emitter_test.cpp @@ -82,6 +82,8 @@ HWTEST_F(SaStringTypeEmitterTest, EmitCppType_001, Level1) EXPECT_EQ(ret, "const std::string&"); ret = emitter.EmitCppType(TypeMode::PARAM_OUT); EXPECT_EQ(ret, "std::string&"); + ret = emitter.EmitCppType(static_cast(-1)); + EXPECT_EQ(ret, "unknown type"); DTEST_LOG << "EmitCppType_001 end" << std::endl; } diff --git a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_struct_type_emitter_test.cpp b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_struct_type_emitter_test.cpp index 5915f7cac8e7cd031e9d752e2e0d93dcc161bf24..36f9fca6d7972959a4445fd892d931467c90ba4f 100644 --- a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_struct_type_emitter_test.cpp +++ b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_struct_type_emitter_test.cpp @@ -84,6 +84,8 @@ HWTEST_F(SaStructTypeEmitterTest, EmitCppType_001, Level1) EXPECT_EQ(ret, "const FooStruct&"); ret = emitter.EmitCppType(TypeMode::PARAM_OUT); EXPECT_EQ(ret, "FooStruct&"); + ret = emitter.EmitCppType(static_cast(-1)); + EXPECT_EQ(ret, "unknown type"); DTEST_LOG << "EmitCppType_001 end" << std::endl; } diff --git a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_u16string_type_emitter_test.cpp b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_u16string_type_emitter_test.cpp index 71284bb3910cbcb0e2884cdf69578353b6a0f561..bb2a4fceb8a92921687eb9a1e4e6f8fb712184e3 100644 --- a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_u16string_type_emitter_test.cpp +++ b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_u16string_type_emitter_test.cpp @@ -82,6 +82,8 @@ HWTEST_F(SaU16stringTypeEmitterTest, EmitCppType_001, Level1) EXPECT_EQ(ret, "const std::u16string&"); ret = emitter.EmitCppType(TypeMode::PARAM_OUT); EXPECT_EQ(ret, "std::u16string&"); + ret = emitter.EmitCppType(static_cast(-1)); + EXPECT_EQ(ret, "unknown type"); DTEST_LOG << "EmitCppType_001 end" << std::endl; } diff --git a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_uchar_type_emitter_test.cpp b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_uchar_type_emitter_test.cpp index fc6c50006a844a8ab4d4a374302029de4272a113..1e7396b36f221b5b5d030b7a039e51187f6098cd 100644 --- a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_uchar_type_emitter_test.cpp +++ b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_uchar_type_emitter_test.cpp @@ -80,6 +80,8 @@ HWTEST_F(SaUcharTypeEmitterTest, EmitCppType_001, Level1) EXPECT_EQ(ret, "uint8_t"); ret = emitter.EmitCppType(TypeMode::PARAM_OUT); EXPECT_EQ(ret, "uint8_t&"); + ret = emitter.EmitCppType(static_cast(-1)); + EXPECT_EQ(ret, "unknown type"); DTEST_LOG << "EmitCppType_001 end" << std::endl; } diff --git a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_uint_type_emitter_test.cpp b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_uint_type_emitter_test.cpp index 2673ddda7a7f8ae1c0d7fb7a05cae260c2d2166b..e93666228f15c4ec51dbb9df8b7672f2c375e323 100644 --- a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_uint_type_emitter_test.cpp +++ b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_uint_type_emitter_test.cpp @@ -80,6 +80,8 @@ HWTEST_F(SaUintTypeEmitterTest, EmitCppType_001, Level1) EXPECT_EQ(ret, "uint32_t"); ret = emitter.EmitCppType(TypeMode::PARAM_OUT); EXPECT_EQ(ret, "uint32_t&"); + ret = emitter.EmitCppType(static_cast(-1)); + EXPECT_EQ(ret, "unknown type"); DTEST_LOG << "EmitCppType_001 end" << std::endl; } diff --git a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_ulong_type_emitter_test.cpp b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_ulong_type_emitter_test.cpp index 44f998bf42b0005746ca415494a1236caeeb0d66..acb34e924eb53d526fce07213aa8f9a8ba124c07 100644 --- a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_ulong_type_emitter_test.cpp +++ b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_ulong_type_emitter_test.cpp @@ -80,6 +80,8 @@ HWTEST_F(SaUlongTypeEmitterTest, EmitCppType_001, Level1) EXPECT_EQ(ret, "uint64_t"); ret = emitter.EmitCppType(TypeMode::PARAM_OUT); EXPECT_EQ(ret, "uint64_t&"); + ret = emitter.EmitCppType(static_cast(-1)); + EXPECT_EQ(ret, "unknown type"); DTEST_LOG << "EmitCppType_001 end" << std::endl; } diff --git a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_union_type_emitter_test.cpp b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_union_type_emitter_test.cpp index 81bd9e78b212e8853e04bc9388ba9ffe5e12a1f5..2c6e71d94223a4fa87c0a4fa5e4d141846ec06cf 100644 --- a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_union_type_emitter_test.cpp +++ b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_union_type_emitter_test.cpp @@ -84,6 +84,8 @@ HWTEST_F(SaUnionTypeEmitterTest, EmitCppType_001, Level1) EXPECT_EQ(ret, "const FooUnion&"); ret = emitter.EmitCppType(TypeMode::PARAM_OUT); EXPECT_EQ(ret, "FooUnion&"); + ret = emitter.EmitCppType(static_cast(-1)); + EXPECT_EQ(ret, "unknown type"); DTEST_LOG << "EmitCppType_001 end" << std::endl; } diff --git a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_ushort_type_emitter_test.cpp b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_ushort_type_emitter_test.cpp index 74f9d40586ea7681755f6578bb35d9371c45e41f..f1726ee19dd0d46b5b5c267cd8799b38bfa0a8bc 100644 --- a/idl_tool_2/test/unittest/sa_type_emitter_test/sa_ushort_type_emitter_test.cpp +++ b/idl_tool_2/test/unittest/sa_type_emitter_test/sa_ushort_type_emitter_test.cpp @@ -80,6 +80,8 @@ HWTEST_F(SaUshortTypeEmitterTest, EmitCppType_001, Level1) EXPECT_EQ(ret, "uint16_t"); ret = emitter.EmitCppType(TypeMode::PARAM_OUT); EXPECT_EQ(ret, "uint16_t&"); + ret = emitter.EmitCppType(static_cast(-1)); + EXPECT_EQ(ret, "unknown type"); DTEST_LOG << "EmitCppType_001 end" << std::endl; }