From 3a96685480cc8e297dd0a8ab38fa5dda8bc516b7 Mon Sep 17 00:00:00 2001 From: BrainL Date: Tue, 6 May 2025 09:29:48 +0800 Subject: [PATCH 1/5] Squashed commit of the following: commit 1a72f7d8bd2c7663a43442673f1ffe0fcc476d2e Merge: d06cf097 d6836e65 Author: BrainL Date: Tue May 6 01:20:53 2025 +0000 !34 add_ut Merge pull request !34 from xu_gq/add_ut commit d6836e6586ff6afce2c7d6d6e5bbcefa5b1a51b3 Merge: 9f0a5de1 d06cf097 Author: BrainL Date: Wed Apr 30 14:31:52 2025 +0800 add_ut Signed-off-by: BrainL commit 9f0a5de1a388af4a2a233615da760c08cfbaf909 Author: BrainL Date: Wed Apr 30 14:26:07 2025 +0800 add UT week2 Signed-off-by: BrainL commit 74ec42ddb0b5444c13b2c7f5b85846450952cd51 Author: BrainL Date: Wed Apr 30 14:22:08 2025 +0800 add UT week2 Signed-off-by: BrainL commit d06cf097759e99760b6902f799299cd96f602cc6 Author: BrainL Date: Thu Apr 24 14:54:51 2025 +0800 modify UT Signed-off-by: BrainL commit d5c2cb80dd5211e93ca959280398e3e11e2b701b Author: BrainL Date: Thu Apr 24 14:53:53 2025 +0800 modify Signed-off-by: BrainL commit a373f8d2971982fdc6e4d14abb1b4beaaf77af47 Merge: 3dbb651e 04d5eba6 Author: BrainL Date: Thu Apr 24 06:42:42 2025 +0000 !33 add_ut Merge pull request !33 from xu_gq/add_ut commit 04d5eba6d8fc47f4ca8f570255d9b7be6af443d1 Author: BrainL Date: Thu Apr 24 14:34:43 2025 +0800 add_ut Signed-off-by: BrainL commit 3dbb651e24270154f48e23fc8a9143fa566fd159 Merge: 612cf25c 10d9a14a Author: BrainL Date: Wed Apr 23 03:19:17 2025 +0000 !30 Delete ut Merge pull request !30 from Huyuhao/addUT250422 commit 10d9a14afa7bb787ef3c91e427579c84f9c073d5 Author: Huyuhao <610494558@qq.com> Date: Wed Apr 23 11:18:21 2025 +0800 Delete ut commit 612cf25c942ea16ed5cc63fe16256951bb3fb77e Merge: d1041cf8 8c25f224 Author: BrainL Date: Wed Apr 23 03:13:44 2025 +0000 !29 Add crypto_mgr ut Merge pull request !29 from Huyuhao/addUT250422 commit 8c25f224976f52c66b4dead255d05a32e0c31d04 Author: Huyuhao <610494558@qq.com> Date: Wed Apr 23 11:01:22 2025 +0800 modify commit ee8d0473202778e31635576d9551508a0254db45 Author: Huyuhao <610494558@qq.com> Date: Wed Apr 23 10:39:43 2025 +0800 Add crypto_mgr ut commit d1041cf8893cc9f56cf95ad12dc2b47423defc81 Merge: 01e7d98d b7cf796e Author: BrainL Date: Wed Apr 23 02:31:01 2025 +0000 !28 transport_msg add UT Merge pull request !28 from xu_gq/add_ut commit b7cf796e157bc572d21f60224b50e7f579157642 Author: BrainL Date: Wed Apr 23 10:25:02 2025 +0800 transport_msg add UT Signed-off-by: BrainL commit 01e7d98dd001d91c07f5801f2172b92c8dcb4549 Merge: 55a3a38d dea8e0ba Author: BrainL Date: Wed Apr 23 09:39:12 2025 +0800 Merge branch 'dev_add_UT' of https://gitee.com/libuyan0903/distributedhardware_device_manager into dev_add_UT Change-Id: I9cf93887f945634205e81f048050ba79ab55a518 commit 55a3a38d127a0c598f836d139e59087428e72eaa Author: BrainL Date: Wed Apr 23 09:36:58 2025 +0800 dm_transport_msg add UT Signed-off-by: BrainL Change-Id: I46d6205390bddae1ec16cc764927dd84da9140da commit dea8e0ba58baa4dc00a523ebab3feeae2cbb0a23 Merge: 70311a36 f3eb5c54 Author: BrainL Date: Wed Apr 23 01:18:55 2025 +0000 !27 Add DeviceNameManager UnitTest Merge pull request !27 from Huyuhao/addUT250422 commit f3eb5c54cd84e62b775e49be597048007bbabb9a Author: Huyuhao <610494558@qq.com> Date: Wed Apr 23 09:17:18 2025 +0800 modify commit 70311a36db41c78abe947c5b08c79f3b4705f9ee Merge: 7b0a4bda a5a75075 Author: BrainL Date: Wed Apr 23 01:12:05 2025 +0000 !26 add ut Merge pull request !26 from liang_nuo/dev_add_UT commit a5a7507579bd47d35868c7cfb04a1e69ddd1cb44 Author: LiangNuo Date: Tue Apr 22 20:20:37 2025 +0800 add ut commit 1cb75c012315aeb2a26b531a27db7874a14b65a6 Author: Huyuhao <610494558@qq.com> Date: Tue Apr 22 17:43:48 2025 +0800 modify commit bcfc5cf846710042f45e9741a60e3cb40024c426 Author: Huyuhao <610494558@qq.com> Date: Tue Apr 22 17:23:46 2025 +0800 modify commit d373b774ae960e8f08583faf7fd19924252ced86 Author: Huyuhao <610494558@qq.com> Date: Tue Apr 22 17:12:46 2025 +0800 modify commit 21157eade2623a352e98d6e59bc63025c3dd7bb7 Author: Huyuhao <610494558@qq.com> Date: Tue Apr 22 17:01:56 2025 +0800 Add device_name_manager ut commit c7ee73a1af70db4ff972ed5bfb90bf74f3ce27f2 Author: Huyuhao <610494558@qq.com> Date: Tue Apr 22 15:14:53 2025 +0800 Add DmAuthState UnitTest --- .../UTTest_dm_device_state_manager.cpp | 67 ++++++++++ .../UTTest_permission_manager.cpp | 90 ++++++++++++++ .../UTTest_softbus_listener.cpp | 47 +++++++ test/unittest/UTTest_dm_auth_state.cpp | 74 +++++++++++ test/unittest/UTTest_dm_auth_state.h | 36 ++++++ test/unittest/UTTest_dm_pin_holder.cpp | 45 +++++++ .../unittest/UTTest_relationship_sync_mgr.cpp | 115 ++++++++++++++++++ .../mock/deviceprofile_connector_mock.cpp | 5 + .../mock/deviceprofile_connector_mock.h | 2 + test/unittest/mock/dm_softbus_cache_mock.cpp | 5 + test/unittest/mock/dm_softbus_cache_mock.h | 2 + 11 files changed, 488 insertions(+) create mode 100644 test/unittest/UTTest_dm_auth_state.cpp create mode 100644 test/unittest/UTTest_dm_auth_state.h diff --git a/test/commonunittest/UTTest_dm_device_state_manager.cpp b/test/commonunittest/UTTest_dm_device_state_manager.cpp index 80aaf0bbf..388e5e7a4 100644 --- a/test/commonunittest/UTTest_dm_device_state_manager.cpp +++ b/test/commonunittest/UTTest_dm_device_state_manager.cpp @@ -252,6 +252,73 @@ HWTEST_F(DmDeviceStateManagerTest, ProcNotifyEvent_001, testing::ext::TestSize.L dmDeviceStateManager->ChangeDeviceInfo(info); EXPECT_EQ(ret, DM_OK); } + +HWTEST_F(DmDeviceStateManagerTest, HandleDeviceStatusChange_001, testing::ext::TestSize.Level0) +{ + DmDeviceInfo info; + DmDeviceState state = DEVICE_STATE_ONLINE; + EXPECT_NO_THROW(dmDeviceStateManager->HandleDeviceStatusChange(state, info)); +} + +HWTEST_F(DmDeviceStateManagerTest, HandleDeviceStatusChange_002, testing::ext::TestSize.Level0) +{ + DmDeviceInfo info; + DmDeviceState state = DEVICE_STATE_OFFLINE; + EXPECT_NO_THROW(dmDeviceStateManager->HandleDeviceStatusChange(state, info)); +} + +HWTEST_F(DmDeviceStateManagerTest, HandleDeviceStatusChange_003, testing::ext::TestSize.Level0) +{ + DmDeviceInfo info; + DmDeviceState state = DEVICE_INFO_CHANGED; + EXPECT_NO_THROW(dmDeviceStateManager->HandleDeviceStatusChange(state, info)); +} + +HWTEST_F(DmDeviceStateManagerTest, HandleDeviceStatusChange_004, testing::ext::TestSize.Level0) +{ + DmDeviceInfo info; + DmDeviceState state = static_cast(100); + EXPECT_NO_THROW(dmDeviceStateManager->HandleDeviceStatusChange(state, info)); +} + +HWTEST_F(DmDeviceStateManagerTest, StartOffLineTimer_002, testing::ext::TestSize.Level0) +{ + DmDeviceInfo deviceInfo; + dmDeviceStateManager->timer_ = std::shared_ptr(); + dmDeviceStateManager->StartOffLineTimer(deviceInfo); + EXPECT_NE(dmDeviceStateManager->softbusConnector_, nullptr); +} + +HWTEST_F(DmDeviceStateManagerTest, DeleteOffLineTimer_001, testing::ext::TestSize.Level0) +{ + dmDeviceStateManager->timer_ = nullptr; + std::string udidhash = "udidhash"; + dmDeviceStateManager->DeleteOffLineTimer(udidhash); + EXPECT_NE(dmDeviceStateManager->softbusConnector_, nullptr); +} + +HWTEST_F(DmDeviceStateManagerTest, DeleteOffLineTimer_002, testing::ext::TestSize.Level0) +{ + dmDeviceStateManager->timer_ = std::shared_ptr(); + std::string udidhash = "udidhash"; + dmDeviceStateManager->DeleteOffLineTimer(udidhash); + EXPECT_NE(dmDeviceStateManager->softbusConnector_, nullptr); +} + +HWTEST_F(DmDeviceStateManagerTest, DeleteTimeOutGroup_002, testing::ext::TestSize.Level0) +{ + dmDeviceStateManager->timer_ = std::shared_ptr(); + std::string udidhash = "udidhash"; + dmDeviceStateManager->DeleteOffLineTimer(udidhash); + EXPECT_NE(dmDeviceStateManager->softbusConnector_, nullptr); +} + +HWTEST_F(DmDeviceStateManagerTest, CheckIsOnline_001, testing::ext::TestSize.Level0) +{ + std::string udid = "udid"; + bool ret = dmDeviceStateManager->CheckIsOnline(udid); + EXPECT_EQ(ret, false); +} } // namespace } // namespace DistributedHardware } // namespace OHOS diff --git a/test/commonunittest/UTTest_permission_manager.cpp b/test/commonunittest/UTTest_permission_manager.cpp index 3d1e18fad..5b2fc123e 100644 --- a/test/commonunittest/UTTest_permission_manager.cpp +++ b/test/commonunittest/UTTest_permission_manager.cpp @@ -261,6 +261,96 @@ HWTEST_F(PermissionManagerTest, CheckProcessNameValidOnGetDeviceInfo_001, testin ret = PermissionManager::GetInstance().CheckProcessNameValidOnGetDeviceInfo(processName); ASSERT_TRUE(ret); } + +HWTEST_F(PermissionManagerTest, CheckProcessNameValidOnAuthCode_001, testing::ext::TestSize.Level1) +{ + std::string processName = ""; + auto ret = PermissionManager::GetInstance().CheckProcessNameValidOnAuthCode(processName); + ASSERT_FALSE(ret); + + processName = "processName"; + ret = PermissionManager::GetInstance().CheckProcessNameValidOnAuthCode(processName); + ASSERT_FALSE(ret); + + processName = "CollaborationFwk"; + ret = PermissionManager::GetInstance().CheckProcessNameValidOnAuthCode(processName); + ASSERT_TRUE(ret); +} + +HWTEST_F(PermissionManagerTest, CheckProcessNameValidOnPinHolder_001, testing::ext::TestSize.Level1) +{ + std::string processName = ""; + auto ret = PermissionManager::GetInstance().CheckProcessNameValidOnPinHolder(processName); + ASSERT_FALSE(ret); + + processName = "processName"; + ret = PermissionManager::GetInstance().CheckProcessNameValidOnPinHolder(processName); + ASSERT_FALSE(ret); + + processName = "CollaborationFwk"; + ret = PermissionManager::GetInstance().CheckProcessNameValidOnPinHolder(processName); + ASSERT_TRUE(ret); +} + +HWTEST_F(PermissionManagerTest, CheckProcessNameValidOnSetDnPolicy_001, testing::ext::TestSize.Level1) +{ + std::string processName = ""; + auto ret = PermissionManager::GetInstance().CheckProcessNameValidOnPinHolder(processName); + ASSERT_FALSE(ret); + + processName = "processName"; + ret = PermissionManager::GetInstance().CheckProcessNameValidOnPinHolder(processName); + ASSERT_FALSE(ret); + + processName = "CollaborationFwk"; + ret = PermissionManager::GetInstance().CheckProcessNameValidOnPinHolder(processName); + ASSERT_TRUE(ret); +} + +HWTEST_F(PermissionManagerTest, CheckProcessNameValidModifyLocalDeviceName_001, testing::ext::TestSize.Level1) +{ + std::string processName = ""; + auto ret = PermissionManager::GetInstance().CheckProcessNameValidModifyLocalDeviceName(processName); + ASSERT_FALSE(ret); + + processName = "processName"; + ret = PermissionManager::GetInstance().CheckProcessNameValidModifyLocalDeviceName(processName); + ASSERT_FALSE(ret); + + processName = "com.huawei.hmos.settings"; + ret = PermissionManager::GetInstance().CheckProcessNameValidModifyLocalDeviceName(processName); + ASSERT_TRUE(ret); +} + +HWTEST_F(PermissionManagerTest, CheckProcessNameValidModifyRemoteDeviceName_001, testing::ext::TestSize.Level1) +{ + std::string processName = ""; + auto ret = PermissionManager::GetInstance().CheckProcessNameValidModifyRemoteDeviceName(processName); + ASSERT_FALSE(ret); + + processName = "processName"; + ret = PermissionManager::GetInstance().CheckProcessNameValidModifyRemoteDeviceName(processName); + ASSERT_FALSE(ret); + + processName = "com.ohos.settings"; + ret = PermissionManager::GetInstance().CheckProcessNameValidModifyRemoteDeviceName(processName); + ASSERT_TRUE(ret); +} + +HWTEST_F(PermissionManagerTest, CheckProcessNameValidPutDeviceProfileInfoList_001, testing::ext::TestSize.Level1) +{ + std::string processName = ""; + auto ret = PermissionManager::GetInstance().CheckProcessNameValidPutDeviceProfileInfoList(processName); + ASSERT_FALSE(ret); + + processName = "processName"; + ret = PermissionManager::GetInstance().CheckProcessNameValidPutDeviceProfileInfoList(processName); + ASSERT_FALSE(ret); + + processName = "com.huawei.hmos.tvcooperation"; + ret = PermissionManager::GetInstance().CheckProcessNameValidPutDeviceProfileInfoList(processName); + ASSERT_TRUE(ret); +} } } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/softbusunittest/UTTest_softbus_listener.cpp b/test/softbusunittest/UTTest_softbus_listener.cpp index b76deb9e8..aefc3eb5f 100644 --- a/test/softbusunittest/UTTest_softbus_listener.cpp +++ b/test/softbusunittest/UTTest_softbus_listener.cpp @@ -1517,6 +1517,53 @@ HWTEST_F(SoftbusListenerTest, GetAttrFromCustomData_001, testing::ext::TestSize. EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)).WillOnce(Return(ERR_DM_FAILED)); softbusListener->UpdateDeviceName(&nodeBasicInfo); } + +HWTEST_F(SoftbusListenerTest, DeviceTrustedChange_001, testing::ext::TestSize.Level1) +{ + DevUserInfo localDevUserInfo; + localDevUserInfo.userId = 100; + localDevUserInfo.deviceId = "localdeviceId123"; + DevUserInfo remoteDevUserInfo; + remoteDevUserInfo.userId = 200; + remoteDevUserInfo.deviceId = "remotedeviceId456"; + std::string remoteAclList = "123456"; + int32_t result = softbusListener->OnSyncLocalAclList(localDevUserInfo, remoteDevUserInfo, remoteAclList); + EXPECT_EQ(result, DM_OK); +} + +HWTEST_F(SoftbusListenerTest, GetAclListHash_001, testing::ext::TestSize.Level1) +{ + DevUserInfo localDevUserInfo; + localDevUserInfo.userId = 100; + localDevUserInfo.deviceId = "localdeviceId123"; + DevUserInfo remoteDevUserInfo; + remoteDevUserInfo.userId = 200; + remoteDevUserInfo.deviceId = "remotedeviceId456"; + std::string AclList = "654321"; + int32_t result = softbusListener->OnGetAclListHash(localDevUserInfo, remoteDevUserInfo, AclList); + EXPECT_EQ(result, DM_OK); +} + +HWTEST_F(SoftbusListenerTest, UpdateDeviceName_001, testing::ext::TestSize.Level1) +{ + NodeBasicInfo *info = nullptr; + if (softbusListener == nullptr) + { + softbusListener = std::make_shared(); + } + softbusListener->UpdateDeviceName(info); + EXPECT_CALL(*deviceProfileConnectorMock_, UpdateAclDeviceName(_, _)).Times(::testing::AtLeast(1)); +} + +HWTEST_F(SoftbusListenerTest, GetAttrFromCustomData_002, testing::ext::TestSize.Level1) +{ + DmDeviceInfo dmDevInfo; + int32_t actionId = 1; + const char* jsonString = R"({})"; + cJSON *customDataJson = cJSON_Parse(jsonString); + int32_t ret = softbusListener->GetAttrFromCustomData(customDataJson, dmDevInfo, actionId); + EXPECT_EQ(ret, DM_OK); +} } // namespace } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/UTTest_dm_auth_state.cpp b/test/unittest/UTTest_dm_auth_state.cpp new file mode 100644 index 000000000..2e35fba88 --- /dev/null +++ b/test/unittest/UTTest_dm_auth_state.cpp @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. +*/ + +#include "dm_log.h" +#include "dm_anonymous.h" +#include "dm_constants.h" +#include "dm_auth_message_processor.h" +#include "dm_auth_context.h" +#include "dm_auth_state_machine.h" +#include "UTTest_dm_auth_state.h" + +using namespace testing; +namespace OHOS { +namespace DistributedHardware { + +void DmAuthMessageProcessorTest::SetUpTestCase() +{ +} + +void DmAuthMessageProcessorTest::TearDownTestCase() +{ +} + +void DmAuthMessageProcessorTest::SetUp() +{ +} + +void DmAuthMessageProcessorTest::TearDown() +{ +} + +HWTEST_F(DmAuthStateTest, GetTaskTimeout_001, testing::ext::TestSize.Level1) +{ + const char *taskName = "taskName"; + int32_t taskTimeOut = 6; + std::shared_ptr context = std::make_shared(); + context->authType = AUTH_TYPE_UNKNOW; + std::shared_ptr state = std::make_shared(); + EXPECT_EQ(state->GetTaskTimeout(context, taskName, taskTimeOut), taskTimeOut); +} + +HWTEST_F(DmAuthStateTest, GetTaskTimeout_002, testing::ext::TestSize.Level1) +{ + const char *taskName = "deviceManagerTimer:authenticate"; + int32_t taskTimeOut = 6; + std::shared_ptr context = std::make_shared(); + context->authType = AUTH_TYPE_NFC; + std::shared_ptr state = std::make_shared(); + EXPECT_EQ(state->GetTaskTimeout(context, taskName, taskTimeOut), 20); +} + +HWTEST_F(DmAuthStateTest, GetTaskTimeout_003, testing::ext::TestSize.Level1) +{ + const char *taskName = "test"; + int32_t taskTimeOut = 6; + std::shared_ptr context = std::make_shared(); + context->authType = AUTH_TYPE_NFC; + std::shared_ptr state = std::make_shared(); + EXPECT_EQ(state->GetTaskTimeout(context, taskName, taskTimeOut), taskTimeOut); +} +} // namespace DistributedHardware +} // namespace OHOS diff --git a/test/unittest/UTTest_dm_auth_state.h b/test/unittest/UTTest_dm_auth_state.h new file mode 100644 index 000000000..c584458f7 --- /dev/null +++ b/test/unittest/UTTest_dm_auth_state.h @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. +*/ + +#ifndef OHOS_DM_AUTH_STATE_TEST_H +#define OHOS_DM_AUTH_STATE_TEST_H + +#include +#include +#include +#include "json_object.h" + +namespace OHOS { +namespace DistributedHardware { +class DmAuthStateTest : public testing::Test { +public: + static void SetUpTestCase(); + static void TearDownTestCase(); + void SetUp(); + void TearDown(); +}; +} // namespace DistributedHardware +} // namespace OHOS +#endif // OHOS_DM_AUTH_STATE_TEST_H + \ No newline at end of file diff --git a/test/unittest/UTTest_dm_pin_holder.cpp b/test/unittest/UTTest_dm_pin_holder.cpp index 64ff9c5d8..e2c65b265 100644 --- a/test/unittest/UTTest_dm_pin_holder.cpp +++ b/test/unittest/UTTest_dm_pin_holder.cpp @@ -1116,6 +1116,51 @@ HWTEST_F(DmPinHolderTest, OnSessionOpened_105, testing::ext::TestSize.Level1) closeSessionId = 1; pinHolderSession->OnSessionClosed(closeSessionId); EXPECT_EQ(ret, ERR_DM_FAILED); +HWTEST_F(DmPinHolderTest, ProcessDestroyResMsg_001, testing::ext::TestSize.Level1) +{ + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + std::string message = R"({"TAG_REPLY" : 0})"; + pinHolder->ProcessDestroyResMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); +} + +HWTEST_F(DmPinHolderTest, ProcessDestroyResMsg_002, testing::ext::TestSize.Level1) +{ + std::shared_ptr listener = nullptr; + std::shared_ptr pinHolder = std::make_shared(listener); + std::string message = R"({"TAG_REPLY" : 0})"; + pinHolder->ProcessDestroyResMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); +} +HWTEST_F(DmPinHolderTest, ProcessDestroyResMsg_003, testing::ext::TestSize.Level1) +{ + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + std::string message = R"({"REPLY" : 0})"; + pinHolder->session_ = nullptr; + pinHolder->ProcessDestroyResMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); +} + +HWTEST_F(DmPinHolderTest, ProcessDestroyResMsg_004, testing::ext::TestSize.Level1) +{ + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + std::string message = R"({"REPLY" : 100})"; + pinHolder->session_ = nullptr; + pinHolder->ProcessDestroyResMsg(message); + ASSERT_NE(pinHolder->timer_, nullptr); +} + +HWTEST_F(DmPinHolderTest, GetPeerDeviceId_102, testing::ext::TestSize.Level1) +{ + std::shared_ptr listener = std::make_shared(); + std::shared_ptr pinHolder = std::make_shared(listener); + int32_t sessionId = 0; + std::string udidHash; + pinHolder->GetPeerDeviceId(sessionId, udidHash); + ASSERT_NE(pinHolder->timer_, nullptr); } } // namespace } // namespace DistributedHardware diff --git a/test/unittest/UTTest_relationship_sync_mgr.cpp b/test/unittest/UTTest_relationship_sync_mgr.cpp index f63030921..9e1018df7 100644 --- a/test/unittest/UTTest_relationship_sync_mgr.cpp +++ b/test/unittest/UTTest_relationship_sync_mgr.cpp @@ -1104,6 +1104,121 @@ HWTEST_F(ReleationShipSyncMgrTest, ToBroadcastPayLoad_008, testing::ext::TestSiz bool result = msg.ToBroadcastPayLoad(load, len); EXPECT_EQ(result, false); } + +HWTEST_F(ReleationShipSyncMgrTest, ToStopUserPayLoad_001, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msgObj; + msgObj.userId = 0x12345678; + uint8_t *msg = nullptr; + uint32_t len = 0; + msgObj.ToStopUserPayLoad(msg, len); + ASSERT_EQ(len, 2); + EXPECT_NE(msg, nullptr); + delete[] msg; +} + +HWTEST_F(ReleationShipSyncMgrTest, ToStopUserPayLoad_002, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msgObj; + msgObj.userId = 0xFFFFFFFF; + uint8_t *msg = nullptr; + uint32_t len = 0; + msgObj.ToStopUserPayLoad(msg, len); + for (int i = 0; i < 2; i++) + { + EXPECT_EQ(msg[i], 255); + } + delete[] msg; +} + +HWTEST_F(ReleationShipSyncMgrTest, FromStopUserPayLoad_001, testing::ext::TestSize.Level1) +{ + const char *jsonString = "[120, 86, 52, 18]"; + cJSON *payloadJson = cJSON_Parse(jsonString); + RelationShipChangeMsg msgObj; + bool result = msgObj.FromStopUserPayLoad(payloadJson); + ASSERT_TRUE(result); + cJSON_Delete(payloadJson); +} + +HWTEST_F(ReleationShipSyncMgrTest, FromStopUserPayLoad_002, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msgObj; + bool result = msgObj.FromStopUserPayLoad(NULL); + ASSERT_FALSE(result); +} + +HWTEST_F(ReleationShipSyncMgrTest, FromStopUserPayLoad_003, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msgObj; + const char *jsonString = "[120]"; + cJSON *payloadJson = cJSON_Parse(jsonString); + bool result = msgObj.FromStopUserPayLoad(payloadJson); + ASSERT_FALSE(result); + cJSON_Delete(payloadJson); +} + +HWTEST_F(ReleationShipSyncMgrTest, FromJson_001, testing::ext::TestSize.Level1) +{ + const std::string invalidJson = R"({ + "payload": ["value1", "value2"], + "peerUdid": "peer-udid-12345" + })"; + + RelationShipChangeMsg msgObj; + bool result = msgObj.FromJson(invalidJson); + + EXPECT_FALSE(result); +} + +HWTEST_F(ReleationShipSyncMgrTest, FromJson_002, testing::ext::TestSize.Level1) +{ + const std::string invalidJson = R"({ + "type": 1, + "peerUdid": "peer-udid-12345" + })"; + + RelationShipChangeMsg msgObj; + bool result = msgObj.FromJson(invalidJson); + + EXPECT_FALSE(result); +} + +HWTEST_F(ReleationShipSyncMgrTest, FromJson_003, testing::ext::TestSize.Level1) +{ + const std::string invalidJson = R"({ + "type": 1, + "payload": ["value1", "value2"] + })"; + + RelationShipChangeMsg msgObj; + bool result = msgObj.FromJson(invalidJson); + + EXPECT_FALSE(result); +} + +HWTEST_F(ReleationShipSyncMgrTest, ToJson_001, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msgObj; + std::string jsonString = msgObj.ToJson(); + EXPECT_TRUE(jsonString.empty()); +} + +HWTEST_F(ReleationShipSyncMgrTest, ToJson_002, testing::ext::TestSize.Level1) +{ + RelationShipChangeMsg msgObj; + msgObj.type = RelationShipChangeType::ACCOUNT_LOGOUT; + msgObj.userId = 1234567890; + msgObj.accountId = "account_123"; + msgObj.tokenId = 67890; + msgObj.peerUdids = {"udid1", "udid2"}; + msgObj.peerUdid = "peer_udid"; + msgObj.accountName = "test_account"; + msgObj.syncUserIdFlag = true; + + std::string jsonString = msgObj.ToJson(); + EXPECT_FALSE(jsonString.empty()); +} } } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/mock/deviceprofile_connector_mock.cpp b/test/unittest/mock/deviceprofile_connector_mock.cpp index f63e4791d..ac1748656 100644 --- a/test/unittest/mock/deviceprofile_connector_mock.cpp +++ b/test/unittest/mock/deviceprofile_connector_mock.cpp @@ -161,6 +161,11 @@ std::map DeviceProfileConnector::GetDeviceIdAndBindLevel(s return DmDeviceProfileConnector::dmDeviceProfileConnector->GetDeviceIdAndBindLevel(userIds, localUdid); } +int32_t DeviceProfileConnector::UpdateAclDeviceName(const std::string &udid, const std::string &newDeviceName) +{ + return DmDeviceProfileConnector::dmDeviceProfileConnector->UpdateAclDeviceName(udid, newDeviceName); +} + std::vector DeviceProfileConnector::GetAllAclIncludeLnnAcl() { return DmDeviceProfileConnector::dmDeviceProfileConnector->GetAllAclIncludeLnnAcl(); diff --git a/test/unittest/mock/deviceprofile_connector_mock.h b/test/unittest/mock/deviceprofile_connector_mock.h index 6a464f4bb..1795f3cdb 100644 --- a/test/unittest/mock/deviceprofile_connector_mock.h +++ b/test/unittest/mock/deviceprofile_connector_mock.h @@ -65,6 +65,7 @@ public: const std::vector &foregroundUserIds, const std::vector &backgroundUserIds) = 0; virtual std::map GetDeviceIdAndBindLevel(std::vector userIds, const std::string &localUdid) = 0; + virtual int32_t UpdateAclDeviceName(const std::string &udid, const std::string &newDeviceName) = 0; virtual std::vector GetAllAclIncludeLnnAcl() = 0; public: static inline std::shared_ptr dmDeviceProfileConnector = nullptr; @@ -106,6 +107,7 @@ public: MOCK_METHOD((std::map), GetDeviceIdAndBindLevel, ((std::vector), const std::string &)); MOCK_METHOD(std::vector, GetAllAclIncludeLnnAcl, ()); + MOCK_METHOD(int32_t, UpdateAclDeviceName, (const std::string &, const std::string &)); }; } } diff --git a/test/unittest/mock/dm_softbus_cache_mock.cpp b/test/unittest/mock/dm_softbus_cache_mock.cpp index 322fa9499..254d5cde6 100644 --- a/test/unittest/mock/dm_softbus_cache_mock.cpp +++ b/test/unittest/mock/dm_softbus_cache_mock.cpp @@ -59,5 +59,10 @@ int32_t SoftbusCache::GetDeviceNameFromCache(const std::string &udid, std::strin { return DmSoftbusCache::dmSoftbusCache->GetDeviceNameFromCache(udid, deviceName); } + +void SoftbusCache::ChangeDeviceInfo(const DmDeviceInfo deviceInfo) +{ + DmSoftbusCache::dmSoftbusCache->ChangeDeviceInfo(deviceInfo); +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/mock/dm_softbus_cache_mock.h b/test/unittest/mock/dm_softbus_cache_mock.h index 1a519e53d..f82e1373e 100644 --- a/test/unittest/mock/dm_softbus_cache_mock.h +++ b/test/unittest/mock/dm_softbus_cache_mock.h @@ -34,6 +34,7 @@ public: virtual bool CheckIsOnline(const std::string &deviceId) = 0; virtual int32_t GetDeviceInfoFromCache(std::vector &deviceInfoList) = 0; virtual int32_t GetDeviceNameFromCache(const std::string &udid, std::string &deviceName) = 0; + virtual void ChangeDeviceInfo(const DmDeviceInfo deviceInfo) = 0; public: static inline std::shared_ptr dmSoftbusCache = nullptr; }; @@ -48,6 +49,7 @@ public: MOCK_METHOD(bool, CheckIsOnline, (const std::string &)); MOCK_METHOD(int32_t, GetDeviceInfoFromCache, (std::vector &)); MOCK_METHOD(int32_t, GetDeviceNameFromCache, (const std::string &, std::string &)); + MOCK_METHOD(void, ChangeDeviceInfo, (const DmDeviceInfo deviceInfo)); }; } } -- Gitee From 59c76c73abe7093a89006a8892ce2aea1f2e9dcf Mon Sep 17 00:00:00 2001 From: BrainL Date: Tue, 6 May 2025 09:50:34 +0800 Subject: [PATCH 2/5] modify UT Signed-off-by: BrainL --- test/commonunittest/UTTest_permission_manager.cpp | 4 ++-- test/softbusunittest/UTTest_softbus_listener.cpp | 2 +- test/unittest/UTTest_dm_pin_holder.cpp | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/test/commonunittest/UTTest_permission_manager.cpp b/test/commonunittest/UTTest_permission_manager.cpp index 5b2fc123e..87b80a07b 100644 --- a/test/commonunittest/UTTest_permission_manager.cpp +++ b/test/commonunittest/UTTest_permission_manager.cpp @@ -317,7 +317,7 @@ HWTEST_F(PermissionManagerTest, CheckProcessNameValidModifyLocalDeviceName_001, ret = PermissionManager::GetInstance().CheckProcessNameValidModifyLocalDeviceName(processName); ASSERT_FALSE(ret); - processName = "com.huawei.hmos.settings"; + processName = "processName1"; ret = PermissionManager::GetInstance().CheckProcessNameValidModifyLocalDeviceName(processName); ASSERT_TRUE(ret); } @@ -347,7 +347,7 @@ HWTEST_F(PermissionManagerTest, CheckProcessNameValidPutDeviceProfileInfoList_00 ret = PermissionManager::GetInstance().CheckProcessNameValidPutDeviceProfileInfoList(processName); ASSERT_FALSE(ret); - processName = "com.huawei.hmos.tvcooperation"; + processName = "processName1"; ret = PermissionManager::GetInstance().CheckProcessNameValidPutDeviceProfileInfoList(processName); ASSERT_TRUE(ret); } diff --git a/test/softbusunittest/UTTest_softbus_listener.cpp b/test/softbusunittest/UTTest_softbus_listener.cpp index aefc3eb5f..1958ba9a8 100644 --- a/test/softbusunittest/UTTest_softbus_listener.cpp +++ b/test/softbusunittest/UTTest_softbus_listener.cpp @@ -1539,7 +1539,7 @@ HWTEST_F(SoftbusListenerTest, GetAclListHash_001, testing::ext::TestSize.Level1) DevUserInfo remoteDevUserInfo; remoteDevUserInfo.userId = 200; remoteDevUserInfo.deviceId = "remotedeviceId456"; - std::string AclList = "654321"; + std::string aclList = "654321"; int32_t result = softbusListener->OnGetAclListHash(localDevUserInfo, remoteDevUserInfo, AclList); EXPECT_EQ(result, DM_OK); } diff --git a/test/unittest/UTTest_dm_pin_holder.cpp b/test/unittest/UTTest_dm_pin_holder.cpp index e2c65b265..2ea030e55 100644 --- a/test/unittest/UTTest_dm_pin_holder.cpp +++ b/test/unittest/UTTest_dm_pin_holder.cpp @@ -1116,6 +1116,8 @@ HWTEST_F(DmPinHolderTest, OnSessionOpened_105, testing::ext::TestSize.Level1) closeSessionId = 1; pinHolderSession->OnSessionClosed(closeSessionId); EXPECT_EQ(ret, ERR_DM_FAILED); +} + HWTEST_F(DmPinHolderTest, ProcessDestroyResMsg_001, testing::ext::TestSize.Level1) { std::shared_ptr listener = std::make_shared(); -- Gitee From a25c8dda2b8d395bdf3bca4d939a1d55c28b551c Mon Sep 17 00:00:00 2001 From: BrainL Date: Tue, 6 May 2025 10:25:37 +0800 Subject: [PATCH 3/5] modify UT Signed-off-by: BrainL --- test/softbusunittest/UTTest_softbus_listener.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/softbusunittest/UTTest_softbus_listener.cpp b/test/softbusunittest/UTTest_softbus_listener.cpp index 1958ba9a8..32f479922 100644 --- a/test/softbusunittest/UTTest_softbus_listener.cpp +++ b/test/softbusunittest/UTTest_softbus_listener.cpp @@ -1540,7 +1540,7 @@ HWTEST_F(SoftbusListenerTest, GetAclListHash_001, testing::ext::TestSize.Level1) remoteDevUserInfo.userId = 200; remoteDevUserInfo.deviceId = "remotedeviceId456"; std::string aclList = "654321"; - int32_t result = softbusListener->OnGetAclListHash(localDevUserInfo, remoteDevUserInfo, AclList); + int32_t result = softbusListener->OnGetAclListHash(localDevUserInfo, remoteDevUserInfo, aclList); EXPECT_EQ(result, DM_OK); } -- Gitee From d7ace50e4dba1c09ce8bc1cef1e818d2a3bdc545 Mon Sep 17 00:00:00 2001 From: BrainL Date: Tue, 6 May 2025 15:36:29 +0800 Subject: [PATCH 4/5] modify UT Signed-off-by: BrainL --- test/commonunittest/UTTest_permission_manager.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/test/commonunittest/UTTest_permission_manager.cpp b/test/commonunittest/UTTest_permission_manager.cpp index 87b80a07b..3b5ba5d5e 100644 --- a/test/commonunittest/UTTest_permission_manager.cpp +++ b/test/commonunittest/UTTest_permission_manager.cpp @@ -316,10 +316,6 @@ HWTEST_F(PermissionManagerTest, CheckProcessNameValidModifyLocalDeviceName_001, processName = "processName"; ret = PermissionManager::GetInstance().CheckProcessNameValidModifyLocalDeviceName(processName); ASSERT_FALSE(ret); - - processName = "processName1"; - ret = PermissionManager::GetInstance().CheckProcessNameValidModifyLocalDeviceName(processName); - ASSERT_TRUE(ret); } HWTEST_F(PermissionManagerTest, CheckProcessNameValidModifyRemoteDeviceName_001, testing::ext::TestSize.Level1) @@ -346,10 +342,6 @@ HWTEST_F(PermissionManagerTest, CheckProcessNameValidPutDeviceProfileInfoList_00 processName = "processName"; ret = PermissionManager::GetInstance().CheckProcessNameValidPutDeviceProfileInfoList(processName); ASSERT_FALSE(ret); - - processName = "processName1"; - ret = PermissionManager::GetInstance().CheckProcessNameValidPutDeviceProfileInfoList(processName); - ASSERT_TRUE(ret); } } } // namespace DistributedHardware -- Gitee From 79816314510d8c18cb5cff0cdc0df444ef678e32 Mon Sep 17 00:00:00 2001 From: BrainL Date: Fri, 30 May 2025 11:34:23 +0800 Subject: [PATCH 5/5] modify UT Signed-off-by: BrainL --- test/unittest/UTTest_relationship_sync_mgr.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/unittest/UTTest_relationship_sync_mgr.cpp b/test/unittest/UTTest_relationship_sync_mgr.cpp index f371b04c8..e4bc8635c 100644 --- a/test/unittest/UTTest_relationship_sync_mgr.cpp +++ b/test/unittest/UTTest_relationship_sync_mgr.cpp @@ -1360,6 +1360,8 @@ HWTEST_F(ReleationShipSyncMgrTest, ToJson_002, testing::ext::TestSize.Level1) std::string jsonString = msgObj.ToJson(); EXPECT_FALSE(jsonString.empty()); +} + HWTEST_F(ReleationShipSyncMgrTest, ToBroadcastPayLoad_013, testing::ext::TestSize.Level1) { RelationShipChangeMsg msg; @@ -1572,7 +1574,6 @@ HWTEST_F(ReleationShipSyncMgrTest, FromAppUninstallPayLoad_001, testing::ext::Te result = msg.FromAppUninstallPayLoad(jsonObject); ASSERT_EQ(result, false); } - } } // namespace DistributedHardware } // namespace OHOS -- Gitee