From db6b2116ec4f650f258f89de60c4a04f091ae396 Mon Sep 17 00:00:00 2001 From: yuwenze Date: Wed, 1 Mar 2023 06:17:45 +0000 Subject: [PATCH] offline invalid interface Signed-off-by: yuwenze Change-Id: If0082e3bd969b4376628366480e3189674a06569 --- .../appmgr/include/app_mgr_service_inner.h | 7 - services/appmgr/include/app_running_record.h | 24 - .../appmgr/include/module_running_record.h | 22 - services/appmgr/src/app_mgr_service_inner.cpp | 27 +- services/appmgr/src/app_running_record.cpp | 38 -- services/appmgr/src/module_running_record.cpp | 35 -- .../apprunningrecordsecond_fuzzer.cpp | 4 - .../modulerunningrecord_fuzzer.cpp | 4 - ...ams_ability_running_record_module_test.cpp | 162 +------ ...app_running_processes_info_module_test.cpp | 5 +- .../ams_app_running_record_module_test.cpp | 5 +- .../ams_app_service_flow_module_test.cpp | 411 ++++++++++-------- .../ams_ability_running_record_test.cpp | 117 ----- .../ams_app_life_cycle_test.cpp | 12 +- .../ams_app_running_record_test.cpp | 62 +-- .../ams_service_load_ability_process_test.cpp | 42 +- .../app_mgr_service_inner_test.cpp | 24 - 17 files changed, 265 insertions(+), 736 deletions(-) diff --git a/services/appmgr/include/app_mgr_service_inner.h b/services/appmgr/include/app_mgr_service_inner.h index 9ab571a5fbd..f741656e88e 100644 --- a/services/appmgr/include/app_mgr_service_inner.h +++ b/services/appmgr/include/app_mgr_service_inner.h @@ -348,13 +348,6 @@ public: */ virtual void AddAbilityStageDone(const int32_t recordId); - /** - * GetRecordMap, Get all the ability information in the application record. - * - * @return all the ability information in the application record. - */ - std::map> GetRecordMap() const; - /** * GetAppRunningRecordByPid, Get process record by application pid. * diff --git a/services/appmgr/include/app_running_record.h b/services/appmgr/include/app_running_record.h index 7ade713abbc..39cc41490f1 100644 --- a/services/appmgr/include/app_running_record.h +++ b/services/appmgr/include/app_running_record.h @@ -225,32 +225,8 @@ public: std::shared_ptr GetModuleRunningRecordByTerminateLists(const sptr &token) const; - // It can only used in SINGLETON mode. - /** - * GetAbilityRunningRecord, Get ability record by the ability Name. - * - * @param abilityName, the ability name. - * @param ownerUserId, the owner userId of this ability. - * - * @return the ability record. - */ - std::shared_ptr GetAbilityRunningRecord( - const std::string &abilityName, const std::string &moduleName, int32_t ownerUserId = -1) const; - std::shared_ptr GetAbilityRunningRecord(const int64_t eventId) const; - // Clear(remove) the specified ability record from the list - - /** - * ClearAbility, Clear ability record by record info. - * - * @param record, the ability record. - * - * @return - */ - void ClearAbility(const std::shared_ptr &record); - - // Update the trim memory level value of this process /** * @brief Setting the Trim Memory Level. * diff --git a/services/appmgr/include/module_running_record.h b/services/appmgr/include/module_running_record.h index eacc3aa1075..9d5201c8523 100644 --- a/services/appmgr/include/module_running_record.h +++ b/services/appmgr/include/module_running_record.h @@ -89,28 +89,6 @@ public: std::shared_ptr GetAbilityByTerminateLists(const sptr &token) const; - // Clear(remove) the specified ability record from the list - - /** - * ClearAbility, Clear ability record by record info. - * - * @param record, the ability record. - * - * @return - */ - void ClearAbility(const std::shared_ptr &record); - // It can only used in SINGLETON mode. - /** - * GetAbilityRunningRecord, Get ability record by the ability Name. - * - * @param abilityName, the ability name. - * @param ownerUserId, the owner userId of this ability. - * - * @return the ability record. - */ - std::shared_ptr GetAbilityRunningRecord( - const std::string &abilityName, int32_t ownerUserId = -1) const; - std::shared_ptr GetAbilityRunningRecord(const int64_t eventId) const; /** diff --git a/services/appmgr/src/app_mgr_service_inner.cpp b/services/appmgr/src/app_mgr_service_inner.cpp index cffba2c9bd8..530dec14b26 100644 --- a/services/appmgr/src/app_mgr_service_inner.cpp +++ b/services/appmgr/src/app_mgr_service_inner.cpp @@ -1111,17 +1111,6 @@ SpawnConnectionState AppMgrServiceInner::QueryAppSpawnConnectionState() const return SpawnConnectionState::STATE_NOT_CONNECT; } -std::map> AppMgrServiceInner::GetRecordMap() const -{ - if (!appRunningManager_) { - HILOG_ERROR("appRunningManager nullptr!"); - std::map> appRunningRecordMap; - return appRunningRecordMap; - } - - return appRunningManager_->GetAppRunningRecordMap(); -} - void AppMgrServiceInner::SetAppSpawnClient(std::shared_ptr spawnClient) { if (remoteClientManager_ == nullptr) { @@ -1259,20 +1248,12 @@ void AppMgrServiceInner::StartAbility(const sptr &token, const sp want->SetParam(DLP_PARAMS_SECURITY_FLAG, appRecord->GetSecurityFlag()); } - if (abilityInfo->launchMode == LaunchMode::SINGLETON) { - int32_t ownerUserId = -1; - if (want) { - ownerUserId = want->GetIntParam(ABILITY_OWNER_USERID, -1); - } - auto abilityRecord = appRecord->GetAbilityRunningRecord(abilityInfo->name, - abilityInfo->moduleName, ownerUserId); - if (abilityRecord) { - HILOG_WARN("same ability info in singleton launch mode, will not add ability"); - return; - } + auto ability = appRecord->GetAbilityRunningRecordByToken(token); + if (abilityInfo->launchMode == LaunchMode::SINGLETON && ability != nullptr) { + HILOG_WARN("same ability info in singleton launch mode, will not add ability"); + return; } - auto ability = appRecord->GetAbilityRunningRecordByToken(token); if (ability && preToken) { HILOG_ERROR("Ability is already started"); ability->SetPreToken(preToken); diff --git a/services/appmgr/src/app_running_record.cpp b/services/appmgr/src/app_running_record.cpp index 13dcda00e05..3073772ccfb 100644 --- a/services/appmgr/src/app_running_record.cpp +++ b/services/appmgr/src/app_running_record.cpp @@ -272,24 +272,6 @@ sptr AppRunningRecord::GetApplicationClient() const return (appLifeCycleDeal_ ? appLifeCycleDeal_->GetApplicationClient() : nullptr); } -std::shared_ptr AppRunningRecord::GetAbilityRunningRecord( - const std::string &abilityName, const std::string &moduleName, int32_t ownerUserId) const -{ - HILOG_INFO("Get ability running record by ability name."); - auto moduleRecordList = GetAllModuleRecord(); - for (const auto &moduleRecord : moduleRecordList) { - if (!moduleName.empty() && moduleRecord->GetModuleName() != moduleName) { - continue; - } - auto abilityRecord = moduleRecord->GetAbilityRunningRecord(abilityName, ownerUserId); - if (abilityRecord) { - return abilityRecord; - } - } - - return nullptr; -} - std::shared_ptr AppRunningRecord::GetAbilityRunningRecord(const int64_t eventId) const { HILOG_INFO("Get ability running record by eventId."); @@ -304,26 +286,6 @@ std::shared_ptr AppRunningRecord::GetAbilityRunningRecord( return nullptr; } -void AppRunningRecord::ClearAbility(const std::shared_ptr &record) -{ - if (!record) { - HILOG_ERROR("Param record is null"); - return; - } - - auto moduleRecord = GetModuleRunningRecordByToken(record->GetToken()); - if (!moduleRecord) { - HILOG_ERROR("moduleRecord is not exit"); - return; - } - - moduleRecord->ClearAbility(record); - - if (moduleRecord->GetAbilities().empty()) { - RemoveModuleRecord(moduleRecord); - } -} - void AppRunningRecord::RemoveModuleRecord(const std::shared_ptr &moduleRecord) { HILOG_INFO("Remove module record."); diff --git a/services/appmgr/src/module_running_record.cpp b/services/appmgr/src/module_running_record.cpp index 49d191f6ecc..ab69fb3e646 100644 --- a/services/appmgr/src/module_running_record.cpp +++ b/services/appmgr/src/module_running_record.cpp @@ -130,41 +130,6 @@ std::shared_ptr ModuleRunningRecord::GetAbilityByTerminate return nullptr; } -void ModuleRunningRecord::ClearAbility(const std::shared_ptr &record) -{ - HILOG_INFO("Clear ability."); - if (!record) { - HILOG_ERROR("Param record is null"); - return; - } - if (!GetAbilityRunningRecordByToken(record->GetToken())) { - HILOG_ERROR("Param record is not exist"); - return; - } - abilities_.erase(record->GetToken()); -} - -std::shared_ptr ModuleRunningRecord::GetAbilityRunningRecord( - const std::string &abilityName, int32_t ownerUserId) const -{ - HILOG_INFO("Get ability running record by ability name."); - const auto &it = std::find_if(abilities_.begin(), abilities_.end(), [&abilityName, ownerUserId](const auto &pair) { - auto ability = pair.second; - if (!ability) { - return false; - } - - bool flag = ability->GetName() == abilityName; - if (ability->GetAbilityInfo() && ability->GetAbilityInfo()->type == AppExecFwk::AbilityType::PAGE && - ability->GetAbilityInfo()->launchMode == AppExecFwk::LaunchMode::SINGLETON) { - flag = flag && (ability->GetOwnerUserId() == ownerUserId) && !ability->IsTerminating(); - } - return flag; - }); - - return ((it == abilities_.end()) ? nullptr : it->second); -} - std::shared_ptr ModuleRunningRecord::GetAbilityRunningRecord(const int64_t eventId) const { HILOG_INFO("Get ability running record by eventId."); diff --git a/test/fuzztest/apprunningrecordsecond_fuzzer/apprunningrecordsecond_fuzzer.cpp b/test/fuzztest/apprunningrecordsecond_fuzzer/apprunningrecordsecond_fuzzer.cpp index e86ff1366f2..f8ecaf15274 100755 --- a/test/fuzztest/apprunningrecordsecond_fuzzer/apprunningrecordsecond_fuzzer.cpp +++ b/test/fuzztest/apprunningrecordsecond_fuzzer/apprunningrecordsecond_fuzzer.cpp @@ -127,9 +127,6 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) appRecord->GetProcessName(); appRecord->GetAppInfoList(); appRecord->GetAbilities(); - std::string abilityName(data, size); - int32_t ownerUserId = static_cast(GetU32Data(data)); - appRecord->GetAbilityRunningRecord(abilityName, moduleName, ownerUserId); int64_t eventId = static_cast(GetU32Data(data)); appRecord->GetAbilityRunningRecord(eventId); appRecord->GetModuleRecordByModuleName(bundleName, moduleName); @@ -158,7 +155,6 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) appRecord->AbilityTerminated(token); appRecord->ScheduleTerminate(); appRecord->ApplicationTerminated(); - appRecord->ClearAbility(ability); appRecord->RemoveTerminateAbilityTimeoutTask(token); sptr callback; appRecord->NotifyLoadRepairPatch(bundleName, callback, recordId); diff --git a/test/fuzztest/modulerunningrecord_fuzzer/modulerunningrecord_fuzzer.cpp b/test/fuzztest/modulerunningrecord_fuzzer/modulerunningrecord_fuzzer.cpp index 70f8ab17e9f..d70b30498ea 100644 --- a/test/fuzztest/modulerunningrecord_fuzzer/modulerunningrecord_fuzzer.cpp +++ b/test/fuzztest/modulerunningrecord_fuzzer/modulerunningrecord_fuzzer.cpp @@ -76,9 +76,6 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) Parcel wantParcel; std::shared_ptr want; moduleRecord.AddAbility(token, abilityInfo, want); - std::string abilityName(data, size); - int32_t ownerUserId = static_cast(GetU32Data(data)); - moduleRecord.GetAbilityRunningRecord(abilityName, ownerUserId); int64_t eventId = static_cast(GetU32Data(data)); moduleRecord.GetAbilityRunningRecord(eventId); std::shared_ptr record; @@ -95,7 +92,6 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) int64_t timeOut = static_cast(GetU32Data(data)); moduleRecord.SendEvent(msg, timeOut, record); moduleRecord.RemoveTerminateAbilityTimeoutTask(token); - moduleRecord.ClearAbility(record); moduleRecord.GetModuleName(); moduleRecord.GetPageAbilitySize(); moduleRecord.GetModuleRecordState(); diff --git a/test/moduletest/common/ams/ability_running_record_test/ams_ability_running_record_module_test.cpp b/test/moduletest/common/ams/ability_running_record_test/ams_ability_running_record_module_test.cpp index 81704d36318..6b9aa79d55a 100644 --- a/test/moduletest/common/ams/ability_running_record_test/ams_ability_running_record_module_test.cpp +++ b/test/moduletest/common/ams/ability_running_record_test/ams_ability_running_record_module_test.cpp @@ -220,39 +220,6 @@ std::shared_ptr AmsAbilityRunningRecordModuleTest::QueryAppRun return caseAppRunningRecord_; } -/* - * Feature: AMS - * Function: AbilityRunningRecord - * SubFunction: NA - * FunctionPoints: Create AbilityRunningRecord succeed - * EnvConditions: NA - * CaseDescription: Verify the function creating two same names of AbilityRunningRecord. - */ -HWTEST_F(AmsAbilityRunningRecordModuleTest, AddAbilityRunningRecord_001, TestSize.Level1) -{ - HILOG_INFO("AddAbilityRunningRecord_001 start"); - auto appRunningRecord = QueryAppRunningRecord(); - auto caseAbilityInfo = std::make_shared(); - caseAbilityInfo->name = ABILITY_RECORD_NAME; - auto appInfo = std::make_shared(); - appInfo->bundleName = "com.ohos.test.helloworld"; - HapModuleInfo hapModuleInfo; - hapModuleInfo.moduleName = "Module"; - sptr token = new MockAbilityToken(); - appRunningRecord->AddModule(appInfo, caseAbilityInfo, token, hapModuleInfo, nullptr); - auto moduleRecord = appRunningRecord->GetModuleRecordByModuleName(appInfo->bundleName, hapModuleInfo.moduleName); - auto caseAbilityRunningRecord = moduleRecord->AddAbility(token, caseAbilityInfo, nullptr); - - EXPECT_TRUE(caseAbilityRunningRecord == nullptr); - caseAbilityRunningRecord = moduleRecord->GetAbilityRunningRecord(ABILITY_RECORD_NAME); - EXPECT_EQ(caseAbilityRunningRecord, appRunningRecord->GetAbilityRunningRecordByToken(token)); - auto abilityRunningRecordWithSameName = moduleRecord->AddAbility(token, caseAbilityInfo, nullptr); - EXPECT_TRUE(abilityRunningRecordWithSameName == nullptr); - appRunningRecord->ClearAbility(caseAbilityRunningRecord); - EXPECT_TRUE(appRunningRecord->GetAbilityRunningRecordByToken(token) == nullptr); - HILOG_INFO("AddAbilityRunningRecord_001 end"); -} - /* * Feature: AMS * Function: AbilityRunningRecord @@ -280,7 +247,7 @@ HWTEST_F(AmsAbilityRunningRecordModuleTest, AddAbilityRunningRecord_002, TestSiz hapModuleInfo.moduleName); auto caseAbilityRunningRecord = moduleRecord->AddAbility(token, caseAbilityInfo, nullptr); EXPECT_TRUE(caseAbilityRunningRecord == nullptr); - caseAbilityRunningRecord = moduleRecord->GetAbilityRunningRecord(ABILITY_RECORD_NAME + "_" + std::to_string(i)); + caseAbilityRunningRecord = moduleRecord->GetAbilityRunningRecordByToken(token); EXPECT_EQ(caseAbilityRunningRecord, appRunningRecord->GetAbilityRunningRecordByToken(token)); EXPECT_EQ(caseAbilityRunningRecord->GetState(), AbilityState::ABILITY_STATE_CREATE); } @@ -314,7 +281,7 @@ HWTEST_F(AmsAbilityRunningRecordModuleTest, UpdateAbilityRunningRecord_001, Test hapModuleInfo.moduleName); auto caseAbilityRunningRecord = moduleRecord->AddAbility(token, caseAbilityInfo, nullptr); EXPECT_TRUE(caseAbilityRunningRecord == nullptr); - caseAbilityRunningRecord = moduleRecord->GetAbilityRunningRecord(ABILITY_RECORD_NAME + "_" + std::to_string(i)); + caseAbilityRunningRecord = moduleRecord->GetAbilityRunningRecordByToken(token); EXPECT_EQ(caseAbilityRunningRecord, appRunningRecord->GetAbilityRunningRecordByToken(token)); caseAbilityRunningRecord->SetState(AbilityState::ABILITY_STATE_BACKGROUND); appRunningRecord->SetState(ApplicationState::APP_STATE_FOREGROUND); @@ -353,7 +320,7 @@ HWTEST_F(AmsAbilityRunningRecordModuleTest, UpdateAbilityRunningRecord_002, Test hapModuleInfo.moduleName); auto caseAbilityRunningRecord = moduleRecord->AddAbility(token, caseAbilityInfo, nullptr); EXPECT_TRUE(caseAbilityRunningRecord == nullptr); - caseAbilityRunningRecord = moduleRecord->GetAbilityRunningRecord(ABILITY_RECORD_NAME + "_" + std::to_string(i)); + caseAbilityRunningRecord = moduleRecord->GetAbilityRunningRecordByToken(token); EXPECT_EQ(caseAbilityRunningRecord, appRunningRecord->GetAbilityRunningRecordByToken(token)); appRunningRecord->UpdateAbilityState(token, AbilityState::ABILITY_STATE_END); EXPECT_EQ(caseAbilityRunningRecord->GetState(), AbilityState::ABILITY_STATE_CREATE); @@ -388,7 +355,7 @@ HWTEST_F(AmsAbilityRunningRecordModuleTest, UpdateAbilityRunningRecord_003, Test hapModuleInfo.moduleName); auto caseAbilityRunningRecord = moduleRecord->AddAbility(token, caseAbilityInfo, nullptr); EXPECT_TRUE(caseAbilityRunningRecord == nullptr); - caseAbilityRunningRecord = moduleRecord->GetAbilityRunningRecord(ABILITY_RECORD_NAME + "_" + std::to_string(i)); + caseAbilityRunningRecord = moduleRecord->GetAbilityRunningRecordByToken(token); EXPECT_EQ(caseAbilityRunningRecord, appRunningRecord->GetAbilityRunningRecordByToken(token)); caseAbilityRunningRecord->SetState(AbilityState::ABILITY_STATE_FOREGROUND); appRunningRecord->SetState(ApplicationState::APP_STATE_BACKGROUND); @@ -399,126 +366,5 @@ HWTEST_F(AmsAbilityRunningRecordModuleTest, UpdateAbilityRunningRecord_003, Test } HILOG_INFO("UpdateAbilityRunningRecord_003 end"); } - -/* - * Feature: AMS - * Function: AbilityRunningRecord - * SubFunction: NA - * FunctionPoints: Clear AbilityRunningRecord succeed - * EnvConditions: NA - * CaseDescription: Verify the function clearing more AbilityRunningRecords. - */ -HWTEST_F(AmsAbilityRunningRecordModuleTest, ClearAbilityRunningRecord_001, TestSize.Level1) -{ - HILOG_INFO("ClearAbilityRunningRecord_001 start"); - int i; - auto appRunningRecord = QueryAppRunningRecord(); - auto appInfo = std::make_shared(); - appInfo->bundleName = "com.ohos.test.helloworld"; - - for (i = 0; i < ABILITY_RUNNING_RECORD_NUM; i++) { - auto caseAbilityInfo = std::make_shared(); - caseAbilityInfo->name = ABILITY_RECORD_NAME + "_" + std::to_string(i); - sptr token = new MockAbilityToken(); - HapModuleInfo hapModuleInfo; - hapModuleInfo.moduleName = "Module"; - appRunningRecord->AddModule(appInfo, caseAbilityInfo, token, hapModuleInfo, nullptr); - auto moduleRecord = appRunningRecord->GetModuleRecordByModuleName(appInfo->bundleName, - hapModuleInfo.moduleName); - auto caseAbilityRunningRecord = moduleRecord->AddAbility(token, caseAbilityInfo, nullptr); - EXPECT_TRUE(caseAbilityRunningRecord == nullptr); - caseAbilityRunningRecord = moduleRecord->GetAbilityRunningRecord(ABILITY_RECORD_NAME + "_" + std::to_string(i)); - EXPECT_EQ(caseAbilityRunningRecord, appRunningRecord->GetAbilityRunningRecordByToken(token)); - } - for (i = 0; i < ABILITY_RUNNING_RECORD_NUM; i++) { - auto caseAbilityInfo = std::make_shared(); - caseAbilityInfo->name = ABILITY_RECORD_NAME + "_" + std::to_string(i); - sptr token = new MockAbilityToken(); - auto caseAbilityRunningRecord = appRunningRecord->GetAbilityRunningRecordByToken(token); - appRunningRecord->ClearAbility(caseAbilityRunningRecord); - EXPECT_TRUE(appRunningRecord->GetAbilityRunningRecordByToken(token) == nullptr); - } - HILOG_INFO("ClearAbilityRunningRecord_001 end"); -} - -/* - * Feature: AMS - * Function: AbilityRunningRecord - * SubFunction: NA - * FunctionPoints: Clear AbilityRunningRecord succeed - * EnvConditions: NA - * CaseDescription: Verify the function clearing all AbilityRunningRecords, the AbilityRunningRecord is null. - */ -HWTEST_F(AmsAbilityRunningRecordModuleTest, ClearAbilityRunningRecord_002, TestSize.Level1) -{ - HILOG_INFO("ClearAbilityRunningRecord_002 start"); - int i; - auto appRunningRecord = QueryAppRunningRecord(); - auto appInfo = std::make_shared(); - appInfo->bundleName = "com.ohos.test.helloworld"; - - for (i = 0; i < ABILITY_RUNNING_RECORD_NUM; i++) { - auto caseAbilityInfo = std::make_shared(); - caseAbilityInfo->name = ABILITY_RECORD_NAME + "_" + std::to_string(i); - sptr token = new MockAbilityToken(); - HapModuleInfo hapModuleInfo; - hapModuleInfo.moduleName = "Module"; - appRunningRecord->AddModule(appInfo, caseAbilityInfo, token, hapModuleInfo, nullptr); - auto moduleRecord = appRunningRecord->GetModuleRecordByModuleName(appInfo->bundleName, - hapModuleInfo.moduleName); - auto caseAbilityRunningRecord = moduleRecord->AddAbility(token, caseAbilityInfo, nullptr); - EXPECT_TRUE(caseAbilityRunningRecord == nullptr); - caseAbilityRunningRecord = moduleRecord->GetAbilityRunningRecord(ABILITY_RECORD_NAME + "_" + std::to_string(i)); - EXPECT_EQ(caseAbilityRunningRecord, appRunningRecord->GetAbilityRunningRecordByToken(token)); - appRunningRecord->ClearAbility(caseAbilityRunningRecord); - EXPECT_TRUE(appRunningRecord->GetAbilityRunningRecordByToken(token) == nullptr); - } - if (i == ABILITY_RUNNING_RECORD_NUM) { - auto abilityMap = appRunningRecord->GetAbilities(); - EXPECT_TRUE(abilityMap.empty()); - } - HILOG_INFO("ClearAbilityRunningRecord_002 end"); -} - -/* - * Feature: AMS - * Function: AbilityRunningRecord - * SubFunction: NA - * FunctionPoints: Add ,update and Clear AbilityRunningRecord succeed - * EnvConditions: NA - * CaseDescription: Verify the function Add ,update and clear more AbilityRunningRecords. - */ -HWTEST_F(AmsAbilityRunningRecordModuleTest, OperateAbilityRunningRecord_001, TestSize.Level1) -{ - HILOG_INFO("OperateAbilityRunningRecord_001 start"); - int i; - auto appRunningRecord = QueryAppRunningRecord(); - auto appInfo = std::make_shared(); - appInfo->bundleName = "com.ohos.test.helloworld"; - - for (i = 0; i < ABILITY_RUNNING_RECORD_NUM; i++) { - auto caseAbilityInfo = std::make_shared(); - caseAbilityInfo->name = ABILITY_RECORD_NAME + "_" + std::to_string(i); - sptr token = new MockAbilityToken(); - HapModuleInfo hapModuleInfo; - hapModuleInfo.moduleName = "Module"; - appRunningRecord->AddModule(appInfo, caseAbilityInfo, token, hapModuleInfo, nullptr); - auto moduleRecord = appRunningRecord->GetModuleRecordByModuleName(appInfo->bundleName, - hapModuleInfo.moduleName); - auto caseAbilityRunningRecord = moduleRecord->AddAbility(token, caseAbilityInfo, nullptr); - EXPECT_TRUE(caseAbilityRunningRecord == nullptr); - caseAbilityRunningRecord = moduleRecord->GetAbilityRunningRecord(ABILITY_RECORD_NAME + "_" + std::to_string(i)); - EXPECT_EQ(caseAbilityRunningRecord, appRunningRecord->GetAbilityRunningRecordByToken(token)); - } - for (i = 0; i < ABILITY_RUNNING_RECORD_NUM; i++) { - auto caseAbilityInfo = std::make_shared(); - caseAbilityInfo->name = ABILITY_RECORD_NAME + "_" + std::to_string(i); - sptr token = new MockAbilityToken(); - auto caseAbilityRunningRecord = appRunningRecord->GetAbilityRunningRecordByToken(token); - appRunningRecord->ClearAbility(caseAbilityRunningRecord); - EXPECT_TRUE(appRunningRecord->GetAbilityRunningRecordByToken(token) == nullptr); - } - HILOG_INFO("OperateAbilityRunningRecord_001 end"); -} } // namespace AppExecFwk } // namespace OHOS diff --git a/test/moduletest/common/ams/app_running_processes_info_module_test/app_running_processes_info_module_test.cpp b/test/moduletest/common/ams/app_running_processes_info_module_test/app_running_processes_info_module_test.cpp index 6e0cb99ab6c..aab40162378 100644 --- a/test/moduletest/common/ams/app_running_processes_info_module_test/app_running_processes_info_module_test.cpp +++ b/test/moduletest/common/ams/app_running_processes_info_module_test/app_running_processes_info_module_test.cpp @@ -104,7 +104,7 @@ protected: EXPECT_TRUE(appInfo != nullptr) << "appInfo is nullptr!"; EXPECT_TRUE(abilityInfo != nullptr) << "abilityInfo is nullptr!"; EXPECT_TRUE(record != nullptr) << "record is nullptr!"; - auto abilityRecord = record->GetAbilityRunningRecord(GetTestAbilityName(index), abilityInfo->moduleName); + auto abilityRecord = record->GetAbilityRunningRecordByToken(GetMockToken()); int32_t id = record->GetRecordId(); auto name = record->GetName(); sptr token = abilityRecord->GetToken(); @@ -117,8 +117,7 @@ protected: auto appRecordFromServ = service_->appRunningManager_->CheckAppRunningRecordIsExist( appInfo->name, processName, appInfo->uid, bundleInfo); EXPECT_TRUE(appRecordFromServ); - auto abilityRecordFromServ = appRecordFromServ->GetAbilityRunningRecord(GetTestAbilityName(index), - abilityInfo->moduleName); + auto abilityRecordFromServ = appRecordFromServ->GetAbilityRunningRecordByToken(GetMockToken()); int32_t idFromServ = appRecordFromServ->GetRecordId(); sptr tokenFromServ = abilityRecordFromServ->GetToken(); auto nameFromServ = appRecordFromServ->GetName(); diff --git a/test/moduletest/common/ams/app_running_record_test/ams_app_running_record_module_test.cpp b/test/moduletest/common/ams/app_running_record_test/ams_app_running_record_module_test.cpp index 763c6888ee7..65a81d04884 100644 --- a/test/moduletest/common/ams/app_running_record_test/ams_app_running_record_module_test.cpp +++ b/test/moduletest/common/ams/app_running_record_test/ams_app_running_record_module_test.cpp @@ -103,7 +103,7 @@ protected: EXPECT_TRUE(appInfo != nullptr) << "appInfo is nullptr!"; EXPECT_TRUE(abilityInfo != nullptr) << "abilityInfo is nullptr!"; EXPECT_TRUE(record != nullptr) << "record is nullptr!"; - auto abilityRecord = record->GetAbilityRunningRecord(GetTestAbilityName(index), abilityInfo->moduleName); + auto abilityRecord = record->GetAbilityRunningRecordByToken(GetMockToken()); int32_t id = record->GetRecordId(); auto name = record->GetName(); sptr token = abilityRecord->GetToken(); @@ -116,8 +116,7 @@ protected: auto appRecordFromServ = service_->appRunningManager_->CheckAppRunningRecordIsExist( appInfo->name, processName, appInfo->uid, bundleInfo); EXPECT_TRUE(appRecordFromServ); - auto abilityRecordFromServ = appRecordFromServ->GetAbilityRunningRecord(GetTestAbilityName(index), - abilityInfo->moduleName); + auto abilityRecordFromServ = appRecordFromServ->GetAbilityRunningRecordByToken(GetMockToken()); int32_t idFromServ = appRecordFromServ->GetRecordId(); sptr tokenFromServ = abilityRecordFromServ->GetToken(); auto nameFromServ = appRecordFromServ->GetName(); diff --git a/test/moduletest/common/ams/app_service_flow_test/ams_app_service_flow_module_test.cpp b/test/moduletest/common/ams/app_service_flow_test/ams_app_service_flow_module_test.cpp index 5cef283436c..036b22f436a 100644 --- a/test/moduletest/common/ams/app_service_flow_test/ams_app_service_flow_module_test.cpp +++ b/test/moduletest/common/ams/app_service_flow_test/ams_app_service_flow_module_test.cpp @@ -43,21 +43,14 @@ const uint32_t CYCLE_NUMBER = 10; struct TestApplicationPreRunningRecord { TestApplicationPreRunningRecord( const std::shared_ptr& appRecord, const sptr& mockAppScheduler) - : appRecord_(appRecord), mockAppScheduler_(mockAppScheduler) - {} - sptr GetToken(const std::string& abilityName) const - { - auto abilityRecord = appRecord_->GetAbilityRunningRecord(abilityName, ""); - return abilityRecord ? abilityRecord->GetToken() : nullptr; - } + : appRecord_(appRecord), mockAppScheduler_(mockAppScheduler) {} - std::shared_ptr GetAbility(const std::string& abilityName) const + std::shared_ptr GetAbility(const sptr& token) const { - return appRecord_->GetAbilityRunningRecord(abilityName, ""); + return appRecord_->GetAbilityRunningRecordByToken(token); } - virtual ~TestApplicationPreRunningRecord() - {} + virtual ~TestApplicationPreRunningRecord() {} std::shared_ptr appRecord_; sptr mockAppScheduler_; @@ -75,7 +68,8 @@ public: protected: sptr TestCreateApplicationClient(const std::shared_ptr& appRecord) const; TestApplicationPreRunningRecord TestCreateApplicationRecordAndSetState(const std::string& abilityName, - const std::string& appName, const AbilityState abilityState, const ApplicationState appState) const; + const std::string& appName, const AbilityState abilityState, const ApplicationState appState, + sptr& outToken) const; protected: std::shared_ptr serviceInner_ = nullptr; @@ -120,7 +114,7 @@ sptr AmsAppServiceFlowModuleTest::TestCreateApplicationClient( // create one application that include one ability, and set state TestApplicationPreRunningRecord AmsAppServiceFlowModuleTest::TestCreateApplicationRecordAndSetState( const std::string& abilityName, const std::string& appName, const AbilityState abilityState, - const ApplicationState appState) const + const ApplicationState appState, sptr& outToken) const { auto abilityInfo = std::make_shared(); auto appInfo = std::make_shared(); @@ -131,6 +125,7 @@ TestApplicationPreRunningRecord AmsAppServiceFlowModuleTest::TestCreateApplicati abilityInfo->name = abilityName; abilityInfo->applicationInfo.uid = 0; sptr token = new (std::nothrow) MockAbilityToken(); + outToken = token; BundleInfo bundleInfo; HapModuleInfo hapModuleInfo; @@ -169,35 +164,39 @@ TestApplicationPreRunningRecord AmsAppServiceFlowModuleTest::TestCreateApplicati HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_BackKey_001, TestSize.Level1) { HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_BackKey_001 start"); - TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState( - "abilityA1", "appA", AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND); + sptr abilityA1Token; + TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState("abilityA1", "appA", + AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND, abilityA1Token); + sptr abilityA2Token; TestCreateApplicationRecordAndSetState("abilityA2", testAppA.appRecord_->GetName(), AbilityState::ABILITY_STATE_FOREGROUND, - ApplicationState::APP_STATE_FOREGROUND); + ApplicationState::APP_STATE_FOREGROUND, abilityA2Token); // The previous app and ability - TestApplicationPreRunningRecord testAppB = TestCreateApplicationRecordAndSetState( - "abilityB1", "appB", AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND); + sptr abilityB1Token; + TestApplicationPreRunningRecord testAppB = TestCreateApplicationRecordAndSetState("abilityB1", "appB", + AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND, abilityB1Token); + sptr abilityB2Token; TestCreateApplicationRecordAndSetState("abilityB2", testAppB.appRecord_->GetName(), AbilityState::ABILITY_STATE_BACKGROUND, - ApplicationState::APP_STATE_BACKGROUND); + ApplicationState::APP_STATE_BACKGROUND, abilityB2Token); EXPECT_CALL(*(testAppB.mockAppScheduler_), ScheduleForegroundApplication()).Times(1); EXPECT_CALL(*(testAppA.mockAppScheduler_), ScheduleBackgroundApplication()).Times(2); // simulate press back key - serviceInner_->UpdateAbilityState(testAppB.GetToken("abilityB1"), AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityB1Token, AbilityState::ABILITY_STATE_FOREGROUND); serviceInner_->ApplicationForegrounded(testAppB.appRecord_->GetRecordId()); - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA1"), AbilityState::ABILITY_STATE_BACKGROUND); - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA2"), AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityA1Token, AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityA2Token, AbilityState::ABILITY_STATE_BACKGROUND); serviceInner_->ApplicationBackgrounded(testAppA.appRecord_->GetRecordId()); - EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppB.GetAbility("abilityB1")->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppB.GetAbility("abilityB2")->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppB.GetAbility(abilityB1Token)->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppB.GetAbility(abilityB2Token)->GetState()); EXPECT_EQ(ApplicationState::APP_STATE_FOREGROUND, testAppB.appRecord_->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility("abilityA1")->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility("abilityA2")->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility(abilityA1Token)->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility(abilityA2Token)->GetState()); EXPECT_EQ(ApplicationState::APP_STATE_BACKGROUND, testAppA.appRecord_->GetState()); HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_BackKey_001 end"); } @@ -212,35 +211,38 @@ HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_BackKey_001, TestSize.Level1) HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_BackKey_002, TestSize.Level1) { HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_BackKey_002 start"); - TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState( - "abilityA1", "appA", AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND); - TestApplicationPreRunningRecord testAppB = TestCreateApplicationRecordAndSetState( - "abilityB1", "appB", AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND); - TestApplicationPreRunningRecord testappC = TestCreateApplicationRecordAndSetState( - "abilityC1", "appC", AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND); + sptr abilityA1Token; + TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState("abilityA1", "appA", + AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND, abilityA1Token); + sptr abilityB1Token; + TestApplicationPreRunningRecord testAppB = TestCreateApplicationRecordAndSetState("abilityB1", "appB", + AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND, abilityB1Token); + sptr abilityC1Token; + TestApplicationPreRunningRecord testappC = TestCreateApplicationRecordAndSetState("abilityC1", "appC", + AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND, abilityC1Token); EXPECT_CALL(*(testAppB.mockAppScheduler_), ScheduleForegroundApplication()).Times(1); EXPECT_CALL(*(testAppA.mockAppScheduler_), ScheduleBackgroundApplication()).Times(1); // simulate press back key - serviceInner_->UpdateAbilityState(testAppB.GetToken("abilityB1"), AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityB1Token, AbilityState::ABILITY_STATE_FOREGROUND); serviceInner_->ApplicationForegrounded(testAppB.appRecord_->GetRecordId()); - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA1"), AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityA1Token, AbilityState::ABILITY_STATE_BACKGROUND); serviceInner_->ApplicationBackgrounded(testAppA.appRecord_->GetRecordId()); - EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppB.GetAbility("abilityB1")->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppB.GetAbility(abilityB1Token)->GetState()); EXPECT_EQ(ApplicationState::APP_STATE_FOREGROUND, testAppB.appRecord_->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility("abilityA1")->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility(abilityA1Token)->GetState()); EXPECT_EQ(ApplicationState::APP_STATE_BACKGROUND, testAppA.appRecord_->GetState()); EXPECT_CALL(*(testappC.mockAppScheduler_), ScheduleForegroundApplication()).Times(1); EXPECT_CALL(*(testAppB.mockAppScheduler_), ScheduleBackgroundApplication()).Times(1); // simulate press back key again - serviceInner_->UpdateAbilityState(testappC.GetToken("abilityC1"), AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityC1Token, AbilityState::ABILITY_STATE_FOREGROUND); serviceInner_->ApplicationForegrounded(testappC.appRecord_->GetRecordId()); - serviceInner_->UpdateAbilityState(testAppB.GetToken("abilityB1"), AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityB1Token, AbilityState::ABILITY_STATE_BACKGROUND); serviceInner_->ApplicationBackgrounded(testAppB.appRecord_->GetRecordId()); - EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testappC.GetAbility("abilityC1")->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testappC.GetAbility(abilityC1Token)->GetState()); EXPECT_EQ(ApplicationState::APP_STATE_FOREGROUND, testappC.appRecord_->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility("abilityA1")->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility(abilityA1Token)->GetState()); EXPECT_EQ(ApplicationState::APP_STATE_BACKGROUND, testAppA.appRecord_->GetState()); HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_BackKey_002 end"); } @@ -255,24 +257,27 @@ HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_BackKey_002, TestSize.Level1) HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_BackKey_003, TestSize.Level1) { HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_BackKey_003 start"); - TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState( - "abilityA1", "appA", AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND); + sptr abilityA1Token; + TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState("abilityA1", "appA", + AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND, abilityA1Token); + sptr abilityA2Token; TestCreateApplicationRecordAndSetState("abilityA2", testAppA.appRecord_->GetName(), AbilityState::ABILITY_STATE_BACKGROUND, - ApplicationState::APP_STATE_FOREGROUND); + ApplicationState::APP_STATE_FOREGROUND, abilityA2Token); + sptr abilityA3Token; TestCreateApplicationRecordAndSetState("abilityA3", testAppA.appRecord_->GetName(), AbilityState::ABILITY_STATE_BACKGROUND, - ApplicationState::APP_STATE_FOREGROUND); + ApplicationState::APP_STATE_FOREGROUND, abilityA3Token); // simulate press back key - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA2"), AbilityState::ABILITY_STATE_FOREGROUND); - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA3"), AbilityState::ABILITY_STATE_FOREGROUND); - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA1"), AbilityState::ABILITY_STATE_BACKGROUND); - EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility("abilityA1")->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility("abilityA2")->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility("abilityA3")->GetState()); + serviceInner_->UpdateAbilityState(abilityA2Token, AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityA3Token, AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityA1Token, AbilityState::ABILITY_STATE_BACKGROUND); + EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility(abilityA1Token)->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility(abilityA2Token)->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility(abilityA3Token)->GetState()); EXPECT_EQ(ApplicationState::APP_STATE_FOREGROUND, testAppA.appRecord_->GetState()); HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_BackKey_003 end"); } @@ -287,48 +292,52 @@ HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_BackKey_003, TestSize.Level1) HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_BackKey_004, TestSize.Level1) { HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_BackKey_004 start"); - TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState( - "abilityA1", "appA", AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND); + sptr abilityA1Token; + TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState("abilityA1", "appA", + AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND, abilityA1Token); + sptr abilityA2Token; TestCreateApplicationRecordAndSetState("abilityA2", testAppA.appRecord_->GetName(), AbilityState::ABILITY_STATE_FOREGROUND, - ApplicationState::APP_STATE_FOREGROUND); + ApplicationState::APP_STATE_FOREGROUND, abilityA2Token); // The previous app and ability - TestApplicationPreRunningRecord testAppB = TestCreateApplicationRecordAndSetState( - "abilityB1", "appB", AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND); + sptr abilityB1Token; + TestApplicationPreRunningRecord testAppB = TestCreateApplicationRecordAndSetState("abilityB1", "appB", + AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND, abilityB1Token); + sptr abilityB2Token; TestCreateApplicationRecordAndSetState("abilityB2", testAppB.appRecord_->GetName(), AbilityState::ABILITY_STATE_BACKGROUND, - ApplicationState::APP_STATE_BACKGROUND); + ApplicationState::APP_STATE_BACKGROUND, abilityB2Token); EXPECT_CALL(*(testAppB.mockAppScheduler_), ScheduleForegroundApplication()).Times(1); EXPECT_CALL(*(testAppA.mockAppScheduler_), ScheduleBackgroundApplication()).Times(2); EXPECT_CALL(*(testAppA.mockAppScheduler_), ScheduleCleanAbility(_)).Times(2); // simulate press back key - serviceInner_->UpdateAbilityState(testAppB.GetToken("abilityB2"), AbilityState::ABILITY_STATE_FOREGROUND); - serviceInner_->UpdateAbilityState(testAppB.GetToken("abilityB1"), AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityB2Token, AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityB1Token, AbilityState::ABILITY_STATE_FOREGROUND); serviceInner_->ApplicationForegrounded(testAppB.appRecord_->GetRecordId()); - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA1"), AbilityState::ABILITY_STATE_BACKGROUND); - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA2"), AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityA1Token, AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityA2Token, AbilityState::ABILITY_STATE_BACKGROUND); serviceInner_->ApplicationBackgrounded(testAppA.appRecord_->GetRecordId()); - serviceInner_->TerminateAbility(testAppA.GetToken("abilityA1"), false); - serviceInner_->AbilityTerminated(testAppA.GetToken("abilityA1")); - serviceInner_->TerminateAbility(testAppA.GetToken("abilityA2"), false); - serviceInner_->AbilityTerminated(testAppA.GetToken("abilityA2")); + serviceInner_->TerminateAbility(abilityA1Token, false); + serviceInner_->AbilityTerminated(abilityA1Token); + serviceInner_->TerminateAbility(abilityA2Token, false); + serviceInner_->AbilityTerminated(abilityA2Token); serviceInner_->ApplicationTerminated(testAppA.appRecord_->GetRecordId()); - EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppB.GetAbility("abilityB1")->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppB.GetAbility("abilityB2")->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppB.GetAbility(abilityB1Token)->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppB.GetAbility(abilityB2Token)->GetState()); EXPECT_EQ(ApplicationState::APP_STATE_FOREGROUND, testAppB.appRecord_->GetState()); - EXPECT_EQ(testAppA.GetAbility("abilityA1"), nullptr); - EXPECT_EQ(testAppA.GetAbility("abilityA2"), nullptr); + EXPECT_EQ(testAppA.GetAbility(abilityA1Token), nullptr); + EXPECT_EQ(testAppA.GetAbility(abilityA2Token), nullptr); EXPECT_EQ(ApplicationState::APP_STATE_TERMINATED, testAppA.appRecord_->GetState()); HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_BackKey_004 end"); } @@ -345,44 +354,47 @@ HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_BackKey_004, TestSize.Level1) HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_BackKey_005, TestSize.Level1) { HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_BackKey_005 start"); - TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState( - "abilityA1", "appA", AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND); - TestApplicationPreRunningRecord testAppB = TestCreateApplicationRecordAndSetState( - "abilityB1", "appB", AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND); - TestApplicationPreRunningRecord testappC = TestCreateApplicationRecordAndSetState( - "abilityC1", "appC", AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND); + sptr abilityA1Token; + TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState("abilityA1", "appA", + AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND, abilityA1Token); + sptr abilityB1Token; + TestApplicationPreRunningRecord testAppB = TestCreateApplicationRecordAndSetState("abilityB1", "appB", + AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND, abilityB1Token); + sptr abilityC1Token; + TestApplicationPreRunningRecord testappC = TestCreateApplicationRecordAndSetState("abilityC1", "appC", + AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND, abilityC1Token); EXPECT_CALL(*(testAppB.mockAppScheduler_), ScheduleForegroundApplication()).Times(1); EXPECT_CALL(*(testAppA.mockAppScheduler_), ScheduleBackgroundApplication()).Times(1); EXPECT_CALL(*(testAppA.mockAppScheduler_), ScheduleCleanAbility(_)).Times(1); // simulate press back key, AppA to background and exit. - serviceInner_->UpdateAbilityState(testAppB.GetToken("abilityB1"), AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityB1Token, AbilityState::ABILITY_STATE_FOREGROUND); serviceInner_->ApplicationForegrounded(testAppB.appRecord_->GetRecordId()); - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA1"), AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityA1Token, AbilityState::ABILITY_STATE_BACKGROUND); serviceInner_->ApplicationBackgrounded(testAppA.appRecord_->GetRecordId()); - serviceInner_->TerminateAbility(testAppA.GetToken("abilityA1"), false); - serviceInner_->AbilityTerminated(testAppA.GetToken("abilityA1")); + serviceInner_->TerminateAbility(abilityA1Token, false); + serviceInner_->AbilityTerminated(abilityA1Token); serviceInner_->ApplicationTerminated(testAppA.appRecord_->GetRecordId()); - EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppB.GetAbility("abilityB1")->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppB.GetAbility(abilityB1Token)->GetState()); EXPECT_EQ(ApplicationState::APP_STATE_FOREGROUND, testAppB.appRecord_->GetState()); - EXPECT_EQ(testAppA.GetAbility("abilityA1"), nullptr); + EXPECT_EQ(testAppA.GetAbility(abilityA1Token), nullptr); EXPECT_EQ(ApplicationState::APP_STATE_TERMINATED, testAppA.appRecord_->GetState()); EXPECT_CALL(*(testappC.mockAppScheduler_), ScheduleForegroundApplication()).Times(1); EXPECT_CALL(*(testAppB.mockAppScheduler_), ScheduleBackgroundApplication()).Times(1); EXPECT_CALL(*(testAppB.mockAppScheduler_), ScheduleCleanAbility(_)).Times(1); // simulate press back key again - serviceInner_->UpdateAbilityState(testappC.GetToken("abilityC1"), AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityC1Token, AbilityState::ABILITY_STATE_FOREGROUND); serviceInner_->ApplicationForegrounded(testappC.appRecord_->GetRecordId()); - serviceInner_->UpdateAbilityState(testAppB.GetToken("abilityB1"), AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityB1Token, AbilityState::ABILITY_STATE_BACKGROUND); serviceInner_->ApplicationBackgrounded(testAppB.appRecord_->GetRecordId()); - serviceInner_->TerminateAbility(testAppB.GetToken("abilityB1"), false); - serviceInner_->AbilityTerminated(testAppB.GetToken("abilityB1")); + serviceInner_->TerminateAbility(abilityB1Token, false); + serviceInner_->AbilityTerminated(abilityB1Token); serviceInner_->ApplicationTerminated(testAppB.appRecord_->GetRecordId()); - EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testappC.GetAbility("abilityC1")->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testappC.GetAbility(abilityC1Token)->GetState()); EXPECT_EQ(ApplicationState::APP_STATE_FOREGROUND, testappC.appRecord_->GetState()); - EXPECT_EQ(testAppB.GetAbility("abilityB1"), nullptr); + EXPECT_EQ(testAppB.GetAbility(abilityB1Token), nullptr); EXPECT_EQ(ApplicationState::APP_STATE_TERMINATED, testAppB.appRecord_->GetState()); HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_BackKey_005 end"); } @@ -397,11 +409,13 @@ HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_BackKey_005, TestSize.Level1) HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_ScreenOff_001, TestSize.Level1) { HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_ScreenOff_001 start"); - TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState( - "abilityA1", "appA", AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND); + sptr abilityA1Token; + TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState("abilityA1", "appA", + AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND, abilityA1Token); // The previous app and ability - TestApplicationPreRunningRecord testAppB = TestCreateApplicationRecordAndSetState( - "abilityB1", "appB", AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND); + sptr abilityB1Token; + TestApplicationPreRunningRecord testAppB = TestCreateApplicationRecordAndSetState("abilityB1", "appB", + AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND, abilityB1Token); EXPECT_CALL(*(testAppB.mockAppScheduler_), ScheduleBackgroundApplication()).Times(1); EXPECT_CALL(*(testAppB.mockAppScheduler_), ScheduleCleanAbility(_)).Times(1); @@ -409,20 +423,20 @@ HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_ScreenOff_001, TestSize.Level1 EXPECT_CALL(*(testAppA.mockAppScheduler_), ScheduleCleanAbility(_)).Times(1); // simulate press screenOff key - serviceInner_->UpdateAbilityState(testAppB.GetToken("abilityB1"), AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityB1Token, AbilityState::ABILITY_STATE_BACKGROUND); serviceInner_->ApplicationBackgrounded(testAppB.appRecord_->GetRecordId()); - serviceInner_->TerminateAbility(testAppB.GetToken("abilityB1"), false); - serviceInner_->AbilityTerminated(testAppB.GetToken("abilityB1")); + serviceInner_->TerminateAbility(abilityB1Token, false); + serviceInner_->AbilityTerminated(abilityB1Token); serviceInner_->ApplicationTerminated(testAppB.appRecord_->GetRecordId()); - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA1"), AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityA1Token, AbilityState::ABILITY_STATE_BACKGROUND); serviceInner_->ApplicationBackgrounded(testAppA.appRecord_->GetRecordId()); - serviceInner_->TerminateAbility(testAppA.GetToken("abilityA1"), false); - serviceInner_->AbilityTerminated(testAppA.GetToken("abilityA1")); + serviceInner_->TerminateAbility(abilityA1Token, false); + serviceInner_->AbilityTerminated(abilityA1Token); serviceInner_->ApplicationTerminated(testAppA.appRecord_->GetRecordId()); - EXPECT_EQ(testAppA.GetAbility("abilityA1"), nullptr); + EXPECT_EQ(testAppA.GetAbility(abilityB1Token), nullptr); EXPECT_EQ(ApplicationState::APP_STATE_TERMINATED, testAppA.appRecord_->GetState()); - EXPECT_EQ(testAppB.GetAbility("abilityB1"), nullptr); + EXPECT_EQ(testAppB.GetAbility(abilityB1Token), nullptr); EXPECT_EQ(ApplicationState::APP_STATE_TERMINATED, testAppB.appRecord_->GetState()); HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_ScreenOff_001 end"); } @@ -437,35 +451,39 @@ HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_ScreenOff_001, TestSize.Level1 HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_ScreenOff_002, TestSize.Level1) { HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_ScreenOff_002 start"); - TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState( - "abilityA1", "appA", AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND); + sptr abilityA1Token; + TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState("abilityA1", "appA", + AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND, abilityA1Token); + sptr abilityA2Token; TestCreateApplicationRecordAndSetState("abilityA2", testAppA.appRecord_->GetName(), AbilityState::ABILITY_STATE_FOREGROUND, - ApplicationState::APP_STATE_FOREGROUND); + ApplicationState::APP_STATE_FOREGROUND, abilityA2Token); // The previous app and ability - TestApplicationPreRunningRecord testAppB = TestCreateApplicationRecordAndSetState( - "abilityB1", "appB", AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND); + sptr abilityB1Token; + TestApplicationPreRunningRecord testAppB = TestCreateApplicationRecordAndSetState("abilityB1", "appB", + AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND, abilityB1Token); + sptr abilityB2Token; TestCreateApplicationRecordAndSetState("abilityB2", testAppB.appRecord_->GetName(), AbilityState::ABILITY_STATE_BACKGROUND, - ApplicationState::APP_STATE_BACKGROUND); + ApplicationState::APP_STATE_BACKGROUND, abilityB2Token); EXPECT_CALL(*(testAppA.mockAppScheduler_), ScheduleBackgroundApplication()).Times(2); // simulate press screenOff key - serviceInner_->UpdateAbilityState(testAppB.GetToken("abilityB1"), AbilityState::ABILITY_STATE_BACKGROUND); - serviceInner_->UpdateAbilityState(testAppB.GetToken("abilityB2"), AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityB1Token, AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityB2Token, AbilityState::ABILITY_STATE_BACKGROUND); serviceInner_->ApplicationBackgrounded(testAppB.appRecord_->GetRecordId()); - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA1"), AbilityState::ABILITY_STATE_BACKGROUND); - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA2"), AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityA1Token, AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityA2Token, AbilityState::ABILITY_STATE_BACKGROUND); serviceInner_->ApplicationBackgrounded(testAppA.appRecord_->GetRecordId()); - EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppB.GetAbility("abilityB1")->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppB.GetAbility("abilityB2")->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppB.GetAbility(abilityB1Token)->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppB.GetAbility(abilityB2Token)->GetState()); EXPECT_EQ(ApplicationState::APP_STATE_BACKGROUND, testAppB.appRecord_->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility("abilityA1")->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility("abilityA2")->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility(abilityA1Token)->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility(abilityA2Token)->GetState()); EXPECT_EQ(ApplicationState::APP_STATE_BACKGROUND, testAppA.appRecord_->GetState()); HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_ScreenOff_002 end"); } @@ -480,38 +498,41 @@ HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_ScreenOff_002, TestSize.Level1 HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_ScreenOff_003, TestSize.Level1) { HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_ScreenOff_003 start"); - TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState( - "abilityA1", "appA", AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND); + sptr abilityA1Token; + TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState("abilityA1", "appA", + AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND, abilityA1Token); + sptr abilityA2Token; TestCreateApplicationRecordAndSetState("abilityA2", testAppA.appRecord_->GetName(), AbilityState::ABILITY_STATE_BACKGROUND, - ApplicationState::APP_STATE_FOREGROUND); + ApplicationState::APP_STATE_FOREGROUND, abilityA2Token); // The previous app and ability - TestApplicationPreRunningRecord testAppB = TestCreateApplicationRecordAndSetState( - "abilityB1", "appB", AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_BACKGROUND); + sptr abilityB1Token; + TestApplicationPreRunningRecord testAppB = TestCreateApplicationRecordAndSetState("abilityB1", "appB", + AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_BACKGROUND, abilityB1Token); EXPECT_CALL(*(testAppA.mockAppScheduler_), ScheduleBackgroundApplication()).Times(1); EXPECT_CALL(*(testAppA.mockAppScheduler_), ScheduleCleanAbility(_)).Times(2); EXPECT_CALL(*(testAppB.mockAppScheduler_), ScheduleCleanAbility(_)).Times(1); // simulate press screenOff key - serviceInner_->UpdateAbilityState(testAppB.GetToken("abilityB1"), AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityB1Token, AbilityState::ABILITY_STATE_BACKGROUND); serviceInner_->ApplicationBackgrounded(testAppB.appRecord_->GetRecordId()); - serviceInner_->TerminateAbility(testAppB.GetToken("abilityB1"), false); - serviceInner_->AbilityTerminated(testAppB.GetToken("abilityB1")); + serviceInner_->TerminateAbility(abilityB1Token, false); + serviceInner_->AbilityTerminated(abilityB1Token); serviceInner_->ApplicationTerminated(testAppB.appRecord_->GetRecordId()); - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA1"), AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityA1Token, AbilityState::ABILITY_STATE_BACKGROUND); serviceInner_->ApplicationBackgrounded(testAppA.appRecord_->GetRecordId()); - serviceInner_->TerminateAbility(testAppA.GetToken("abilityA1"), false); - serviceInner_->AbilityTerminated(testAppA.GetToken("abilityA1")); - serviceInner_->TerminateAbility(testAppA.GetToken("abilityA2"), false); - serviceInner_->AbilityTerminated(testAppA.GetToken("abilityA2")); + serviceInner_->TerminateAbility(abilityA1Token, false); + serviceInner_->AbilityTerminated(abilityA1Token); + serviceInner_->TerminateAbility(abilityA2Token, false); + serviceInner_->AbilityTerminated(abilityA2Token); serviceInner_->ApplicationTerminated(testAppA.appRecord_->GetRecordId()); - EXPECT_EQ(testAppA.GetAbility("abilityA1"), nullptr); - EXPECT_EQ(testAppA.GetAbility("abilityA2"), nullptr); + EXPECT_EQ(testAppA.GetAbility(abilityA1Token), nullptr); + EXPECT_EQ(testAppA.GetAbility(abilityA2Token), nullptr); EXPECT_EQ(ApplicationState::APP_STATE_TERMINATED, testAppA.appRecord_->GetState()); - EXPECT_EQ(testAppB.GetAbility("abilityB1"), nullptr); + EXPECT_EQ(testAppB.GetAbility(abilityB1Token), nullptr); EXPECT_EQ(ApplicationState::APP_STATE_TERMINATED, testAppB.appRecord_->GetState()); HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_ScreenOff_003 end"); } @@ -526,39 +547,43 @@ HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_ScreenOff_003, TestSize.Level1 HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_ScreenOff_004, TestSize.Level1) { HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_ScreenOff_004 start"); - TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState( - "abilityA1", "appA", AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND); + sptr abilityA1Token; + TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState("abilityA1", "appA", + AbilityState::ABILITY_STATE_FOREGROUND, ApplicationState::APP_STATE_FOREGROUND, abilityA1Token); + sptr abilityA2Token; TestCreateApplicationRecordAndSetState("abilityA2", testAppA.appRecord_->GetName(), AbilityState::ABILITY_STATE_BACKGROUND, - ApplicationState::APP_STATE_FOREGROUND); + ApplicationState::APP_STATE_FOREGROUND, abilityA2Token); // The previous app and ability - TestApplicationPreRunningRecord testAppB = TestCreateApplicationRecordAndSetState( - "abilityB1", "appB", AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND); + sptr abilityB1Token; + TestApplicationPreRunningRecord testAppB = TestCreateApplicationRecordAndSetState("abilityB1", "appB", + AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND, abilityB1Token); + sptr abilityB2Token; TestCreateApplicationRecordAndSetState("abilityB2", testAppB.appRecord_->GetName(), AbilityState::ABILITY_STATE_BACKGROUND, - ApplicationState::APP_STATE_BACKGROUND); + ApplicationState::APP_STATE_BACKGROUND, abilityB2Token); EXPECT_CALL(*(testAppA.mockAppScheduler_), ScheduleBackgroundApplication()).Times(1); EXPECT_CALL(*(testAppB.mockAppScheduler_), ScheduleCleanAbility(_)).Times(2); // simulate press screenOff key - serviceInner_->UpdateAbilityState(testAppB.GetToken("abilityB1"), AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityB1Token, AbilityState::ABILITY_STATE_BACKGROUND); serviceInner_->ApplicationBackgrounded(testAppB.appRecord_->GetRecordId()); - serviceInner_->TerminateAbility(testAppB.GetToken("abilityB1"), false); - serviceInner_->AbilityTerminated(testAppB.GetToken("abilityB1")); - serviceInner_->TerminateAbility(testAppB.GetToken("abilityB2"), false); - serviceInner_->AbilityTerminated(testAppB.GetToken("abilityB2")); + serviceInner_->TerminateAbility(abilityB1Token, false); + serviceInner_->AbilityTerminated(abilityB1Token); + serviceInner_->TerminateAbility(abilityB2Token, false); + serviceInner_->AbilityTerminated(abilityB2Token); serviceInner_->ApplicationTerminated(testAppB.appRecord_->GetRecordId()); - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA1"), AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityA1Token, AbilityState::ABILITY_STATE_BACKGROUND); serviceInner_->ApplicationBackgrounded(testAppA.appRecord_->GetRecordId()); - EXPECT_EQ(testAppB.GetAbility("abilityB1"), nullptr); - EXPECT_EQ(testAppB.GetAbility("abilityB2"), nullptr); + EXPECT_EQ(testAppB.GetAbility(abilityB1Token), nullptr); + EXPECT_EQ(testAppB.GetAbility(abilityB2Token), nullptr); EXPECT_EQ(ApplicationState::APP_STATE_TERMINATED, testAppB.appRecord_->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility("abilityA1")->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility("abilityA2")->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility(abilityA1Token)->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility(abilityA2Token)->GetState()); EXPECT_EQ(ApplicationState::APP_STATE_BACKGROUND, testAppA.appRecord_->GetState()); HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_ScreenOff_004 end"); } @@ -573,26 +598,29 @@ HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_ScreenOff_004, TestSize.Level1 HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_ScreenOn_001, TestSize.Level1) { HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_ScreenOn_001 start"); - TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState( - "abilityA1", "appA", AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND); + sptr abilityA1Token; + TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState("abilityA1", "appA", + AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND, abilityA1Token); + sptr abilityA2Token; TestCreateApplicationRecordAndSetState("abilityA2", testAppA.appRecord_->GetName(), AbilityState::ABILITY_STATE_BACKGROUND, - ApplicationState::APP_STATE_BACKGROUND); + ApplicationState::APP_STATE_BACKGROUND, abilityA2Token); + sptr abilityA3Token; TestCreateApplicationRecordAndSetState("abilityA3", testAppA.appRecord_->GetName(), AbilityState::ABILITY_STATE_BACKGROUND, - ApplicationState::APP_STATE_BACKGROUND); + ApplicationState::APP_STATE_BACKGROUND, abilityA3Token); EXPECT_CALL(*(testAppA.mockAppScheduler_), ScheduleForegroundApplication()).Times(1); // simulate press ScreenOn key - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA1"), AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityA1Token, AbilityState::ABILITY_STATE_FOREGROUND); serviceInner_->ApplicationForegrounded(testAppA.appRecord_->GetRecordId()); - EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility("abilityA1")->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility("abilityA2")->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility("abilityA3")->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility(abilityA1Token)->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility(abilityA2Token)->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, testAppA.GetAbility(abilityA3Token)->GetState()); EXPECT_EQ(ApplicationState::APP_STATE_FOREGROUND, testAppA.appRecord_->GetState()); HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_ScreenOn_001 end"); } @@ -607,28 +635,31 @@ HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_ScreenOn_001, TestSize.Level1) HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_ScreenOn_002, TestSize.Level1) { HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_ScreenOn_002 start"); - TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState( - "abilityA1", "appA", AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND); + sptr abilityA1Token; + TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState("abilityA1", "appA", + AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND, abilityA1Token); + sptr abilityA2Token; TestCreateApplicationRecordAndSetState("abilityA2", testAppA.appRecord_->GetName(), AbilityState::ABILITY_STATE_BACKGROUND, - ApplicationState::APP_STATE_BACKGROUND); + ApplicationState::APP_STATE_BACKGROUND, abilityA2Token); + sptr abilityA3Token; TestCreateApplicationRecordAndSetState("abilityA3", testAppA.appRecord_->GetName(), AbilityState::ABILITY_STATE_BACKGROUND, - ApplicationState::APP_STATE_BACKGROUND); + ApplicationState::APP_STATE_BACKGROUND, abilityA3Token); EXPECT_CALL(*(testAppA.mockAppScheduler_), ScheduleForegroundApplication()).Times(1); // simulate press ScreenOn key - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA1"), AbilityState::ABILITY_STATE_FOREGROUND); - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA2"), AbilityState::ABILITY_STATE_FOREGROUND); - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA3"), AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityA1Token, AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityA2Token, AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityA3Token, AbilityState::ABILITY_STATE_FOREGROUND); serviceInner_->ApplicationForegrounded(testAppA.appRecord_->GetRecordId()); - EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility("abilityA1")->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility("abilityA2")->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility("abilityA3")->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility(abilityA1Token)->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility(abilityA2Token)->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility(abilityA3Token)->GetState()); EXPECT_EQ(ApplicationState::APP_STATE_FOREGROUND, testAppA.appRecord_->GetState()); HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_ScreenOn_002 end"); } @@ -643,35 +674,39 @@ HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_ScreenOn_002, TestSize.Level1) HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_ScreenOn_003, TestSize.Level1) { HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_ScreenOn_003 start"); - TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState( - "abilityA1", "appA", AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND); + sptr abilityA1Token; + TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState("abilityA1", "appA", + AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND, abilityA1Token); + sptr abilityA2Token; TestCreateApplicationRecordAndSetState("abilityA2", testAppA.appRecord_->GetName(), AbilityState::ABILITY_STATE_BACKGROUND, - ApplicationState::APP_STATE_BACKGROUND); - TestApplicationPreRunningRecord testAppB = TestCreateApplicationRecordAndSetState( - "abilityB1", "appB", AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND); + ApplicationState::APP_STATE_BACKGROUND, abilityA2Token); + sptr abilityB1Token; + TestApplicationPreRunningRecord testAppB = TestCreateApplicationRecordAndSetState("abilityB1", "appB", + AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND, abilityB1Token); + sptr abilityB2Token; TestCreateApplicationRecordAndSetState("abilityB2", testAppB.appRecord_->GetName(), AbilityState::ABILITY_STATE_BACKGROUND, - ApplicationState::APP_STATE_BACKGROUND); + ApplicationState::APP_STATE_BACKGROUND, abilityB2Token); EXPECT_CALL(*(testAppA.mockAppScheduler_), ScheduleForegroundApplication()).Times(1); EXPECT_CALL(*(testAppB.mockAppScheduler_), ScheduleForegroundApplication()).Times(1); // simulate press ScreenOn key - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA1"), AbilityState::ABILITY_STATE_FOREGROUND); - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA2"), AbilityState::ABILITY_STATE_FOREGROUND); - serviceInner_->UpdateAbilityState(testAppB.GetToken("abilityB1"), AbilityState::ABILITY_STATE_FOREGROUND); - serviceInner_->UpdateAbilityState(testAppB.GetToken("abilityB2"), AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityA1Token, AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityA2Token, AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityB1Token, AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityB2Token, AbilityState::ABILITY_STATE_FOREGROUND); serviceInner_->ApplicationForegrounded(testAppA.appRecord_->GetRecordId()); serviceInner_->ApplicationForegrounded(testAppB.appRecord_->GetRecordId()); - EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility("abilityA1")->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility("abilityA2")->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility(abilityA1Token)->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility(abilityA2Token)->GetState()); EXPECT_EQ(ApplicationState::APP_STATE_FOREGROUND, testAppA.appRecord_->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppB.GetAbility("abilityB1")->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppB.GetAbility("abilityB2")->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppB.GetAbility(abilityB1Token)->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppB.GetAbility(abilityB2Token)->GetState()); EXPECT_EQ(ApplicationState::APP_STATE_FOREGROUND, testAppB.appRecord_->GetState()); HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_ScreenOn_003 end"); } @@ -686,12 +721,14 @@ HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_ScreenOn_003, TestSize.Level1) HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_ScreenOnAndOff_001, TestSize.Level1) { HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_ScreenOnAndOff_001 start"); - TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState( - "abilityA1", "appA", AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND); + sptr abilityA1Token; + TestApplicationPreRunningRecord testAppA = TestCreateApplicationRecordAndSetState("abilityA1", "appA", + AbilityState::ABILITY_STATE_BACKGROUND, ApplicationState::APP_STATE_BACKGROUND, abilityA1Token); + sptr abilityA2Token; TestCreateApplicationRecordAndSetState("abilityA2", testAppA.appRecord_->GetName(), AbilityState::ABILITY_STATE_BACKGROUND, - ApplicationState::APP_STATE_BACKGROUND); + ApplicationState::APP_STATE_BACKGROUND, abilityA2Token); EXPECT_CALL(*(testAppA.mockAppScheduler_), ScheduleForegroundApplication()) .Times(::testing::AtLeast(CYCLE_NUMBER + 1)); @@ -700,23 +737,23 @@ HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_ScreenOnAndOff_001, TestSize.L for (uint32_t i = 0; i < CYCLE_NUMBER; i++) { // simulate press ScreenOn key - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA1"), AbilityState::ABILITY_STATE_FOREGROUND); - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA2"), AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityA1Token, AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityA2Token, AbilityState::ABILITY_STATE_FOREGROUND); serviceInner_->ApplicationForegrounded(testAppA.appRecord_->GetRecordId()); // simulate press ScreenOff key - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA1"), AbilityState::ABILITY_STATE_BACKGROUND); - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA2"), AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityA1Token, AbilityState::ABILITY_STATE_BACKGROUND); + serviceInner_->UpdateAbilityState(abilityA2Token, AbilityState::ABILITY_STATE_BACKGROUND); serviceInner_->ApplicationBackgrounded(testAppA.appRecord_->GetRecordId()); } // simulate press ScreenOn key - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA1"), AbilityState::ABILITY_STATE_FOREGROUND); - serviceInner_->UpdateAbilityState(testAppA.GetToken("abilityA2"), AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityA1Token, AbilityState::ABILITY_STATE_FOREGROUND); + serviceInner_->UpdateAbilityState(abilityA2Token, AbilityState::ABILITY_STATE_FOREGROUND); serviceInner_->ApplicationForegrounded(testAppA.appRecord_->GetRecordId()); - EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility("abilityA1")->GetState()); - EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility("abilityA2")->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility(abilityA1Token)->GetState()); + EXPECT_EQ(AbilityState::ABILITY_STATE_FOREGROUND, testAppA.GetAbility(abilityA2Token)->GetState()); EXPECT_EQ(ApplicationState::APP_STATE_FOREGROUND, testAppA.appRecord_->GetState()); HILOG_INFO("AmsAppServiceFlowModuleTest ServiceFlow_ScreenOnAndOff_001 end"); } diff --git a/test/unittest/ams_ability_running_record_test/ams_ability_running_record_test.cpp b/test/unittest/ams_ability_running_record_test/ams_ability_running_record_test.cpp index 6638f23596f..d1c5a545d2a 100644 --- a/test/unittest/ams_ability_running_record_test/ams_ability_running_record_test.cpp +++ b/test/unittest/ams_ability_running_record_test/ams_ability_running_record_test.cpp @@ -493,123 +493,6 @@ HWTEST_F(AmsAbilityRunningRecordTest, UpdateAbilityRunningRecord_007, TestSize.L HILOG_DEBUG("UpdateAbilityRunningRecord_007 end."); } -/* - * Feature: AMS - * Function: AbilityRunningRecord - * SubFunction: NA - * FunctionPoints: Delete AbilityRunningRecord using correct args. - * EnvConditions: NA - * CaseDescription: Verify the function ClearAbility can delete AbilityRunningRecord. - */ -HWTEST_F(AmsAbilityRunningRecordTest, DeleteAbilityRunningRecord_001, TestSize.Level1) -{ - HILOG_DEBUG("DeleteAbilityRunningRecord_001 start."); - auto appRunningRecord = GetTestAppRunningRecord(); - auto abilityInfo = std::make_shared(); - abilityInfo->name = GetTestAbilityName(); - sptr token = new MockAbilityToken(); - HapModuleInfo hapModuleInfo; - hapModuleInfo.moduleName = "module789"; - - auto appInfo = std::make_shared(); - appInfo->name = GetTestAppName(); - - appRunningRecord->AddModule(appInfo, abilityInfo, token, hapModuleInfo, nullptr); - auto moduleRecord = appRunningRecord->GetModuleRecordByModuleName(appInfo->bundleName, hapModuleInfo.moduleName); - EXPECT_TRUE(moduleRecord); - auto abilityRunningRecord = moduleRecord->GetAbilityRunningRecordByToken(token); - - EXPECT_TRUE(abilityRunningRecord != nullptr); - EXPECT_TRUE(appRunningRecord->GetAbilityRunningRecordByToken(token) != nullptr); - - appRunningRecord->ClearAbility(abilityRunningRecord); - EXPECT_TRUE(appRunningRecord->GetAbilityRunningRecordByToken(token) == nullptr); - HILOG_DEBUG("DeleteAbilityRunningRecord_001 end."); -} - -/* - * Feature: AMS - * Function: AbilityRunningRecord - * SubFunction: NA - * FunctionPoints: Delete AbilityRunningRecord using null args. - * EnvConditions: NA - * CaseDescription: Verify the function ClearAbility works but does not take effect using nullptr parameter. - */ -HWTEST_F(AmsAbilityRunningRecordTest, DeleteAbilityRunningRecord_002, TestSize.Level1) -{ - HILOG_DEBUG("DeleteAbilityRunningRecord_002 start."); - auto appRunningRecord = GetTestAppRunningRecord(); - auto abilityInfo = std::make_shared(); - abilityInfo->name = GetTestAbilityName(); - sptr token = new MockAbilityToken(); - HapModuleInfo hapModuleInfo; - hapModuleInfo.moduleName = "module789"; - - auto appInfo = std::make_shared(); - appInfo->name = GetTestAppName(); - - appRunningRecord->AddModule(appInfo, abilityInfo, token, hapModuleInfo, nullptr); - auto moduleRecord = appRunningRecord->GetModuleRecordByModuleName(appInfo->bundleName, hapModuleInfo.moduleName); - EXPECT_TRUE(moduleRecord); - auto abilityRunningRecord = moduleRecord->GetAbilityRunningRecordByToken(token); - - EXPECT_TRUE(abilityRunningRecord != nullptr); - EXPECT_TRUE(appRunningRecord->GetAbilityRunningRecordByToken(token) != nullptr); - - appRunningRecord->ClearAbility(nullptr); - EXPECT_TRUE(appRunningRecord->GetAbilityRunningRecordByToken(token) != nullptr); - HILOG_DEBUG("DeleteAbilityRunningRecord_002 end."); -} - -/* - * Feature: AMS - * Function: AbilityRunningRecord - * SubFunction: NA - * FunctionPoints: Delete AbilityRunningRecord that does not exist. - * EnvConditions: NA - * CaseDescription: Verify the function ClearAbility cannot delete AbilityRunningRecord that does not exist. - */ -HWTEST_F(AmsAbilityRunningRecordTest, DeleteAbilityRunningRecord_003, TestSize.Level1) -{ - HILOG_DEBUG("DeleteAbilityRunningRecord_003 start."); - auto appRunningRecord = GetTestAppRunningRecord(); - auto abilityInfo = std::make_shared(); - abilityInfo->name = GetTestAbilityName(); - auto anotherAbilityInfo = std::make_shared(); - anotherAbilityInfo->name = GetAnotherTestAbilityName(); - sptr token = new MockAbilityToken(); - sptr anotherToken = new MockAbilityToken(); - HapModuleInfo hapModuleInfo; - hapModuleInfo.moduleName = "module789"; - - auto appInfo = std::make_shared(); - appInfo->name = GetTestAppName(); - - appRunningRecord->AddModule(appInfo, abilityInfo, token, hapModuleInfo, nullptr); - auto moduleRecord = appRunningRecord->GetModuleRecordByModuleName(appInfo->bundleName, hapModuleInfo.moduleName); - EXPECT_TRUE(moduleRecord); - auto abilityRunningRecord = moduleRecord->GetAbilityRunningRecordByToken(token); - - appRunningRecord->AddModule(appInfo, anotherAbilityInfo, anotherToken, hapModuleInfo, nullptr); - moduleRecord = appRunningRecord->GetModuleRecordByModuleName(appInfo->bundleName, hapModuleInfo.moduleName); - EXPECT_TRUE(moduleRecord); - auto anotherAbilityRunningRecord = moduleRecord->GetAbilityRunningRecordByToken(anotherToken); - - EXPECT_TRUE(abilityRunningRecord != nullptr); - EXPECT_TRUE(anotherAbilityRunningRecord != nullptr); - EXPECT_TRUE(appRunningRecord->GetAbilityRunningRecordByToken(token) != nullptr); - EXPECT_TRUE(appRunningRecord->GetAbilityRunningRecordByToken(anotherToken) != nullptr); - - appRunningRecord->ClearAbility(anotherAbilityRunningRecord); - EXPECT_TRUE(appRunningRecord->GetAbilityRunningRecordByToken(token) != nullptr); - EXPECT_TRUE(appRunningRecord->GetAbilityRunningRecordByToken(anotherToken) == nullptr); - - appRunningRecord->ClearAbility(anotherAbilityRunningRecord); - EXPECT_TRUE(appRunningRecord->GetAbilityRunningRecordByToken(token) != nullptr); - EXPECT_TRUE(appRunningRecord->GetAbilityRunningRecordByToken(anotherToken) == nullptr); - HILOG_DEBUG("DeleteAbilityRunningRecord_003 end."); -} - /* * Feature: AMS * Function: AbilityRunningRecord diff --git a/test/unittest/ams_app_life_cycle_test/ams_app_life_cycle_test.cpp b/test/unittest/ams_app_life_cycle_test/ams_app_life_cycle_test.cpp index e30286cd032..93b9641bb18 100644 --- a/test/unittest/ams_app_life_cycle_test/ams_app_life_cycle_test.cpp +++ b/test/unittest/ams_app_life_cycle_test/ams_app_life_cycle_test.cpp @@ -1292,11 +1292,11 @@ HWTEST_F(AmsAppLifeCycleTest, Stop_001, TestSize.Level1) EXPECT_EQ(appState, appRecord->GetState()); EXPECT_EQ(SpawnConnectionState::STATE_NOT_CONNECT, serviceInner_->QueryAppSpawnConnectionState()); - int32_t size = serviceInner_->GetRecordMap().size(); + int32_t size = serviceInner_->appRunningManager_->GetAppRunningRecordMap().size(); EXPECT_EQ(1, size); serviceInner_->OnStop(); EXPECT_EQ(SpawnConnectionState::STATE_NOT_CONNECT, serviceInner_->QueryAppSpawnConnectionState()); - size = serviceInner_->GetRecordMap().size(); + size = serviceInner_->appRunningManager_->GetAppRunningRecordMap().size(); EXPECT_EQ(0, size); } @@ -1317,13 +1317,13 @@ HWTEST_F(AmsAppLifeCycleTest, Stop_002, TestSize.Level1) serviceInner_->SetAppSpawnClient(appSpawnClient); serviceInner_->OpenAppSpawnConnection(); EXPECT_EQ(SpawnConnectionState::STATE_CONNECTED, serviceInner_->QueryAppSpawnConnectionState()); - int32_t size = serviceInner_->GetRecordMap().size(); + int32_t size = serviceInner_->appRunningManager_->GetAppRunningRecordMap().size(); EXPECT_EQ(0, size); EXPECT_CALL(*socketMock, CloseAppSpawnConnection()).Times(1); serviceInner_->OnStop(); EXPECT_EQ(SpawnConnectionState::STATE_NOT_CONNECT, serviceInner_->QueryAppSpawnConnectionState()); - size = serviceInner_->GetRecordMap().size(); + size = serviceInner_->appRunningManager_->GetAppRunningRecordMap().size(); EXPECT_EQ(0, size); } @@ -1358,13 +1358,13 @@ HWTEST_F(AmsAppLifeCycleTest, Stop_003, TestSize.Level1) serviceInner_->SetAppSpawnClient(appSpawnClient); serviceInner_->OpenAppSpawnConnection(); EXPECT_EQ(SpawnConnectionState::STATE_CONNECTED, serviceInner_->QueryAppSpawnConnectionState()); - int32_t size = serviceInner_->GetRecordMap().size(); + int32_t size = serviceInner_->appRunningManager_->GetAppRunningRecordMap().size(); EXPECT_EQ(1, size); EXPECT_CALL(*socketMock, CloseAppSpawnConnection()).Times(1); serviceInner_->OnStop(); EXPECT_EQ(SpawnConnectionState::STATE_NOT_CONNECT, serviceInner_->QueryAppSpawnConnectionState()); - size = serviceInner_->GetRecordMap().size(); + size = serviceInner_->appRunningManager_->GetAppRunningRecordMap().size(); EXPECT_EQ(0, size); } diff --git a/test/unittest/ams_app_running_record_test/ams_app_running_record_test.cpp b/test/unittest/ams_app_running_record_test/ams_app_running_record_test.cpp index 1c705f6e97b..1579dbdb5c3 100644 --- a/test/unittest/ams_app_running_record_test/ams_app_running_record_test.cpp +++ b/test/unittest/ams_app_running_record_test/ams_app_running_record_test.cpp @@ -900,8 +900,6 @@ HWTEST_F(AmsAppRunningRecordTest, LaunchAbilityForApp_001, TestSize.Level1) EXPECT_TRUE(service_ != nullptr); std::shared_ptr record = service_->CreateAppRunningRecord( GetMockToken(), nullptr, appInfo, abilityInfo, GetTestProcessName(), bundleInfo, hapModuleInfo, nullptr); - auto abilityRecord = record->GetAbilityRunningRecord(GetTestAbilityName(), hapModuleInfo.moduleName); - EXPECT_TRUE(abilityRecord != nullptr); EXPECT_CALL(*mockAppSchedulerClient_, ScheduleLaunchApplication(_, _)).Times(1); EXPECT_CALL(*mockAppSchedulerClient_, ScheduleLaunchAbility(_, _, _)).Times(1); @@ -943,8 +941,6 @@ HWTEST_F(AmsAppRunningRecordTest, LaunchAbilityForApp_002, TestSize.Level1) std::shared_ptr record = service_->CreateAppRunningRecord( GetMockToken(), nullptr, appInfo, abilityInfo, GetTestProcessName(), bundleInfo, hapModuleInfo, nullptr); - auto abilityRecord = record->GetAbilityRunningRecord(GetTestAbilityName(), hapModuleInfo.moduleName); - EXPECT_TRUE(abilityRecord != nullptr); sptr token2 = new (std::nothrow) MockAbilityToken(); record->AddModule(appInfo, abilityInfo2, token2, hapModuleInfo, nullptr); @@ -995,8 +991,6 @@ HWTEST_F(AmsAppRunningRecordTest, LaunchAbilityForApp_003, TestSize.Level1) GetMockToken(), nullptr, appInfo, abilityInfo, GetTestProcessName(), bundleInfo, hapModuleInfo, nullptr); record->SetState(ApplicationState::APP_STATE_READY); record->SetApplicationClient(GetMockedAppSchedulerClient()); - auto abilityRecord = record->GetAbilityRunningRecord(GetTestAbilityName(), hapModuleInfo.moduleName); - EXPECT_TRUE(abilityRecord != nullptr); EXPECT_CALL(*mockAppSchedulerClient_, ScheduleLaunchApplication(_, _)).Times(0); EXPECT_CALL(*mockAppSchedulerClient_, ScheduleLaunchAbility(_, _, _)).Times(0); @@ -1039,8 +1033,6 @@ HWTEST_F(AmsAppRunningRecordTest, LaunchAbilityForApp_004, TestSize.Level1) std::shared_ptr record = service_->CreateAppRunningRecord( GetMockToken(), nullptr, appInfo, abilityInfo, GetTestProcessName(), bundleInfo, hapModuleInfo, nullptr); - auto abilityRecord = record->GetAbilityRunningRecord(GetTestAbilityName(), hapModuleInfo.moduleName); - EXPECT_TRUE(abilityRecord != nullptr); EXPECT_CALL(*mockAppSchedulerClient_, ScheduleLaunchApplication(_, _)).Times(1); EXPECT_CALL(*mockAppSchedulerClient_, ScheduleLaunchAbility(_, _, _)).Times(1); @@ -1087,8 +1079,6 @@ HWTEST_F(AmsAppRunningRecordTest, LaunchAbilityForApp_005, TestSize.Level1) std::shared_ptr record = service_->CreateAppRunningRecord( GetMockToken(), nullptr, appInfo, abilityInfo, GetTestProcessName(), bundleInfo, hapModuleInfo, nullptr); - auto abilityRecord = record->GetAbilityRunningRecord(GetTestAbilityName(), hapModuleInfo.moduleName); - EXPECT_TRUE(abilityRecord != nullptr); sptr token2 = new (std::nothrow) MockAbilityToken(); record->AddModule(appInfo, abilityInfo2, token2, hapModuleInfo, nullptr); @@ -1156,8 +1146,6 @@ HWTEST_F(AmsAppRunningRecordTest, TerminateAbility_002, TestSize.Level1) std::shared_ptr record = service_->CreateAppRunningRecord( GetMockToken(), nullptr, appInfo, abilityInfo, GetTestProcessName(), bundleInfo, hapModuleInfo, nullptr); - auto abilityRecord = record->GetAbilityRunningRecord(GetTestAbilityName(), hapModuleInfo.moduleName); - EXPECT_TRUE(abilityRecord != nullptr); EXPECT_CALL(*mockAppSchedulerClient_, ScheduleCleanAbility(_)).Times(0); record->TerminateAbility(GetMockToken(), false); @@ -1184,40 +1172,6 @@ HWTEST_F(AmsAppRunningRecordTest, AbilityTerminated_001, TestSize.Level1) HILOG_INFO("AmsAppRunningRecordTest AbilityTerminated_001 end"); } -/* - * Feature: AMS - * Function: AppRunningRecord - * SubFunction: GetAbilityRunningRecord - * FunctionPoints: check params - * EnvConditions: Mobile that can run ohos test framework - * CaseDescription: Verify the function GetAbilityRunningRecord return nullptr when the ability doesn't added. - */ -HWTEST_F(AmsAppRunningRecordTest, GetAbilityRunningRecord_001, TestSize.Level1) -{ - HILOG_INFO("AmsAppRunningRecordTest GetAbilityRunningRecord_001 start"); - - auto abilityInfo = std::make_shared(); - abilityInfo->name = GetTestAbilityName(); - - HapModuleInfo hapModuleInfo; - hapModuleInfo.moduleName = "module789"; - BundleInfo bundleInfo; - bundleInfo.appId = "com.ohos.test.helloworld_code123"; - auto appInfo = std::make_shared(); - appInfo->name = GetTestAppName(); - appInfo->bundleName = GetTestAppName(); - - std::shared_ptr record = service_->CreateAppRunningRecord( - GetMockToken(), nullptr, appInfo, abilityInfo, GetTestProcessName(), bundleInfo, hapModuleInfo, nullptr); - auto abilityRecord = record->GetAbilityRunningRecord(GetTestAbilityName(), hapModuleInfo.moduleName); - EXPECT_TRUE(abilityRecord != nullptr); - - std::string abilityName = "not_exist_ability_name"; - EXPECT_EQ(nullptr, record->GetAbilityRunningRecord(abilityName, hapModuleInfo.moduleName)); - - HILOG_INFO("AmsAppRunningRecordTest GetAbilityRunningRecord_001 end"); -} - /* * Feature: AMS * Function: AppRunningRecord @@ -1297,7 +1251,7 @@ HWTEST_F(AmsAppRunningRecordTest, OnAbilityStateChanged_001, TestSize.Level1) GetMockToken(), nullptr, appInfo, abilityInfo, GetTestProcessName(), bundleInfo, hapModuleInfo, nullptr); auto moduleRecord = record->GetModuleRecordByModuleName(appInfo->bundleName, hapModuleInfo.moduleName); EXPECT_TRUE(moduleRecord != nullptr); - auto abilityRecord = record->GetAbilityRunningRecord(GetTestAbilityName(), hapModuleInfo.moduleName); + auto abilityRecord = record->GetAbilityRunningRecordByToken(GetMockToken()); EXPECT_TRUE(abilityRecord != nullptr); sptr callback = new (std::nothrow) MockAppStateCallback(); @@ -1847,14 +1801,12 @@ HWTEST_F(AmsAppRunningRecordTest, Specified_LaunchApplication_001, TestSize.Leve EXPECT_TRUE(service_ != nullptr); std::shared_ptr record = service_->CreateAppRunningRecord( GetMockToken(), nullptr, appInfo, abilityInfo, GetTestProcessName(), bundleInfo, hapModuleInfo, nullptr); - auto abilityRecord = record->GetAbilityRunningRecord(GetTestAbilityName(), hapModuleInfo.moduleName); - EXPECT_TRUE(abilityRecord != nullptr); record->SetApplicationClient(GetMockedAppSchedulerClient()); record->isSpecifiedAbility_ = true; EXPECT_CALL(*mockAppSchedulerClient_, ScheduleLaunchApplication(_, _)).Times(1); service_->LaunchApplication(record); - auto ability = record->GetAbilityRunningRecord(GetTestAbilityName(), hapModuleInfo.moduleName); + auto ability = record->GetAbilityRunningRecordByToken(GetMockToken()); EXPECT_TRUE(ability->GetState() != AbilityState::ABILITY_STATE_READY); } @@ -2195,10 +2147,6 @@ HWTEST_F(AmsAppRunningRecordTest, GetAbilityRunningRecord_002, TestSize.Level1) std::shared_ptr record = service_->CreateAppRunningRecord( GetMockToken(), nullptr, appInfo, abilityInfo, GetTestProcessName(), bundleInfo, hapModuleInfo, nullptr); - std::shared_ptr abilityRunningRecord = - record->GetAbilityRunningRecord(GetTestAbilityName(), "module123", 0); - EXPECT_EQ(abilityRunningRecord, nullptr); - sptr token = new (std::nothrow) MockAbilityToken(); record->AddModule(appInfo, abilityInfo, token, hapModuleInfo, nullptr); auto abilityInfo1 = std::make_shared(); @@ -2211,12 +2159,6 @@ HWTEST_F(AmsAppRunningRecordTest, GetAbilityRunningRecord_002, TestSize.Level1) auto moduleRecordList = record->GetAllModuleRecord(); EXPECT_TRUE(moduleRecordList.size() == 2); - abilityRunningRecord = record->GetAbilityRunningRecord(GetTestAbilityName(), "", 0); - EXPECT_NE(abilityRunningRecord, nullptr); - abilityRunningRecord = record->GetAbilityRunningRecord(GetTestAbilityName(), "module789", 0); - EXPECT_NE(abilityRunningRecord, nullptr); - - abilityRunningRecord->SetEventId(999); std::shared_ptr abilityRunningRecord1 = record->GetAbilityRunningRecord(999); EXPECT_NE(abilityRunningRecord1, nullptr); std::shared_ptr abilityRunningRecord2 = record->GetAbilityRunningRecord(123); diff --git a/test/unittest/ams_service_load_ability_process_test/ams_service_load_ability_process_test.cpp b/test/unittest/ams_service_load_ability_process_test/ams_service_load_ability_process_test.cpp index ac23baec0f3..a7b14c72943 100644 --- a/test/unittest/ams_service_load_ability_process_test/ams_service_load_ability_process_test.cpp +++ b/test/unittest/ams_service_load_ability_process_test/ams_service_load_ability_process_test.cpp @@ -139,7 +139,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, LoadAbility_001, TestSize.Level1) EXPECT_TRUE(service_ != nullptr); sptr token = GetMockToken(); StartLoadAbility(token, nullptr, abilityInfo, appInfo, PID); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); BundleInfo bundleInfo; @@ -189,7 +189,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, LoadAbility_002, TestSize.Level1) const pid_t PID = 1234; StartLoadAbility(token, nullptr, abilityInfo, appInfo, PID); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); BundleInfo bundleInfo; bundleInfo.appId = "com.ohos.test.helloworld_code123"; @@ -261,7 +261,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, LoadAbility_003, TestSize.Level1) service_->SetAppSpawnClient(mockClientPtr); service_->LoadAbility(nullptr, nullptr, abilityInfo, appInfo, nullptr); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)0); HILOG_INFO("AmsServiceLoadAbilityProcessTest LoadAbility_003 end"); } @@ -292,7 +292,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, LoadAbility_004, TestSize.Level1) service_->SetAppSpawnClient(mockClientPtr); service_->LoadAbility(token, nullptr, abilityInfo, appInfo, nullptr); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)0); HILOG_INFO("AmsServiceLoadAbilityProcessTest LoadAbility_004 end"); } @@ -322,7 +322,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, LoadAbility_005, TestSize.Level1) service_->SetAppSpawnClient(mockClientPtr); service_->LoadAbility(token, nullptr, abilityInfo, appInfo, nullptr); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)0); HILOG_INFO("AmsServiceLoadAbilityProcessTest LoadAbility_005 end"); } @@ -353,7 +353,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, LoadAbility_006, TestSize.Level1) service_->SetAppSpawnClient(mockClientPtr); service_->LoadAbility(token, nullptr, abilityInfo, appInfo, nullptr); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)0); HILOG_INFO("AmsServiceLoadAbilityProcessTest LoadAbility_006 end"); } @@ -382,7 +382,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, LoadAbility_007, TestSize.Level1) const pid_t PID = 1234; EXPECT_TRUE(service_ != nullptr); StartLoadAbility(token, nullptr, abilityInfo, appInfo, PID); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); BundleInfo bundleInfo; bundleInfo.appId = "com.ohos.test.helloworld_code123"; @@ -437,7 +437,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, LoadAbility_008, TestSize.Level1) const pid_t PID = 1234; EXPECT_TRUE(service_ != nullptr); StartLoadAbility(token, nullptr, abilityInfo, appInfo, PID); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); BundleInfo bundleInfo; bundleInfo.appId = "com.ohos.test.helloworld_code123"; @@ -508,7 +508,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, RequestProcess_001, TestSize.Level1) service_->SetAppSpawnClient(mockClientPtr); service_->LoadAbility(token, nullptr, abilityInfo, appInfo, nullptr); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); BundleInfo bundleInfo; bundleInfo.appId = "com.ohos.test.helloworld_code123"; @@ -550,7 +550,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, RequestProcess_002, TestSize.Level1) service_->SetAppSpawnClient(mockClientPtr); service_->LoadAbility(token, nullptr, abilityInfo, appInfo, nullptr); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)0); HILOG_INFO("AmsServiceLoadAbilityProcessTest RequestProcess_002 end"); } @@ -652,7 +652,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, LaunchMode_001, TestSize.Level1) EXPECT_TRUE(service_ != nullptr); sptr token = GetMockToken(); StartLoadAbility(token, nullptr, abilityInfo, appInfo, PID); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); BundleInfo bundleInfo; bundleInfo.appId = "com.ohos.test.helloworld_code123"; @@ -696,7 +696,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, LaunchMode_002, TestSize.Level1) const pid_t PID = 1234; EXPECT_TRUE(service_ != nullptr); StartLoadAbility(token, nullptr, abilityInfo, appInfo, PID); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); BundleInfo bundleInfo; bundleInfo.appId = "com.ohos.test.helloworld_code123"; @@ -751,7 +751,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartAbility_001, TestSize.Level1) const pid_t PID = 1234; EXPECT_TRUE(service_ != nullptr); StartLoadAbility(token, nullptr, abilityInfo, appInfo, PID); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); BundleInfo bundleInfo; bundleInfo.appId = "com.ohos.test.helloworld_code123"; @@ -818,7 +818,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartAbility_002, TestSize.Level1) const pid_t PID = 1234; EXPECT_TRUE(service_ != nullptr); StartLoadAbility(token, nullptr, abilityInfo, appInfo, PID); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); BundleInfo bundleInfo; bundleInfo.appId = "com.ohos.test.helloworld_code123"; @@ -882,7 +882,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartAbility_003, TestSize.Level1) const pid_t PID = 1234; EXPECT_TRUE(service_ != nullptr); StartLoadAbility(token, nullptr, abilityInfo, appInfo, PID); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); BundleInfo bundleInfo; bundleInfo.appId = "com.ohos.test.helloworld_code123"; @@ -945,7 +945,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartAbility_004, TestSize.Level1) const pid_t PID = 1234; EXPECT_TRUE(service_ != nullptr); StartLoadAbility(token, nullptr, abilityInfo, appInfo, PID); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); BundleInfo bundleInfo; bundleInfo.appId = "com.ohos.test.helloworld_code123"; @@ -1007,7 +1007,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartAbility_005, TestSize.Level1) EXPECT_TRUE(service_ != nullptr); StartLoadAbility(token, nullptr, abilityInfo, appInfo, PID); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); BundleInfo bundleInfo; bundleInfo.appId = "com.ohos.test.helloworld_code123"; @@ -1071,7 +1071,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartAbility_006, TestSize.Level1) const pid_t PID = 1234; EXPECT_TRUE(service_ != nullptr); StartLoadAbility(token, nullptr, abilityInfo, appInfo, PID); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); BundleInfo bundleInfo; bundleInfo.appId = "com.ohos.test.helloworld_code123"; @@ -1145,7 +1145,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartProcess001, TestSize.Level1) false, record, abilityInfo->applicationInfo.uid, abilityInfo->applicationInfo.bundleName, 0); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); auto record1 = service_->appRunningManager_->CheckAppRunningRecordIsExist( @@ -1196,7 +1196,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartProcess002, TestSize.Level1) false, record, abilityInfo->applicationInfo.uid, abilityInfo->applicationInfo.bundleName, 0); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); auto record1 = service_->appRunningManager_->CheckAppRunningRecordIsExist( @@ -1240,7 +1240,7 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartProcess003, TestSize.Level1) false, nullptr, abilityInfo->applicationInfo.uid, abilityInfo->applicationInfo.bundleName, 0); - const auto& recordMap = service_->GetRecordMap(); + const auto& recordMap = service_->appRunningManager_->GetAppRunningRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); auto record1 = service_->appRunningManager_->CheckAppRunningRecordIsExist( diff --git a/test/unittest/app_mgr_service_inner_test/app_mgr_service_inner_test.cpp b/test/unittest/app_mgr_service_inner_test/app_mgr_service_inner_test.cpp index 54a0efc5176..6c983c145d8 100644 --- a/test/unittest/app_mgr_service_inner_test/app_mgr_service_inner_test.cpp +++ b/test/unittest/app_mgr_service_inner_test/app_mgr_service_inner_test.cpp @@ -1194,30 +1194,6 @@ HWTEST_F(AppMgrServiceInnerTest, QueryAppSpawnConnectionState_001, TestSize.Leve HILOG_INFO("QueryAppSpawnConnectionState_001 end"); } -/** - * @tc.name: GetRecordMap_001 - * @tc.desc: get record map. - * @tc.type: FUNC - * @tc.require: issueI5W4S7 - */ -HWTEST_F(AppMgrServiceInnerTest, GetRecordMap_001, TestSize.Level0) -{ - HILOG_INFO("GetRecordMap_001 start"); - auto appMgrServiceInner = std::make_shared(); - EXPECT_NE(appMgrServiceInner, nullptr); - - std::map> appRunningRecordMap; - - auto appRunningRecordMap1 = appMgrServiceInner->GetRecordMap(); - EXPECT_EQ(appRunningRecordMap1, appRunningRecordMap); - - appMgrServiceInner->appRunningManager_ = nullptr; - auto appRunningRecordMap2 = appMgrServiceInner->GetRecordMap(); - EXPECT_EQ(appRunningRecordMap2, appRunningRecordMap); - - HILOG_INFO("GetRecordMap_001 end"); -} - /** * @tc.name: SetAppSpawnClient_001 * @tc.desc: set app spawn client. -- Gitee