From 64e6f99e71d787f843395a54d97b33652c70ac38 Mon Sep 17 00:00:00 2001 From: l60055366 Date: Sat, 15 Feb 2025 11:14:36 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=96=B0=E5=A2=9Edm=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84ut=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l60055366 --- .../UTTest_dm_auth_manager_first.cpp | 22 +++- .../UTTest_softbus_listener.cpp | 109 ++++++++++++++++++ .../softbusunittest/UTTest_softbus_listener.h | 8 ++ test/unittest/BUILD.gn | 4 + .../UTTest_device_manager_impl_two.cpp | 48 ++++++++ .../UTTest_device_manager_service_two.cpp | 60 ++++++++++ test/unittest/mock/dm_softbus_cache_mock.cpp | 5 + test/unittest/mock/dm_softbus_cache_mock.h | 2 + 8 files changed, 256 insertions(+), 2 deletions(-) diff --git a/test/commonunittest/UTTest_dm_auth_manager_first.cpp b/test/commonunittest/UTTest_dm_auth_manager_first.cpp index b9afe71af..e592dc51f 100644 --- a/test/commonunittest/UTTest_dm_auth_manager_first.cpp +++ b/test/commonunittest/UTTest_dm_auth_manager_first.cpp @@ -776,7 +776,7 @@ HWTEST_F(DmAuthManagerTest, ResponseCredential001, testing::ext::TestSize.Level0 authManager_->ResponseCredential(); ASSERT_EQ(authManager_->isAuthDevice_, false); - authManager_->authResponseContext_->publicKey == "publicKey"; + authManager_->authResponseContext_->publicKey = "publicKey"; EXPECT_CALL(*hiChainAuthConnectorMock_, ImportCredential(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); ASSERT_EQ(authManager_->isAuthDevice_, false); @@ -1909,7 +1909,8 @@ HWTEST_F(DmAuthManagerTest, StopAuthenticateDevice_002, testing::ext::TestSize.L int32_t sessionId = 1; authManager_->remoteUdidHash_ = "remoteUdidhash"; EXPECT_CALL(*softbusSessionMock_, GetPeerDeviceId(_, _)).WillOnce(Return(DM_OK)); - EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)) + .WillOnce(DoAll(SetArgReferee<1>(reinterpret_cast(authManager_->remoteUdidHash_.c_str())), Return(DM_OK))); authManager_->DeleteOffLineTimer(sessionId); authManager_->authMessageProcessor_ = std::make_shared(authManager_); @@ -1944,6 +1945,23 @@ HWTEST_F(DmAuthManagerTest, RegisterAuthenticationType_001, testing::ext::TestSi authManager_->authResponseState_ = std::make_shared(); authManager_->ProcessReqPublicKey(); } + +HWTEST_F(DmAuthManagerTest, CheckProcessNameInWhiteList_001, testing::ext::TestSize.Level0) +{ + std::string processName = ""; + bool ret = authManager_->CheckProcessNameInWhiteList(processName); + ASSERT_FALSE(ret); + + processName = "processName"; + ret = authManager_->CheckProcessNameInWhiteList(processName); + ASSERT_FALSE(ret); + + processName = "com.example.myapplication"; + ret = authManager_->CheckProcessNameInWhiteList(processName); + ASSERT_TRUE(ret); +} + + } // namespace } // namespace DistributedHardware } // namespace OHOS diff --git a/test/softbusunittest/UTTest_softbus_listener.cpp b/test/softbusunittest/UTTest_softbus_listener.cpp index 4607adbde..fb4a359f8 100644 --- a/test/softbusunittest/UTTest_softbus_listener.cpp +++ b/test/softbusunittest/UTTest_softbus_listener.cpp @@ -40,9 +40,20 @@ void SoftbusListenerTest::TearDown() } void SoftbusListenerTest::SetUpTestCase() { + DistributedDeviceProfile::DpDistributedDeviceProfileClient::dpDistributedDeviceProfileClient = + distributedDeviceProfileClientMock_; + DmCrypto::dmCrypto = cryptoMock_; + DmSoftbusCache::dmSoftbusCache = softbusCacheMock_; + } void SoftbusListenerTest::TearDownTestCase() { + DistributedDeviceProfile::DpDistributedDeviceProfileClient::dpDistributedDeviceProfileClient = nullptr; + distributedDeviceProfileClientMock_ = nullptr; + DmCrypto::dmCrypto = nullptr; + cryptoMock_ = nullptr; + DmSoftbusCache::dmSoftbusCache = nullptr; + softbusCacheMock_ = nullptr; } namespace { @@ -1073,6 +1084,104 @@ HWTEST_F(SoftbusListenerTest, SetForegroundUserIdsToDSoftBus_001, testing::ext:: softbusListener->OnCredentialAuthStatus(devicelist, deviceListLen, deviceTypeId, errcode); softbusListener = nullptr; } + +HWTEST_F(SoftbusListenerTest, GetUdidFromDp_001, testing::ext::TestSize.Level0) +{ + std::string udidHash = "udidHash"; + std::string udid = "udid"; + if (softbusListener == nullptr) { + softbusListener = std::make_shared(); + } + EXPECT_CALL(*distributedDeviceProfileClientMock_, GetAllAccessControlProfile(_)).WillOnce(Return(ERR_DM_FAILED)); + int32_t ret = softbusListener->GetUdidFromDp(udidHash, udid); + EXPECT_EQ(ret, ERR_DM_FAILED); + + std::vector allProfile; + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetBindType(1); + allProfile.push_back(profile); + EXPECT_CALL(*distributedDeviceProfileClientMock_, GetAllAccessControlProfile(_)) + .WillOnce(DoAll(SetArgReferee<0>(allProfile), Return(DM_OK))); + ret = softbusListener->GetUdidFromDp(udidHash, udid); + EXPECT_EQ(ret, ERR_DM_FAILED); + + profile.SetBindType(2); + profile.SetTrustDeviceId("trustDeviceId"); + allProfile.push_back(profile); + EXPECT_CALL(*distributedDeviceProfileClientMock_, GetAllAccessControlProfile(_)) + .WillOnce(DoAll(SetArgReferee<0>(allProfile), Return(DM_OK))); + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(ERR_DM_FAILED)); + ret = softbusListener->GetUdidFromDp(udidHash, udid); + EXPECT_EQ(ret, ERR_DM_FAILED); + + EXPECT_CALL(*distributedDeviceProfileClientMock_, GetAllAccessControlProfile(_)) + .WillOnce(DoAll(SetArgReferee<0>(allProfile), Return(DM_OK))); + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)) + .WillOnce(DoAll(SetArgReferee<1>(reinterpret_cast(udidHash.c_str())), Return(DM_OK))); + ret = softbusListener->GetUdidFromDp(udidHash, udid); + EXPECT_EQ(ret, DM_OK); +} + +HWTEST_F(SoftbusListenerTest, SetLocalDisplayName_001, testing::ext::TestSize.Level0) +{ + std::string displayName = "displayName"; + if (softbusListener == nullptr) { + softbusListener = std::make_shared(); + } + int32_t ret = softbusListener->SetLocalDisplayName(displayName); + EXPECT_EQ(ret, DM_OK); + std::vector onlineDevInfoVec; + EXPECT_CALL(*softbusCacheMock_, GetDeviceInfoFromCache(_)).Times(::testing::AtLeast(1)) + .WillOnce(DoAll(SetArgReferee<0>(onlineDevInfoVec), Return(DM_OK))); + softbusListener->DeleteCacheDeviceInfo(); + + DmDeviceInfo dmDeviceInfo; + dmDeviceInfo.authForm = DmAuthForm::ACROSS_ACCOUNT; + dmDeviceInfo.deviceTypeId = 1; + onlineDevInfoVec.push_back(dmDeviceInfo); + EXPECT_CALL(*softbusCacheMock_, GetDeviceInfoFromCache(_)).Times(::testing::AtLeast(1)) + .WillOnce(DoAll(SetArgReferee<0>(onlineDevInfoVec), Return(DM_OK))); + softbusListener->DeleteCacheDeviceInfo(); + + DistributedDeviceProfile::AccessControlProfile profile; + DmDeviceInfo deviceInfo; + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(ERR_DM_FAILED)); + softbusListener->ConvertAclToDeviceInfo(profile, deviceInfo); + + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); + softbusListener->ConvertAclToDeviceInfo(profile, deviceInfo); + + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)).WillOnce(Return(ERR_DM_FAILED)); + EXPECT_CALL(*softbusCacheMock_, GetDeviceNameFromCache(_, _)).WillOnce(Return(DM_OK)); + softbusListener->ConvertAclToDeviceInfo(profile, deviceInfo); + + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)).WillOnce(Return(ERR_DM_FAILED)); + EXPECT_CALL(*softbusCacheMock_, GetDeviceNameFromCache(_, _)).WillOnce(Return(ERR_DM_FAILED)); + softbusListener->ConvertAclToDeviceInfo(profile, deviceInfo); + softbusListener = nullptr; +} + +HWTEST_F(SoftbusListenerTest, GetAllTrustedDeviceList_001, testing::ext::TestSize.Level0) +{ + std::string pkgName = "pkgName"; + std::string extra = "extra"; + std::vector deviceList; + if (softbusListener == nullptr) { + softbusListener = std::make_shared(); + } + std::vector allProfile; + DistributedDeviceProfile::AccessControlProfile profile; + profile.SetBindType(1); + allProfile.push_back(profile); + EXPECT_CALL(*distributedDeviceProfileClientMock_, GetAllAccessControlProfile(_)) + .WillOnce(DoAll(SetArgReferee<0>(allProfile), Return(DM_OK))); + int32_t ret = softbusListener->GetAllTrustedDeviceList(pkgName, extra, deviceList); + EXPECT_EQ(ret, DM_OK); + softbusListener = nullptr; +} } // namespace } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/test/softbusunittest/UTTest_softbus_listener.h b/test/softbusunittest/UTTest_softbus_listener.h index f840ea9e7..59fa7a976 100644 --- a/test/softbusunittest/UTTest_softbus_listener.h +++ b/test/softbusunittest/UTTest_softbus_listener.h @@ -29,6 +29,9 @@ #include "dm_subscribe_info.h" #include "inner_session.h" #include "session.h" +#include "distributed_device_profile_client_mock.h" +#include "dm_crypto_mock.h" +#include "dm_softbus_cache_mock.h" namespace OHOS { namespace DistributedHardware { @@ -38,6 +41,11 @@ public: static void TearDownTestCase(); void SetUp(); void TearDown(); + static inline std::shared_ptr + distributedDeviceProfileClientMock_ = + std::make_shared(); + static inline std::shared_ptr cryptoMock_ = std::make_shared(); + static inline std::shared_ptr softbusCacheMock_ = std::make_shared(); }; class ISoftbusDiscoveringCallbackTest : public ISoftbusDiscoveringCallback { diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index d47d3f153..258dc2528 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -589,6 +589,9 @@ ohos_unittest("UTTest_softbus_listener") { sources = [ "${devicemanager_path}/test/softbusunittest/UTTest_softbus_listener.cpp", "${devicemanager_path}/test/unittest/mock/parameter.cpp", + "mock/distributed_device_profile_client_mock.cpp", + "mock/dm_crypto_mock.cpp", + "mock/dm_softbus_cache_mock.cpp", ] deps = [ ":device_manager_test_common" ] @@ -601,6 +604,7 @@ ohos_unittest("UTTest_softbus_listener") { "dsoftbus:softbus_client", "ffrt:libffrt", "googletest:gmock", + "googletest:gmock_main", "hisysevent:libhisysevent", "hitrace:hitrace_meter", ] diff --git a/test/unittest/UTTest_device_manager_impl_two.cpp b/test/unittest/UTTest_device_manager_impl_two.cpp index c28495417..9bb9613f3 100644 --- a/test/unittest/UTTest_device_manager_impl_two.cpp +++ b/test/unittest/UTTest_device_manager_impl_two.cpp @@ -2296,6 +2296,54 @@ HWTEST_F(DeviceManagerImplTest, GetNetworkIdByUdid_202, testing::ext::TestSize.L callbackMap[DmCommonNotifyEvent::REG_DEVICE_SCREEN_STATE] = strSet; DeviceManagerImpl::GetInstance().SyncCallbacksToService(callbackMap); } + +HWTEST_F(DeviceManagerImplTest, PutDeviceProfileInfoList_201, testing::ext::TestSize.Level0) +{ + std::string pkgName = "pkgName"; + std::vector deviceProfileInfoList; + std::shared_ptr mockInstance = std::make_shared(); + std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; + DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; + EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); + ret = DeviceManager::GetInstance().PutDeviceProfileInfoList(pkgName, deviceProfileInfoList); + ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; +} + +HWTEST_F(DeviceManagerImplTest, PutDeviceProfileInfoList_202, testing::ext::TestSize.Level0) +{ + std::string pkgName = "pkgName"; + std::vector deviceProfileInfoList; + std::shared_ptr mockInstance = std::make_shared(); + std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; + DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; + EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(DM_OK)); + ret = DeviceManager::GetInstance().PutDeviceProfileInfoList(pkgName, deviceProfileInfoList); + ASSERT_EQ(ret, DM_OK); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; +} + +HWTEST_F(DeviceManagerImplTest, GetLocalDisplayDeviceName_201, testing::ext::TestSize.Level0) +{ + std::string pkgName = "pkgName"; + int32_t maxNameLength = 1; + std::string displayName = "displayName"; + std::shared_ptr mockInstance = std::make_shared(); + std::shared_ptr ipcClientProxy = DeviceManagerImpl::GetInstance().ipcClientProxy_; + DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; + EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); + ret = DeviceManager::GetInstance().GetLocalDisplayDeviceName(pkgName, maxNameLength, displayName); + ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); + + EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) + .Times(1).WillOnce(testing::Return(DM_OK)); + ret = DeviceManager::GetInstance().GetLocalDisplayDeviceName(pkgName, maxNameLength, displayName); + ASSERT_EQ(ret, DM_OK); + DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; +} } // namespace } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/UTTest_device_manager_service_two.cpp b/test/unittest/UTTest_device_manager_service_two.cpp index 56e8d168d..7e4fb020f 100644 --- a/test/unittest/UTTest_device_manager_service_two.cpp +++ b/test/unittest/UTTest_device_manager_service_two.cpp @@ -1288,6 +1288,66 @@ HWTEST_F(DeviceManagerServiceTest, GetDeviceIconInfo_202, testing::ext::TestSize int32_t ret = DeviceManagerService::GetInstance().GetDeviceIconInfo(pkgName, filterOptions); EXPECT_EQ(ret, ERR_DM_UNSUPPORTED_METHOD); } + +HWTEST_F(DeviceManagerServiceTest, PutDeviceProfileInfoList_201, testing::ext::TestSize.Level0) +{ + DeletePermission(); + std::string pkgName = "pkgName"; + std::vector deviceProfileInfoList; + int32_t ret = DeviceManagerService::GetInstance().PutDeviceProfileInfoList(pkgName, deviceProfileInfoList); + EXPECT_EQ(ret, ERR_DM_NO_PERMISSION); +} + +HWTEST_F(DeviceManagerServiceTest, PutDeviceProfileInfoList_202, testing::ext::TestSize.Level0) +{ + std::string pkgName = "pkgName"; + std::vector deviceProfileInfoList; + int32_t ret = DeviceManagerService::GetInstance().PutDeviceProfileInfoList(pkgName, deviceProfileInfoList); + EXPECT_EQ(ret, ERR_DM_UNSUPPORTED_METHOD); +} + +HWTEST_F(DeviceManagerServiceTest, SetLocalDisplayNameToSoftbus_201, testing::ext::TestSize.Level0) +{ + std::string displayName = "displayName"; + DeviceManagerService::GetInstance().softbusListener_ = nullptr; + int32_t ret = DeviceManagerService::GetInstance().SetLocalDisplayNameToSoftbus(displayName); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); + + DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); + EXPECT_CALL(*softbusListenerMock_, SetLocalDisplayName(_)).WillOnce(Return(DM_OK)); + ret = DeviceManagerService::GetInstance().SetLocalDisplayNameToSoftbus(displayName); + EXPECT_EQ(ret, DM_OK); + + EXPECT_CALL(*softbusListenerMock_, SetLocalDisplayName(_)).WillOnce(Return(ERR_DM_NO_PERMISSION)); + ret = DeviceManagerService::GetInstance().SetLocalDisplayNameToSoftbus(displayName); + EXPECT_EQ(ret, ERR_DM_NO_PERMISSION); + DeviceManagerService::GetInstance().softbusListener_ = nullptr; +} + +HWTEST_F(DeviceManagerServiceTest, GetLocalDisplayDeviceName_201, testing::ext::TestSize.Level0) +{ + DeletePermission(); + std::string pkgName = "packName"; + int32_t maxNameLength = 1; + std::string displayName = "displayName"; + int32_t ret = DeviceManagerService::GetInstance().GetLocalDisplayDeviceName(pkgName, maxNameLength, displayName); + EXPECT_EQ(ret, ERR_DM_NO_PERMISSION); +} + +HWTEST_F(DeviceManagerServiceTest, GetLocalDisplayDeviceName_202, testing::ext::TestSize.Level0) +{ + std::string pkgName = "packName"; + int32_t maxNameLength = 1; + std::string displayName = "displayName"; + int32_t ret = DeviceManagerService::GetInstance().GetLocalDisplayDeviceName(pkgName, maxNameLength, displayName); + EXPECT_EQ(ret, ERR_DM_INPUT_PARA_INVALID); +} + +HWTEST_F(DeviceManagerServiceTest, GetDeviceNamePrefixs_201, testing::ext::TestSize.Level0) +{ + auto ret = DeviceManagerService::GetInstance().GetDeviceNamePrefixs(); + EXPECT_EQ(ret.empty(), true); +} } // namespace } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/mock/dm_softbus_cache_mock.cpp b/test/unittest/mock/dm_softbus_cache_mock.cpp index ca401d4f5..322fa9499 100644 --- a/test/unittest/mock/dm_softbus_cache_mock.cpp +++ b/test/unittest/mock/dm_softbus_cache_mock.cpp @@ -54,5 +54,10 @@ int32_t SoftbusCache::GetDeviceInfoFromCache(std::vector &deviceIn { return DmSoftbusCache::dmSoftbusCache->GetDeviceInfoFromCache(deviceInfoList); } + +int32_t SoftbusCache::GetDeviceNameFromCache(const std::string &udid, std::string &deviceName) +{ + return DmSoftbusCache::dmSoftbusCache->GetDeviceNameFromCache(udid, deviceName); +} } // 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 adf41876d..1a519e53d 100644 --- a/test/unittest/mock/dm_softbus_cache_mock.h +++ b/test/unittest/mock/dm_softbus_cache_mock.h @@ -33,6 +33,7 @@ public: virtual int32_t GetUuidFromCache(const char *networkId, std::string &uuid) = 0; 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; public: static inline std::shared_ptr dmSoftbusCache = nullptr; }; @@ -46,6 +47,7 @@ public: MOCK_METHOD(int32_t, GetUuidFromCache, (const char *, std::string &)); MOCK_METHOD(bool, CheckIsOnline, (const std::string &)); MOCK_METHOD(int32_t, GetDeviceInfoFromCache, (std::vector &)); + MOCK_METHOD(int32_t, GetDeviceNameFromCache, (const std::string &, std::string &)); }; } } -- Gitee From b70cd051d9a4bc393c6d8e57edf05aca8faac971 Mon Sep 17 00:00:00 2001 From: l60055366 Date: Sat, 15 Feb 2025 12:46:47 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=96=B0=E5=A2=9Edm=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84ut=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l60055366 --- test/commonunittest/UTTest_dm_auth_manager_first.cpp | 3 ++- test/softbusunittest/UTTest_softbus_listener.cpp | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/commonunittest/UTTest_dm_auth_manager_first.cpp b/test/commonunittest/UTTest_dm_auth_manager_first.cpp index e592dc51f..a4607432b 100644 --- a/test/commonunittest/UTTest_dm_auth_manager_first.cpp +++ b/test/commonunittest/UTTest_dm_auth_manager_first.cpp @@ -1910,7 +1910,8 @@ HWTEST_F(DmAuthManagerTest, StopAuthenticateDevice_002, testing::ext::TestSize.L authManager_->remoteUdidHash_ = "remoteUdidhash"; EXPECT_CALL(*softbusSessionMock_, GetPeerDeviceId(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)) - .WillOnce(DoAll(SetArgReferee<1>(reinterpret_cast(authManager_->remoteUdidHash_.c_str())), Return(DM_OK))); + .WillOnce(DoAll(SetArgReferee<1>(reinterpret_cast(authManager_->remoteUdidHash_.c_str())), + Return(DM_OK))); authManager_->DeleteOffLineTimer(sessionId); authManager_->authMessageProcessor_ = std::make_shared(authManager_); diff --git a/test/softbusunittest/UTTest_softbus_listener.cpp b/test/softbusunittest/UTTest_softbus_listener.cpp index fb4a359f8..29009c213 100644 --- a/test/softbusunittest/UTTest_softbus_listener.cpp +++ b/test/softbusunittest/UTTest_softbus_listener.cpp @@ -44,7 +44,6 @@ void SoftbusListenerTest::SetUpTestCase() distributedDeviceProfileClientMock_; DmCrypto::dmCrypto = cryptoMock_; DmSoftbusCache::dmSoftbusCache = softbusCacheMock_; - } void SoftbusListenerTest::TearDownTestCase() { -- Gitee From 10f64b5b9caad8fb9144f7d35399100fd089428c Mon Sep 17 00:00:00 2001 From: l60055366 Date: Sat, 15 Feb 2025 16:39:00 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=96=B0=E5=A2=9Edm=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84ut=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l60055366 --- test/commonunittest/UTTest_dm_auth_manager_first.cpp | 4 ++-- test/softbusunittest/UTTest_softbus_listener.cpp | 2 ++ test/unittest/UTTest_device_manager_impl_two.cpp | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/commonunittest/UTTest_dm_auth_manager_first.cpp b/test/commonunittest/UTTest_dm_auth_manager_first.cpp index a4607432b..da7e42b17 100644 --- a/test/commonunittest/UTTest_dm_auth_manager_first.cpp +++ b/test/commonunittest/UTTest_dm_auth_manager_first.cpp @@ -1908,10 +1908,10 @@ HWTEST_F(DmAuthManagerTest, StopAuthenticateDevice_002, testing::ext::TestSize.L int32_t sessionId = 1; authManager_->remoteUdidHash_ = "remoteUdidhash"; + char udidHashTmp[DM_MAX_DEVICE_ID_LEN] = {1}; EXPECT_CALL(*softbusSessionMock_, GetPeerDeviceId(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)) - .WillOnce(DoAll(SetArgReferee<1>(reinterpret_cast(authManager_->remoteUdidHash_.c_str())), - Return(DM_OK))); + .WillOnce(DoAll(SetArgReferee<1>(reinterpret_cast(udidHashTmp)), Return(DM_OK))); authManager_->DeleteOffLineTimer(sessionId); authManager_->authMessageProcessor_ = std::make_shared(authManager_); diff --git a/test/softbusunittest/UTTest_softbus_listener.cpp b/test/softbusunittest/UTTest_softbus_listener.cpp index 29009c213..54a79462d 100644 --- a/test/softbusunittest/UTTest_softbus_listener.cpp +++ b/test/softbusunittest/UTTest_softbus_listener.cpp @@ -30,6 +30,8 @@ #include "softbus_listener.cpp" #include "softbus_error_code.h" +using namespace testing; +using namespace testing::ext; namespace OHOS { namespace DistributedHardware { void SoftbusListenerTest::SetUp() diff --git a/test/unittest/UTTest_device_manager_impl_two.cpp b/test/unittest/UTTest_device_manager_impl_two.cpp index 9bb9613f3..f042d188e 100644 --- a/test/unittest/UTTest_device_manager_impl_two.cpp +++ b/test/unittest/UTTest_device_manager_impl_two.cpp @@ -2320,7 +2320,7 @@ HWTEST_F(DeviceManagerImplTest, PutDeviceProfileInfoList_202, testing::ext::Test DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); - ret = DeviceManager::GetInstance().PutDeviceProfileInfoList(pkgName, deviceProfileInfoList); + int32_t ret = DeviceManager::GetInstance().PutDeviceProfileInfoList(pkgName, deviceProfileInfoList); ASSERT_EQ(ret, DM_OK); DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } @@ -2335,7 +2335,7 @@ HWTEST_F(DeviceManagerImplTest, GetLocalDisplayDeviceName_201, testing::ext::Tes DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); - ret = DeviceManager::GetInstance().GetLocalDisplayDeviceName(pkgName, maxNameLength, displayName); + int32_t ret = DeviceManager::GetInstance().GetLocalDisplayDeviceName(pkgName, maxNameLength, displayName); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) -- Gitee From c68d22568b59c77a7efc64ec3fe285142b6899fb Mon Sep 17 00:00:00 2001 From: l60055366 Date: Sat, 15 Feb 2025 18:19:01 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=96=B0=E5=A2=9Edm=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84ut=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l60055366 --- .../UTTest_dm_auth_manager_first.cpp | 3 +-- .../UTTest_softbus_listener.cpp | 4 ++-- .../UTTest_device_manager_impl_two.cpp | 2 +- test/unittest/mock/dm_crypto_mock.cpp | 20 +++++++++++++++++++ test/unittest/mock/dm_crypto_mock.h | 1 + 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/test/commonunittest/UTTest_dm_auth_manager_first.cpp b/test/commonunittest/UTTest_dm_auth_manager_first.cpp index da7e42b17..e53297f75 100644 --- a/test/commonunittest/UTTest_dm_auth_manager_first.cpp +++ b/test/commonunittest/UTTest_dm_auth_manager_first.cpp @@ -1910,8 +1910,7 @@ HWTEST_F(DmAuthManagerTest, StopAuthenticateDevice_002, testing::ext::TestSize.L authManager_->remoteUdidHash_ = "remoteUdidhash"; char udidHashTmp[DM_MAX_DEVICE_ID_LEN] = {1}; EXPECT_CALL(*softbusSessionMock_, GetPeerDeviceId(_, _)).WillOnce(Return(DM_OK)); - EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)) - .WillOnce(DoAll(SetArgReferee<1>(reinterpret_cast(udidHashTmp)), Return(DM_OK))); + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(CryptoMock::ActionGetUdidHash); authManager_->DeleteOffLineTimer(sessionId); authManager_->authMessageProcessor_ = std::make_shared(authManager_); diff --git a/test/softbusunittest/UTTest_softbus_listener.cpp b/test/softbusunittest/UTTest_softbus_listener.cpp index 54a79462d..6db12953c 100644 --- a/test/softbusunittest/UTTest_softbus_listener.cpp +++ b/test/softbusunittest/UTTest_softbus_listener.cpp @@ -1115,10 +1115,10 @@ HWTEST_F(SoftbusListenerTest, GetUdidFromDp_001, testing::ext::TestSize.Level0) ret = softbusListener->GetUdidFromDp(udidHash, udid); EXPECT_EQ(ret, ERR_DM_FAILED); + char udidHashTmp[DM_MAX_DEVICE_ID_LEN] = {1}; EXPECT_CALL(*distributedDeviceProfileClientMock_, GetAllAccessControlProfile(_)) .WillOnce(DoAll(SetArgReferee<0>(allProfile), Return(DM_OK))); - EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)) - .WillOnce(DoAll(SetArgReferee<1>(reinterpret_cast(udidHash.c_str())), Return(DM_OK))); + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(CryptoMock::ActionGetUdidHash); ret = softbusListener->GetUdidFromDp(udidHash, udid); EXPECT_EQ(ret, DM_OK); } diff --git a/test/unittest/UTTest_device_manager_impl_two.cpp b/test/unittest/UTTest_device_manager_impl_two.cpp index f042d188e..ea0aa57f4 100644 --- a/test/unittest/UTTest_device_manager_impl_two.cpp +++ b/test/unittest/UTTest_device_manager_impl_two.cpp @@ -2306,7 +2306,7 @@ HWTEST_F(DeviceManagerImplTest, PutDeviceProfileInfoList_201, testing::ext::Test DeviceManagerImpl::GetInstance().ipcClientProxy_ = mockInstance; EXPECT_CALL(*mockInstance, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(ERR_DM_IPC_SEND_REQUEST_FAILED)); - ret = DeviceManager::GetInstance().PutDeviceProfileInfoList(pkgName, deviceProfileInfoList); + int32_t ret = DeviceManager::GetInstance().PutDeviceProfileInfoList(pkgName, deviceProfileInfoList); ASSERT_EQ(ret, ERR_DM_IPC_SEND_REQUEST_FAILED); DeviceManagerImpl::GetInstance().ipcClientProxy_ = ipcClientProxy; } diff --git a/test/unittest/mock/dm_crypto_mock.cpp b/test/unittest/mock/dm_crypto_mock.cpp index f6cf4713d..1e46abd20 100644 --- a/test/unittest/mock/dm_crypto_mock.cpp +++ b/test/unittest/mock/dm_crypto_mock.cpp @@ -16,9 +16,15 @@ #include "dm_crypto_mock.h" #include "gtest/gtest.h" +#include "dm_constants.h" namespace OHOS { namespace DistributedHardware { + +namespace{ + constexpr int32_t DM_MAX_LEN = 20; +} + int32_t Crypto::GetAccountIdHash(const std::string &accountId, unsigned char *accountIdHash) { return DmCrypto::dmCrypto->GetAccountIdHash(accountId, accountIdHash); @@ -35,6 +41,20 @@ int32_t Crypto::GetUdidHash(const std::string &udid, unsigned char *udidHash) return DmCrypto::dmCrypto->GetUdidHash(udid, udidHash); } +int32_t CryptoMock::ActionGetUdidHash(const std::string &udid, unsigned char *udidHash) +{ + (void)udid; + if (udidHash == nullptr) { + return ERR_DM_FAILED; + } + + char udidHashTmp[DM_MAX_LEN] = {1}; + if (strcpy_s(udidHash, DM_MAX_LEN, udidHashTmp) != DM_OK) { + return ERR_DM_FAILED; + } + return DM_OK; +} + std::string Crypto::GetGroupIdHash(const std::string &groupId) { return DmCrypto::dmCrypto->GetGroupIdHash(groupId); diff --git a/test/unittest/mock/dm_crypto_mock.h b/test/unittest/mock/dm_crypto_mock.h index 0bc47fe35..38ef74c89 100644 --- a/test/unittest/mock/dm_crypto_mock.h +++ b/test/unittest/mock/dm_crypto_mock.h @@ -44,6 +44,7 @@ public: MOCK_METHOD(int32_t, GetUdidHash, (const std::string &, unsigned char *)); MOCK_METHOD(std::string, GetGroupIdHash, (const std::string &)); MOCK_METHOD(int32_t, ConvertUdidHashToAnoyDeviceId, (const std::string &, const std::string &, DmKVValue &)); + static int32_t ActionGetUdidHash(const std::string &udid, unsigned char *udidHash); }; } } -- Gitee From 363b6843926ca449e322b5d4cd267176d1c72c12 Mon Sep 17 00:00:00 2001 From: l60055366 Date: Mon, 17 Feb 2025 11:36:13 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=96=B0=E5=A2=9Edm=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84ut=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l60055366 --- .../UTTest_dm_auth_manager_first.cpp | 4 +++- .../UTTest_softbus_listener.cpp | 4 +++- test/unittest/mock/dm_crypto_mock.cpp | 18 ------------------ test/unittest/mock/dm_crypto_mock.h | 1 - 4 files changed, 6 insertions(+), 21 deletions(-) diff --git a/test/commonunittest/UTTest_dm_auth_manager_first.cpp b/test/commonunittest/UTTest_dm_auth_manager_first.cpp index e53297f75..95c611351 100644 --- a/test/commonunittest/UTTest_dm_auth_manager_first.cpp +++ b/test/commonunittest/UTTest_dm_auth_manager_first.cpp @@ -1910,7 +1910,9 @@ HWTEST_F(DmAuthManagerTest, StopAuthenticateDevice_002, testing::ext::TestSize.L authManager_->remoteUdidHash_ = "remoteUdidhash"; char udidHashTmp[DM_MAX_DEVICE_ID_LEN] = {1}; EXPECT_CALL(*softbusSessionMock_, GetPeerDeviceId(_, _)).WillOnce(Return(DM_OK)); - EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(CryptoMock::ActionGetUdidHash); + char udidHashTmp[DM_MAX_DEVICE_ID_LEN] = {1}; + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)) + .WillOnce(DoAll(SetArgPointee<1>(reinterpret_cast(udidHashTmp)), Return(DM_OK))); authManager_->DeleteOffLineTimer(sessionId); authManager_->authMessageProcessor_ = std::make_shared(authManager_); diff --git a/test/softbusunittest/UTTest_softbus_listener.cpp b/test/softbusunittest/UTTest_softbus_listener.cpp index 6db12953c..08a760eef 100644 --- a/test/softbusunittest/UTTest_softbus_listener.cpp +++ b/test/softbusunittest/UTTest_softbus_listener.cpp @@ -1118,7 +1118,9 @@ HWTEST_F(SoftbusListenerTest, GetUdidFromDp_001, testing::ext::TestSize.Level0) char udidHashTmp[DM_MAX_DEVICE_ID_LEN] = {1}; EXPECT_CALL(*distributedDeviceProfileClientMock_, GetAllAccessControlProfile(_)) .WillOnce(DoAll(SetArgReferee<0>(allProfile), Return(DM_OK))); - EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(CryptoMock::ActionGetUdidHash); + char udidHashTmp[DM_MAX_DEVICE_ID_LEN] = {1}; + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)) + .WillOnce(DoAll(SetArgPointee<1>(reinterpret_cast(udidHashTmp)), Return(DM_OK))); ret = softbusListener->GetUdidFromDp(udidHash, udid); EXPECT_EQ(ret, DM_OK); } diff --git a/test/unittest/mock/dm_crypto_mock.cpp b/test/unittest/mock/dm_crypto_mock.cpp index 1e46abd20..a559c2d01 100644 --- a/test/unittest/mock/dm_crypto_mock.cpp +++ b/test/unittest/mock/dm_crypto_mock.cpp @@ -16,14 +16,10 @@ #include "dm_crypto_mock.h" #include "gtest/gtest.h" -#include "dm_constants.h" namespace OHOS { namespace DistributedHardware { -namespace{ - constexpr int32_t DM_MAX_LEN = 20; -} int32_t Crypto::GetAccountIdHash(const std::string &accountId, unsigned char *accountIdHash) { @@ -41,20 +37,6 @@ int32_t Crypto::GetUdidHash(const std::string &udid, unsigned char *udidHash) return DmCrypto::dmCrypto->GetUdidHash(udid, udidHash); } -int32_t CryptoMock::ActionGetUdidHash(const std::string &udid, unsigned char *udidHash) -{ - (void)udid; - if (udidHash == nullptr) { - return ERR_DM_FAILED; - } - - char udidHashTmp[DM_MAX_LEN] = {1}; - if (strcpy_s(udidHash, DM_MAX_LEN, udidHashTmp) != DM_OK) { - return ERR_DM_FAILED; - } - return DM_OK; -} - std::string Crypto::GetGroupIdHash(const std::string &groupId) { return DmCrypto::dmCrypto->GetGroupIdHash(groupId); diff --git a/test/unittest/mock/dm_crypto_mock.h b/test/unittest/mock/dm_crypto_mock.h index 38ef74c89..0bc47fe35 100644 --- a/test/unittest/mock/dm_crypto_mock.h +++ b/test/unittest/mock/dm_crypto_mock.h @@ -44,7 +44,6 @@ public: MOCK_METHOD(int32_t, GetUdidHash, (const std::string &, unsigned char *)); MOCK_METHOD(std::string, GetGroupIdHash, (const std::string &)); MOCK_METHOD(int32_t, ConvertUdidHashToAnoyDeviceId, (const std::string &, const std::string &, DmKVValue &)); - static int32_t ActionGetUdidHash(const std::string &udid, unsigned char *udidHash); }; } } -- Gitee From 48192f97fd229dcf8bc3cd37ede0a18539dbc4a8 Mon Sep 17 00:00:00 2001 From: l60055366 Date: Mon, 17 Feb 2025 15:37:30 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=96=B0=E5=A2=9Edm=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84ut=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l60055366 --- test/commonunittest/UTTest_dm_auth_manager_first.cpp | 3 +-- test/softbusunittest/UTTest_softbus_listener.cpp | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/test/commonunittest/UTTest_dm_auth_manager_first.cpp b/test/commonunittest/UTTest_dm_auth_manager_first.cpp index 95c611351..6dd53c12f 100644 --- a/test/commonunittest/UTTest_dm_auth_manager_first.cpp +++ b/test/commonunittest/UTTest_dm_auth_manager_first.cpp @@ -1911,8 +1911,7 @@ HWTEST_F(DmAuthManagerTest, StopAuthenticateDevice_002, testing::ext::TestSize.L char udidHashTmp[DM_MAX_DEVICE_ID_LEN] = {1}; EXPECT_CALL(*softbusSessionMock_, GetPeerDeviceId(_, _)).WillOnce(Return(DM_OK)); char udidHashTmp[DM_MAX_DEVICE_ID_LEN] = {1}; - EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)) - .WillOnce(DoAll(SetArgPointee<1>(reinterpret_cast(udidHashTmp)), Return(DM_OK))); + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); authManager_->DeleteOffLineTimer(sessionId); authManager_->authMessageProcessor_ = std::make_shared(authManager_); diff --git a/test/softbusunittest/UTTest_softbus_listener.cpp b/test/softbusunittest/UTTest_softbus_listener.cpp index 08a760eef..a9ae3a09e 100644 --- a/test/softbusunittest/UTTest_softbus_listener.cpp +++ b/test/softbusunittest/UTTest_softbus_listener.cpp @@ -1115,12 +1115,9 @@ HWTEST_F(SoftbusListenerTest, GetUdidFromDp_001, testing::ext::TestSize.Level0) ret = softbusListener->GetUdidFromDp(udidHash, udid); EXPECT_EQ(ret, ERR_DM_FAILED); - char udidHashTmp[DM_MAX_DEVICE_ID_LEN] = {1}; EXPECT_CALL(*distributedDeviceProfileClientMock_, GetAllAccessControlProfile(_)) .WillOnce(DoAll(SetArgReferee<0>(allProfile), Return(DM_OK))); - char udidHashTmp[DM_MAX_DEVICE_ID_LEN] = {1}; - EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)) - .WillOnce(DoAll(SetArgPointee<1>(reinterpret_cast(udidHashTmp)), Return(DM_OK))); + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); ret = softbusListener->GetUdidFromDp(udidHash, udid); EXPECT_EQ(ret, DM_OK); } -- Gitee From 3eff8b06b3725480938d98eb1243120761de5af7 Mon Sep 17 00:00:00 2001 From: l60055366 Date: Mon, 17 Feb 2025 15:39:20 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=96=B0=E5=A2=9Edm=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84ut=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l60055366 --- test/commonunittest/UTTest_dm_auth_manager_first.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/commonunittest/UTTest_dm_auth_manager_first.cpp b/test/commonunittest/UTTest_dm_auth_manager_first.cpp index 6dd53c12f..7c563bde9 100644 --- a/test/commonunittest/UTTest_dm_auth_manager_first.cpp +++ b/test/commonunittest/UTTest_dm_auth_manager_first.cpp @@ -1908,9 +1908,7 @@ HWTEST_F(DmAuthManagerTest, StopAuthenticateDevice_002, testing::ext::TestSize.L int32_t sessionId = 1; authManager_->remoteUdidHash_ = "remoteUdidhash"; - char udidHashTmp[DM_MAX_DEVICE_ID_LEN] = {1}; EXPECT_CALL(*softbusSessionMock_, GetPeerDeviceId(_, _)).WillOnce(Return(DM_OK)); - char udidHashTmp[DM_MAX_DEVICE_ID_LEN] = {1}; EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); authManager_->DeleteOffLineTimer(sessionId); -- Gitee From d5335c37c5be719b8a79a727442eb3d4e4244926 Mon Sep 17 00:00:00 2001 From: l60055366 Date: Mon, 17 Feb 2025 19:41:12 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=96=B0=E5=A2=9Edm=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9A=84ut=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l60055366 --- test/softbusunittest/UTTest_softbus_listener.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/softbusunittest/UTTest_softbus_listener.cpp b/test/softbusunittest/UTTest_softbus_listener.cpp index a9ae3a09e..12b9bb8d3 100644 --- a/test/softbusunittest/UTTest_softbus_listener.cpp +++ b/test/softbusunittest/UTTest_softbus_listener.cpp @@ -326,6 +326,7 @@ HWTEST_F(SoftbusListenerTest, GetUdidByNetworkId_001, testing::ext::TestSize.Lev if (softbusListener == nullptr) { softbusListener = std::make_shared(); } + EXPECT_CALL(*softbusCacheMock_, GetUdidFromCache(_, _)).WillOnce(Return(SOFTBUS_INVALID_PARAM)); int32_t ret = softbusListener->GetUdidByNetworkId(networkId.c_str(), udid); EXPECT_EQ(true, checkSoftbusRes(ret)); } @@ -337,6 +338,7 @@ HWTEST_F(SoftbusListenerTest, GetUuidByNetworkId_001, testing::ext::TestSize.Lev if (softbusListener == nullptr) { softbusListener = std::make_shared(); } + EXPECT_CALL(*softbusCacheMock_, GetUuidFromCache(_, _)).WillOnce(Return(SOFTBUS_INVALID_PARAM)); int32_t ret = softbusListener->GetUuidByNetworkId(networkId.c_str(), udid); EXPECT_EQ(true, checkSoftbusRes(ret)); } @@ -810,6 +812,7 @@ HWTEST_F(SoftbusListenerTest, GetLocalDeviceInfo_001, testing::ext::TestSize.Lev if (softbusListener == nullptr) { softbusListener = std::make_shared(); } + EXPECT_CALL(*softbusCacheMock_, GetLocalDeviceInfo(_)).WillOnce(Return(SOFTBUS_INVALID_PARAM)); int32_t ret = softbusListener->GetLocalDeviceInfo(info); EXPECT_EQ(true, checkSoftbusRes(ret)); } @@ -1052,6 +1055,7 @@ HWTEST_F(SoftbusListenerTest, GetNetworkIdByUdid_001, testing::ext::TestSize.Lev if (softbusListener == nullptr) { softbusListener = std::make_shared(); } + EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)).WillOnce(Return(ERR_DM_FAILED)); int32_t ret = softbusListener->GetNetworkIdByUdid(udid, networkId); EXPECT_EQ(ret, ERR_DM_FAILED); } @@ -1119,7 +1123,7 @@ HWTEST_F(SoftbusListenerTest, GetUdidFromDp_001, testing::ext::TestSize.Level0) .WillOnce(DoAll(SetArgReferee<0>(allProfile), Return(DM_OK))); EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); ret = softbusListener->GetUdidFromDp(udidHash, udid); - EXPECT_EQ(ret, DM_OK); + EXPECT_EQ(ret, ERR_DM_FAILED); } HWTEST_F(SoftbusListenerTest, SetLocalDisplayName_001, testing::ext::TestSize.Level0) -- Gitee