From 834199afed02226c0c2369856e29d9c3292756fd Mon Sep 17 00:00:00 2001 From: zhaochaoyan Date: Sat, 23 Aug 2025 13:52:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BC=82=E5=B8=B8UT=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaochaoyan --- .../UTTest_device_manager_service_two.cpp | 45 ------------------- 1 file changed, 45 deletions(-) diff --git a/test/unittest/UTTest_device_manager_service_two.cpp b/test/unittest/UTTest_device_manager_service_two.cpp index 7c658a6ab..1ebb13d85 100644 --- a/test/unittest/UTTest_device_manager_service_two.cpp +++ b/test/unittest/UTTest_device_manager_service_two.cpp @@ -1562,51 +1562,6 @@ HWTEST_F(DeviceManagerServiceTest, UpdateLocalServiceInfo_201, testing::ext::Tes EXPECT_CALL(*deviceProfileConnectorMock_, UpdateLocalServiceInfo(_)).WillOnce(Return(DM_OK)); int32_t ret = DeviceManagerService::GetInstance().UpdateLocalServiceInfo(serviceInfo); EXPECT_EQ(ret, DM_OK); - - std::string localUdid = "localUdid"; - std::vector peerUdids{"kxjasdkaj"}; - std::vector foregroundUserIds{1, 2}; - std::vector backgroundUserIds{1, 2}; - DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); - EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)).WillOnce(DoAll(SetArgReferee<1>(""), Return(DM_OK))); - DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitch(localUdid, peerUdids, - foregroundUserIds, backgroundUserIds); - - EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)) - .WillOnce(DoAll(SetArgReferee<1>("net*****7"), Return(DM_OK))); - EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) - .WillOnce(DoAll(SetArgReferee<1>(1), Return(ERR_DM_FAILED))); - DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitch(localUdid, peerUdids, - foregroundUserIds, backgroundUserIds); - - EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)) - .WillOnce(DoAll(SetArgReferee<1>("net*****7"), Return(DM_OK))); - EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) - .WillOnce(DoAll(SetArgReferee<1>(1), Return(DM_OK))); - EXPECT_CALL(*dMCommToolMock_, SendUserIds(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); - DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitch(localUdid, peerUdids, - foregroundUserIds, backgroundUserIds); - - EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)) - .WillOnce(DoAll(SetArgReferee<1>("net*****7"), Return(DM_OK))); - EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) - .WillOnce(DoAll(SetArgReferee<1>(4), Return(DM_OK))); - DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitch(localUdid, peerUdids, - foregroundUserIds, backgroundUserIds); - - std::map wifiDevices; - wifiDevices.insert(std::make_pair("deviceName", "networkwifi")); - EXPECT_CALL(*dMCommToolMock_, SendUserIds(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); - DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitchByWifi(localUdid, wifiDevices, - foregroundUserIds, backgroundUserIds); - - GTEST_LOG_(INFO) << "NotifyRemoteLocalUserSwitchByWifi SendUserIds is ok" ; - EXPECT_CALL(*dMCommToolMock_, SendUserIds(_, _, _)).WillOnce(Return(DM_OK)); - DeviceManagerService::GetInstance().NotifyRemoteLocalUserSwitchByWifi(localUdid, wifiDevices, - foregroundUserIds, backgroundUserIds); - GTEST_LOG_(INFO) << "NotifyRemoteLocalUserSwitchByWifi end" ; - sleep(3); - DeviceManagerService::GetInstance().softbusListener_ = nullptr; } HWTEST_F(DeviceManagerServiceTest, GetLocalServiceInfoByBundleNameAndPinExchangeType_201, -- Gitee From edc0d714930268df05cdd781422d99bb6b0b8384 Mon Sep 17 00:00:00 2001 From: zhaochaoyan Date: Sat, 23 Aug 2025 07:50:42 +0000 Subject: [PATCH 2/2] update test/unittest/UTTest_device_manager_service_two.cpp. Signed-off-by: zhaochaoyan --- .../UTTest_device_manager_service_two.cpp | 73 ------------------- 1 file changed, 73 deletions(-) diff --git a/test/unittest/UTTest_device_manager_service_two.cpp b/test/unittest/UTTest_device_manager_service_two.cpp index 1ebb13d85..b21bd0105 100644 --- a/test/unittest/UTTest_device_manager_service_two.cpp +++ b/test/unittest/UTTest_device_manager_service_two.cpp @@ -1741,85 +1741,12 @@ HWTEST_F(DeviceManagerServiceTest, SetRemoteDeviceName_202, testing::ext::TestSi } HWTEST_F(DeviceManagerServiceTest, GetDeviceNetworkIdList_201, testing::ext::TestSize.Level1) -{ - std::string pkgName = "pkgName"; - NetworkIdQueryFilter queryFilter; - std::vector networkIds{"uehd*****87"}; - DeletePermission(); - int32_t ret = DeviceManagerService::GetInstance().GetDeviceNetworkIdList(pkgName, queryFilter, networkIds); - EXPECT_EQ(ret, ERR_DM_NO_PERMISSION); - - int32_t stopUserId = 1; - std::string stopEventUdid = "ud*********4"; - std::vector acceptEventUdids{"acc**********7"}; - DeviceManagerService::GetInstance().InitDMServiceListener(); - DeviceManagerService::GetInstance().HandleUserStop(stopUserId, stopEventUdid, acceptEventUdids); - DeviceManagerService::GetInstance().HandleUserStop(stopUserId, stopEventUdid); - - std::string localUdid = "local*******76"; - std::vector peerUdids; - DeviceManagerService::GetInstance().NotifyRemoteLocalUserStop(localUdid, peerUdids, stopUserId); - DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); - DeviceManagerService::GetInstance().SendUserStopBroadCast(peerUdids, stopUserId); - std::string remoteUdid = "re********7"; - DeviceManagerService::GetInstance().HandleUserStopBroadCast(stopUserId, remoteUdid); - - std::map wifiDevices; - wifiDevices.insert(std::make_pair("wikjdmcsk", "deviceInfowifi")); - EXPECT_CALL(*dMCommToolMock_, SendUserStop(_, _)).WillOnce(Return(ERR_DM_FAILED)); - DeviceManagerService::GetInstance().NotifyRemoteLocalUserStopByWifi(localUdid, wifiDevices, stopUserId); - - EXPECT_CALL(*dMCommToolMock_, SendUserStop(_, _)).WillOnce(Return(DM_OK)); - DeviceManagerService::GetInstance().NotifyRemoteLocalUserStopByWifi(localUdid, wifiDevices, stopUserId); - DeviceManagerService::GetInstance().UninitDMServiceListener(); - DeviceManagerService::GetInstance().softbusListener_ = nullptr; -} - -HWTEST_F(DeviceManagerServiceTest, GetDeviceNetworkIdList_202, testing::ext::TestSize.Level1) { std::string pkgName = "pkgName"; NetworkIdQueryFilter queryFilter; std::vector networkIds{"uehd*****87"}; int32_t ret = DeviceManagerService::GetInstance().GetDeviceNetworkIdList(pkgName, queryFilter, networkIds); EXPECT_NE(ret, DM_OK); - - int32_t stopUserId = 1; - std::map deviceMap; - DeviceManagerService::GetInstance().InitDMServiceListener(); - DeviceManagerService::GetInstance().HandleUserStopEvent(stopUserId); - - std::vector peerUdids; - std::vector bleUdids; - std::map wifiDevices; - DeviceManagerService::GetInstance().DivideNotifyMethod(peerUdids, bleUdids, wifiDevices); - - peerUdids.push_back("u********23"); - DeviceManagerService::GetInstance().softbusListener_ = nullptr; - DeviceManagerService::GetInstance().DivideNotifyMethod(peerUdids, bleUdids, wifiDevices); - - DeviceManagerService::GetInstance().softbusListener_ = std::make_shared(); - EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)) - .WillOnce(DoAll(SetArgReferee<1>(""), Return(DM_OK))); - DeviceManagerService::GetInstance().DivideNotifyMethod(peerUdids, bleUdids, wifiDevices); - - EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)) - .WillOnce(DoAll(SetArgReferee<1>("net********8"), Return(DM_OK))); - EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) - .WillOnce(DoAll(SetArgReferee<1>(4), Return(ERR_DM_FAILED))); - DeviceManagerService::GetInstance().DivideNotifyMethod(peerUdids, bleUdids, wifiDevices); - - EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)) - .WillOnce(DoAll(SetArgReferee<1>("net********8"), Return(DM_OK))); - EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) - .WillOnce(DoAll(SetArgReferee<1>(4), Return(DM_OK))); - DeviceManagerService::GetInstance().DivideNotifyMethod(peerUdids, bleUdids, wifiDevices); - - EXPECT_CALL(*softbusCacheMock_, GetNetworkIdFromCache(_, _)) - .WillOnce(DoAll(SetArgReferee<1>("net********8"), Return(DM_OK))); - EXPECT_CALL(*softbusListenerMock_, GetNetworkTypeByNetworkId(_, _)) - .WillOnce(DoAll(SetArgReferee<1>(2), Return(DM_OK))); - DeviceManagerService::GetInstance().DivideNotifyMethod(peerUdids, bleUdids, wifiDevices); - DeviceManagerService::GetInstance().UninitDMServiceListener(); } HWTEST_F(DeviceManagerServiceTest, SendShareTypeUnBindBroadCast_001, testing::ext::TestSize.Level1) -- Gitee