From 32131edd947a2c1c2f8f57d3c99db0b991d90535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=B9=8F=E6=98=8A?= Date: Tue, 20 Aug 2024 07:00:48 +0000 Subject: [PATCH 1/2] fix: Adjust gn order MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨鹏昊 --- bundle.json | 4 ++- test/dslm_unit_test/BUILD.gn | 1 + test/dslm_unit_test/dslm_msg_interface_mock.h | 29 ++++++++++--------- test/dslm_unit_test/dslm_msg_lib_test.cpp | 18 +++++++----- .../dslm_request_callback_mock.h | 4 +-- test/dslm_unit_test/dslm_test.cpp | 18 ++++++------ 6 files changed, 41 insertions(+), 33 deletions(-) diff --git a/bundle.json b/bundle.json index 64e4183..6baa5cf 100644 --- a/bundle.json +++ b/bundle.json @@ -47,7 +47,9 @@ "ipc", "safwk", "samgr", - "openssl" + "openssl", + "access_token", + "selinux_adapter" ], "third_party": [ "openssl" ] }, diff --git a/test/dslm_unit_test/BUILD.gn b/test/dslm_unit_test/BUILD.gn index b999e17..1fc8181 100644 --- a/test/dslm_unit_test/BUILD.gn +++ b/test/dslm_unit_test/BUILD.gn @@ -112,6 +112,7 @@ if (os_level == "standard") { "hisysevent:libhisysevent", "hitrace:hitrace_meter", "huks:libhukssdk", + "selinux_adapter:librestorecon", ] } } diff --git a/test/dslm_unit_test/dslm_msg_interface_mock.h b/test/dslm_unit_test/dslm_msg_interface_mock.h index 138ccdd..2163402 100644 --- a/test/dslm_unit_test/dslm_msg_interface_mock.h +++ b/test/dslm_unit_test/dslm_msg_interface_mock.h @@ -58,19 +58,22 @@ class DslmMsgInterfaceMock : public DslmMsgInterface { public: DslmMsgInterfaceMock(); ~DslmMsgInterfaceMock() override; - MOCK_METHOD1(IsMessengerReady, bool(const Messenger *messenger)); - MOCK_METHOD5(SendMsgTo, uint64_t(const Messenger *messenger, uint64_t transNo, const DeviceIdentify *devId, - const uint8_t *msg, uint32_t msgLen)); - MOCK_METHOD3(GetDeviceOnlineStatus, - bool(const Messenger *messenger, const DeviceIdentify *devId, int32_t *level)); - MOCK_METHOD3(GetSelfDeviceIdentify, bool(const Messenger *messenger, DeviceIdentify *devId, int32_t *level)); - MOCK_METHOD3(ForEachDeviceProcess, void(const Messenger *messenger, const DeviceProcessor processor, void *para)); - MOCK_METHOD1(Socket, int32_t(SocketInfo info)); - MOCK_METHOD4(Listen, - int32_t(int32_t socket, const QosTV qos[], uint32_t qosCount, const ISocketListener *listener)); - MOCK_METHOD4(Bind, int32_t(int32_t socket, const QosTV qos[], uint32_t qosCount, const ISocketListener *listener)); - MOCK_METHOD3(SendBytes, int32_t(int32_t socket, const void *data, uint32_t len)); - MOCK_METHOD1(Shutdown, void(int32_t socket)); + MOCK_METHOD(bool, IsMessengerReady, (const Messenger *messenger), (override)); + MOCK_METHOD(uint64_t, SendMsgTo, (const Messenger *messenger, uint64_t transNo, const DeviceIdentify *devId, + const uint8_t *msg, uint32_t msgLen), (override)); + MOCK_METHOD(bool, GetDeviceOnlineStatus, + (const Messenger *messenger, const DeviceIdentify *devId, int32_t *level), (override)); + MOCK_METHOD(bool, GetSelfDeviceIdentify, (const Messenger *messenger, DeviceIdentify *devId, int32_t *level), + (override)); + MOCK_METHOD(void, ForEachDeviceProcess, (const Messenger *messenger, const DeviceProcessor processor, void *para), + (override)); + MOCK_METHOD(int32_t, Socket, (SocketInfo info), (override)); + MOCK_METHOD(int32_t, Listen, + (int32_t socket, const QosTV qos[], uint32_t qosCount, const ISocketListener *listener), (override)); + MOCK_METHOD(int32_t, Bind, (int32_t socket, const QosTV qos[], uint32_t qosCount, + const ISocketListener *listener), (override)); + MOCK_METHOD(int32_t, SendBytes, (int32_t socket, const void *data, uint32_t len), (override)); + MOCK_METHOD(void, Shutdown, (int32_t socket), (override)); void MakeMsgLoopback() const; void MakeSelfDeviceId(const DeviceIdentify *devId) const; void MakeDeviceOnline(const DeviceIdentify *devId) const; diff --git a/test/dslm_unit_test/dslm_msg_lib_test.cpp b/test/dslm_unit_test/dslm_msg_lib_test.cpp index 13f3685..955d7ee 100755 --- a/test/dslm_unit_test/dslm_msg_lib_test.cpp +++ b/test/dslm_unit_test/dslm_msg_lib_test.cpp @@ -113,7 +113,7 @@ HWTEST_F(DslmMsgLibTest, DeviceSocketTestCase2, TestSize.Level0) char dummy[] = {'a', 0}; PeerSocketInfo peer = {.name = dummy, .networkId = dummy}; { - DeviceIdentify id {.identity = {'a'}, .length = 1}; + DeviceIdentify id {.length = 1, .identity = {'a'}}; uint8_t msg[UINT8_MAX] = {0}; UtPushMsgDataToPendingList(0, &id, msg, 1); } @@ -186,9 +186,10 @@ HWTEST_F(DslmMsgLibTest, ProcessSocketMessageReceivedTest, TestSize.Level0) .pkgName = "pkg", .primarySockName = "pr", .secondarySockName = "", - .threadCnt = 1, .messageReceiver = [](const DeviceIdentify *, const uint8_t *, uint32_t) { return 0; }, + .threadCnt = 1, }; + auto ret = InitDeviceSocketManager(queue, &config); EXPECT_TRUE(ret); @@ -287,18 +288,19 @@ HWTEST_F(DslmMsgLibTest, MessengerSendMsgToTest, TestSize.Level0) MessengerConfig config = {.pkgName = "pkg", .primarySockName = "pr", .secondarySockName = "se", + .messageReceiver = [](const DeviceIdentify *, const uint8_t *, uint32_t) { return 0; }, .threadCnt = 1, - .messageReceiver = [](const DeviceIdentify *, const uint8_t *, uint32_t) { return 0; }}; + }; auto ret = InitDeviceSocketManager(queue, &config); EXPECT_TRUE(ret); uint8_t msg[UINT8_MAX] = {0}; { - DeviceIdentify idt {.identity = {'a'}, .length = 1}; + DeviceIdentify idt {.length = 1, .identity = {'x'}}; MessengerSendMsgTo(0, &idt, msg, UINT8_MAX); } { - DeviceIdentify idt {.identity = {'x'}, .length = 1}; + DeviceIdentify idt {.length = 1, .identity = {'x'}}; MessengerSendMsgTo(0, &idt, msg, UINT8_MAX); } EXPECT_TRUE(DeInitDeviceSocketManager()); @@ -334,7 +336,7 @@ HWTEST_F(DslmMsgLibTest, CreateQueueMsgDataTest, TestSize.Level0) uint32_t queueDataLen = 0; auto *data = CreateQueueMsgData(&idt, msg, UINT8_MAX, &queueDataLen); ASSERT_NE(data, nullptr); - EXPECT_EQ(data->msgLen, UINT8_MAX); + EXPECT_EQ(data->msgLen, static_cast(UINT8_MAX)); EXPECT_EQ(queueDataLen, UINT8_MAX + sizeof(QueueMsgData)); } } @@ -532,11 +534,11 @@ HWTEST_F(DslmMsgLibTest, MessengerGetDeviceOnlineStatus, TestSize.Level0) EXPECT_FALSE(MessengerGetDeviceOnlineStatus(nullptr, nullptr)); } { - DeviceIdentify idt {.identity = {'a'}, .length = 1}; + DeviceIdentify idt {.length = 1, .identity = {'a'}}; EXPECT_FALSE(MessengerGetDeviceOnlineStatus(&idt, nullptr)); } { - DeviceIdentify idt {.identity = {'a'}, .length = 1}; + DeviceIdentify idt {.length = 1, .identity = {'a'}}; int32_t level = 0; EXPECT_FALSE(MessengerGetDeviceOnlineStatus(&idt, &level)); } diff --git a/test/dslm_unit_test/dslm_request_callback_mock.h b/test/dslm_unit_test/dslm_request_callback_mock.h index 582a0e8..d1dfef0 100644 --- a/test/dslm_unit_test/dslm_request_callback_mock.h +++ b/test/dslm_unit_test/dslm_request_callback_mock.h @@ -30,14 +30,14 @@ class DslmRequestCallback { public: DslmRequestCallback() = default; virtual ~DslmRequestCallback() = default; - virtual void RequestCallback(uint32_t cookie, uint32_t result, const DslmCallbackInfo *info) = 0; + virtual void RequestCallback(uint32_t cookie, uint32_t result, const DslmCallbackInfo *info) = 0; }; class DslmRequestCallbackMock : public DslmRequestCallback { public: DslmRequestCallbackMock(); ~DslmRequestCallbackMock() override; - MOCK_METHOD3(RequestCallback, void(uint32_t cookie, uint32_t result, const DslmCallbackInfo *info)); + MOCK_METHOD(void, RequestCallback, (uint32_t cookie, uint32_t result, const DslmCallbackInfo *info), (override)); static void MockedCallback(uint32_t owner, uint32_t cookie, uint32_t result, const DslmCallbackInfo *info); diff --git a/test/dslm_unit_test/dslm_test.cpp b/test/dslm_unit_test/dslm_test.cpp index d58de4e..4199b4b 100755 --- a/test/dslm_unit_test/dslm_test.cpp +++ b/test/dslm_unit_test/dslm_test.cpp @@ -1701,7 +1701,7 @@ HWTEST_F(DslmTest, OnMsgSendResultNotifier_case1, TestSize.Level0) uint32_t res = 2; // ERR_SESSION_OPEN_FAILED ScheduleDslmStateMachine(deviceInfo, EVENT_MSG_SEND_FAILED, &res); - EXPECT_GE(deviceInfo->machine.currState, 0); + EXPECT_GE(deviceInfo->machine.currState, static_cast(0)); ScheduleDslmStateMachine(deviceInfo, EVENT_DEVICE_OFFLINE, &res); mockMsg.MakeDeviceOffline(&identify); } @@ -2045,7 +2045,7 @@ HWTEST_F(DslmTest, DslmDumper_case1, TestSize.Level0) ReportAppInvokeEvent(nullptr); ReportSecurityInfoSyncEvent(nullptr); auto handle = DslmUtilsStartPeriodicTimerTask(100, [](const void *context) { return; }, nullptr); - ASSERT_NE(handle, 0); + ASSERT_NE(handle, static_cast(0)); DslmUtilsStopTimerTask(handle); } @@ -2057,35 +2057,35 @@ HWTEST_F(DslmTest, DslmQueue_case1, TestSize.Level0) auto proc = [](const uint8_t *data, uint32_t len) { return; }; { auto ret = QueueWork(queue, proc, nullptr, 0); - EXPECT_EQ(ret, WORK_QUEUE_OK); + EXPECT_EQ(ret, static_cast(WORK_QUEUE_OK)); } { auto ret = QueueWork(nullptr, nullptr, nullptr, 0); - EXPECT_EQ(ret, WORK_QUEUE_NULL_PTR); + EXPECT_EQ(ret, static_cast(WORK_QUEUE_NULL_PTR)); ret = QueueWork(queue, nullptr, nullptr, 0); - EXPECT_EQ(ret, WORK_QUEUE_NULL_PTR); + EXPECT_EQ(ret, static_cast(WORK_QUEUE_NULL_PTR)); } { auto sleepfunc = [](const uint8_t *data, uint32_t len) { this_thread::sleep_for(milliseconds(600)); }; auto ret = QueueWork(queue, sleepfunc, nullptr, 0); - EXPECT_EQ(ret, WORK_QUEUE_OK); + EXPECT_EQ(ret, static_cast(WORK_QUEUE_OK)); ret = QueueWork(queue, sleepfunc, nullptr, 0); (void)QueueWork(queue, proc, nullptr, 0); (void)QueueWork(queue, proc, nullptr, 0); (void)QueueWork(queue, proc, nullptr, 0); (void)QueueWork(queue, proc, nullptr, 0); (void)QueueWork(queue, proc, nullptr, 0); - EXPECT_GE(ret, WORK_QUEUE_OK); + EXPECT_GE(ret, static_cast(WORK_QUEUE_OK)); } { auto ret = DestroyWorkQueue(queue); - EXPECT_EQ(ret, 0); + EXPECT_EQ(ret, static_cast(0)); } { auto ret = DestroyWorkQueue(nullptr); - EXPECT_EQ(ret, WORK_QUEUE_NULL_PTR); + EXPECT_EQ(ret, static_cast(WORK_QUEUE_NULL_PTR)); } } } // namespace DslmUnitTest -- Gitee From af95a082995bb131d747e645e516218709f59597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E9=B9=8F=E6=98=8A?= Date: Tue, 20 Aug 2024 07:12:35 +0000 Subject: [PATCH 2/2] fix: Adjust gn order MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨鹏昊 --- test/dslm_unit_test/dslm_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dslm_unit_test/dslm_test.cpp b/test/dslm_unit_test/dslm_test.cpp index 4199b4b..23bc08d 100755 --- a/test/dslm_unit_test/dslm_test.cpp +++ b/test/dslm_unit_test/dslm_test.cpp @@ -1701,7 +1701,7 @@ HWTEST_F(DslmTest, OnMsgSendResultNotifier_case1, TestSize.Level0) uint32_t res = 2; // ERR_SESSION_OPEN_FAILED ScheduleDslmStateMachine(deviceInfo, EVENT_MSG_SEND_FAILED, &res); - EXPECT_GE(deviceInfo->machine.currState, static_cast(0)); + EXPECT_GE(deviceInfo->machine.currState, static_cast(0)); ScheduleDslmStateMachine(deviceInfo, EVENT_DEVICE_OFFLINE, &res); mockMsg.MakeDeviceOffline(&identify); } -- Gitee