diff --git a/tests/unittests/backup_sa/module_ipc/service_incremental_test.cpp b/tests/unittests/backup_sa/module_ipc/service_incremental_test.cpp index 12ac2756ea97c9ee4b1f87b91886d4a5b4a58bba..f7b85345077a5292fd4c1a9faf5a09577c511fa8 100644 --- a/tests/unittests/backup_sa/module_ipc/service_incremental_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_incremental_test.cpp @@ -718,6 +718,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalDone_0000, ret = service->AppIncrementalDone(errCode); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); + service->backupExtMutexMap_[""] = make_shared(""); EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(true)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(nullptr)); ret = service->AppIncrementalDone(errCode); diff --git a/tests/unittests/backup_sa/module_ipc/service_other_test.cpp b/tests/unittests/backup_sa/module_ipc/service_other_test.cpp index 4c463cda91aef685a226811a66739b0eae06b534..fc7f065a1bc4b4cc580b9882a5c551b5b4f7f51d 100644 --- a/tests/unittests/backup_sa/module_ipc/service_other_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_other_test.cpp @@ -754,6 +754,7 @@ HWTEST_F(ServiceTest, SUB_Service_AppDone_0200, TestSize.Level1) ASSERT_TRUE(service != nullptr); ErrCode errCode = BError(BError::Codes::SA_INVAL_ARG).GetCode(); + service->backupExtMutexMap_[""] = make_shared(""); EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)); EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_HAP)); EXPECT_CALL(*token, GetHapTokenInfo(_, _)).WillOnce(Return(0)); @@ -763,7 +764,6 @@ HWTEST_F(ServiceTest, SUB_Service_AppDone_0200, TestSize.Level1) auto ret = service->AppDone(errCode); EXPECT_NE(ret, BError(BError::Codes::OK)); - EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)); EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_HAP)); EXPECT_CALL(*token, GetHapTokenInfo(_, _)).WillOnce(Return(0)); @@ -806,6 +806,7 @@ HWTEST_F(ServiceTest, SUB_Service_NotifyCloneBundleFinish_0100, TestSize.Level1) service->NotifyCloneBundleFinish(bundleName, senario); EXPECT_TRUE(true); + service->backupExtMutexMap_[BUNDLE_NAME] = make_shared(BUNDLE_NAME); EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(true)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(nullptr)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); diff --git a/tests/unittests/backup_sa/module_ipc/service_test.cpp b/tests/unittests/backup_sa/module_ipc/service_test.cpp index a0b52e0889d85c935b3af2b321b0b7cd3b0aff02..841911384e10ff8e44b1385fb50767d93350055f 100644 --- a/tests/unittests/backup_sa/module_ipc/service_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_test.cpp @@ -371,15 +371,18 @@ HWTEST_F(ServiceTest, SUB_Service_AppDone_0100, testing::ext::TestSize.Level1) try { GTEST_LOG_(INFO) << "SUB_Service_AppDone Branches Start"; EXPECT_TRUE(servicePtr_ != nullptr); + servicePtr_->backupExtMutexMap_[BUNDLE_NAME] = make_shared(BUNDLE_NAME); auto ret = servicePtr_->AppDone(BError(BError::Codes::OK)); EXPECT_EQ(ret, BError(BError::Codes::OK)); GTEST_LOG_(INFO) << "SUB_Service_AppDone_0100 BACKUP"; ret = Init(IServiceReverse::Scenario::BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK)); GTEST_LOG_(INFO) << "ServiceTest-AppDone Branches"; + servicePtr_->backupExtMutexMap_[BUNDLE_NAME] = make_shared(BUNDLE_NAME); ret = servicePtr_->AppDone(1); EXPECT_EQ(ret, BError(BError::Codes::OK)); GTEST_LOG_(INFO) << "ServiceTest-AppDone Branches End"; + servicePtr_->backupExtMutexMap_[BUNDLE_NAME] = make_shared(BUNDLE_NAME); ret = servicePtr_->AppDone(BError(BError::Codes::OK)); EXPECT_EQ(ret, BError(BError::Codes::OK)); } catch (...) { @@ -404,11 +407,13 @@ HWTEST_F(ServiceTest, SUB_Service_AppDone_0101, testing::ext::TestSize.Level1) try { GTEST_LOG_(INFO) << "SUB_Service_AppDone Branches Start"; EXPECT_TRUE(servicePtr_ != nullptr); + servicePtr_->backupExtMutexMap_[BUNDLE_NAME] = make_shared(BUNDLE_NAME); auto ret = servicePtr_->AppDone(BError(BError::Codes::OK)); EXPECT_EQ(ret, BError(BError::Codes::OK)); GTEST_LOG_(INFO) << "SUB_Service_AppDone_0101 RESTORE"; ret = Init(IServiceReverse::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); + servicePtr_->backupExtMutexMap_[BUNDLE_NAME] = make_shared(BUNDLE_NAME); ret = servicePtr_->AppDone(BError(BError::Codes::OK)); EXPECT_EQ(ret, BError(BError::Codes::OK)); } catch (...) { @@ -434,6 +439,7 @@ HWTEST_F(ServiceTest, SUB_Service_AppDone_0102, testing::ext::TestSize.Level1) GTEST_LOG_(INFO) << "SUB_Service_AppDone Branches Start"; string bundleName = ""; EXPECT_TRUE(servicePtr_ != nullptr); + servicePtr_->backupExtMutexMap_[BUNDLE_NAME] = make_shared(BUNDLE_NAME); auto ret = servicePtr_->AppDone(BError(BError::Codes::OK)); EXPECT_EQ(ret, BError(BError::Codes::OK)); } catch (...) { @@ -459,18 +465,23 @@ HWTEST_F(ServiceTest, SUB_Service_ServiceResultReport_0000, testing::ext::TestSi GTEST_LOG_(INFO) << "SUB_Service_ServiceResultReport Branches Start"; string bundleName = ""; EXPECT_TRUE(servicePtr_ != nullptr); + servicePtr_->backupExtMutexMap_[BUNDLE_NAME] = make_shared(BUNDLE_NAME); auto ret = servicePtr_->ServiceResultReport("test", BackupRestoreScenario::FULL_RESTORE, 0); EXPECT_EQ(ret, BError(BError::Codes::OK)); + servicePtr_->backupExtMutexMap_[BUNDLE_NAME] = make_shared(BUNDLE_NAME); ret = servicePtr_->ServiceResultReport("test", BackupRestoreScenario::INCREMENTAL_RESTORE, 0); EXPECT_EQ(ret, BError(BError::Codes::OK)); + servicePtr_->backupExtMutexMap_[BUNDLE_NAME] = make_shared(BUNDLE_NAME); ret = servicePtr_->ServiceResultReport("test", BackupRestoreScenario::FULL_BACKUP, 0); EXPECT_EQ(ret, BError(BError::Codes::OK)); + servicePtr_->backupExtMutexMap_[BUNDLE_NAME] = make_shared(BUNDLE_NAME); ret = servicePtr_->ServiceResultReport("test", BackupRestoreScenario::INCREMENTAL_BACKUP, 0); EXPECT_EQ(ret, BError(BError::Codes::OK)); + servicePtr_->backupExtMutexMap_[BUNDLE_NAME] = make_shared(BUNDLE_NAME); ret = servicePtr_->ServiceResultReport("test", static_cast(1000), 0); EXPECT_EQ(ret, BError(BError::Codes::OK)); } catch (...) { @@ -615,11 +626,13 @@ HWTEST_F(ServiceTest, SUB_Service_OnBackupExtensionDied_0100, testing::ext::Test EXPECT_EQ(ret, BError(BError::Codes::OK)); string bundleName = BUNDLE_NAME; EXPECT_TRUE(servicePtr_ != nullptr); + servicePtr_->backupExtMutexMap_[BUNDLE_NAME] = make_shared(BUNDLE_NAME); servicePtr_->OnBackupExtensionDied(move(bundleName)); GTEST_LOG_(INFO) << "SUB_Service_OnBackupExtensionDied_0100 BACKUP"; ret = Init(IServiceReverse::Scenario::BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK)); bundleName = BUNDLE_NAME; + servicePtr_->backupExtMutexMap_[BUNDLE_NAME] = make_shared(BUNDLE_NAME); servicePtr_->OnBackupExtensionDied(move(bundleName)); } catch (...) { EXPECT_TRUE(false); @@ -654,6 +667,7 @@ HWTEST_F(ServiceTest, SUB_Service_OnBackupExtensionDied_0101, testing::ext::Test impl_.backupExtNameMap[BUNDLE_NAME] = extInfo; impl_.scenario = IServiceReverse::Scenario::RESTORE; EXPECT_TRUE(servicePtr_ != nullptr); + servicePtr_->backupExtMutexMap_[bundleName] = make_shared(bundleName); servicePtr_->OnBackupExtensionDied(move(bundleName)); GTEST_LOG_(INFO) << "SUB_Service_OnBackupExtensionDied_0101 BACKUP"; @@ -662,6 +676,7 @@ HWTEST_F(ServiceTest, SUB_Service_OnBackupExtensionDied_0101, testing::ext::Test impl_.restoreDataType = RESTORE_DATA_READDY; bundleName = "123456789"; impl_.backupExtNameMap[bundleName] = extInfo; + servicePtr_->backupExtMutexMap_[bundleName] = make_shared(bundleName); servicePtr_->OnBackupExtensionDied(move(bundleName)); } catch (...) { EXPECT_TRUE(false); @@ -1517,6 +1532,7 @@ HWTEST_F(ServiceTest, SUB_Service_NotifyCloneBundleFinish_0100, testing::ext::Te impl_.backupExtNameMap[BUNDLE_NAME] = extInfo; impl_.scenario = IServiceReverse::Scenario::RESTORE; EXPECT_TRUE(servicePtr_ != nullptr); + servicePtr_->backupExtMutexMap_[BUNDLE_NAME] = make_shared(BUNDLE_NAME); servicePtr_->NotifyCloneBundleFinish(BUNDLE_NAME, BackupRestoreScenario::FULL_RESTORE); } catch (...) { EXPECT_TRUE(false); @@ -1599,7 +1615,9 @@ HWTEST_F(ServiceTest, SUB_Service_ExtConnectDied_0100, testing::ext::TestSize.Le impl_.backupExtNameMap[BUNDLE_NAME] = extInfo; impl_.scenario = IServiceReverse::Scenario::RESTORE; EXPECT_TRUE(servicePtr_ != nullptr); + servicePtr_->backupExtMutexMap_[callName] = make_shared(callName); servicePtr_->ExtConnectDied(callName); + servicePtr_->backupExtMutexMap_[callName] = make_shared(callName); extInfo.backUpConnection->isConnected_.store(true); servicePtr_->ExtConnectDied(callName); } catch (...) { diff --git a/tests/unittests/backup_sa/module_ipc/service_throw_test.cpp b/tests/unittests/backup_sa/module_ipc/service_throw_test.cpp index 031be7b9afbed02d9a3cd58352296ebe6e040ac7..c0a136bba8dfeca55c83c1d118b9ef2f1de52b16 100644 --- a/tests/unittests/backup_sa/module_ipc/service_throw_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_throw_test.cpp @@ -528,6 +528,7 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_OnBackupExtensionDied_0100, testing try { EXPECT_NE(service, nullptr); string bundleName; + service->backupExtMutexMap_["bundleName"] = make_shared("bundleName"); EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) .WillOnce(Invoke([]() {