From f6402f6ba9c47c7494a916e2d3a36fc279c1573b Mon Sep 17 00:00:00 2001 From: wx Date: Thu, 8 Feb 2024 15:01:25 +0800 Subject: [PATCH 1/2] feat: Solve circular dependency Signed-off-by: wx --- baselib/msglib/BUILD.gn | 1 + .../msglib/src/{common => utils}/messenger_utils.h | 0 test/dslm_fuzz_test/dslm_fuzzer/BUILD.gn | 1 + test/dslm_unit_test/dslm_test.cpp | 13 ------------- 4 files changed, 2 insertions(+), 13 deletions(-) rename baselib/msglib/src/{common => utils}/messenger_utils.h (100%) diff --git a/baselib/msglib/BUILD.gn b/baselib/msglib/BUILD.gn index 9dabb05..d890c3f 100644 --- a/baselib/msglib/BUILD.gn +++ b/baselib/msglib/BUILD.gn @@ -23,6 +23,7 @@ ohos_static_library("messenger_static") { include_dirs = [ "include", "src/common", + "src/utils", ] sources = [ "src/common/messenger.c" ] diff --git a/baselib/msglib/src/common/messenger_utils.h b/baselib/msglib/src/utils/messenger_utils.h similarity index 100% rename from baselib/msglib/src/common/messenger_utils.h rename to baselib/msglib/src/utils/messenger_utils.h diff --git a/test/dslm_fuzz_test/dslm_fuzzer/BUILD.gn b/test/dslm_fuzz_test/dslm_fuzzer/BUILD.gn index ea308e9..e59f7a6 100644 --- a/test/dslm_fuzz_test/dslm_fuzzer/BUILD.gn +++ b/test/dslm_fuzz_test/dslm_fuzzer/BUILD.gn @@ -28,6 +28,7 @@ if (os_level == "standard") { include_dirs = [ "../../../baselib/utils/include", "../../../baselib/msglib/include", + "../../../baselib/msglib/src/utils", "../../../baselib/msglib/src/common", "../../../baselib/msglib/src/standard", "../../../common/include", diff --git a/test/dslm_unit_test/dslm_test.cpp b/test/dslm_unit_test/dslm_test.cpp index 74c2f45..10c80b7 100644 --- a/test/dslm_unit_test/dslm_test.cpp +++ b/test/dslm_unit_test/dslm_test.cpp @@ -334,19 +334,6 @@ HWTEST_F(DslmTest, GetPkInfoListStr_case3, TestSize.Level0) EXPECT_EQ(result, ERR_MEMORY_ERR); } -HWTEST_F(DslmTest, GetPkInfoListStr_case4, TestSize.Level0) -{ - const char *udidStr = "device"; - char *pkInfoListStr = nullptr; - - MockStrcpy mock; - // mock the strcpy_s return a EINVAL on the second call - EXPECT_CALL(mock, strcpy_s).WillOnce(Invoke(MockStrcpy::defaultstrcpy_s)).WillOnce(Return(EINVAL)); - - int32_t result = GetPkInfoListStr(true, udidStr, &pkInfoListStr); - EXPECT_EQ(result, ERR_MEMORY_ERR); -} - HWTEST_F(DslmTest, ParseDeviceSecInfoRequest_case1, TestSize.Level0) { const char *message = "{\"version\":3351057,\"challenge\":\"010203040a0b0c0d\"}"; -- Gitee From ce6a4607184294cc14a97f42922c3d18badf520d Mon Sep 17 00:00:00 2001 From: wx Date: Thu, 22 Feb 2024 10:50:14 +0800 Subject: [PATCH 2/2] feat: delete GetPkInfoListCase4 Signed-off-by: wx --- baselib/msglib/BUILD.gn | 1 - baselib/msglib/src/{utils => common}/messenger_utils.h | 0 test/dslm_fuzz_test/dslm_fuzzer/BUILD.gn | 1 - 3 files changed, 2 deletions(-) rename baselib/msglib/src/{utils => common}/messenger_utils.h (100%) diff --git a/baselib/msglib/BUILD.gn b/baselib/msglib/BUILD.gn index d890c3f..9dabb05 100644 --- a/baselib/msglib/BUILD.gn +++ b/baselib/msglib/BUILD.gn @@ -23,7 +23,6 @@ ohos_static_library("messenger_static") { include_dirs = [ "include", "src/common", - "src/utils", ] sources = [ "src/common/messenger.c" ] diff --git a/baselib/msglib/src/utils/messenger_utils.h b/baselib/msglib/src/common/messenger_utils.h similarity index 100% rename from baselib/msglib/src/utils/messenger_utils.h rename to baselib/msglib/src/common/messenger_utils.h diff --git a/test/dslm_fuzz_test/dslm_fuzzer/BUILD.gn b/test/dslm_fuzz_test/dslm_fuzzer/BUILD.gn index e59f7a6..ea308e9 100644 --- a/test/dslm_fuzz_test/dslm_fuzzer/BUILD.gn +++ b/test/dslm_fuzz_test/dslm_fuzzer/BUILD.gn @@ -28,7 +28,6 @@ if (os_level == "standard") { include_dirs = [ "../../../baselib/utils/include", "../../../baselib/msglib/include", - "../../../baselib/msglib/src/utils", "../../../baselib/msglib/src/common", "../../../baselib/msglib/src/standard", "../../../common/include", -- Gitee