diff --git a/test/commonunittest/UTTest_dm_auth_manager_first.cpp b/test/commonunittest/UTTest_dm_auth_manager_first.cpp index 2c05a519b052c0318ab42ef6c5814237ed5c8bc8..0397ef37b6f4ba291640db23fd7705b28f5a8a67 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, STATUS_DM_AUTH_DEFAULT); } HWTEST_F(DmAuthManagerTest, AuthDeviceError005, testing::ext::TestSize.Level1) @@ -1480,11 +1480,11 @@ HWTEST_F(DmAuthManagerTest, StopAuthenticateDevice_001, testing::ext::TestSize.L authManager_->NegotiateRespMsg(DM_VERSION_4_1_5_1); authManager_->NegotiateRespMsg(DM_VERSION_5_0_2); EXPECT_CALL(*softbusSessionMock_, GetPeerDeviceId(_, _)).WillOnce(Return(DM_OK)); - EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).WillOnce(Return(DM_OK)); + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(DM_OK)); authManager_->GetPeerUdidHash(sessionId, peerUdidHash); EXPECT_CALL(*softbusSessionMock_, GetPeerDeviceId(_, _)).WillOnce(Return(DM_OK)); - EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).WillOnce(Return(ERR_DM_FAILED)); + EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).Times(::testing::AtLeast(1)).WillOnce(Return(ERR_DM_FAILED)); authManager_->GetPeerUdidHash(sessionId, peerUdidHash); ret = authManager_->StopAuthenticateDevice(pkgName); ASSERT_EQ(ret, DM_OK); @@ -1524,20 +1524,21 @@ HWTEST_F(DmAuthManagerTest, IsAuthFinish_001, testing::ext::TestSize.Level1) bool ret = authManager_->IsAuthFinish(); EXPECT_TRUE(ret); - authManager_->authResponseContext_->isOnline = false; + authManager_->authResponseContext_->reply = AUTH_TYPE_IMPORT_AUTH_CODE; authManager_->authResponseContext_->isIdenticalAccount = true; authManager_->authResponseContext_->authed = false; ret = authManager_->IsAuthFinish(); EXPECT_TRUE(ret); authManager_->authResponseContext_->isIdenticalAccount = false; - authManager_->authResponseContext_->authType = AUTH_TYPE_IMPORT_AUTH_CODE; - authManager_->authResponseContext_->isAuthCodeReady = false; + authManager_->authResponseContext_->authed = true; + authManager_->authResponseContext_->isOnline = false; ret = authManager_->IsAuthFinish(); EXPECT_TRUE(ret); - authManager_->authResponseContext_->reply = ERR_DM_AUTH_BUSINESS_BUSY; + authManager_->authResponseContext_->isOnline = true; authManager_->authResponseContext_->isAuthCodeReady = true; + authManager_->authResponseContext_->authType = ERR_DM_AUTH_BUSINESS_BUSY; ret = authManager_->IsAuthFinish(); EXPECT_FALSE(ret); @@ -1550,7 +1551,6 @@ HWTEST_F(DmAuthManagerTest, IsAuthFinish_001, testing::ext::TestSize.Level1) authManager_->authResponseContext_->isOnline = true; authManager_->authResponseContext_->authed = true; authManager_->authResponseContext_->importAuthCode = ""; - EXPECT_CALL(*cryptoMock_, GetUdidHash(_, _)).WillOnce(Return(DM_OK)).WillOnce(Return(DM_OK)); authManager_->ProcessAuthRequestExt(sessionId); authManager_->authResponseContext_->reply = ERR_DM_AUTH_BUSINESS_BUSY; authManager_->authResponseContext_->isOnline = false; diff --git a/test/unittest/UTTest_device_manager_impl.cpp b/test/unittest/UTTest_device_manager_impl.cpp index fe041c308d2ac4b0f83fd67ce003c14e5582ef11..4ce462374eecef75b91c35cad411777042449323 100644 --- a/test/unittest/UTTest_device_manager_impl.cpp +++ b/test/unittest/UTTest_device_manager_impl.cpp @@ -729,7 +729,8 @@ HWTEST_F(DeviceManagerImplTest, RegisterDevStateCallback_101, testing::ext::Test std::shared_ptr initCallback = std::make_shared(); int32_t ret = DeviceManager::GetInstance().InitDeviceManager(packName, initCallback); ret = DeviceManager::GetInstance().RegisterDevStateCallback(packName, extra, callback); - ASSERT_EQ(ret, DM_OK); + bool res = (ret == ERR_DM_NO_PERMISSION) || (ret == DM_OK); + ASSERT_EQ(res, true); DeviceManager::GetInstance().UnInitDeviceManager(packName); } 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_impl.cpp b/test/unittest/UTTest_device_manager_service_impl.cpp index fae4ecbfe0397e0055c48395704b9e7cdfc92d27..521f0800eaf5a01e1102c8a17d332b9f09f3e5b0 100644 --- a/test/unittest/UTTest_device_manager_service_impl.cpp +++ b/test/unittest/UTTest_device_manager_service_impl.cpp @@ -1831,7 +1831,7 @@ HWTEST_F(DeviceManagerServiceImplTest, GetGroupType_004, testing::ext::TestSize. HWTEST_F(DeviceManagerServiceImplTest, GetDeviceIdAndUserId_001, testing::ext::TestSize.Level1) { - int32_t userId = 1; + int32_t userId = 100001; std::string accountId = "accountId"; auto ret = deviceManagerServiceImpl_->GetDeviceIdAndUserId(userId, accountId); EXPECT_TRUE(ret.empty());