openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-24 12:43:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove mission in AbilityRecord

Browse Source 
Signed-off-by: wangzhen <wangzhen346@huawei.com>
This commit is contained in:
wangzhen
2024-06-19 18:03:29 +08:00
parent 161253997c
commit 8877db00a9
19 changed files with 249 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/abilitymgr/include/ability_first_frame_state_observer_manager.h
+6 -7
View File
@@ -29,11 +29,9 @@ namespace OHOS {
namespace AppExecFwk {
using AbilityFirstFrameStateObserverMap = std::map<sptr<IAbilityFirstFrameStateObserver>, std::string>;
class AbilityFirstFrameStateObserverManager;
class AbilityFirstFrameStateObserverSet final {
public:
AbilityFirstFrameStateObserverSet(std::weak_ptr<AbilityFirstFrameStateObserverManager> managerPtr,
bool isNotifyAllBundles = false);
explicit AbilityFirstFrameStateObserverSet(bool isNotifyAllBundles);
~AbilityFirstFrameStateObserverSet() = default;
int32_t AddAbilityFirstFrameStateObserver(const sptr<IAbilityFirstFrameStateObserver> &observer,
const std::string &bundleName);
@@ -48,14 +46,15 @@ private:
ffrt::mutex observerLock_;
AbilityFirstFrameStateObserverMap observerMap_;
std::map<sptr<IRemoteObject>, sptr<IRemoteObject::DeathRecipient>> recipientMap_;
std::weak_ptr<AbilityFirstFrameStateObserverManager> abilityFirstFrameStateObserverManager_;
bool isNotifyAllBundles_;
};
class AbilityFirstFrameStateObserverManager :
public std::enable_shared_from_this<AbilityFirstFrameStateObserverManager> {
DECLARE_DELAYED_SINGLETON(AbilityFirstFrameStateObserverManager)
class AbilityFirstFrameStateObserverManager {
public:
static AbilityFirstFrameStateObserverManager &GetInstance();
AbilityFirstFrameStateObserverManager() = default;
~AbilityFirstFrameStateObserverManager() = default;
void Init();
int32_t RegisterAbilityFirstFrameStateObserver(const sptr<IAbilityFirstFrameStateObserver> &observer,
const std::string &targetBundleName);
services/abilitymgr/include/ability_manager_service.h
+2 -2
View File
@@ -1682,7 +1682,8 @@ public:
*/
virtual int32_t TransferAbilityResultForExtension(const sptr<IRemoteObject> &callerToken, int32_t resultCode,
const Want &want) override;
std::shared_ptr<MissionListManager> GetMissionListManagerByUserId(int32_t userId);
/**
* Notify ability manager service frozen process.
*
@@ -1905,7 +1906,6 @@ private:
std::shared_ptr<PendingWantManager> GetPendingWantManagerByUserId(int32_t userId);
std::unordered_map<int, std::shared_ptr<MissionListManager>> GetMissionListManagers();
std::shared_ptr<MissionListManager> GetCurrentMissionListManager();
std::shared_ptr<MissionListManager> GetMissionListManagerByUserId(int32_t userId);
std::unordered_map<int, std::shared_ptr<UIAbilityLifecycleManager>> GetUIAbilityManagers();
std::shared_ptr<UIAbilityLifecycleManager> GetCurrentUIAbilityManager();
std::shared_ptr<UIAbilityLifecycleManager> GetUIAbilityManagerByUserId(int32_t userId);
services/abilitymgr/include/ability_record.h
+2 -9
View File
@@ -54,8 +54,6 @@ using Closure = std::function<void()>;
class AbilityRecord;
class ConnectionRecord;
class Mission;
class MissionList;
class CallContainer;
constexpr const char* ABILITY_TOKEN_NAME = "AbilityToken";
@@ -673,7 +671,7 @@ public:
*
*/
void RemoveSpecifiedWantParam(const std::string &key);
/**
* get request code of the ability to start.
*
@@ -892,11 +890,8 @@ public:
void SetLastExitReason(const ExitReason &exitReason);
void ContinueAbility(const std::string &deviceId, uint32_t versionCode);
void NotifyContinuationResult(int32_t result);
std::shared_ptr<MissionList> GetOwnedMissionList() const;
void SetMission(const std::shared_ptr<Mission> &mission);
void SetMissionList(const std::shared_ptr<MissionList> &missionList);
std::shared_ptr<Mission> GetMission() const;
void SetMissionId(int32_t missionId);
int32_t GetMissionId() const;
void SetUid(int32_t uid);
@@ -1163,8 +1158,6 @@ private:
int32_t uid_ = 0;
int32_t pid_ = 0;
std::weak_ptr<MissionList> missionList_;
std::weak_ptr<Mission> mission_;
int32_t missionId_ = -1;
int32_t ownerMissionUserId_ = -1;
bool isSwitchingPause_ = false;
services/abilitymgr/include/mission.h
+2 -11
View File
@@ -23,6 +23,8 @@
namespace OHOS {
namespace AAFwk {
class MissionList;
/**
* @class Mission
* a mission only contains an AbilityRecord
@@ -215,22 +217,11 @@ public:
return unclearable_;
}
std::string GetMissionAffinity() const
{
return missionAffinity_;
}
void SetMissionAffinity(const std::string &missionAffinity)
{
missionAffinity_ = missionAffinity;
}
private:
int32_t missionId_;
int32_t startMethod_;
std::shared_ptr<AbilityRecord> abilityRecord_;
std::string missionName_;
std::string missionAffinity_;
std::string specifiedFlag_;
std::weak_ptr<MissionList> ownerMissionList_;
bool lockedState_ = false;
services/abilitymgr/include/mission_list_manager.h
+1 -1
View File
@@ -525,7 +525,7 @@ private:
std::shared_ptr<AbilityRecord> GetAbilityFromTerminateListInner(const sptr<IRemoteObject> &token);
void SetLastExitReason(std::shared_ptr<AbilityRecord> &abilityRecord);
bool IsAppLastAbility(const std::shared_ptr<AbilityRecord> &abilityRecord);
std::shared_ptr<MissionList> GetMissionList(int32_t missionId);
int PrepareClearMissionLocked(int missionId, const std::shared_ptr<Mission> &mission);
bool CheckPrepareTerminateEnable(const std::shared_ptr<Mission> &mission);
services/abilitymgr/include/system_dialog_scheduler.h
-3
View File
@@ -100,9 +100,6 @@ private:
void DialogPortraitPositionAdaptive(
DialogPosition &position, float densityPixels, int lineNums) const;
void DialogPositionAdaptive(DialogPosition &position, int lineNums) const;
void GetAppNameFromResource(int32_t labelId,
const std::string &bundleName, int32_t userId, std::string &appName);
};
} // namespace AAFwk
} // namespace OHOS
services/abilitymgr/src/ability_first_frame_state_observer_manager.cpp
+11 -17
View File
@@ -25,9 +25,8 @@
namespace OHOS {
namespace AppExecFwk {
AbilityFirstFrameStateObserverSet::AbilityFirstFrameStateObserverSet(
std::weak_ptr<AbilityFirstFrameStateObserverManager> managerPtr, bool isNotifyAllBundles)
: abilityFirstFrameStateObserverManager_(managerPtr), isNotifyAllBundles_(isNotifyAllBundles) {}
AbilityFirstFrameStateObserverSet::AbilityFirstFrameStateObserverSet(bool isNotifyAllBundles)
: isNotifyAllBundles_(isNotifyAllBundles) {}
int32_t AbilityFirstFrameStateObserverSet::AddAbilityFirstFrameStateObserver(
const sptr<IAbilityFirstFrameStateObserver> &observer, const std::string &targetBundleName)
@@ -63,15 +62,14 @@ void AbilityFirstFrameStateObserverSet::AddObserverDeathRecipient(const sptr<IRe
TAG_LOGE(AAFwkTag::ABILITYMGR, "This death recipient has been added.");
return;
}
auto deathRecipientFunc = [weak = abilityFirstFrameStateObserverManager_](const wptr<IRemoteObject> &remote) {
auto manager = weak.lock();
auto deathRecipientFunc = [](const wptr<IRemoteObject> &remote) {
auto object = remote.promote();
if (manager == nullptr || object == nullptr) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "manager or object is nullptr.");
if (object == nullptr) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "object is nullptr.");
return;
}
sptr<IAbilityFirstFrameStateObserver> observer = iface_cast<IAbilityFirstFrameStateObserver>(object);
manager->UnregisterAbilityFirstFrameStateObserver(observer);
AbilityFirstFrameStateObserverManager::GetInstance().UnregisterAbilityFirstFrameStateObserver(observer);
};
sptr<IRemoteObject::DeathRecipient> deathRecipient =
new (std::nothrow) AbilityFirstFrameStateObserverRecipient(deathRecipientFunc);
@@ -141,23 +139,19 @@ void AbilityFirstFrameStateObserverSet::OnAbilityFirstFrameState(const std::shar
}
}
AbilityFirstFrameStateObserverManager::AbilityFirstFrameStateObserverManager()
AbilityFirstFrameStateObserverManager &AbilityFirstFrameStateObserverManager::GetInstance()
{
TAG_LOGD(AAFwkTag::ABILITYMGR, "AbilityFirstFrameStateObserverManager instance is created");
}
AbilityFirstFrameStateObserverManager::~AbilityFirstFrameStateObserverManager()
{
TAG_LOGD(AAFwkTag::ABILITYMGR, "AbilityFirstFrameStateObserverManager instance is destroyed");
static AbilityFirstFrameStateObserverManager instance;
return instance;
}
void AbilityFirstFrameStateObserverManager::Init()
{
if (!stateObserverSetForBundleName_) {
stateObserverSetForBundleName_ = std::make_unique<AbilityFirstFrameStateObserverSet>(shared_from_this());
stateObserverSetForBundleName_ = std::make_unique<AbilityFirstFrameStateObserverSet>(false);
}
if (!stateObserverSetForAllBundles_) {
stateObserverSetForAllBundles_ = std::make_unique<AbilityFirstFrameStateObserverSet>(shared_from_this(), true);
stateObserverSetForAllBundles_ = std::make_unique<AbilityFirstFrameStateObserverSet>(true);
}
}
services/abilitymgr/src/ability_manager_service.cpp
+3 -3
View File
@@ -406,7 +406,7 @@ bool AbilityManagerService::Init()
if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) {
InitFocusListener();
}
DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->Init();
AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().Init();
#endif
DelayedSingleton<ConnectionStateManager>::GetInstance()->Init(taskHandler_);
@@ -8652,14 +8652,14 @@ void AbilityManagerService::InitPrepareTerminateConfig()
int AbilityManagerService::RegisterAbilityFirstFrameStateObserver(
const sptr<IAbilityFirstFrameStateObserver> &observer, const std::string &targetBundleName)
{
return DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
return AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
RegisterAbilityFirstFrameStateObserver(observer, targetBundleName);
}
int AbilityManagerService::UnregisterAbilityFirstFrameStateObserver(
const sptr<IAbilityFirstFrameStateObserver> &observer)
{
return DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
return AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
UnregisterAbilityFirstFrameStateObserver(observer);
}
#endif
services/abilitymgr/src/ability_record.cpp
+4 -31
View File
@@ -2277,9 +2277,8 @@ void AbilityRecord::DumpAbilityState(
info.push_back(dumpInfo);
}
auto mission = GetMission();
if (mission) {
std::string missionAffinity = mission->GetMissionAffinity();
auto missionAffinity = GetMissionAffinity();
if (!missionAffinity.empty()) {
dumpInfo = " missionAffinity: " + missionAffinity;
info.push_back(dumpInfo);
}
@@ -2383,13 +2382,6 @@ void AbilityRecord::RemoveAbilityDeathRecipient() const
void AbilityRecord::OnSchedulerDied(const wptr<IRemoteObject> &remote)
{
TAG_LOGD(AAFwkTag::ABILITYMGR, "called.");
if (!Rosen::SceneBoardJudgement::IsSceneBoardEnabled()) {
auto mission = GetMission();
if (mission) {
TAG_LOGW(AAFwkTag::ABILITYMGR, "On scheduler died. Is app not response Reason:%{public}d",
mission->IsANRState());
}
}
std::lock_guard<ffrt::mutex> guard(lock_);
CHECK_POINTER(scheduler_);
@@ -2770,26 +2762,12 @@ void AbilityRecord::NotifyContinuationResult(int32_t result)
lifecycleDeal_->NotifyContinuationResult(result);
}
std::shared_ptr<MissionList> AbilityRecord::GetOwnedMissionList() const
void AbilityRecord::SetMissionId(int32_t missionId)
{
return missionList_.lock();
}
void AbilityRecord::SetMissionList(const std::shared_ptr<MissionList> &missionList)
{
missionList_ = missionList;
}
void AbilityRecord::SetMission(const std::shared_ptr<Mission> &mission)
{
if (mission) {
missionId_ = mission->GetMissionId();
TAG_LOGD(AAFwkTag::ABILITYMGR, "SetMission come, missionId is %{public}d.", missionId_);
}
std::lock_guard guard(wantLock_);
missionId_ = missionId;
want_.RemoveParam(KEY_MISSION_ID);
want_.SetParam(KEY_MISSION_ID, missionId_);
mission_ = mission;
}
void AbilityRecord::SetSessionInfo(sptr<SessionInfo> sessionInfo)
@@ -2848,11 +2826,6 @@ bool AbilityRecord::IsClearMissionFlag()
return clearMissionFlag_;
}
std::shared_ptr<Mission> AbilityRecord::GetMission() const
{
return mission_.lock();
}
int32_t AbilityRecord::GetMissionId() const
{
return missionId_;
services/abilitymgr/src/mission.cpp
+2 -3
View File
@@ -15,6 +15,8 @@
#include "mission.h"
#include "mission_list.h"
namespace OHOS {
namespace AAFwk {
Mission::Mission(int32_t id, const std::shared_ptr<AbilityRecord> abilityRecord, const std::string &missionName,
@@ -101,9 +103,6 @@ std::string Mission::GetMissionName() const
void Mission::SetMissionList(const std::shared_ptr<MissionList> &missionList)
{
ownerMissionList_ = missionList;
if (abilityRecord_) {
abilityRecord_->SetMissionList(missionList);
}
}
void Mission::SetLockedState(bool lockedState)
services/abilitymgr/src/mission_list_manager.cpp
+36 -24
View File
@@ -638,7 +638,7 @@ void MissionListManager::GetTargetMissionAndAbility(const AbilityRequest &abilit
targetMission->SetLockedState(info.missionInfo.lockedState);
targetMission->SetUnclearable(info.missionInfo.unclearable);
targetMission->UpdateMissionTime(info.missionInfo.time);
targetRecord->SetMission(targetMission);
targetRecord->SetMissionId(targetMission->GetMissionId());
targetRecord->SetOwnerMissionUserId(userId_);
SetLastExitReason(targetRecord);
@@ -751,11 +751,13 @@ std::shared_ptr<MissionList> MissionListManager::GetTargetMissionListByDefault(
return nullptr;
}
auto callerMission = callerAbility->GetMission();
auto callerList = callerAbility->GetOwnedMissionList();
if (!callerMission || !callerList) {
return nullptr; // invalid status
}
auto missionListMgr = DelayedSingleton<AbilityManagerService>::GetInstance()->GetMissionListManagerByUserId(
callerAbility->GetOwnerMissionUserId());
CHECK_POINTER_AND_RETURN(missionListMgr, nullptr);
auto callerMission = missionListMgr->GetMissionById(callerAbility->GetMissionId());
CHECK_POINTER_AND_RETURN(callerMission, nullptr);
auto callerList = callerMission->GetMissionList();
CHECK_POINTER_AND_RETURN(callerList, nullptr);
// target mission should in caller mission list
if (callerList != defaultStandardList_ && callerList != defaultSingleList_) {
@@ -1310,7 +1312,7 @@ void MissionListManager::CompleteForegroundSuccess(const std::shared_ptr<Ability
AbilityUtil::UTCTimeSeconds());
#endif
auto mission = abilityRecord->GetMission();
auto mission = GetMissionById(abilityRecord->GetMissionId());
if (mission) {
auto currentTime = GetCurrentTime();
mission->UpdateMissionTime(currentTime);
@@ -1489,10 +1491,17 @@ int MissionListManager::MoveAbilityToBackgroundLocked(const std::shared_ptr<Abil
}
}
std::shared_ptr<MissionList> MissionListManager::GetMissionList(int32_t missionId)
{
auto mission = GetMissionById(missionId);
CHECK_POINTER_AND_RETURN(mission, nullptr);
return mission->GetMissionList();
}
void MissionListManager::RemoveBackgroundingAbility(const std::shared_ptr<AbilityRecord> &abilityRecord)
{
CHECK_POINTER_LOG(abilityRecord, "RemoveBackgroundingAbility fail, ability record is null.")
auto missionList = abilityRecord->GetOwnedMissionList();
auto missionList = GetMissionList(abilityRecord->GetMissionId());
CHECK_POINTER(missionList);
auto mission = missionList->GetTopMission();
missionList->RemoveMissionByAbilityRecord(abilityRecord);
@@ -1521,7 +1530,6 @@ void MissionListManager::RemoveBackgroundingAbility(const std::shared_ptr<Abilit
}
if (!needTopAbility) {
TAG_LOGD(AAFwkTag::ABILITYMGR, "The ability needs to top is null.");
if (!abilityRecord->IsNeedBackToOtherMissionStack()) {
TAG_LOGI(AAFwkTag::ABILITYMGR, "This ability doesn't need back to other mission stack.");
return;
@@ -1655,8 +1663,9 @@ void MissionListManager::RemoveTerminatingAbility(const std::shared_ptr<AbilityR
TAG_LOGD(AAFwkTag::ABILITYMGR, "Find ability in terminating list, return.");
return;
}
auto missionList = abilityRecord->GetOwnedMissionList();
auto mission = GetMissionById(abilityRecord->GetMissionId());
CHECK_POINTER(mission);
auto missionList = mission->GetMissionList();
CHECK_POINTER(missionList);
missionList->RemoveMissionByAbilityRecord(abilityRecord);
@@ -2089,7 +2098,7 @@ void MissionListManager::MoveToBackgroundTask(const std::shared_ptr<AbilityRecor
void MissionListManager::NotifyMissionCreated(const std::shared_ptr<AbilityRecord> &abilityRecord) const
{
CHECK_POINTER(abilityRecord);
auto mission = abilityRecord->GetMission();
auto mission = GetMissionById(abilityRecord->GetMissionId());
if (mission && mission->NeedNotify() && listenerController_ &&
!(abilityRecord->GetAbilityInfo().excludeFromMissions)) {
auto missionId = abilityRecord->GetMissionId();
@@ -2288,8 +2297,9 @@ void MissionListManager::HandleForegroundTimeout(const std::shared_ptr<AbilityRe
return;
}
if (ability->GetMission()) {
ability->GetMission()->SetMovingState(false);
auto mission = GetMissionById(ability->GetMissionId());
if (mission) {
mission->SetMovingState(false);
}
if (!ability->IsAbilityState(AbilityState::FOREGROUNDING)) {
@@ -2420,12 +2430,14 @@ void MissionListManager::MoveToTerminateList(const std::shared_ptr<AbilityRecord
TAG_LOGE(AAFwkTag::ABILITYMGR, "timeout ability record is nullptr.");
return;
}
auto missionList = abilityRecord->GetOwnedMissionList();
auto mission = GetMissionById(abilityRecord->GetMissionId());
CHECK_POINTER(mission);
auto missionList = mission->GetMissionList();
if (missionList == nullptr) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "timeout missionList is nullptr.");
return;
}
auto selMission = abilityRecord->GetMission();
auto selMission = GetMissionById(abilityRecord->GetMissionId());
if (selMission == nullptr) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "timeout mission is nullptr.");
return;
@@ -2612,7 +2624,7 @@ std::shared_ptr<MissionList> MissionListManager::GetTargetMissionList(int missio
innerMissionInfo.hasRecoverInfo = false;
mission->SetLockedState(innerMissionInfo.missionInfo.lockedState);
mission->SetUnclearable(innerMissionInfo.missionInfo.unclearable);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetOwnerMissionUserId(userId_);
SetLastExitReason(abilityRecord);
std::shared_ptr<MissionList> newMissionList = std::make_shared<MissionList>();
@@ -2631,7 +2643,7 @@ int32_t MissionListManager::GetMissionIdByAbilityTokenInner(const sptr<IRemoteOb
if (!abilityRecord) {
return -1;
}
auto mission = abilityRecord->GetMission();
auto mission = GetMissionById(abilityRecord->GetMissionId());
if (!mission) {
return -1;
}
@@ -2689,7 +2701,7 @@ void MissionListManager::HandleAbilityDied(std::shared_ptr<AbilityRecord> abilit
void MissionListManager::HandleLauncherDied(std::shared_ptr<AbilityRecord> ability)
{
TAG_LOGI(AAFwkTag::ABILITYMGR, "Handle launcher Ability Died.");
auto mission = ability->GetMission();
auto mission = GetMissionById(ability->GetMissionId());
CHECK_POINTER_LOG(mission, "Fail to get launcher mission.");
auto missionList = mission->GetMissionList();
if (launcherList_ != missionList) {
@@ -2722,7 +2734,7 @@ void MissionListManager::HandleAbilityDiedByDefault(std::shared_ptr<AbilityRecor
return;
}
auto mission = ability->GetMission();
auto mission = GetMissionById(ability->GetMissionId());
CHECK_POINTER_LOG(mission, "Fail to get mission.");
auto missionList = mission->GetMissionList();
CHECK_POINTER_LOG(missionList, "Fail to get mission list.");
@@ -2798,7 +2810,7 @@ void MissionListManager::BackToLauncher()
return;
}
auto launcherRootMission = launcherRootAbility->GetMission();
auto launcherRootMission = GetMissionById(launcherRootAbility->GetMissionId());
if (!launcherRootMission) {
TAG_LOGW(AAFwkTag::ABILITYMGR, "no root launcher mission, no need back to launcher.");
return;
@@ -2843,7 +2855,7 @@ int MissionListManager::SetMissionLabel(const sptr<IRemoteObject> &token, const
// store label if not notify mission created.
auto abilityRecord = GetAbilityRecordByToken(token);
if (abilityRecord) {
auto mission = abilityRecord->GetMission();
auto mission = GetMissionById(abilityRecord->GetMissionId());
if (mission && mission->NeedNotify()) {
mission->SetNeedNotifyUpdateLabel(true);
}
@@ -2904,7 +2916,7 @@ void MissionListManager::CompleteFirstFrameDrawing(const sptr<IRemoteObject> &ab
}
abilityRecord->ReportAtomicServiceDrawnCompleteEvent();
abilityRecord->SetCompleteFirstFrameDrawing(true);
DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
HandleOnFirstFrameState(abilityRecord);
auto handler = DelayedSingleton<AbilityManagerService>::GetInstance()->GetTaskHandler();
if (handler == nullptr) {
@@ -3892,7 +3904,7 @@ void MissionListManager::SetMissionANRStateByTokens(const std::vector<sptr<IRemo
TAG_LOGW(AAFwkTag::ABILITYMGR, "abilityRecord is nullptr.");
continue;
}
auto mission = abilityRecord->GetMission();
auto mission = GetMissionById(abilityRecord->GetMissionId());
if (mission == nullptr) {
TAG_LOGW(AAFwkTag::ABILITYMGR, "mission is nullptr.");
continue;
services/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp
+2 -2
View File
@@ -570,7 +570,7 @@ void UIAbilityLifecycleManager::CompleteFirstFrameDrawing(const sptr<IRemoteObje
}
abilityRecord->ReportAtomicServiceDrawnCompleteEvent();
abilityRecord->SetCompleteFirstFrameDrawing(true);
DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
HandleOnFirstFrameState(abilityRecord);
}
#endif
@@ -2438,7 +2438,7 @@ void UIAbilityLifecycleManager::CompleteFirstFrameDrawing(int32_t sessionId) con
abilityRecord->ReportAtomicServiceDrawnCompleteEvent();
#ifdef SUPPORT_SCREEN
abilityRecord->SetCompleteFirstFrameDrawing(true);
DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
HandleOnFirstFrameState(abilityRecord);
#endif // SUPPORT_SCREEN
}
services/abilitymgr/src/system_dialog_scheduler.cpp
-46
View File
@@ -586,52 +586,6 @@ void SystemDialogScheduler::GetDialogPositionAndSize(DialogType type, DialogPosi
}
}
void SystemDialogScheduler::GetAppNameFromResource(int32_t labelId,
const std::string &bundleName, int32_t userId, std::string &appName)
{
std::shared_ptr<Global::Resource::ResourceManager> resourceManager(Global::Resource::CreateResourceManager());
if (resourceManager == nullptr) {
TAG_LOGE(AAFwkTag::DIALOG, "The resourceManager is nullptr.");
return;
}
AppExecFwk::BundleInfo bundleInfo;
auto bundleMgrHelper = DelayedSingleton<AppExecFwk::BundleMgrHelper>::GetInstance();
CHECK_POINTER(bundleMgrHelper);
if (!IN_PROCESS_CALL(
bundleMgrHelper->GetBundleInfo(bundleName, AppExecFwk::BundleFlag::GET_BUNDLE_DEFAULT, bundleInfo, userId))) {
TAG_LOGE(AAFwkTag::DIALOG, "Failed to get bundle info.");
return;
}
std::unique_ptr<Global::Resource::ResConfig> resConfig(Global::Resource::CreateResConfig());
UErrorCode status = U_ZERO_ERROR;
icu::Locale locale = icu::Locale::forLanguageTag(Global::I18n::LocaleConfig::GetSystemLanguage(), status);
resConfig->SetLocaleInfo(locale);
resourceManager->UpdateResConfig(*resConfig);
std::regex pattern(std::string(ABS_CODE_PATH) +
std::string(FILE_SEPARATOR) + bundleInfo.name);
for (auto hapModuleInfo : bundleInfo.hapModuleInfos) {
std::string loadPath;
TAG_LOGD(AAFwkTag::DIALOG, "make a judgment.");
if (!hapModuleInfo.hapPath.empty()) {
loadPath = hapModuleInfo.hapPath;
} else {
loadPath = hapModuleInfo.resourcePath;
}
if (loadPath.empty()) {
continue;
}
TAG_LOGD(AAFwkTag::DIALOG, "GetAppNameFromResource loadPath: %{public}s.", loadPath.c_str());
if (!resourceManager->AddResource(loadPath.c_str())) {
TAG_LOGE(AAFwkTag::DIALOG, "ResourceManager add %{public}s resource path failed.", bundleInfo.name.c_str());
}
}
resourceManager->GetStringById(static_cast<uint32_t>(labelId), appName);
TAG_LOGD(
AAFwkTag::DIALOG, "Get app display info, labelId: %{public}d, appname: %{public}s.", labelId, appName.c_str());
}
bool SystemDialogScheduler::GetAssertFaultDialogWant(Want &want)
{
auto bundleMgrHelper = AbilityUtil::GetBundleManagerHelper();
test/fuzztest/abilitymgrrest_fuzzer/abilitymgrrest_fuzzer.cpp
-4
View File
@@ -56,13 +56,9 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size)
if (wantParcel.WriteBuffer(data, size)) {
want = Want::Unmarshalling(wantParcel);
}
int32_t userId = static_cast<int32_t>(GetU32Data(data));
std::shared_ptr<SystemDialogScheduler> systemDialogScheduler = std::make_shared<SystemDialogScheduler>();
std::vector<DialogAppInfo> dialogAppInfos;
systemDialogScheduler->GetSelectorParams(dialogAppInfos);
int32_t labelId = static_cast<int32_t>(GetU32Data(data));
std::string appName(data, size);
systemDialogScheduler->GetAppNameFromResource(labelId, bundleName, userId, appName);
InnerMissionInfo innerMissionInfo;
innerMissionInfo.ToJsonStr();
std::string jsonStr(data, size);
test/moduletest/ability_timeout_module_test/ability_timeout_module_test.cpp
+3 -6
View File
@@ -198,8 +198,7 @@ std::shared_ptr<AbilityRecord> AbilityTimeoutModuleTest::CreateRootLauncher()
abilityRequest.appInfo.name = AbilityConfig::LAUNCHER_BUNDLE_NAME;
auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest);
auto mission = std::make_shared<Mission>(MOCK_MISSION_ID++, abilityRecord, abilityRequest.abilityInfo.bundleName);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionList(lauList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetLauncherRoot();
lauList->AddMissionToTop(mission);
EXPECT_TRUE(lauList->GetAbilityRecordByToken(abilityRecord->GetToken()) != nullptr);
@@ -222,8 +221,7 @@ std::shared_ptr<AbilityRecord> AbilityTimeoutModuleTest::CreateLauncherAbility()
abilityRequest.appInfo.name = "com.ix.hiworld";
auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest);
auto mission = std::make_shared<Mission>(MOCK_MISSION_ID++, abilityRecord, abilityRequest.abilityInfo.bundleName);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionList(lauList);
abilityRecord->SetMissionId(mission->GetMissionId());
lauList->AddMissionToTop(mission);
EXPECT_TRUE(lauList->GetAbilityRecordByToken(abilityRecord->GetToken()) != nullptr);
@@ -282,9 +280,8 @@ std::shared_ptr<AbilityRecord> AbilityTimeoutModuleTest::CreateCommonAbility()
auto mission = std::make_shared<Mission>(MOCK_MISSION_ID++, abilityRecord, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(abilityRecord != nullptr);
EXPECT_TRUE(mission != nullptr);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
auto missionList = std::make_shared<MissionList>(MissionListType::CURRENT);
abilityRecord->SetMissionList(missionList);
missionList->AddMissionToTop(mission);
curListManager->MoveMissionListToTop(missionList);
EXPECT_TRUE(curListManager->GetAbilityRecordByToken(abilityRecord->GetToken()) != nullptr);
test/unittest/ability_first_frame_state_observer_manager_test/ability_first_frame_state_observer_manager_test.cpp
+31 -32
View File
@@ -81,9 +81,9 @@ void AbilityFirstFrameStateObserverManagerTest::TearDown()
*/
HWTEST_F(AbilityFirstFrameStateObserverManagerTest, RegisterAbilityFirstFrameStateObserver_001, TestSize.Level0)
{
DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->Init();
AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().Init();
std::string bundleName = "com.example.test";
int32_t res = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
int32_t res = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
RegisterAbilityFirstFrameStateObserver(nullptr, bundleName);
EXPECT_EQ(res, ERR_NOT_SYSTEM_APP);
}
@@ -98,11 +98,11 @@ HWTEST_F(AbilityFirstFrameStateObserverManagerTest, RegisterAbilityFirstFrameSta
*/
HWTEST_F(AbilityFirstFrameStateObserverManagerTest, RegisterAbilityFirstFrameStateObserver_002, TestSize.Level0)
{
DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->Init();
AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().Init();
std::string bundleName = "com.example.test";
MyFlag::isSystemApp_ = true;
MyFlag::flag_ = ERR_PERMISSION_DENIED;
int32_t res = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
int32_t res = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
RegisterAbilityFirstFrameStateObserver(nullptr, bundleName);
EXPECT_EQ(res, ERR_PERMISSION_DENIED);
}
@@ -117,11 +117,11 @@ HWTEST_F(AbilityFirstFrameStateObserverManagerTest, RegisterAbilityFirstFrameSta
*/
HWTEST_F(AbilityFirstFrameStateObserverManagerTest, RegisterAbilityFirstFrameStateObserver_003, TestSize.Level0)
{
DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->Init();
AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().Init();
std::string bundleName = "";
MyFlag::isSystemApp_ = true;
MyFlag::flag_ = ERR_OK;
int32_t res = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
int32_t res = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
RegisterAbilityFirstFrameStateObserver(nullptr, bundleName);
EXPECT_EQ(res, ERR_INVALID_VALUE);
}
@@ -136,32 +136,32 @@ HWTEST_F(AbilityFirstFrameStateObserverManagerTest, RegisterAbilityFirstFrameSta
*/
HWTEST_F(AbilityFirstFrameStateObserverManagerTest, RegisterAbilityFirstFrameStateObserver_004, TestSize.Level0)
{
DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->Init();
AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().Init();
std::string bundleName = "";
MyFlag::isSystemApp_ = true;
MyFlag::flag_ = ERR_OK;
// step1. register not null remoteObj,expect success.
sptr<MockAbilityFirstFrameStateObserver> remoteObject = new MockAbilityFirstFrameStateObserver();
int32_t res = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
int32_t res = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
RegisterAbilityFirstFrameStateObserver(remoteObject, bundleName);
EXPECT_EQ(res, ERR_OK);
// step2. duplicate register not null remoteObj,expect success.
res = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
res = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
RegisterAbilityFirstFrameStateObserver(remoteObject, bundleName);
EXPECT_EQ(res, ERR_OK);
auto observerMap = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
auto observerMap = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
stateObserverSetForAllBundles_->observerMap_;
auto recipientMap = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
auto recipientMap = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
stateObserverSetForAllBundles_->recipientMap_;
// step3. duplicate register same remoteObj, expect only one observer register success.
EXPECT_EQ(observerMap.size(), 1); // 1 means: observer num
EXPECT_EQ(recipientMap.size(), 1); // 1 means: death recipient num
// step4. unregister remoteObject, expect unregister success.
DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
UnregisterAbilityFirstFrameStateObserver(remoteObject);
auto observerMap2 = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
auto observerMap2 = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
stateObserverSetForAllBundles_->observerMap_;
auto recipientMap2 = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
auto recipientMap2 = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
stateObserverSetForAllBundles_->recipientMap_;
EXPECT_EQ(observerMap2.size(), 0);
EXPECT_EQ(recipientMap2.size(), 0);
@@ -177,22 +177,22 @@ HWTEST_F(AbilityFirstFrameStateObserverManagerTest, RegisterAbilityFirstFrameSta
*/
HWTEST_F(AbilityFirstFrameStateObserverManagerTest, RegisterAbilityFirstFrameStateObserver_005, TestSize.Level0)
{
DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->Init();
AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().Init();
std::string bundleName = "com.example.test";
MyFlag::isSystemApp_ = true;
MyFlag::flag_ = ERR_OK;
// step1. register not null remoteObj,expect success.
sptr<MockAbilityFirstFrameStateObserver> remoteObject = new MockAbilityFirstFrameStateObserver();
int32_t res = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
int32_t res = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
RegisterAbilityFirstFrameStateObserver(remoteObject, bundleName);
EXPECT_EQ(res, ERR_OK);
// step2. duplicate register not null remoteObj,expect success.
res = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
res = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
RegisterAbilityFirstFrameStateObserver(remoteObject, bundleName);
EXPECT_EQ(res, ERR_OK);
auto observerMap = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
auto observerMap = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
stateObserverSetForBundleName_->observerMap_;
auto recipientMap = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
auto recipientMap = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
stateObserverSetForBundleName_->recipientMap_;
// step3. duplicate register same remoteObj, expect only one observer register success.
EXPECT_EQ(observerMap.size(), 1); // 1 means observerMap size.
@@ -200,14 +200,14 @@ HWTEST_F(AbilityFirstFrameStateObserverManagerTest, RegisterAbilityFirstFrameSta
for (auto it : observerMap) {
EXPECT_EQ(it.second, bundleName);
}
DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
UnregisterAbilityFirstFrameStateObserver(remoteObject);
// step4. unregister remoteObject, expect unregister success.
DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
UnregisterAbilityFirstFrameStateObserver(remoteObject);
auto observerMap2 = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
auto observerMap2 = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
stateObserverSetForAllBundles_->observerMap_;
auto recipientMap2 = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
auto recipientMap2 = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
stateObserverSetForAllBundles_->recipientMap_;
EXPECT_EQ(observerMap2.size(), 0);
EXPECT_EQ(recipientMap2.size(), 0);
@@ -223,7 +223,7 @@ HWTEST_F(AbilityFirstFrameStateObserverManagerTest, RegisterAbilityFirstFrameSta
*/
HWTEST_F(AbilityFirstFrameStateObserverManagerTest, HandleOnFirstFrameState_001, TestSize.Level0)
{
DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->Init();
AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().Init();
std::string bundleName = "com.example.test";
MyFlag::isSystemApp_ = true;
MyFlag::flag_ = ERR_OK;
@@ -236,17 +236,17 @@ HWTEST_F(AbilityFirstFrameStateObserverManagerTest, HandleOnFirstFrameState_001,
EXPECT_CALL(*remoteObject2, SendRequest(_, _, _, _))
.Times(1)
.WillOnce(Invoke(remoteObject1.GetRefPtr(), &MockAbilityFirstFrameStateObserver::InvokeSendRequest));
int32_t res = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
int32_t res = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
RegisterAbilityFirstFrameStateObserver(remoteObject1, bundleName);
res = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
res = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
RegisterAbilityFirstFrameStateObserver(remoteObject2, "");
auto observerMap1 = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
auto observerMap1 = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
stateObserverSetForBundleName_->observerMap_;
auto recipientMap1 = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
auto recipientMap1 = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
stateObserverSetForBundleName_->recipientMap_;
auto observerMap2 = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
auto observerMap2 = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
stateObserverSetForAllBundles_->observerMap_;
auto recipientMap2 = DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
auto recipientMap2 = AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().
stateObserverSetForAllBundles_->recipientMap_;
EXPECT_EQ(observerMap1.size(), 1); // 1 means observerMap size.
EXPECT_EQ(recipientMap1.size(), 1); // 1 means recipientMap size.
@@ -256,8 +256,7 @@ HWTEST_F(AbilityFirstFrameStateObserverManagerTest, HandleOnFirstFrameState_001,
AppExecFwk::AbilityInfo info;
AppExecFwk::ApplicationInfo appInfo;
std::shared_ptr<AbilityRecord> abilityRecord = std::make_shared<AbilityRecord>(want, info, appInfo);
DelayedSingleton<AppExecFwk::AbilityFirstFrameStateObserverManager>::GetInstance()->
HandleOnFirstFrameState(abilityRecord);
AppExecFwk::AbilityFirstFrameStateObserverManager::GetInstance().HandleOnFirstFrameState(abilityRecord);
EXPECT_EQ(remoteObject1->code_,
static_cast<uint32_t>(IAbilityFirstFrameStateObserver::Message::ON_ABILITY_FIRST_FRAME_STATE));
EXPECT_EQ(remoteObject2->code_,
test/unittest/ability_interceptor_test/ability_interceptor_test.cpp
+2 -2
View File
@@ -57,7 +57,6 @@ public:
void AbilityInterceptorTest::SetUpTestCase()
{
GTEST_LOG_(INFO) << "AbilityInterceptorTest SetUpTestCase called";
DelayedSingleton<AbilityManagerService>::GetInstance()->CleanAllMissions();
OHOS::DelayedSingleton<SaMgrClient>::DestroyInstance();
OHOS::DelayedSingleton<SaMgrClient>::GetInstance()->RegisterSystemAbility(
@@ -729,7 +728,8 @@ HWTEST_F(AbilityInterceptorTest, EcologicalRuleInterceptor_002, TestSize.Level1)
want.SetBundle(bundleName);
int requestCode = 0;
int userId = 100;
AbilityInterceptorParam param = AbilityInterceptorParam(want, requestCode, userId, true, nullptr);
sptr<IRemoteObject> token;
AbilityInterceptorParam param = AbilityInterceptorParam(want, requestCode, userId, true, token);
ErrCode result = interceptor->DoProcess(param);
EXPECT_EQ(result, ERR_OK);
}
test/unittest/ability_timeout_test/ability_timeout_test.cpp
+39 -68
View File
@@ -104,8 +104,7 @@ HWTEST_F(AbilityTimeoutTest, OnAbilityDied_001, TestSize.Level1)
auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest);
auto mission =
std::make_shared<Mission>(MOCK_MISSION_ID, abilityRecord, abilityRequest.abilityInfo.bundleName);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionList(defList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetOwnerMissionUserId(MOCK_MAIN_USER_ID);
defList->AddMissionToTop(mission);
EXPECT_TRUE(defList->GetAbilityRecordByToken(abilityRecord->GetToken()) != nullptr);
@@ -144,8 +143,7 @@ HWTEST_F(AbilityTimeoutTest, OnAbilityDied_002, TestSize.Level1)
auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest);
auto mission =
std::make_shared<Mission>(MOCK_MISSION_ID, abilityRecord, abilityRequest.abilityInfo.bundleName);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionList(lauList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetLauncherRoot();
abilityRecord->SetOwnerMissionUserId(MOCK_MAIN_USER_ID);
lauList->AddMissionToTop(mission);
@@ -190,8 +188,7 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_001, TestSize.Level1)
std::make_shared<Mission>(MOCK_MISSION_ID, abilityRecord, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(mission != nullptr);
EXPECT_TRUE(abilityRecord != nullptr);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionList(lauList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetLauncherRoot();
lauList->AddMissionToTop(mission);
EXPECT_TRUE(lauList->GetAbilityRecordByToken(abilityRecord->GetToken()) != nullptr);
@@ -235,8 +232,7 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_002, TestSize.Level1)
std::make_shared<Mission>(MOCK_MISSION_ID, launcher, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(launcher != nullptr);
EXPECT_TRUE(missionLauncher != nullptr);
launcher->SetMission(missionLauncher);
launcher->SetMissionList(lauList);
launcher->SetMissionId(missionLauncher->GetMissionId());
launcher->SetLauncherRoot();
lauList->AddMissionToTop(missionLauncher);
EXPECT_TRUE(lauList->GetAbilityRecordByToken(launcher->GetToken()) != nullptr);
@@ -246,13 +242,12 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_002, TestSize.Level1)
abilityRequest.abilityInfo.name = "com.test.Timeout002";
auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest);
auto mission =
std::make_shared<Mission>(MOCK_MISSION_ID, abilityRecord, abilityRequest.abilityInfo.bundleName);
std::make_shared<Mission>(MOCK_MISSION_ID + 1, abilityRecord, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(mission != nullptr);
EXPECT_TRUE(abilityRecord != nullptr);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
auto missionList = std::make_shared<MissionList>(MissionListType::CURRENT);
abilityRecord->SetMissionList(missionList);
missionList->AddMissionToTop(mission);
curListManager->MoveMissionListToTop(missionList);
EXPECT_TRUE(curListManager->GetAbilityRecordByToken(abilityRecord->GetToken()) != nullptr);
@@ -293,8 +288,7 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_003, TestSize.Level1)
auto launcher = AbilityRecord::CreateAbilityRecord(abilityRequest);
auto missionLauncher =
std::make_shared<Mission>(MOCK_MISSION_ID, launcher, abilityRequest.abilityInfo.bundleName);
launcher->SetMission(missionLauncher);
launcher->SetMissionList(lauList);
launcher->SetMissionId(missionLauncher->GetMissionId());
launcher->SetLauncherRoot();
lauList->AddMissionToTop(missionLauncher);
EXPECT_TRUE(lauList->GetAbilityRecordByToken(launcher->GetToken()) != nullptr);
@@ -306,9 +300,8 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_003, TestSize.Level1)
std::make_shared<Mission>(MOCK_MISSION_ID + 1, caller, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(caller != nullptr);
EXPECT_TRUE(callerMission != nullptr);
caller->SetMission(callerMission);
caller->SetMissionId(callerMission->GetMissionId());
auto missionList = std::make_shared<MissionList>(MissionListType::CURRENT);
caller->SetMissionList(missionList);
missionList->AddMissionToTop(callerMission);
curListManager->MoveMissionListToTop(missionList);
EXPECT_TRUE(curListManager->GetAbilityRecordByToken(caller->GetToken()) != nullptr);
@@ -319,8 +312,7 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_003, TestSize.Level1)
std::make_shared<Mission>(MOCK_MISSION_ID + 2, abilityRecord, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(abilityRecord != nullptr);
EXPECT_TRUE(mission != nullptr);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->AddCallerRecord(caller->GetToken(), -1);
missionList->AddMissionToTop(mission);
curListManager->MoveMissionListToTop(missionList);
@@ -364,8 +356,7 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_004, TestSize.Level1)
auto missionLauncher =
std::make_shared<Mission>(MOCK_MISSION_ID, launcher, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(missionLauncher != nullptr);
launcher->SetMission(missionLauncher);
launcher->SetMissionList(lauList);
launcher->SetMissionId(missionLauncher->GetMissionId());
launcher->SetLauncherRoot();
lauList->AddMissionToTop(missionLauncher);
EXPECT_TRUE(lauList->GetAbilityRecordByToken(launcher->GetToken()) != nullptr);
@@ -383,12 +374,11 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_004, TestSize.Level1)
auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest);
EXPECT_TRUE(launcher != nullptr);
auto mission =
std::make_shared<Mission>(MOCK_MISSION_ID, abilityRecord, abilityRequest.abilityInfo.bundleName);
std::make_shared<Mission>(MOCK_MISSION_ID + 1, abilityRecord, abilityRequest.abilityInfo.bundleName);
auto missionList = std::make_shared<MissionList>(MissionListType::CURRENT);
EXPECT_TRUE(mission != nullptr);
EXPECT_TRUE(missionList != nullptr);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->AddCallerRecord(caller->GetToken(), -1);
missionList->AddMissionToTop(mission);
curListManager->MoveMissionListToTop(missionList);
@@ -433,8 +423,7 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_005, TestSize.Level1)
auto missionLauncher =
std::make_shared<Mission>(MOCK_MISSION_ID, launcher, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(missionLauncher != nullptr);
launcher->SetMission(missionLauncher);
launcher->SetMissionList(lauList);
launcher->SetMissionId(missionLauncher->GetMissionId());
launcher->SetLauncherRoot();
lauList->AddMissionToTop(missionLauncher);
EXPECT_TRUE(lauList->GetAbilityRecordByToken(launcher->GetToken()) != nullptr);
@@ -452,12 +441,11 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_005, TestSize.Level1)
auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest);
EXPECT_TRUE(launcher != nullptr);
auto mission =
std::make_shared<Mission>(MOCK_MISSION_ID, abilityRecord, abilityRequest.abilityInfo.bundleName);
std::make_shared<Mission>(MOCK_MISSION_ID + 1, abilityRecord, abilityRequest.abilityInfo.bundleName);
auto missionList = std::make_shared<MissionList>(MissionListType::CURRENT);
EXPECT_TRUE(mission != nullptr);
EXPECT_TRUE(missionList != nullptr);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->AddCallerRecord(caller->GetToken(), -1);
missionList->AddMissionToTop(mission);
curListManager->MoveMissionListToTop(missionList);
@@ -502,8 +490,7 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_006, TestSize.Level1)
auto missionLauncher =
std::make_shared<Mission>(MOCK_MISSION_ID, launcher, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(missionLauncher != nullptr);
launcher->SetMission(missionLauncher);
launcher->SetMissionList(lauList);
launcher->SetMissionId(missionLauncher->GetMissionId());
launcher->SetLauncherRoot();
lauList->AddMissionToTop(missionLauncher);
EXPECT_TRUE(lauList->GetAbilityRecordByToken(launcher->GetToken()) != nullptr);
@@ -519,12 +506,11 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_006, TestSize.Level1)
auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest);
EXPECT_TRUE(launcher != nullptr);
auto mission =
std::make_shared<Mission>(MOCK_MISSION_ID, abilityRecord, abilityRequest.abilityInfo.bundleName);
std::make_shared<Mission>(MOCK_MISSION_ID + 1, abilityRecord, abilityRequest.abilityInfo.bundleName);
auto missionList = std::make_shared<MissionList>(MissionListType::CURRENT);
EXPECT_TRUE(mission != nullptr);
EXPECT_TRUE(missionList != nullptr);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->AddCallerRecord(caller->GetToken(), -1);
missionList->AddMissionToTop(mission);
curListManager->MoveMissionListToTop(missionList);
@@ -569,8 +555,7 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_007, TestSize.Level1)
auto missionLauncher =
std::make_shared<Mission>(MOCK_MISSION_ID, launcher, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(missionLauncher != nullptr);
launcher->SetMission(missionLauncher);
launcher->SetMissionList(lauList);
launcher->SetMissionId(missionLauncher->GetMissionId());
launcher->SetLauncherRoot();
lauList->AddMissionToTop(missionLauncher);
EXPECT_TRUE(lauList->GetAbilityRecordByToken(launcher->GetToken()) != nullptr);
@@ -588,12 +573,11 @@ HWTEST_F(AbilityTimeoutTest, HandleLoadTimeOut_007, TestSize.Level1)
auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest);
EXPECT_TRUE(launcher != nullptr);
auto mission =
std::make_shared<Mission>(MOCK_MISSION_ID, abilityRecord, abilityRequest.abilityInfo.bundleName);
std::make_shared<Mission>(MOCK_MISSION_ID + 1, abilityRecord, abilityRequest.abilityInfo.bundleName);
auto missionList = std::make_shared<MissionList>(MissionListType::CURRENT);
EXPECT_TRUE(mission != nullptr);
EXPECT_TRUE(missionList != nullptr);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->AddCallerRecord(caller->GetToken(), -1);
missionList->AddMissionToTop(mission);
curListManager->MoveMissionListToTop(missionList);
@@ -638,8 +622,7 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_001, TestSize.Level1)
auto missionLauncher =
std::make_shared<Mission>(MOCK_MISSION_ID, launcher, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(missionLauncher != nullptr);
launcher->SetMission(missionLauncher);
launcher->SetMissionList(lauList);
launcher->SetMissionId(missionLauncher->GetMissionId());
launcher->SetLauncherRoot();
lauList->AddMissionToTop(missionLauncher);
EXPECT_TRUE(lauList->GetAbilityRecordByToken(launcher->GetToken()) != nullptr);
@@ -684,8 +667,7 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_002, TestSize.Level1)
auto missionLauncher =
std::make_shared<Mission>(MOCK_MISSION_ID, launcher, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(missionLauncher != nullptr);
launcher->SetMission(missionLauncher);
launcher->SetMissionList(lauList);
launcher->SetMissionId(missionLauncher->GetMissionId());
launcher->SetLauncherRoot();
lauList->AddMissionToTop(missionLauncher);
EXPECT_TRUE(lauList->GetAbilityRecordByToken(launcher->GetToken()) != nullptr);
@@ -695,10 +677,9 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_002, TestSize.Level1)
auto commonLauncher = AbilityRecord::CreateAbilityRecord(abilityRequest);
EXPECT_TRUE(commonLauncher != nullptr);
auto commonMissionLauncher =
std::make_shared<Mission>(MOCK_MISSION_ID, commonLauncher, abilityRequest.abilityInfo.bundleName);
std::make_shared<Mission>(MOCK_MISSION_ID + 1, commonLauncher, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(commonMissionLauncher != nullptr);
commonLauncher->SetMission(commonMissionLauncher);
commonLauncher->SetMissionList(lauList);
commonLauncher->SetMissionId(commonMissionLauncher->GetMissionId());
lauList->AddMissionToTop(commonMissionLauncher);
commonLauncher->SetAbilityState(AbilityState::FOREGROUNDING);
EXPECT_TRUE(lauList->GetAbilityRecordByToken(commonLauncher->GetToken()) != nullptr);
@@ -741,8 +722,7 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_003, TestSize.Level1)
auto missionLauncher =
std::make_shared<Mission>(MOCK_MISSION_ID, launcher, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(missionLauncher != nullptr);
launcher->SetMission(missionLauncher);
launcher->SetMissionList(lauList);
launcher->SetMissionId(missionLauncher->GetMissionId());
launcher->SetLauncherRoot();
lauList->AddMissionToTop(missionLauncher);
EXPECT_TRUE(lauList->GetAbilityRecordByToken(launcher->GetToken()) != nullptr);
@@ -754,9 +734,8 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_003, TestSize.Level1)
std::make_shared<Mission>(MOCK_MISSION_ID + 1, caller, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(caller != nullptr);
EXPECT_TRUE(callerMission != nullptr);
caller->SetMission(callerMission);
caller->SetMissionId(callerMission->GetMissionId());
auto missionList = std::make_shared<MissionList>(MissionListType::CURRENT);
caller->SetMissionList(missionList);
missionList->AddMissionToTop(callerMission);
curListManager->MoveMissionListToTop(missionList);
EXPECT_TRUE(curListManager->GetAbilityRecordByToken(caller->GetToken()) != nullptr);
@@ -767,7 +746,7 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_003, TestSize.Level1)
auto commonMissionLauncher =
std::make_shared<Mission>(MOCK_MISSION_ID + 2, commonLauncher, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(commonMissionLauncher != nullptr);
commonLauncher->SetMission(commonMissionLauncher);
commonLauncher->SetMissionId(commonMissionLauncher->GetMissionId());
commonLauncher->AddCallerRecord(caller->GetToken(), -1);
missionList->AddMissionToTop(commonMissionLauncher);
curListManager->MoveMissionListToTop(missionList);
@@ -812,8 +791,7 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_004, TestSize.Level1)
auto missionLauncher =
std::make_shared<Mission>(MOCK_MISSION_ID, launcher, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(missionLauncher != nullptr);
launcher->SetMission(missionLauncher);
launcher->SetMissionList(lauList);
launcher->SetMissionId(missionLauncher->GetMissionId());
launcher->SetLauncherRoot();
lauList->AddMissionToTop(missionLauncher);
EXPECT_TRUE(lauList->GetAbilityRecordByToken(launcher->GetToken()) != nullptr);
@@ -830,11 +808,10 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_004, TestSize.Level1)
auto commonLauncher = AbilityRecord::CreateAbilityRecord(abilityRequest);
EXPECT_TRUE(commonLauncher != nullptr);
auto commonMissionLauncher =
std::make_shared<Mission>(MOCK_MISSION_ID, commonLauncher, abilityRequest.abilityInfo.bundleName);
std::make_shared<Mission>(MOCK_MISSION_ID + 1, commonLauncher, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(commonMissionLauncher != nullptr);
auto missionList = std::make_shared<MissionList>(MissionListType::CURRENT);
commonLauncher->SetMissionList(missionList);
commonLauncher->SetMission(commonMissionLauncher);
commonLauncher->SetMissionId(commonMissionLauncher->GetMissionId());
commonLauncher->AddCallerRecord(caller->GetToken(), -1);
missionList->AddMissionToTop(commonMissionLauncher);
curListManager->MoveMissionListToTop(missionList);
@@ -881,8 +858,7 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_005, TestSize.Level1)
auto missionLauncher =
std::make_shared<Mission>(MOCK_MISSION_ID, launcher, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(missionLauncher != nullptr);
launcher->SetMission(missionLauncher);
launcher->SetMissionList(lauList);
launcher->SetMissionId(missionLauncher->GetMissionId());
launcher->SetLauncherRoot();
lauList->AddMissionToTop(missionLauncher);
EXPECT_TRUE(lauList->GetAbilityRecordByToken(launcher->GetToken()) != nullptr);
@@ -900,11 +876,10 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_005, TestSize.Level1)
auto commonLauncher = AbilityRecord::CreateAbilityRecord(abilityRequest);
EXPECT_TRUE(commonLauncher != nullptr);
auto commonMissionLauncher =
std::make_shared<Mission>(MOCK_MISSION_ID, commonLauncher, abilityRequest.abilityInfo.bundleName);
std::make_shared<Mission>(MOCK_MISSION_ID + 1, commonLauncher, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(commonMissionLauncher != nullptr);
auto missionList = std::make_shared<MissionList>(MissionListType::CURRENT);
commonLauncher->SetMissionList(missionList);
commonLauncher->SetMission(commonMissionLauncher);
commonLauncher->SetMissionId(commonMissionLauncher->GetMissionId());
commonLauncher->AddCallerRecord(caller->GetToken(), -1);
missionList->AddMissionToTop(commonMissionLauncher);
curListManager->MoveMissionListToTop(missionList);
@@ -951,8 +926,7 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_006, TestSize.Level1)
auto missionLauncher =
std::make_shared<Mission>(MOCK_MISSION_ID, launcher, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(missionLauncher != nullptr);
launcher->SetMission(missionLauncher);
launcher->SetMissionList(lauList);
launcher->SetMissionId(missionLauncher->GetMissionId());
launcher->SetLauncherRoot();
lauList->AddMissionToTop(missionLauncher);
EXPECT_TRUE(lauList->GetAbilityRecordByToken(launcher->GetToken()) != nullptr);
@@ -973,8 +947,7 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_006, TestSize.Level1)
std::make_shared<Mission>(MOCK_MISSION_ID, commonAbility, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(commonMissionLauncher != nullptr);
auto missionList = std::make_shared<MissionList>(MissionListType::CURRENT);
commonAbility->SetMissionList(missionList);
commonAbility->SetMission(commonMissionLauncher);
commonAbility->SetMissionId(commonMissionLauncher->GetMissionId());
commonAbility->AddCallerRecord(caller->GetToken(), -1);
missionList->AddMissionToTop(commonMissionLauncher);
curListManager->MoveMissionListToTop(missionList);
@@ -1021,8 +994,7 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_007, TestSize.Level1)
auto missionLauncher =
std::make_shared<Mission>(MOCK_MISSION_ID, launcher, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(missionLauncher != nullptr);
launcher->SetMission(missionLauncher);
launcher->SetMissionList(lauList);
launcher->SetMissionId(missionLauncher->GetMissionId());
launcher->SetLauncherRoot();
lauList->AddMissionToTop(missionLauncher);
EXPECT_TRUE(lauList->GetAbilityRecordByToken(launcher->GetToken()) != nullptr);
@@ -1032,11 +1004,10 @@ HWTEST_F(AbilityTimeoutTest, HandleForgroundNewTimeout_007, TestSize.Level1)
auto commonLauncher = AbilityRecord::CreateAbilityRecord(abilityRequest);
EXPECT_TRUE(commonLauncher != nullptr);
auto commonMissionLauncher =
std::make_shared<Mission>(MOCK_MISSION_ID, commonLauncher, abilityRequest.abilityInfo.bundleName);
std::make_shared<Mission>(MOCK_MISSION_ID + 1, commonLauncher, abilityRequest.abilityInfo.bundleName);
EXPECT_TRUE(commonMissionLauncher != nullptr);
auto missionList = std::make_shared<MissionList>(MissionListType::CURRENT);
commonLauncher->SetMissionList(missionList);
commonLauncher->SetMission(commonMissionLauncher);
commonLauncher->SetMissionId(commonMissionLauncher->GetMissionId());
missionList->AddMissionToTop(commonMissionLauncher);
curListManager->MoveMissionListToTop(missionList);
commonLauncher->SetAbilityState(AbilityState::FOREGROUNDING);
test/unittest/mission_list_manager_test/mission_list_manager_test.cpp
+103 -60
View File
@@ -2056,7 +2056,7 @@ HWTEST_F(MissionListManagerTest, CompleteForegroundSuccess_001, TestSize.Level1)
abilityRecord->pendingState_ = AbilityState::BACKGROUND;
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord, "missionName");
mission->SetMovingState(true);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
DelayedSingleton<MissionInfoMgr>::GetInstance()->missionIdMap_[1] = true;
InnerMissionInfo info;
info.missionInfo.id = 1;
@@ -2086,7 +2086,7 @@ HWTEST_F(MissionListManagerTest, CompleteForegroundSuccess_002, TestSize.Level1)
abilityRecord->pendingState_ = AbilityState::FOREGROUND;
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord, "missionName");
mission->SetMovingState(true);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
DelayedSingleton<MissionInfoMgr>::GetInstance()->missionIdMap_.clear();
InnerMissionInfo info;
info.missionInfo.id = 1;
@@ -2117,7 +2117,7 @@ HWTEST_F(MissionListManagerTest, CompleteForegroundSuccess_003, TestSize.Level1)
abilityRecord->pendingState_ = AbilityState::ACTIVE;
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord, "missionName");
mission->SetMovingState(true);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
DelayedSingleton<MissionInfoMgr>::GetInstance()->missionIdMap_.clear();
InnerMissionInfo info;
info.missionInfo.id = 1;
@@ -2146,7 +2146,6 @@ HWTEST_F(MissionListManagerTest, CompleteForegroundSuccess_004, TestSize.Level1)
abilityRecord->SetStartToForeground(true);
abilityRecord->isReady_ = false;
abilityRecord->pendingState_ = AbilityState::ACTIVE;
abilityRecord->SetMission(nullptr);
DelayedSingleton<MissionInfoMgr>::GetInstance()->missionIdMap_.clear();
InnerMissionInfo info;
info.missionInfo.id = 1;
@@ -2177,7 +2176,7 @@ HWTEST_F(MissionListManagerTest, CompleteForegroundSuccess_005, TestSize.Level1)
abilityRecord->pendingState_ = AbilityState::ACTIVE;
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord, "missionName");
mission->SetMovingState(false);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
DelayedSingleton<MissionInfoMgr>::GetInstance()->missionIdMap_.clear();
InnerMissionInfo info;
info.missionInfo.id = 1;
@@ -2434,6 +2433,7 @@ HWTEST_F(MissionListManagerTest, MoveAbilityToBackground_001, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
abilityRecord->SetAbilityState(AbilityState::BACKGROUND);
int res = missionListManager->MoveAbilityToBackground(abilityRecord);
@@ -2453,6 +2453,7 @@ HWTEST_F(MissionListManagerTest, MoveAbilityToBackground_002, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
abilityRecord->SetAbilityState(AbilityState::FOREGROUND);
int res = missionListManager->MoveAbilityToBackground(abilityRecord);
@@ -2472,6 +2473,7 @@ HWTEST_F(MissionListManagerTest, RemoveBackgroundingAbility_001, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
EXPECT_NE(abilityRecord, nullptr);
missionListManager->RemoveBackgroundingAbility(abilityRecord);
@@ -2490,13 +2492,14 @@ HWTEST_F(MissionListManagerTest, RemoveBackgroundingAbility_002, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
EXPECT_NE(abilityRecord, nullptr);
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord, "missionName");
missionList->missions_.push_back(mission);
missionListManager->defaultSingleList_ = std::make_shared<MissionList>();
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAbilityState(AbilityState::BACKGROUND);
missionListManager->RemoveBackgroundingAbility(abilityRecord);
missionListManager.reset();
@@ -2514,6 +2517,7 @@ HWTEST_F(MissionListManagerTest, RemoveBackgroundingAbility_003, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
EXPECT_NE(abilityRecord, nullptr);
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
@@ -2521,7 +2525,7 @@ HWTEST_F(MissionListManagerTest, RemoveBackgroundingAbility_003, TestSize.Level1
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord, "missionName");
missionList->missions_.push_back(mission);
missionListManager->defaultSingleList_ = std::make_shared<MissionList>();
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAbilityState(AbilityState::FOREGROUNDING);
missionListManager->RemoveBackgroundingAbility(abilityRecord);
missionListManager.reset();
@@ -2539,6 +2543,7 @@ HWTEST_F(MissionListManagerTest, RemoveBackgroundingAbility_004, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<AbilityRecord> abilityRecord2 = InitAbilityRecord();
EXPECT_NE(abilityRecord, nullptr);
@@ -2548,7 +2553,7 @@ HWTEST_F(MissionListManagerTest, RemoveBackgroundingAbility_004, TestSize.Level1
missionList->missions_.push_back(mission);
missionList->missions_.push_back(mission2);
missionListManager->defaultSingleList_ = std::make_shared<MissionList>();
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAbilityState(AbilityState::FOREGROUND);
missionListManager->RemoveBackgroundingAbility(abilityRecord);
missionListManager.reset();
@@ -2566,6 +2571,7 @@ HWTEST_F(MissionListManagerTest, RemoveBackgroundingAbility_005, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<AbilityRecord> abilityRecord2 = InitAbilityRecord();
EXPECT_NE(abilityRecord, nullptr);
@@ -2578,7 +2584,7 @@ HWTEST_F(MissionListManagerTest, RemoveBackgroundingAbility_005, TestSize.Level1
missionList->missions_.push_back(mission);
missionList->missions_.push_back(mission2);
missionListManager->defaultSingleList_ = std::make_shared<MissionList>();
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAbilityState(AbilityState::FOREGROUNDING);
missionListManager->launcherList_ = missionList;
missionListManager->RemoveBackgroundingAbility(abilityRecord);
@@ -2597,6 +2603,7 @@ HWTEST_F(MissionListManagerTest, RemoveBackgroundingAbility_006, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<AbilityRecord> abilityRecord2 = InitAbilityRecord();
EXPECT_NE(abilityRecord, nullptr);
@@ -2612,7 +2619,7 @@ HWTEST_F(MissionListManagerTest, RemoveBackgroundingAbility_006, TestSize.Level1
missionList->missions_.push_back(mission);
missionList->missions_.push_back(mission2);
missionListManager->defaultSingleList_ = std::make_shared<MissionList>();
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAbilityState(AbilityState::FOREGROUNDING);
missionListManager->launcherList_ = missionList;
missionListManager->RemoveBackgroundingAbility(abilityRecord);
@@ -2631,6 +2638,7 @@ HWTEST_F(MissionListManagerTest, RemoveBackgroundingAbility_007, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<AbilityRecord> abilityRecord2 = InitAbilityRecord();
EXPECT_NE(abilityRecord, nullptr);
@@ -2646,7 +2654,7 @@ HWTEST_F(MissionListManagerTest, RemoveBackgroundingAbility_007, TestSize.Level1
missionList->missions_.push_back(mission);
missionList->missions_.push_back(mission2);
missionListManager->defaultSingleList_ = std::make_shared<MissionList>();
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAbilityState(AbilityState::FOREGROUNDING);
missionListManager->launcherList_ = missionList;
missionListManager->RemoveBackgroundingAbility(abilityRecord);
@@ -2665,6 +2673,7 @@ HWTEST_F(MissionListManagerTest, RemoveBackgroundingAbility_008, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<AbilityRecord> abilityRecord2 = InitAbilityRecord();
EXPECT_NE(abilityRecord, nullptr);
@@ -2680,7 +2689,7 @@ HWTEST_F(MissionListManagerTest, RemoveBackgroundingAbility_008, TestSize.Level1
missionList->missions_.push_back(mission);
missionList->missions_.push_back(mission2);
missionListManager->defaultSingleList_ = std::make_shared<MissionList>();
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAbilityState(AbilityState::FOREGROUNDING);
missionListManager->launcherList_ = missionList;
missionListManager->RemoveBackgroundingAbility(abilityRecord);
@@ -2699,6 +2708,7 @@ HWTEST_F(MissionListManagerTest, RemoveBackgroundingAbility_009, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<AbilityRecord> abilityRecord2 = InitAbilityRecord();
EXPECT_NE(abilityRecord, nullptr);
@@ -2714,7 +2724,7 @@ HWTEST_F(MissionListManagerTest, RemoveBackgroundingAbility_009, TestSize.Level1
missionList->missions_.push_back(mission);
missionList->missions_.push_back(mission2);
missionListManager->defaultSingleList_ = std::make_shared<MissionList>();
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAbilityState(AbilityState::FOREGROUNDING);
missionListManager->launcherList_ = missionList;
missionListManager->RemoveBackgroundingAbility(abilityRecord);
@@ -2733,6 +2743,7 @@ HWTEST_F(MissionListManagerTest, TerminateAbility_001, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
abilityRecord->SetTerminatingState();
abilityRecord->SetAbilityState(AbilityState::BACKGROUND);
@@ -2756,6 +2767,7 @@ HWTEST_F(MissionListManagerTest, TerminateAbility_002, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
abilityRecord->SetTerminatingState();
abilityRecord->SetAbilityState(AbilityState::FOREGROUND);
@@ -2784,6 +2796,7 @@ HWTEST_F(MissionListManagerTest, TerminateAbility_003, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
abilityRecord->isTerminating_ = false;
abilityRecord->SetAbilityState(AbilityState::BACKGROUND);
@@ -2808,6 +2821,7 @@ HWTEST_F(MissionListManagerTest, RemoveTerminatingAbility_001, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
bool flag = true;
missionListManager->terminateAbilityList_.push_back(abilityRecord);
@@ -2827,10 +2841,9 @@ HWTEST_F(MissionListManagerTest, RemoveTerminatingAbility_002, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
bool flag = true;
abilityRecord->SetMissionList(missionList);
abilityRecord->SetAbilityState(AbilityState::BACKGROUND);
missionListManager->terminateAbilityList_.clear();
missionListManager->RemoveTerminatingAbility(abilityRecord, flag);
@@ -2849,13 +2862,14 @@ HWTEST_F(MissionListManagerTest, RemoveTerminatingAbility_003, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<AbilityRecord> abilityRecord2 = InitAbilityRecord();
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord2, "missionName");
bool flag = false;
missionList->missions_.push_back(mission);
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAbilityState(AbilityState::FOREGROUND);
missionListManager->terminateAbilityList_.clear();
missionListManager->RemoveTerminatingAbility(abilityRecord, flag);
@@ -2874,11 +2888,9 @@ HWTEST_F(MissionListManagerTest, RemoveTerminatingAbility_004, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
bool flag = true;
missionList->missions_.clear();
abilityRecord->SetMissionList(missionList);
abilityRecord->SetAbilityState(AbilityState::FOREGROUNDING);
missionListManager->terminateAbilityList_.clear();
missionListManager->RemoveTerminatingAbility(abilityRecord, flag);
@@ -2897,6 +2909,7 @@ HWTEST_F(MissionListManagerTest, RemoveTerminatingAbility_005, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<AbilityRecord> abilityRecord2 = InitAbilityRecord();
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
@@ -2906,7 +2919,7 @@ HWTEST_F(MissionListManagerTest, RemoveTerminatingAbility_005, TestSize.Level1)
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord2, "missionName");
bool flag = true;
missionList->missions_.push_back(mission);
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAbilityState(AbilityState::FOREGROUNDING);
missionListManager->terminateAbilityList_.clear();
missionListManager->launcherList_ = missionList;
@@ -2926,6 +2939,7 @@ HWTEST_F(MissionListManagerTest, RemoveTerminatingAbility_006, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<AbilityRecord> abilityRecord2 = InitAbilityRecord();
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
@@ -2938,7 +2952,7 @@ HWTEST_F(MissionListManagerTest, RemoveTerminatingAbility_006, TestSize.Level1)
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord2, "missionName");
bool flag = true;
missionList->missions_.push_back(mission);
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAbilityState(AbilityState::FOREGROUNDING);
missionListManager->terminateAbilityList_.clear();
missionListManager->launcherList_ = missionList;
@@ -2958,6 +2972,7 @@ HWTEST_F(MissionListManagerTest, RemoveTerminatingAbility_007, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<AbilityRecord> abilityRecord2 = InitAbilityRecord();
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
@@ -2970,7 +2985,7 @@ HWTEST_F(MissionListManagerTest, RemoveTerminatingAbility_007, TestSize.Level1)
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord2, "missionName");
bool flag = true;
missionList->missions_.push_back(mission);
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAbilityState(AbilityState::FOREGROUNDING);
missionListManager->terminateAbilityList_.clear();
missionListManager->launcherList_ = missionList;
@@ -2990,6 +3005,7 @@ HWTEST_F(MissionListManagerTest, RemoveTerminatingAbility_008, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<AbilityRecord> abilityRecord2 = InitAbilityRecord();
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
@@ -3002,7 +3018,7 @@ HWTEST_F(MissionListManagerTest, RemoveTerminatingAbility_008, TestSize.Level1)
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord2, "missionName");
bool flag = true;
missionList->missions_.push_back(mission);
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAbilityState(AbilityState::FOREGROUNDING);
missionListManager->terminateAbilityList_.clear();
missionListManager->launcherList_ = missionList;
@@ -3022,6 +3038,7 @@ HWTEST_F(MissionListManagerTest, RemoveTerminatingAbility_009, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<AbilityRecord> abilityRecord2 = InitAbilityRecord();
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
@@ -3034,7 +3051,7 @@ HWTEST_F(MissionListManagerTest, RemoveTerminatingAbility_009, TestSize.Level1)
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord2, "missionName");
bool flag = true;
missionList->missions_.push_back(mission);
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAbilityState(AbilityState::FOREGROUNDING);
missionListManager->terminateAbilityList_.clear();
missionListManager->launcherList_ = missionList;
@@ -3475,6 +3492,7 @@ HWTEST_F(MissionListManagerTest, ClearMissionLocked_003, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
abilityRecord->isTerminating_ = false;
abilityRecord->currentState_ = AbilityState::ACTIVE;
@@ -3497,6 +3515,7 @@ HWTEST_F(MissionListManagerTest, SetMissionLockedState_001, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
int missionId = -1;
bool lockedState = true;
int res = missionListManager->SetMissionLockedState(missionId, lockedState);
@@ -3653,7 +3672,7 @@ HWTEST_F(MissionListManagerTest, NotifyMissionCreated_001, TestSize.Level1)
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, nullptr);
mission->needNotify_ = true;
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->abilityInfo_.excludeFromMissions = false;
missionListManager->NotifyMissionCreated(abilityRecord);
missionListManager.reset();
@@ -3675,7 +3694,7 @@ HWTEST_F(MissionListManagerTest, NotifyMissionCreated_002, TestSize.Level1)
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, nullptr);
mission->needNotify_ = true;
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->abilityInfo_.excludeFromMissions = true;
missionListManager->NotifyMissionCreated(abilityRecord);
missionListManager.reset();
@@ -3693,11 +3712,12 @@ HWTEST_F(MissionListManagerTest, NotifyMissionCreated_003, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
missionListManager->listenerController_ = nullptr;
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, nullptr);
mission->needNotify_ = true;
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->abilityInfo_.excludeFromMissions = true;
missionListManager->NotifyMissionCreated(abilityRecord);
missionListManager.reset();
@@ -3715,11 +3735,12 @@ HWTEST_F(MissionListManagerTest, NotifyMissionCreated_004, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
missionListManager->listenerController_ = nullptr;
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, nullptr);
mission->needNotify_ = false;
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->abilityInfo_.excludeFromMissions = true;
missionListManager->NotifyMissionCreated(abilityRecord);
missionListManager.reset();
@@ -3737,9 +3758,9 @@ HWTEST_F(MissionListManagerTest, NotifyMissionCreated_005, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
missionListManager->listenerController_ = nullptr;
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
abilityRecord->SetMission(nullptr);
abilityRecord->abilityInfo_.excludeFromMissions = true;
missionListManager->NotifyMissionCreated(abilityRecord);
missionListManager.reset();
@@ -4070,6 +4091,7 @@ HWTEST_F(MissionListManagerTest, HandleLoadTimeout_002, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
abilityRecord->SetAbilityState(AbilityState::BACKGROUND);
missionListManager->HandleLoadTimeout(abilityRecord);
@@ -4104,6 +4126,7 @@ HWTEST_F(MissionListManagerTest, CompleteForegroundFailed_002, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
missionListManager->CompleteForegroundFailed(abilityRecord, OHOS::AAFwk::AbilityState::FOREGROUND_WINDOW_FREEZED);
missionListManager.reset();
@@ -4121,6 +4144,7 @@ HWTEST_F(MissionListManagerTest, CompleteForegroundFailed_003, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
abilityRecord->SetStartingWindow(true);
missionListManager->CompleteForegroundFailed(abilityRecord, OHOS::AAFwk::AbilityState::FOREGROUND_FAILED);
@@ -4171,8 +4195,8 @@ HWTEST_F(MissionListManagerTest, MoveToTerminateList_002, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
abilityRecord->SetMissionList(nullptr);
missionListManager->MoveToTerminateList(abilityRecord);
missionListManager.reset();
}
@@ -4189,10 +4213,8 @@ HWTEST_F(MissionListManagerTest, MoveToTerminateList_003, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMission(nullptr);
missionListManager->MoveToTerminateList(abilityRecord);
missionListManager.reset();
}
@@ -4209,11 +4231,11 @@ HWTEST_F(MissionListManagerTest, MoveToTerminateList_004, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>(MissionListType::DEFAULT_STANDARD);
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord);
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAbilityState(AbilityState::INITIAL);
DelayedSingleton<MissionInfoMgr>::GetInstance()->missionIdMap_[1] = true;
InnerMissionInfo info;
@@ -4240,8 +4262,7 @@ HWTEST_F(MissionListManagerTest, MoveToTerminateList_005, TestSize.Level1)
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>(MissionListType::DEFAULT_STANDARD);
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord);
abilityRecord->SetMissionList(missionList);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAbilityState(AbilityState::INITIAL);
DelayedSingleton<MissionInfoMgr>::GetInstance()->missionIdMap_[1] = true;
InnerMissionInfo info;
@@ -4555,9 +4576,9 @@ HWTEST_F(MissionListManagerTest, GetMissionIdByAbilityToken_002, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
sptr<IRemoteObject> token = abilityRecord->GetToken();
abilityRecord->SetMission(nullptr);
missionListManager->terminateAbilityList_.push_back(abilityRecord);
int res = missionListManager->GetMissionIdByAbilityToken(token);
EXPECT_EQ(res, -1);
@@ -4576,13 +4597,14 @@ HWTEST_F(MissionListManagerTest, GetMissionIdByAbilityToken_003, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord);
sptr<IRemoteObject> token = abilityRecord->GetToken();
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
missionListManager->terminateAbilityList_.push_back(abilityRecord);
int res = missionListManager->GetMissionIdByAbilityToken(token);
EXPECT_EQ(res, 1);
EXPECT_EQ(res, -1);
missionListManager.reset();
}
@@ -4598,6 +4620,7 @@ HWTEST_F(MissionListManagerTest, GetAbilityTokenByMissionId_001, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
int missionId = 1;
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord);
@@ -4621,6 +4644,7 @@ HWTEST_F(MissionListManagerTest, GetAbilityTokenByMissionId_002, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
int missionId = 1;
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord);
@@ -4663,6 +4687,7 @@ HWTEST_F(MissionListManagerTest, HandleAbilityDied_002, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
abilityRecord->abilityInfo_.type = AbilityType::PAGE;
abilityRecord->isLauncherAbility_ = true;
@@ -4682,12 +4707,13 @@ HWTEST_F(MissionListManagerTest, HandleLauncherDied_001, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord);
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
std::shared_ptr<MissionList> launcherList = std::make_shared<MissionList>();
mission->SetMissionList(missionList);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
missionListManager->launcherList_ = launcherList;
missionListManager->HandleLauncherDied(abilityRecord);
missionListManager.reset();
@@ -4705,11 +4731,12 @@ HWTEST_F(MissionListManagerTest, HandleLauncherDied_002, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord);
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
mission->SetMissionList(missionList);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetLauncherRoot();
abilityRecord->SetAbilityState(AbilityState::FOREGROUND);
missionListManager->launcherList_ = missionList;
@@ -4729,11 +4756,12 @@ HWTEST_F(MissionListManagerTest, HandleLauncherDied_003, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord);
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
mission->SetMissionList(missionList);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->isLauncherRoot_ = false;
abilityRecord->SetAbilityState(AbilityState::BACKGROUND);
missionListManager->launcherList_ = missionList;
@@ -4753,6 +4781,7 @@ HWTEST_F(MissionListManagerTest, HandleAbilityDiedByDefault_001, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
abilityRecord->SetTerminatingState();
missionListManager->HandleAbilityDiedByDefault(abilityRecord);
@@ -4771,6 +4800,7 @@ HWTEST_F(MissionListManagerTest, HandleAbilityDiedByDefault_002, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<AbilityRecord> abilityRecord2 = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord);
@@ -4780,7 +4810,7 @@ HWTEST_F(MissionListManagerTest, HandleAbilityDiedByDefault_002, TestSize.Level1
abilityRecord2->SetLauncherRoot();
mission->SetMissionList(missionList);
missionList2->missions_.push_back(mission);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAppIndex(1);
abilityRecord->SetAbilityState(AbilityState::FOREGROUND);
abilityRecord->isUninstall_ = false;
@@ -4802,12 +4832,13 @@ HWTEST_F(MissionListManagerTest, HandleAbilityDiedByDefault_003, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord);
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
std::shared_ptr<MissionList> missionList2 = std::make_shared<MissionList>();
mission->SetMissionList(missionList);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAppIndex(0);
abilityRecord->abilityInfo_.removeMissionAfterTerminate = true;
abilityRecord->SetAbilityState(AbilityState::BACKGROUND);
@@ -4830,12 +4861,13 @@ HWTEST_F(MissionListManagerTest, HandleAbilityDiedByDefault_004, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord);
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
std::shared_ptr<MissionList> missionList2 = std::make_shared<MissionList>();
mission->SetMissionList(missionList);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAppIndex(0);
abilityRecord->abilityInfo_.removeMissionAfterTerminate = false;
abilityRecord->abilityInfo_.excludeFromMissions = true;
@@ -4859,6 +4891,7 @@ HWTEST_F(MissionListManagerTest, HandleAbilityDiedByDefault_005, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord);
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
@@ -4868,7 +4901,7 @@ HWTEST_F(MissionListManagerTest, HandleAbilityDiedByDefault_005, TestSize.Level1
info.missionInfo.id = 1;
DelayedSingleton<MissionInfoMgr>::GetInstance()->missionInfoList_.push_back(info);
mission->SetMissionList(missionList);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->SetAppIndex(0);
abilityRecord->abilityInfo_.removeMissionAfterTerminate = false;
abilityRecord->abilityInfo_.excludeFromMissions = false;
@@ -4893,6 +4926,7 @@ HWTEST_F(MissionListManagerTest, BackToLauncher_001, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
missionListManager->launcherList_ = missionList;
missionListManager->BackToLauncher();
@@ -4911,9 +4945,9 @@ HWTEST_F(MissionListManagerTest, BackToLauncher_002, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
abilityRecord->SetLauncherRoot();
abilityRecord->SetMission(nullptr);
abilityRecord->abilityInfo_.bundleName = AbilityConfig::LAUNCHER_BUNDLE_NAME;
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord);
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
@@ -4935,10 +4969,11 @@ HWTEST_F(MissionListManagerTest, BackToLauncher_003, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord);
abilityRecord->SetLauncherRoot();
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->abilityInfo_.bundleName = AbilityConfig::LAUNCHER_BUNDLE_NAME;
std::shared_ptr<Mission> mission2 = std::make_shared<Mission>(2, abilityRecord);
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
@@ -4980,9 +5015,10 @@ HWTEST_F(MissionListManagerTest, SetMissionLabel_002, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(0, abilityRecord);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
sptr<IRemoteObject> token = abilityRecord->GetToken();
std::string label = "label";
missionListManager->terminateAbilityList_.push_back(abilityRecord);
@@ -5011,7 +5047,7 @@ HWTEST_F(MissionListManagerTest, SetMissionLabel_003, TestSize.Level1)
DelayedSingleton<MissionInfoMgr>::GetInstance()->Init(userId);
DelayedSingleton<MissionInfoMgr>::GetInstance()->missionInfoList_.push_back(info);
mission->needNotify_ = true;
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
sptr<IRemoteObject> token = abilityRecord->GetToken();
std::string label = "label";
missionListManager->terminateAbilityList_.push_back(abilityRecord);
@@ -5032,6 +5068,7 @@ HWTEST_F(MissionListManagerTest, SetMissionLabel_004, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
missionListManager->listenerController_ = nullptr;
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord);
@@ -5040,7 +5077,7 @@ HWTEST_F(MissionListManagerTest, SetMissionLabel_004, TestSize.Level1)
DelayedSingleton<MissionInfoMgr>::GetInstance()->Init(userId);
DelayedSingleton<MissionInfoMgr>::GetInstance()->missionInfoList_.push_back(info);
mission->needNotify_ = false;
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
sptr<IRemoteObject> token = abilityRecord->GetToken();
std::string label = "label";
missionListManager->terminateAbilityList_.push_back(abilityRecord);
@@ -5061,12 +5098,13 @@ HWTEST_F(MissionListManagerTest, SetMissionLabel_005, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
missionListManager->listenerController_ = nullptr;
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord);
DelayedSingleton<MissionInfoMgr>::GetInstance()->taskDataPersistenceMgr_ = nullptr;
mission->needNotify_ = false;
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
sptr<IRemoteObject> token = abilityRecord->GetToken();
std::string label = "label";
missionListManager->terminateAbilityList_.push_back(abilityRecord);
@@ -5105,10 +5143,11 @@ HWTEST_F(MissionListManagerTest, SetMissionIcon_002, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<Media::PixelMap> icon;
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(0, abilityRecord);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
sptr<IRemoteObject> token = abilityRecord->GetToken();
missionListManager->terminateAbilityList_.push_back(abilityRecord);
int res = missionListManager->SetMissionIcon(token, icon);
@@ -5128,14 +5167,15 @@ HWTEST_F(MissionListManagerTest, SetMissionIcon_003, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<Media::PixelMap> icon;
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
sptr<IRemoteObject> token = abilityRecord->GetToken();
missionListManager->terminateAbilityList_.push_back(abilityRecord);
int res = missionListManager->SetMissionIcon(token, icon);
EXPECT_EQ(res, 0);
EXPECT_EQ(res, -1);
missionListManager.reset();
}
@@ -5155,12 +5195,12 @@ HWTEST_F(MissionListManagerTest, SetMissionIcon_004, TestSize.Level1)
std::shared_ptr<Media::PixelMap> icon;
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
abilityRecord->abilityInfo_.excludeFromMissions = false;
sptr<IRemoteObject> token = abilityRecord->GetToken();
missionListManager->terminateAbilityList_.push_back(abilityRecord);
int res = missionListManager->SetMissionIcon(token, icon);
EXPECT_EQ(res, 0);
EXPECT_EQ(res, -1);
missionListManager.reset();
}
@@ -5192,6 +5232,7 @@ HWTEST_F(MissionListManagerTest, CompleteFirstFrameDrawing_002, TestSize.Level1)
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
sptr<IRemoteObject> abilityToken = abilityRecord->GetToken();
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
@@ -6057,9 +6098,10 @@ HWTEST_F(MissionListManagerTest, SetMissionANRStateByTokens_001, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::shared_ptr<Mission> mission = std::make_shared<Mission>(1, abilityRecord);
abilityRecord->SetMission(mission);
abilityRecord->SetMissionId(mission->GetMissionId());
std::vector<sptr<IRemoteObject>> tokens;
tokens.push_back(abilityRecord->GetToken());
missionListManager->terminateAbilityList_.push_back(abilityRecord);
@@ -6079,8 +6121,8 @@ HWTEST_F(MissionListManagerTest, SetMissionANRStateByTokens_002, TestSize.Level1
{
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
missionListManager->Init();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
abilityRecord->SetMission(nullptr);
std::vector<sptr<IRemoteObject>> tokens;
tokens.push_back(abilityRecord->GetToken());
missionListManager->terminateAbilityList_.push_back(abilityRecord);
@@ -6101,6 +6143,7 @@ HWTEST_F(MissionListManagerTest, SetMissionANRStateByTokens_003, TestSize.Level1
int userId = 3;
auto missionListManager = std::make_shared<MissionListManager>(userId);
EXPECT_NE(missionListManager, nullptr);
missionListManager->Init();
std::shared_ptr<MissionList> missionList = std::make_shared<MissionList>();
std::shared_ptr<AbilityRecord> abilityRecord = InitAbilityRecord();
std::vector<sptr<IRemoteObject>> tokens;