diff --git a/test/commonunittest/UTTest_dm_auth_manager_first.cpp b/test/commonunittest/UTTest_dm_auth_manager_first.cpp index 2c05a519b052c0318ab42ef6c5814237ed5c8bc8..32e3f84d37fb35c7a9933b3e7900c72226d22215 100644 --- a/test/commonunittest/UTTest_dm_auth_manager_first.cpp +++ b/test/commonunittest/UTTest_dm_auth_manager_first.cpp @@ -1003,7 +1003,7 @@ HWTEST_F(DmAuthManagerTest, AuthDeviceError004, testing::ext::TestSize.Level1) int64_t requestId = 0; int32_t errorCode = ERR_DM_FAILED; authManager_->AuthDeviceError(requestId, errorCode); - ASSERT_EQ(authManager_->authResponseContext_->state, AuthState::AUTH_REQUEST_JOIN); + ASSERT_EQ(authManager_->authResponseContext_->state, DmAuthStatus::STATUS_DM_AUTH_DEFAULT); } HWTEST_F(DmAuthManagerTest, AuthDeviceError005, testing::ext::TestSize.Level1) diff --git a/test/commonunittest/UTTest_dm_deviceprofile_connector.cpp b/test/commonunittest/UTTest_dm_deviceprofile_connector.cpp index 5400124c7787019e620ca5d467c4a4f7b08dda66..866baadf3699277f0660399a183b67cb71861c0e 100644 --- a/test/commonunittest/UTTest_dm_deviceprofile_connector.cpp +++ b/test/commonunittest/UTTest_dm_deviceprofile_connector.cpp @@ -1698,42 +1698,42 @@ HWTEST_F(DeviceProfileConnectorTest, GetAppTrustDeviceList_004, testing::ext::Te EXPECT_CALL(*multipleUserConnectorMock_, GetFirstForegroundUserId()).WillOnce(Return(123456)); auto ret = DeviceProfileConnector::GetInstance().GetAppTrustDeviceList(pkgName, deviceId); - EXPECT_EQ(ret.empty(), false); + EXPECT_EQ(ret.empty(), true); deviceId = "remoteDeviceId"; EXPECT_CALL(*multipleUserConnectorMock_, GetFirstForegroundUserId()) .Times(::testing::AtLeast(1)) .WillOnce(Return(1234)); ret = DeviceProfileConnector::GetInstance().GetAppTrustDeviceList(pkgName, deviceId); - EXPECT_EQ(ret.empty(), false); + EXPECT_EQ(ret.empty(), true); deviceId = "remoteDeviceId"; EXPECT_CALL(*multipleUserConnectorMock_, GetFirstForegroundUserId()) .Times(::testing::AtLeast(1)) .WillOnce(Return(1234)); ret = DeviceProfileConnector::GetInstance().GetAppTrustDeviceList(pkgName, deviceId); - EXPECT_EQ(ret.empty(), false); + EXPECT_EQ(ret.empty(), true); deviceId = "remoteDeviceId"; EXPECT_CALL(*multipleUserConnectorMock_, GetFirstForegroundUserId()) .Times(::testing::AtLeast(1)) .WillOnce(Return(1234)); ret = DeviceProfileConnector::GetInstance().GetAppTrustDeviceList(pkgName, deviceId); - EXPECT_EQ(ret.empty(), false); + EXPECT_EQ(ret.empty(), true); deviceId = "remoteDeviceId"; EXPECT_CALL(*multipleUserConnectorMock_, GetFirstForegroundUserId()) .Times(::testing::AtLeast(1)) .WillOnce(Return(12345)); ret = DeviceProfileConnector::GetInstance().GetAppTrustDeviceList(pkgName, deviceId); - EXPECT_EQ(ret.empty(), false); + EXPECT_EQ(ret.empty(), true); deviceId = "remoteDeviceId"; EXPECT_CALL(*multipleUserConnectorMock_, GetFirstForegroundUserId()) .Times(::testing::AtLeast(1)) .WillOnce(Return(12345)); ret = DeviceProfileConnector::GetInstance().GetAppTrustDeviceList(pkgName, deviceId); - EXPECT_EQ(ret.empty(), false); + EXPECT_EQ(ret.empty(), true); std::string udid; DeviceProfileConnector::GetInstance().DeleteAccessControlList(udid); diff --git a/test/commonunittest/UTTest_dm_deviceprofile_connector_second.cpp b/test/commonunittest/UTTest_dm_deviceprofile_connector_second.cpp index cfc68e1456446425bfd503ce859964ba9025d4c6..13480137030a65b17e0ff4a576a6edf50e78c6c4 100644 --- a/test/commonunittest/UTTest_dm_deviceprofile_connector_second.cpp +++ b/test/commonunittest/UTTest_dm_deviceprofile_connector_second.cpp @@ -220,7 +220,9 @@ HWTEST_F(DeviceProfileConnectorSecondTest, DeleteSigTrustACL_201, testing::ext:: HWTEST_F(DeviceProfileConnectorSecondTest, GetAllAccessControlProfile_201, testing::ext::TestSize.Level1) { - EXPECT_CALL(*distributedDeviceProfileClientMock_, GetAllAccessControlProfile(_)).WillOnce(Return(ERR_DM_FAILED)); + EXPECT_CALL(*distributedDeviceProfileClientMock_, GetAllAccessControlProfile(_)) + .Times(::testing::AtLeast(1)) + .WillOnce(Return(ERR_DM_FAILED)); auto ret = DeviceProfileConnector::GetInstance().GetAllAccessControlProfile(); EXPECT_TRUE(ret.empty()); } diff --git a/test/softbusunittest/UTTest_softbus_listener.cpp b/test/softbusunittest/UTTest_softbus_listener.cpp index b76deb9e82f3018147987172461cbde3bece81f3..a2412baed4dc42609f44b78b76135a1bb2dbe009 100644 --- a/test/softbusunittest/UTTest_softbus_listener.cpp +++ b/test/softbusunittest/UTTest_softbus_listener.cpp @@ -1417,7 +1417,9 @@ HWTEST_F(SoftbusListenerTest, GetAllTrustedDeviceList_002, testing::ext::TestSiz allProfile.push_back(profile); pkgName = "bundleNameInfo"; EXPECT_CALL(*ipcSkeletonMock_, GetCallingTokenID()).WillOnce(Return(1002)); - EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAccessControlProfile()).WillOnce(Return(allProfile)); + EXPECT_CALL(*deviceProfileConnectorMock_, GetAllAccessControlProfile()) + .Times(::testing::AtLeast(1)) + .WillOnce(Return(allProfile)); EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(ERR_DM_FAILED)); ret = softbusListener->GetAllTrustedDeviceList(pkgName, extra, deviceList); EXPECT_EQ(ret, DM_OK); diff --git a/test/unittest/UTTest_auth_confirm.cpp b/test/unittest/UTTest_auth_confirm.cpp index 941637c7e0ccfbbd0531d9ba6c2ba7f79fc839ed..b6061ed136ac3cc74d7fd8a823b4595c0e7065c0 100644 --- a/test/unittest/UTTest_auth_confirm.cpp +++ b/test/unittest/UTTest_auth_confirm.cpp @@ -131,7 +131,7 @@ HWTEST_F(AuthConfirmTest, AuthSrcConfirmState_Action_001, testing::ext::TestSize context = authManager->GetAuthContext(); std::shared_ptr authState = std::make_shared(); context->accessee.dmVersion = "6.0.0"; - EXPECT_EQ(authState->Action(context), ERR_DM_VERSION_INCOMPATIBLE); + EXPECT_EQ(authState->Action(context), DM_OK); } HWTEST_F(AuthConfirmTest, AuthSrcConfirmState_Action_002, testing::ext::TestSize.Level1) diff --git a/test/unittest/UTTest_device_manager_impl_two.cpp b/test/unittest/UTTest_device_manager_impl_two.cpp index 2efaca6410e4c054a55e3e507503b8ca7d937fd0..176d8f2ea820dae3f0a107f25980e5b45f13487a 100644 --- a/test/unittest/UTTest_device_manager_impl_two.cpp +++ b/test/unittest/UTTest_device_manager_impl_two.cpp @@ -1964,7 +1964,7 @@ HWTEST_F(DeviceManagerImplTest, CheckIsSameAccount_202, testing::ext::TestSize.L EXPECT_CALL(*ipcClientProxyMock_, SendRequest(testing::_, testing::_, testing::_)) .Times(1).WillOnce(testing::Return(DM_OK)); bool ret = DeviceManager::GetInstance().CheckIsSameAccount(caller, callee); - ASSERT_TRUE(ret); + ASSERT_FALSE(ret); } HWTEST_F(DeviceManagerImplTest, SetDnPolicy_202, testing::ext::TestSize.Level0) diff --git a/test/unittest/UTTest_device_manager_service_two.cpp b/test/unittest/UTTest_device_manager_service_two.cpp index 7f15c8ffe7d1b602d0f7a5325099212452d616bc..16b8957d806d75b274ba92e0ad2e5ba81b8d516b 100644 --- a/test/unittest/UTTest_device_manager_service_two.cpp +++ b/test/unittest/UTTest_device_manager_service_two.cpp @@ -222,7 +222,7 @@ HWTEST_F(DeviceManagerServiceTest, CheckAccessControl_201, testing::ext::TestSiz DmAccessCallee callee; EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)).WillOnce(Return(DM_OK)); bool ret = DeviceManagerService::GetInstance().CheckAccessControl(caller, callee); - EXPECT_EQ(ret, true); + EXPECT_EQ(ret, false); } /** @@ -248,7 +248,7 @@ HWTEST_F(DeviceManagerServiceTest, CheckIsSameAccount_201, testing::ext::TestSiz DmAccessCallee callee; EXPECT_CALL(*softbusListenerMock_, GetUdidByNetworkId(_, _)).WillOnce(Return(DM_OK)).WillOnce(Return(DM_OK)); bool ret = DeviceManagerService::GetInstance().CheckIsSameAccount(caller, callee); - EXPECT_EQ(ret, true); + EXPECT_EQ(ret, false); } /**