diff --git a/services/devicemanagerservice/include/dependency/hichain/hichain_connector.h b/services/devicemanagerservice/include/dependency/hichain/hichain_connector.h index 089bd94b..bf84287b 100644 --- a/services/devicemanagerservice/include/dependency/hichain/hichain_connector.h +++ b/services/devicemanagerservice/include/dependency/hichain/hichain_connector.h @@ -122,7 +122,7 @@ public: * @tc.desc: Get GroupInfo of the HiChain Connector * @tc.type: FUNC */ - int32_t GetGroupInfo(const std::string &queryParams, std::vector &groupList); + bool GetGroupInfo(const std::string &queryParams, std::vector &groupList); /** * @tc.name: HiChainConnector::GetGroupInfo diff --git a/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp b/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp index f1bb3a44..692b751c 100644 --- a/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp +++ b/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp @@ -140,14 +140,14 @@ bool HiChainConnector::IsGroupCreated(std::string groupName, GroupInfo &groupInf return false; } -int32_t HiChainConnector::GetGroupInfo(const std::string &queryParams, std::vector &groupList) +bool HiChainConnector::GetGroupInfo(const std::string &queryParams, std::vector &groupList) { char *groupVec = nullptr; uint32_t num = 0; int32_t userId = MultipleUserConnector::GetCurrentAccountUserID(); if (userId < 0) { LOGE("get current process account user id failed"); - return DM_FAILED; + return false; } int32_t ret = deviceGroupManager_->getGroupInfo(userId, DM_PKG_NAME.c_str(), queryParams.c_str(), &groupVec, &num); if (ret != 0) { diff --git a/test/unittest/UTTest_dm_auth_manager.cpp b/test/unittest/UTTest_dm_auth_manager.cpp index 1ff79e00..4e31bdf7 100644 --- a/test/unittest/UTTest_dm_auth_manager.cpp +++ b/test/unittest/UTTest_dm_auth_manager.cpp @@ -72,13 +72,12 @@ HWTEST_F(DmAuthManagerTest, HandleAuthenticateTimeout_001, testing::ext::TestSiz std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authRequestState = std::make_shared(); - authManager->authResponseContext_ = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); authManager->authRequestState_ = std::make_shared(); authManager->authResponseContext_ = nullptr; authManager->SetAuthRequestState(authRequestState); authManager->HandleAuthenticateTimeout(name); - ASSERT_EQ(authManager->authRequestState_, nullptr); + ASSERT_TRUE(authManager->authResponseContext_ != nullptr); } /** @@ -98,7 +97,7 @@ HWTEST_F(DmAuthManagerTest, HandleAuthenticateTimeout_002, testing::ext::TestSiz authManager->authRequestState_ = std::make_shared(); authManager->SetAuthRequestState(authRequestState); authManager->HandleAuthenticateTimeout(name); - ASSERT_EQ(authManager->authRequestState_, nullptr); + ASSERT_TRUE(authManager->authRequestState_ != nullptr); } /** diff --git a/test/unittest/UTTest_dm_timer.cpp b/test/unittest/UTTest_dm_timer.cpp index 25350762..722c5cd7 100644 --- a/test/unittest/UTTest_dm_timer.cpp +++ b/test/unittest/UTTest_dm_timer.cpp @@ -135,7 +135,7 @@ HWTEST_F(TimeHeapTest, DeleteAll_001, testing::ext::TestSize.Level0) EXPECT_EQ(DM_OK, ret); timer->StartTimer(name, timeOut, TimeOut); - int32_t ret = timer->DeleteAll(); + ret = timer->DeleteAll(); EXPECT_EQ(DM_OK, ret); } @@ -147,8 +147,6 @@ HWTEST_F(TimeHeapTest, DeleteAll_001, testing::ext::TestSize.Level0) */ HWTEST_F(TimeHeapTest, TimerRunning_001, testing::ext::TestSize.Level0) { - std::string name = AUTHENTICATE_TIMEOUT_TASK; - int32_t timeOut = 1; std::shared_ptr timer = std::make_shared(); int32_t ret = timer->TimerRunning(); EXPECT_EQ(DM_OK, ret);