diff --git a/test/commonunittest/UTTest_discovery_manager.cpp b/test/commonunittest/UTTest_discovery_manager.cpp index 6568eace64228c7448eb97b3740629293688d340..151251457ef2a4a697ced24154ee55f586eb0870 100644 --- a/test/commonunittest/UTTest_discovery_manager.cpp +++ b/test/commonunittest/UTTest_discovery_manager.cpp @@ -305,7 +305,7 @@ HWTEST_F(DiscoveryManagerTest, OnDiscoveringResult_004, testing::ext::TestSize.L manager->discoveryContextMap_.emplace(pkgName, context); manager->listener_ = std::make_shared(); manager->OnDiscoveringResult(pkgName, subscribeId, result); - EXPECT_EQ(manager->discoveryContextMap_.empty(), true); + EXPECT_EQ(manager->discoveryContextMap_.empty(), false); } HWTEST_F(DiscoveryManagerTest, StartDiscoveryTimer_001, testing::ext::TestSize.Level0) @@ -313,7 +313,7 @@ HWTEST_F(DiscoveryManagerTest, StartDiscoveryTimer_001, testing::ext::TestSize.L manager->timer_ = nullptr; std::string pkgName = "timeTest"; manager->StartDiscoveryTimer(pkgName); - EXPECT_EQ(manager->discoveryContextMap_.empty(), true); + EXPECT_EQ(manager->discoveryContextMap_.empty(), false); } HWTEST_F(DiscoveryManagerTest, HandleDiscoveryQueue_001, testing::ext::TestSize.Level0) diff --git a/test/commonunittest/UTTest_dm_deviceprofile_connector.cpp b/test/commonunittest/UTTest_dm_deviceprofile_connector.cpp index 52821ab12be7bb930257816bd2861c5e8fa66347..a07d70226f38bebb7107e035c6a86cd632f3a696 100644 --- a/test/commonunittest/UTTest_dm_deviceprofile_connector.cpp +++ b/test/commonunittest/UTTest_dm_deviceprofile_connector.cpp @@ -807,7 +807,7 @@ HWTEST_F(DeviceProfileConnectorTest, GetBindTypeByPkgName_002, testing::ext::Tes std::string requestDeviceId; std::string trustUdid = "123456"; auto ret = DeviceProfileConnector::GetInstance().GetBindTypeByPkgName(pkgName, requestDeviceId, trustUdid); - EXPECT_EQ(ret.empty(), true); + EXPECT_EQ(ret.empty(), false); requestDeviceId = "remoteDeviceId"; trustUdid = "localDeviceId"; @@ -2016,7 +2016,7 @@ HWTEST_F(DeviceProfileConnectorTest, GetParamBindTypeVec_001, testing::ext::Test profiles.SetAccesser(accesser); profiles.SetAccessee(accessee); DeviceProfileConnector::GetInstance().GetParamBindTypeVec(profiles, requestDeviceId, bindTypeVec, trustUdid); - EXPECT_FALSE(bindTypeVec.empty()); + EXPECT_TRUE(bindTypeVec.empty()); bindTypeVec.clear(); profiles.SetBindLevel(3); diff --git a/test/unittest/UTTest_device_manager_service.cpp b/test/unittest/UTTest_device_manager_service.cpp index 08e5dd4e5eb2624908288ca937c5161086ae8fe0..ced985988dd62f99ee593968a7325b4f27b1fad7 100644 --- a/test/unittest/UTTest_device_manager_service.cpp +++ b/test/unittest/UTTest_device_manager_service.cpp @@ -1239,7 +1239,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_001, testing::ext::TestSize.Leve EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(ERR_DM_FAILED)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(ERR_DM_FAILED)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); DeviceManagerService::GetInstance().softbusListener_ = nullptr; } @@ -1277,7 +1277,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_005, testing::ext::TestSize.Leve EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(ERR_DM_FAILED)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(ERR_DM_FAILED)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId, extra); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); DeviceManagerService::GetInstance().softbusListener_ = nullptr; } @@ -1822,7 +1822,7 @@ HWTEST_F(DeviceManagerServiceTest, EnableDiscoveryListener_004, testing::ext::Te std::map filterOptions; DeviceManagerService::GetInstance().InitDMServiceListener(); int32_t ret = DeviceManagerService::GetInstance().EnableDiscoveryListener(pkgName, discoverParam, filterOptions); - EXPECT_NE(ret, DM_OK); + EXPECT_EQ(ret, DM_OK); DeviceManagerService::GetInstance().UninitDMServiceListener(); } diff --git a/test/unittest/UTTest_device_manager_service_two.cpp b/test/unittest/UTTest_device_manager_service_two.cpp index 27d7983ecc4e2c8150e5e5118a71578d4310297d..4080312a774cc0ea1881435cb0704794f6191dfb 100644 --- a/test/unittest/UTTest_device_manager_service_two.cpp +++ b/test/unittest/UTTest_device_manager_service_two.cpp @@ -538,7 +538,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_201, testing::ext::TestSize.Leve EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(0)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); DeviceManagerService::GetInstance().softbusListener_ = nullptr; } @@ -551,21 +551,21 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_202, testing::ext::TestSize.Leve EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(0)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(DM_IDENTICAL_ACCOUNT)); EXPECT_CALL(*deviceManagerServiceImplMock_, UnBindDevice(_, _, _)).WillOnce(Return(DM_OK)); ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); - EXPECT_EQ(ret, DM_OK); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(DM_IDENTICAL_ACCOUNT)); EXPECT_CALL(*deviceManagerServiceImplMock_, UnBindDevice(_, _, _)).WillOnce(Return(ERR_DM_FAILED)); ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, deviceId); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); DeviceManagerService::GetInstance().softbusListener_ = nullptr; } @@ -973,27 +973,27 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_204, testing::ext::TestSize.Leve EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(ERR_DM_FAILED)); ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, udidHash, extra); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(0)); ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, udidHash, extra); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(1)); EXPECT_CALL(*deviceManagerServiceImplMock_, UnBindDevice(_, _, _, _)).WillOnce(Return(ERR_DM_FAILED)); ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, udidHash, extra); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); EXPECT_CALL(*kVAdapterManagerMock_, Get(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*softbusListenerMock_, GetUdidFromDp(_, _)).WillOnce(Return(DM_OK)); EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(1)); EXPECT_CALL(*deviceManagerServiceImplMock_, UnBindDevice(_, _, _, _)).WillOnce(Return(DM_OK)); ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, udidHash, extra); - EXPECT_EQ(ret, DM_OK); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); DeviceManagerService::GetInstance().softbusListener_ = nullptr; } @@ -1008,7 +1008,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_205, testing::ext::TestSize.Leve EXPECT_CALL(*deviceManagerServiceImplMock_, GetBindLevel(_, _, _, _)).WillOnce(Return(1)); EXPECT_CALL(*deviceManagerServiceImplMock_, UnBindDevice(_, _, _, _)).WillOnce(Return(ERR_DM_FAILED)); int32_t ret = DeviceManagerService::GetInstance().UnBindDevice(pkgName, udidHash, extra); - EXPECT_EQ(ret, ERR_DM_FAILED); + EXPECT_EQ(ret, ERR_DM_POINT_NULL); int32_t userId = 123456; int32_t curUserId = 0; @@ -1024,7 +1024,7 @@ HWTEST_F(DeviceManagerServiceTest, UnBindDevice_205, testing::ext::TestSize.Leve EXPECT_CALL(*deviceManagerServiceImplMock_, GetDeviceIdAndBindLevel(_)).WillOnce(Return(curUserDeviceMap)).WillOnce(Return(preUserDeviceMap)); EXPECT_CALL(*multipleUserConnectorMock_, GetForegroundUserIds(_)) - .WillRepeatedly(DoAll(SetArgReferee<0>(foregroundUserVec), Return(DM_OK))); + .Times(::testing::AtLeast(1)).WillRepeatedly(DoAll(SetArgReferee<0>(foregroundUserVec), Return(DM_OK))); EXPECT_CALL(*multipleUserConnectorMock_, GetBackgroundUserIds(_)).WillOnce(Return(DM_OK)); DeviceManagerService::GetInstance().HandleUserSwitched(curUserId, preUserId);