From a2e38fa667394791447cf635b09a1c239e7e5ef2 Mon Sep 17 00:00:00 2001 From: y00620503 Date: Thu, 13 Nov 2025 21:52:37 +0800 Subject: [PATCH] abilityrecord refactory Signed-off-by: y00620503 --- services/abilitymgr/abilitymgr.gni | 1 + .../include/ability_cache_manager.h | 48 +- .../include/ability_connect_manager.h | 184 ++++---- .../include/ability_manager_service.h | 8 +- services/abilitymgr/include/ability_record.h | 115 ----- .../ability_record/ability_record_utils.h | 1 + .../abilitymgr/include/connection_record.h | 12 +- .../extension_record/base_extension_record.h | 154 +++++++ .../extension_record/extension_record.h | 6 +- .../extension_record_manager.h | 12 +- .../ui_extension_record/ui_extension_record.h | 2 +- .../ui_extension_record_factory.h | 2 +- services/abilitymgr/libabilityms.map | 1 + .../abilitymgr/src/ability_cache_manager.cpp | 45 +- .../src/ability_connect_manager.cpp | 206 ++++----- .../src/ability_manager_service.cpp | 21 +- services/abilitymgr/src/ability_record.cpp | 290 ------------ services/abilitymgr/src/connection_record.cpp | 6 +- .../abilitymgr/src/connection_state_item.cpp | 2 +- .../base_extension_record.cpp | 355 +++++++++++++++ .../src/extension_record/extension_record.cpp | 2 +- .../extension_record_factory.cpp | 3 +- .../extension_record_manager.cpp | 16 +- .../ui_extension_record.cpp | 2 +- .../ui_extension_record_factory.cpp | 4 +- .../abilitycachemanagera_fuzzer.cpp | 16 +- .../abilityconnectmanager_fuzzer.cpp | 11 +- .../abilitymgrextensionrecord_fuzzer.cpp | 4 +- .../abilitymgruiextensionrecord_fuzzer.cpp | 2 +- .../abilitytransitiondone_fuzzer.cpp | 23 +- .../attachabilitythread_fuzzer.cpp | 23 +- .../connectionstatemanager_fuzzer.cpp | 19 +- .../extensionrecordmanager_fuzzer.cpp | 4 +- .../extensionrecordmanagera_fuzzer.cpp | 15 +- .../preloaduiextstateobserver_fuzzer.cpp | 4 +- .../schedulecommandabilitydone_fuzzer.cpp | 23 +- .../scheduleconnectabilitydone_fuzzer.cpp | 21 +- .../scheduledisconnectabilitydone_fuzzer.cpp | 20 +- .../uiextensionrecordfactory_fuzzer.cpp | 2 +- test/moduletest/BUILD.gn | 1 + .../ability_record_module_test.cpp | 132 ------ .../BUILD.gn | 111 +++++ .../extension_record_base_module_test.cpp | 303 +++++++++++++ test/unittest/BUILD.gn | 1 + .../ability_cache_manager_test.cpp | 152 +++---- .../ability_connect_manager_first_test.cpp | 99 +++-- .../ability_connect_manager_fourth_test.cpp | 107 +++-- .../ability_connect_manager_second_test.cpp | 17 +- .../ability_connect_manager_test.cpp | 234 +++++----- .../ability_manager_service_eighth_test.cpp | 2 +- .../abilitymgr.gni | 1 + .../BUILD.gn | 1 + ...bility_manager_service_fourteenth_test.cpp | 29 +- .../mock/src/mock_ability_record.cpp | 144 ------ .../BUILD.gn | 1 + .../abilitymgr.gni | 1 + .../ability_manager_service_tenth_test.cpp | 4 +- .../ability_manager_service_third_test.cpp | 15 +- .../abilitymgr.gni | 1 + .../BUILD.gn | 1 + .../mock/include/mock_my_status.h | 5 +- .../mock/src/mock_ability_connect_manager.cpp | 163 +++---- .../mock/src/mock_ability_record.cpp | 151 ------- .../ability_manager_service_twelfth_test.cpp | 9 +- .../ability_record_dump_test.cpp | 28 -- .../ability_record_second_test.cpp | 171 -------- .../ability_record_test.cpp | 138 ------ .../ability_record_test_call.cpp | 18 - .../app_exit_reason_helper_third_test.cpp | 2 +- .../connection_record_test.cpp | 6 +- .../connection_state_item_test.cpp | 70 +-- .../connection_state_manager_test.cpp | 6 +- .../extension_record_base_first_test/BUILD.gn | 99 +++++ .../extension_record_base_first_test.cpp | 411 ++++++++++++++++++ .../extension_record_test.cpp | 3 +- .../preload_uiext_state_observer_test.cpp | 12 +- .../extension_record_manager_second_test.cpp | 32 +- .../extension_record_manager_test.cpp | 65 +-- .../ui_extension_record_factory_test.cpp | 8 +- .../ui_extension_record_test.cpp | 12 +- 80 files changed, 2453 insertions(+), 1998 deletions(-) create mode 100644 services/abilitymgr/include/extension_record/base_extension_record.h create mode 100644 services/abilitymgr/src/extension_record/base_extension_record.cpp create mode 100644 test/moduletest/extension_record_base_module_test/BUILD.gn create mode 100644 test/moduletest/extension_record_base_module_test/extension_record_base_module_test.cpp create mode 100644 test/unittest/extension_record_base_first_test/BUILD.gn create mode 100644 test/unittest/extension_record_base_first_test/extension_record_base_first_test.cpp diff --git a/services/abilitymgr/abilitymgr.gni b/services/abilitymgr/abilitymgr.gni index afa1f7fb9c..0420cd9663 100644 --- a/services/abilitymgr/abilitymgr.gni +++ b/services/abilitymgr/abilitymgr.gni @@ -45,6 +45,7 @@ abilityms_files = [ "src/ecological_rule/ability_ecological_rule_mgr_service.cpp", "src/extension_config.cpp", "src/extension_running_info.cpp", + "src/extension_record/base_extension_record.cpp", "src/extension_record/extension_record_manager.cpp", "src/extension_record/extension_record.cpp", "src/extension_record/extension_record_factory.cpp", diff --git a/services/abilitymgr/include/ability_cache_manager.h b/services/abilitymgr/include/ability_cache_manager.h index fd017a4de0..80d32df299 100644 --- a/services/abilitymgr/include/ability_cache_manager.h +++ b/services/abilitymgr/include/ability_cache_manager.h @@ -23,7 +23,7 @@ #include "ability_config.h" #include "ability_info.h" -#include "ability_record.h" +#include "base_extension_record.h" namespace OHOS { namespace AAFwk { /** @@ -49,50 +49,50 @@ public: /** * Put a single ability record into ability cache manager. * @param abilityRecord the ability record to be putted into cache manager. - * @return AbilityRecord if one is eliminated, otherwise nullptr. + * @return BaseExtensionRecord if one is eliminated, otherwise nullptr. */ - std::shared_ptr Put(std::shared_ptr abilityRecord); + std::shared_ptr Put(std::shared_ptr abilityRecord); /** * Remove a single ability record from ability cache manager. * @param abilityRecord, the ability record to be removed into cache manager. */ - void Remove(std::shared_ptr abilityRecord); + void Remove(std::shared_ptr abilityRecord); /** * Get a single ability by abilityRequest record from ability cache manager, - * this will remove the AbilityRecord by default + * this will remove the BaseExtensionRecord by default * @param abilityRequest the ability request to be searched in cache manager. - * @return AbilityRecord if one is matched, otherwise nullptr. + * @return BaseExtensionRecord if one is matched, otherwise nullptr. */ - std::shared_ptr Get(const AbilityRequest &abilityRequest); + std::shared_ptr Get(const AbilityRequest &abilityRequest); /** * Get a single ability by token from ability cache manager. * @param token the ability token to be searched in cache manager. - * @return AbilityRecord if one is matched, otherwise nullptr. + * @return BaseExtensionRecord if one is matched, otherwise nullptr. */ - std::shared_ptr FindRecordByToken(const sptr &token); + std::shared_ptr FindRecordByToken(const sptr &token); /** * Get all the abilities of current ability cache manager. - * @return AbilityRecord list. + * @return BaseExtensionRecord list. */ - std::list> GetAbilityList(); + std::list> GetAbilityList(); /** * Get a single ability by sessionId from ability cache manager. * @param assertSessionId the ability assertSessionId to be searched in cache manager. - * @return AbilityRecord if one is matched, otherwise nullptr. + * @return BaseExtensionRecord if one is matched, otherwise nullptr. */ - std::shared_ptr FindRecordBySessionId(const std::string &assertSessionId); + std::shared_ptr FindRecordBySessionId(const std::string &assertSessionId); /** * Get a single ability by serviceKey from ability cache manager. * @param serviceKey the ability serviceKey to be searched in cache manager. - * @return AbilityRecord if one is matched, otherwise nullptr. + * @return BaseExtensionRecord if one is matched, otherwise nullptr. */ - std::shared_ptr FindRecordByServiceKey(const std::string &serviceKey); + std::shared_ptr FindRecordByServiceKey(const std::string &serviceKey); /** * Remove the launcher death recipient from ability cache manager. @@ -116,22 +116,22 @@ public: AbilityCacheManager(); ~AbilityCacheManager(); struct ProcRecordsInfo { - std::list> recList; + std::list> recList; uint32_t cnt; }; uint32_t devLruCapacity_ = 0; uint32_t procLruCapacity_ = 0; uint32_t devLruCnt_ = 0; std::map procLruMap_; - std::list> devRecLru_; - std::shared_ptr AddToProcLru(std::shared_ptr abilityRecord); - std::shared_ptr AddToDevLru(std::shared_ptr abilityRecord, - std::shared_ptr rec); + std::list> devRecLru_; + std::shared_ptr AddToProcLru(std::shared_ptr abilityRecord); + std::shared_ptr AddToDevLru(std::shared_ptr abilityRecord, + std::shared_ptr rec); std::mutex mutex_; - void RemoveAbilityRecInDevList(std::shared_ptr abilityRecord); - void RemoveAbilityRecInProcList(std::shared_ptr abilityRecord); - std::shared_ptr GetAbilityRecInProcList(const AbilityRequest &abilityRequest); - bool IsRecInfoSame(const AbilityRequest& abilityRequest, std::shared_ptr abilityRecord); + void RemoveAbilityRecInDevList(std::shared_ptr abilityRecord); + void RemoveAbilityRecInProcList(std::shared_ptr abilityRecord); + std::shared_ptr GetAbilityRecInProcList(const AbilityRequest &abilityRequest); + bool IsRecInfoSame(const AbilityRequest& abilityRequest, std::shared_ptr abilityRecord); DISALLOW_COPY_AND_MOVE(AbilityCacheManager); }; } // namespace AAFwk diff --git a/services/abilitymgr/include/ability_connect_manager.h b/services/abilitymgr/include/ability_connect_manager.h index cb0ca3bdc2..0c60901543 100644 --- a/services/abilitymgr/include/ability_connect_manager.h +++ b/services/abilitymgr/include/ability_connect_manager.h @@ -28,8 +28,8 @@ #include "ability_connect_callback_interface.h" #include "task_handler_wrap.h" #include "event_handler_wrap.h" -#include "ability_record.h" #include "ability_running_info.h" +#include "base_extension_record.h" #include "event_report.h" #include "extension_config.h" #include "extension_running_info.h" @@ -54,10 +54,10 @@ using UIExtensionSessionInfo = AbilityRuntime::UIExtensionSessionInfo; class AbilityConnectManager : public std::enable_shared_from_this { public: using ConnectMapType = std::map, std::list>>; - using ServiceMapType = std::map>; + using ServiceMapType = std::map>; using ConnectListType = std::list>; using RecipientMapType = std::map, sptr>; - using UIExtWindowMapValType = std::pair, sptr>; + using UIExtWindowMapValType = std::pair, sptr>; using UIExtensionMapType = std::map, UIExtWindowMapValType>; using WindowExtMapValType = std::pair>; using WindowExtensionMapType = std::map, WindowExtMapValType>; @@ -153,14 +153,14 @@ public: * @param hostBundleName, the caller application bundle name. * @return Returns ERR_OK on success, others on failure. */ - int UnloadUIExtensionAbility(const std::shared_ptr &abilityRecord, pid_t &hostPid); + int UnloadUIExtensionAbility(const std::shared_ptr &abilityRecord, pid_t &hostPid); /** * ClearPreloadUIExtensionRecord, clear preload uiextension record. * * @param abilityRecord, uiextension ability record. */ - void ClearPreloadUIExtensionRecord(const std::shared_ptr &abilityRecord); + void ClearPreloadUIExtensionRecord(const std::shared_ptr &abilityRecord); /** * DisconnectAbilityLocked, disconnect session with callback. @@ -255,13 +255,13 @@ public: * @param sessionToken, service ability's session token. * @return Returns AbilityRecord shared_ptr. */ - std::shared_ptr GetUIExtensionBySessionInfo(const sptr &sessionInfo); + std::shared_ptr GetUIExtensionBySessionInfo(const sptr &sessionInfo); - std::shared_ptr GetExtensionByTokenFromServiceMap(const sptr &token); - std::shared_ptr GetExtensionByTokenFromTerminatingMap(const sptr &token); - std::shared_ptr GetExtensionByIdFromServiceMap(const int64_t &abilityRecordId); - std::shared_ptr GetExtensionByIdFromTerminatingMap(const int64_t &abilityRecordId); - std::shared_ptr GetUIExtensionBySessionFromServiceMap(const sptr &sessionInfo); + std::shared_ptr GetExtensionByTokenFromServiceMap(const sptr &token); + std::shared_ptr GetExtensionByTokenFromTerminatingMap(const sptr &token); + std::shared_ptr GetExtensionByIdFromServiceMap(const int64_t &abilityRecordId); + std::shared_ptr GetExtensionByIdFromTerminatingMap(const int64_t &abilityRecordId); + std::shared_ptr GetUIExtensionBySessionFromServiceMap(const sptr &sessionInfo); ConnectListType GetConnectRecordListByCallback(sptr callback); void GetExtensionRunningInfos(int upperLimit, std::vector &info, @@ -269,7 +269,7 @@ public: void GetAbilityRunningInfos(std::vector &info, bool isPerm); - void GetExtensionRunningInfo(std::shared_ptr &abilityRecord, const int32_t userId, + void GetExtensionRunningInfo(std::shared_ptr &abilityRecord, const int32_t userId, std::vector &info); /** @@ -308,14 +308,14 @@ public: */ int32_t GetActiveUIExtensionList(const std::string &bundleName, std::vector &extensionList); - void OnLoadAbilityFailed(std::shared_ptr abilityRecord); + void OnLoadAbilityFailed(std::shared_ptr abilityRecord); /** * OnAbilityDied. * * @param abilityRecord, service ability record. */ - void OnAbilityDied(const std::shared_ptr &abilityRecord); + void OnAbilityDied(const std::shared_ptr abilityRecord); /** * DisconnectBeforeCleanup. @@ -337,9 +337,9 @@ public: * * @param abilityRecord the ability to move */ - void MoveToBackground(const std::shared_ptr &abilityRecord); + void MoveToBackground(const std::shared_ptr &abilityRecord); - void CommandAbilityWindow(const std::shared_ptr &abilityRecord, + void CommandAbilityWindow(const std::shared_ptr &abilityRecord, const sptr &sessionInfo, WindowCommand winCmd); bool IsUIExtensionFocused(uint32_t uiExtensionTokenId, const sptr& focusToken); @@ -350,13 +350,13 @@ public: void HandleProcessFrozen(const std::vector &pidList, int32_t uid); - void ForegroundAbilityWindowLocked(const std::shared_ptr &abilityRecord, + void ForegroundAbilityWindowLocked(const std::shared_ptr &abilityRecord, const sptr &sessionInfo); - void BackgroundAbilityWindowLocked(const std::shared_ptr &abilityRecord, + void BackgroundAbilityWindowLocked(const std::shared_ptr &abilityRecord, const sptr &sessionInfo); - void TerminateAbilityWindowLocked(const std::shared_ptr &abilityRecord, + void TerminateAbilityWindowLocked(const std::shared_ptr &abilityRecord, const sptr &sessionInfo); void RemoveLauncherDeathRecipient(); @@ -394,14 +394,15 @@ public: * GetServiceRecordByAbilityRequest. * * @param abilityRequest, the request of the service ability to start. - * @return Returns AbilityRecord shared_ptr. + * @return Returns BaseExtensionRecord shared_ptr. */ - std::shared_ptr GetServiceRecordByAbilityRequest(const AbilityRequest &abilityRequest); + std::shared_ptr GetServiceRecordByAbilityRequest(const AbilityRequest &abilityRequest); bool HasRequestIdInLoadAbilityQueue(int32_t requestId); void OnStartSpecifiedProcessResponse(const std::string &flag, int32_t requestId); void OnStartSpecifiedProcessTimeoutResponse(int32_t requestId); - void StartSpecifiedProcess(const LoadAbilityContext &context, const std::shared_ptr &abilityRecord); + void StartSpecifiedProcess(const LoadAbilityContext &context, + const std::shared_ptr &abilityRecord); int UnPreloadUIExtensionAbilityLocked(int32_t extensionAbilityId); int UnPreloadUIExtensionAbilityInner(int32_t extensionAbilityId); int ClearAllPreloadUIExtensionAbilityLocked(); @@ -450,23 +451,23 @@ private: * * @param abilityRecord, the ptr of the ability to load. */ - void LoadAbility(const std::shared_ptr &abilityRecord, - std::function &)> updateRecordCallback = nullptr); + void LoadAbility(const std::shared_ptr &abilityRecord, + std::function &)> updateRecordCallback = nullptr); void HandleLoadAbilityOrStartSpecifiedProcess( - const AbilityRuntime::LoadParam &loadParam, const std::shared_ptr &abilityRecord); + const AbilityRuntime::LoadParam &loadParam, const std::shared_ptr &abilityRecord); /** * ConnectAbility.Schedule connect ability * * @param abilityRecord, the ptr of the ability to connect. */ - void ConnectAbility(const std::shared_ptr &abilityRecord); + void ConnectAbility(const std::shared_ptr &abilityRecord); /** * ConnectAbility.Schedule connect ability * * @param abilityRecord, the ptr of the ability to connect. */ - void ConnectUIServiceExtAbility(const std::shared_ptr &abilityRecord, + void ConnectUIServiceExtAbility(const std::shared_ptr &abilityRecord, int connectRecordId, const Want &want); /** @@ -474,36 +475,36 @@ private: * * @param abilityRecord, the ptr of the ability to connect. */ - void ResumeConnectAbility(const std::shared_ptr &abilityRecord); + void ResumeConnectAbility(const std::shared_ptr &abilityRecord); /** * CommandAbility. Schedule command ability * * @param abilityRecord, the ptr of the ability to command. */ - void CommandAbility(const std::shared_ptr &abilityRecord); + void CommandAbility(const std::shared_ptr &abilityRecord); /** * CompleteCommandAbility. complete command ability * * @param abilityRecord, the ptr of the ability to command. */ - void CompleteCommandAbility(std::shared_ptr abilityRecord); + void CompleteCommandAbility(std::shared_ptr abilityRecord); /** * TerminateDone. * * @param abilityRecord, the ptr of the ability to terminate. */ - void TerminateDone(const std::shared_ptr &abilityRecord); + void TerminateDone(const std::shared_ptr &abilityRecord); /** * GetServiceRecordByElementName. * * @param element, service ability's element. - * @return Returns AbilityRecord shared_ptr. + * @return Returns BaseExtensionRecord shared_ptr. */ - std::shared_ptr GetServiceRecordByElementName(const std::string &element); + std::shared_ptr GetServiceRecordByElementName(const std::string &element); /** * GetAbilityConnectedRecordFromRecordList. @@ -513,7 +514,7 @@ private: * @return Returns ConnectionRecord shared_ptr. */ std::shared_ptr GetAbilityConnectedRecordFromRecordList( - const std::shared_ptr &targetService, + const std::shared_ptr &targetService, std::list> &connectRecordList); /** @@ -522,24 +523,24 @@ private: * @param abilityRecord. * @param state. */ - int DispatchInactive(const std::shared_ptr &abilityRecord, int state); - int DispatchForeground(const std::shared_ptr &abilityRecord); - int DispatchBackground(const std::shared_ptr &abilityRecord); - int DispatchTerminate(const std::shared_ptr &abilityRecord); + int DispatchInactive(const std::shared_ptr &abilityRecord, int state); + int DispatchForeground(const std::shared_ptr &abilityRecord); + int DispatchBackground(const std::shared_ptr &abilityRecord); + int DispatchTerminate(const std::shared_ptr &abilityRecord); - void HandleStartTimeoutTask(const std::shared_ptr &abilityRecord); - void HandleStopTimeoutTask(const std::shared_ptr &abilityRecord); + void HandleStartTimeoutTask(const std::shared_ptr &abilityRecord); + void HandleStopTimeoutTask(const std::shared_ptr &abilityRecord); void HandleTerminateDisconnectTask(const ConnectListType& connectlist); - void HandleCommandTimeoutTask(const std::shared_ptr &abilityRecord); - void HandleCommandWindowTimeoutTask(const std::shared_ptr &abilityRecord, + void HandleCommandTimeoutTask(const std::shared_ptr &abilityRecord); + void HandleCommandWindowTimeoutTask(const std::shared_ptr &abilityRecord, const sptr &sessionInfo, WindowCommand winCmd); - void HandleForegroundTimeoutTask(const std::shared_ptr &abilityRecord); - void HandleConnectTimeoutTask(std::shared_ptr abilityRecord); + void HandleForegroundTimeoutTask(const std::shared_ptr &abilityRecord); + void HandleConnectTimeoutTask(std::shared_ptr abilityRecord); void HandleRestartResidentTask(const AbilityRequest &abilityRequest); - void HandleActiveAbility(std::shared_ptr &targetService, + void HandleActiveAbility(std::shared_ptr &targetService, std::shared_ptr &connectRecord); void HandleCommandDestroy(const sptr &sessionInfo); - void TerminateOrCacheAbility(std::shared_ptr abilityRecord); + void TerminateOrCacheAbility(std::shared_ptr abilityRecord); /** * RemoveConnectionRecordFromMap. @@ -553,7 +554,7 @@ private: * * @param service, the ptr of the ability record. */ - void RemoveServiceAbility(const std::shared_ptr &service); + void RemoveServiceAbility(const std::shared_ptr &service); /** * GetOrCreateServiceRecord. @@ -564,8 +565,8 @@ private: * @param isLoadedAbility, whether the target ability has been loaded. */ void GetOrCreateServiceRecord(const AbilityRequest &abilityRequest, const bool isCreatedByConnect, - std::shared_ptr &targetAbilityRecord, bool &isLoadedAbility); - void SetServiceAfterNewCreate(const AbilityRequest &abilityRequest, AbilityRecord &targetService); + std::shared_ptr &targetAbilityRecord, bool &isLoadedAbility); + void SetServiceAfterNewCreate(const AbilityRequest &abilityRequest, BaseExtensionRecord &targetService); void RemoveServiceFromMapSafe(const std::string &serviceKey); @@ -613,11 +614,11 @@ private: * * @param abilityRecord, died ability. */ - void HandleAbilityDiedTask(const std::shared_ptr &abilityRecord); + void HandleAbilityDiedTask(const std::shared_ptr &abilityRecord); - void HandleUIExtensionDied(const std::shared_ptr &abilityRecord); + void HandleUIExtensionDied(const std::shared_ptr &abilityRecord); - void RestartAbility(const std::shared_ptr &abilityRecord, int32_t currentUserId); + void RestartAbility(const std::shared_ptr &abilityRecord, int32_t currentUserId); /** * PostTimeOutTask. @@ -625,25 +626,27 @@ private: * @param abilityRecord, ability. * @param messageId, message id. */ - void PostTimeOutTask(const std::shared_ptr &abilityRecord, uint32_t messageId); - void PostTimeOutTask(const std::shared_ptr &abilityRecord, int connectRecordId, uint32_t messageId); + void PostTimeOutTask(const std::shared_ptr &abilityRecord, uint32_t messageId); + void PostTimeOutTask(const std::shared_ptr &abilityRecord, int connectRecordId, + uint32_t messageId); - void CompleteForeground(const std::shared_ptr &abilityRecord); - void CompleteBackground(const std::shared_ptr &abilityRecord); - void PrintTimeOutLog(const std::shared_ptr &ability, uint32_t msgId, bool isHalf = false); + void CompleteForeground(const std::shared_ptr &abilityRecord); + void CompleteBackground(const std::shared_ptr &abilityRecord); + void PrintTimeOutLog(const std::shared_ptr &ability, uint32_t msgId, bool isHalf = false); void PostRestartResidentTask(const AbilityRequest &abilityRequest); - bool IsAbilityNeedKeepAlive(const std::shared_ptr &abilityRecord); + bool IsAbilityNeedKeepAlive(const std::shared_ptr &abilityRecord); - void ProcessPreload(const std::shared_ptr &record) const; + void ProcessPreload(const std::shared_ptr &record) const; - void HandleInactiveTimeout(const std::shared_ptr &ability); - void CleanActivatingTimeoutAbility(std::shared_ptr abilityRecord); - void MoveToTerminatingMap(const std::shared_ptr& abilityRecord); + void HandleInactiveTimeout(const std::shared_ptr &ability); + void CleanActivatingTimeoutAbility(std::shared_ptr abilityRecord); + void MoveToTerminatingMap(const std::shared_ptr& abilityRecord); - void DoForegroundUIExtension(std::shared_ptr abilityRecord, const AbilityRequest &abilityRequest); - void DoBackgroundAbilityWindow(const std::shared_ptr &abilityRecord, + void DoForegroundUIExtension(std::shared_ptr abilityRecord, + const AbilityRequest &abilityRequest); + void DoBackgroundAbilityWindow(const std::shared_ptr &abilityRecord, const sptr &sessionInfo); /** @@ -671,57 +674,58 @@ private: void RemoveExtensionDelayDisconnectTask(const std::shared_ptr &connectRecord); private: - bool IsNeedToRestart(const std::shared_ptr &abilityRecord, + bool IsNeedToRestart(const std::shared_ptr &abilityRecord, const std::string &bundleName, const std::string &abilityName); - void TerminateRecord(std::shared_ptr abilityRecord); + void TerminateRecord(std::shared_ptr abilityRecord); int DisconnectRecordNormal(ConnectListType &list, std::shared_ptr connectRecord, bool callerDied) const; void DisconnectRecordForce(ConnectListType &list, std::shared_ptr connectRecord); int TerminateAbilityInner(const sptr &token); - bool IsLauncher(std::shared_ptr serviceExtension) const; + bool IsLauncher(std::shared_ptr serviceExtension) const; void KillProcessesByUserId() const; - void SetLastExitReason(const AbilityRequest &abilityRequest, std::shared_ptr &targetService); - inline bool IsUIExtensionAbility(const std::shared_ptr &abilityRecord); + void SetLastExitReason(const AbilityRequest &abilityRequest, std::shared_ptr &targetService); + inline bool IsUIExtensionAbility(const std::shared_ptr &abilityRecord); inline bool IsCacheExtensionAbilityByInfo(const AppExecFwk::AbilityInfo &abilityInfo); - inline bool IsCacheExtensionAbility(const std::shared_ptr &abilityRecord); + inline bool IsCacheExtensionAbility(const std::shared_ptr &abilityRecord); inline bool CheckUIExtensionAbilityLoaded(const AbilityRequest &abilityRequest); - inline bool CheckUIExtensionAbilitySessionExist(const std::shared_ptr &abilityRecord); - inline void RemoveUIExtensionAbilityRecord(const std::shared_ptr &abilityRecord); - inline void AddUIExtensionAbilityRecordToTerminatedList(const std::shared_ptr &abilityRecord); - inline bool IsCallerValid(const std::shared_ptr &abilityRecord); + inline bool CheckUIExtensionAbilitySessionExist(const std::shared_ptr &abilityRecord); + inline void RemoveUIExtensionAbilityRecord(const std::shared_ptr &abilityRecord); + inline void AddUIExtensionAbilityRecordToTerminatedList(const std::shared_ptr &abilityRecord); + inline bool IsCallerValid(const std::shared_ptr &abilityRecord); int32_t GetOrCreateExtensionRecord(const AbilityRequest &abilityRequest, bool isCreatedByConnect, - const std::string &hostBundleName, std::shared_ptr &extensionRecord, bool &isLoaded); + const std::string &hostBundleName, std::shared_ptr &extensionRecord, bool &isLoaded); int32_t GetOrCreateTargetServiceRecord( const AbilityRequest &abilityRequest, const sptr &connectInfo, - std::shared_ptr &targetService, bool &isLoadedAbility); - void HandleNotifyAssertFaultDialogDied(const std::shared_ptr &abilityRecord); - EventInfo BuildEventInfo(const std::shared_ptr &abilityRecord); - void UpdateUIExtensionInfo(const std::shared_ptr &abilityRecord, + std::shared_ptr &targetService, bool &isLoadedAbility); + void HandleNotifyAssertFaultDialogDied(const std::shared_ptr &abilityRecord); + EventInfo BuildEventInfo(const std::shared_ptr &abilityRecord); + void UpdateUIExtensionInfo(const std::shared_ptr &abilityRecord, int32_t hostPid = AAFwk::DEFAULT_INVAL_VALUE); std::string GenerateBundleName(const AbilityRequest &abilityRequest) const; - bool AddToServiceMap(const std::string &key, std::shared_ptr abilityRecord); + bool AddToServiceMap(const std::string &key, std::shared_ptr abilityRecord); ServiceMapType GetServiceMap(); void AddConnectObjectToMap(sptr connectObject, const ConnectListType &connectRecordList, bool updateOnly); - void KeepAbilityAlive(const std::shared_ptr &abilityRecord); - void ProcessEliminateAbilityRecord(std::shared_ptr eliminateRecord); - std::string GetServiceKey(const std::shared_ptr &service); + void KeepAbilityAlive(const std::shared_ptr &abilityRecord); + void ProcessEliminateAbilityRecord(std::shared_ptr eliminateRecord); + std::string GetServiceKey(const std::shared_ptr &service); int32_t ReportXiaoYiToRSSIfNeeded(const AppExecFwk::AbilityInfo &abilityInfo); int32_t ReportAbilityStartInfoToRSS(const AppExecFwk::AbilityInfo &abilityInfo); void ReportEventToRSS(const AppExecFwk::AbilityInfo &abilityInfo, - const std::shared_ptr abilityRecord, sptr callerToken); + const std::shared_ptr abilityRecord, sptr callerToken); - void SetExtensionLoadParam(AbilityRuntime::LoadParam &loadParam, std::shared_ptr abilityRecord); - bool IsStrictMode(std::shared_ptr abilityRecord); - bool NeedExtensionControl(std::shared_ptr abilityRecord); + void SetExtensionLoadParam(AbilityRuntime::LoadParam &loadParam, + std::shared_ptr abilityRecord); + bool IsStrictMode(std::shared_ptr abilityRecord); + bool NeedExtensionControl(std::shared_ptr abilityRecord); bool GetTimeoutMsgContent(uint32_t msgId, std::string &msgContent, int &typeId); - void UpdateUIExtensionBindInfo( - const std::shared_ptr &abilityRecord, std::string callerBundleName, int32_t notifyProcessBind); + void UpdateUIExtensionBindInfo(const std::shared_ptr &abilityRecord, + std::string callerBundleName, int32_t notifyProcessBind); void HandleConnectionCountIncrement(int32_t pid, const std::string &callerBundleName, const std::string &targetName); @@ -752,7 +756,7 @@ private: WindowExtensionMapType windowExtensionMap_; std::map callerPidConnectionCountMap_; - std::list> terminatingExtensionList_; + std::list> terminatingExtensionList_; std::shared_ptr taskHandler_; std::shared_ptr eventHandler_; std::vector restartResidentTaskList_; diff --git a/services/abilitymgr/include/ability_manager_service.h b/services/abilitymgr/include/ability_manager_service.h index 555636cd42..95116294c0 100644 --- a/services/abilitymgr/include/ability_manager_service.h +++ b/services/abilitymgr/include/ability_manager_service.h @@ -490,7 +490,7 @@ public: int32_t userId = DEFAULT_INVAL_VALUE, int32_t hostPid = DEFAULT_INVAL_VALUE, int32_t requestCode = DEFAULT_INVAL_VALUE) override; - int UnloadUIExtensionAbility(const std::shared_ptr &abilityRecord, pid_t &hostPid); + int UnloadUIExtensionAbility(const std::shared_ptr &abilityRecord, pid_t &hostPid); /** * Change the visibility state of an UIAbility. @@ -1285,7 +1285,7 @@ public: virtual int GetAllIntentExemptionInfo(std::vector &info) override; int GetProcessRunningInfosByUserId(std::vector &info, int32_t userId); void GetAbilityRunningInfo(std::vector &info, std::shared_ptr abilityRecord); - void GetExtensionRunningInfo(std::shared_ptr &abilityRecord, const int32_t userId, + void GetExtensionRunningInfo(std::shared_ptr &abilityRecord, const int32_t userId, std::vector &info); int GetMissionSaveTime() const; @@ -2366,7 +2366,7 @@ protected: * @return Returns whether the caller is allowed to start AppServiceExtension. */ int32_t CheckCallAppServiceExtensionPermission(const AbilityRequest &abilityRequest, - std::shared_ptr targetService, bool isFromConnect); + std::shared_ptr targetService, bool isFromConnect); static void HandleAutoStartupReadyCallback(const char *key, const char *value, void *context); @@ -2777,7 +2777,7 @@ private: bool CheckUserIdActive(int32_t userId); void GetConnectManagerAndUIExtensionBySessionInfo(const sptr &sessionInfo, - std::shared_ptr &connectManager, std::shared_ptr &targetAbility, + std::shared_ptr &connectManager, std::shared_ptr &targetAbility, bool needCheck = false); virtual int RegisterSessionHandler(const sptr &object) override; diff --git a/services/abilitymgr/include/ability_record.h b/services/abilitymgr/include/ability_record.h index d21e37995b..af92ad4f10 100644 --- a/services/abilitymgr/include/ability_record.h +++ b/services/abilitymgr/include/ability_record.h @@ -58,7 +58,6 @@ namespace AAFwk { using Closure = std::function; class AbilityRecord; -class ConnectionRecord; class CallContainer; struct EventInfo; @@ -124,8 +123,6 @@ public: void RemoveLoadTimeoutTask(); - void PostUIExtensionAbilityTimeoutTask(uint32_t messageId); - /** * move the ability to back ground. * @@ -388,30 +385,6 @@ public: */ void Terminate(const Closure &task); - /** - * connect the ability. - * - */ - void ConnectAbility(); - - /** - * connect the ability with want. - * - */ - void ConnectAbilityWithWant(const Want &want); - - /** - * disconnect the ability. - * - */ - void DisconnectAbility(); - - /** - * disconnect the ability with want - * - */ - void DisconnectAbilityWithWant(const Want &want); - /** * Command the ability. * @@ -519,47 +492,6 @@ public: */ void SaveResult(int resultCode, const Want *resultWant, std::shared_ptr caller); - bool NeedConnectAfterCommand(); - - /** - * add connect record to the list. - * - */ - void AddConnectRecordToList(const std::shared_ptr &connRecord); - - /** - * get the list of connect record. - * - */ - std::list> GetConnectRecordList() const; - - /** - * get the list of connect record. - * - */ - std::list> GetConnectingRecordList(); - - /** - * get the count of In Progress record. - * - */ - uint32_t GetInProgressRecordCount(); - /** - * remove the connect record from list. - * - */ - void RemoveConnectRecordFromList(const std::shared_ptr &connRecord); - - /** - * check whether connect list is empty. - * - */ - bool IsConnectListEmpty(); - - size_t GetConnectedListSize(); - - size_t GetConnectingListSize(); - void RemoveCallerRequestCode(std::shared_ptr callerAbilityRecord, int32_t requestCode); /** @@ -578,18 +510,6 @@ public: std::shared_ptr GetCallerInfo() const; - /** - * get connecting record from list. - * - */ - std::shared_ptr GetConnectingRecord() const; - - /** - * get disconnecting record from list. - * - */ - std::shared_ptr GetDisconnectingRecord() const; - /** * convert ability state (enum type to string type). * @@ -639,30 +559,6 @@ public: int64_t GetStartTime() const; - /** - * dump service info. - * - */ - void DumpService(std::vector &info, bool isClient = false) const; - - /** - * dump service info. - * - */ - void DumpService(std::vector &info, std::vector ¶ms, bool isClient = false) const; - - /** - * set connect remote object. - * - */ - void SetConnRemoteObject(const sptr &remoteObject); - - /** - * get connect remote object. - * - */ - sptr GetConnRemoteObject() const; - /** * check whether the ability is never started. */ @@ -1058,10 +954,6 @@ private: void NotifyMissionBindPid(); - void DumpUIExtensionRootHostInfo(std::vector &info) const; - - void DumpUIExtensionPid(std::vector &info, bool isUIExtension) const; - void SetDebugAppByWaitingDebugFlag(); void AfterLoaded(); @@ -1144,7 +1036,6 @@ private: bool isAttachDebug_ = false; bool isAssertDebug_ = false; bool isAppAutoStartup_ = false; - bool isConnected = false; bool isRestartApp_ = false; // Only app calling RestartApp can be set to true bool isLaunching_ = true; bool securityFlag_ = false; @@ -1186,12 +1077,6 @@ private: */ std::shared_ptr result_ = {}; - // service(ability) can be connected by multi-pages(abilities), so need to store this service's connections - mutable ffrt::mutex connRecordListMutex_; - std::list> connRecordList_ = {}; - // service(ability) onConnect() return proxy of service ability - sptr connRemoteObject_ = {}; - // page(ability) can be started by multi-pages(abilities), so need to store this ability's caller std::list> callerList_ = {}; mutable ffrt::mutex callerListLock_; diff --git a/services/abilitymgr/include/ability_record/ability_record_utils.h b/services/abilitymgr/include/ability_record/ability_record_utils.h index 2b49244af8..1bf32a7171 100644 --- a/services/abilitymgr/include/ability_record/ability_record_utils.h +++ b/services/abilitymgr/include/ability_record/ability_record_utils.h @@ -53,6 +53,7 @@ enum class AbilityRecordType { BASE_ABILITY, UI_ABILITY, MISSION_ABILITY, + EXTENSION_ABILITY, }; /** diff --git a/services/abilitymgr/include/connection_record.h b/services/abilitymgr/include/connection_record.h index 9327dc876a..372319fd4e 100644 --- a/services/abilitymgr/include/connection_record.h +++ b/services/abilitymgr/include/connection_record.h @@ -18,7 +18,7 @@ #include #include "ability_connect_callback_interface.h" -#include "ability_record.h" +#include "base_extension_record.h" #include "extension_config.h" #include "nocopyable.h" @@ -36,7 +36,7 @@ enum class ConnectionState { INIT, CONNECTING, CONNECTED, DISCONNECTING, DISCONN */ class ConnectionRecord : public std::enable_shared_from_this { public: - ConnectionRecord(const sptr &callerToken, const std::shared_ptr &targetService, + ConnectionRecord(const sptr &callerToken, const std::shared_ptr &targetService, const sptr &connCallback, std::shared_ptr abilityConnectManager); virtual ~ConnectionRecord(); @@ -49,7 +49,7 @@ public: * @return Return the connect record. */ static std::shared_ptr CreateConnectionRecord(const sptr &callerToken, - const std::shared_ptr &targetService, const sptr &connCallback, + const std::shared_ptr &targetService, const sptr &connCallback, std::shared_ptr abilityConnectManager); static int32_t CallOnAbilityConnectDone(sptr callback, @@ -78,9 +78,9 @@ public: /** * get the ability record from connection record. * - * @return AbilityRecord. + * @return BaseExtensionRecord. */ - std::shared_ptr GetAbilityRecord() const; + std::shared_ptr GetAbilityRecord() const; sptr GetAbilityConnectCallback() const; @@ -180,7 +180,7 @@ private: int recordId_ = 0; // record id ConnectionState state_; // service connection state sptr callerToken_ = nullptr; // from:caller token - std::shared_ptr targetService_ = nullptr; // target:service need to be connected + std::shared_ptr targetService_ = nullptr; // target:service need to be connected mutable std::mutex callbackMutex_; sptr connCallback_ = nullptr; // service connect callback diff --git a/services/abilitymgr/include/extension_record/base_extension_record.h b/services/abilitymgr/include/extension_record/base_extension_record.h new file mode 100644 index 0000000000..a7b58b2adf --- /dev/null +++ b/services/abilitymgr/include/extension_record/base_extension_record.h @@ -0,0 +1,154 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_ABILITY_RUNTIME_EXTENSION_RECORD_BASE_H +#define OHOS_ABILITY_RUNTIME_EXTENSION_RECORD_BASE_H + +#include "ability_record.h" + +namespace OHOS { +namespace AAFwk { +class ConnectionRecord; + +class BaseExtensionRecord : public AbilityRecord { +public: + BaseExtensionRecord(const Want &want, const AppExecFwk::AbilityInfo &abilityInfo, + const AppExecFwk::ApplicationInfo &applicationInfo, int requestCode = -1); + + static std::shared_ptr CreateBaseExtensionRecord(const AbilityRequest &abilityRequest); + + static std::shared_ptr TransferToExtensionRecordBase( + const std::shared_ptr &abilityRecord); + + AbilityRecordType GetAbilityRecordType() override; + + /** + * add connect record to the list. + * + */ + void AddConnectRecordToList(const std::shared_ptr &connRecord); + + /** + * get the list of connect record. + * + */ + std::list> GetConnectRecordList() const; + + /** + * get the list of connect record. + * + */ + std::list> GetConnectingRecordList(); + + /** + * remove the connect record from list. + * + */ + void RemoveConnectRecordFromList(const std::shared_ptr &connRecord); + + void PostUIExtensionAbilityTimeoutTask(uint32_t messageId); + + /** + * get connecting record from list. + * + */ + std::shared_ptr GetConnectingRecord() const; + + /** + * get disconnecting record from list. + * + */ + std::shared_ptr GetDisconnectingRecord() const; + + size_t GetConnectedListSize(); + + /** + * check whether connect list is empty. + * + */ + bool IsConnectListEmpty(); + + bool NeedConnectAfterCommand(); + + size_t GetConnectingListSize(); + + /** + * get the count of In Progress record. + * + */ + uint32_t GetInProgressRecordCount(); + + /** + * disconnect the ability. + * + */ + void DisconnectAbility(); + + /** + * disconnect the ability with want + * + */ + void DisconnectAbilityWithWant(const Want &want); + + /** + * connect the ability. + * + */ + void ConnectAbility(); + + /** + * connect the ability with want. + * + */ + void ConnectAbilityWithWant(const Want &want); + /** + * dump service info. + * + */ + void DumpService(std::vector &info, bool isClient = false) const; + + /** + * dump service info. + * + */ + void DumpService(std::vector &info, std::vector ¶ms, + bool isClient = false) const; + + /** + * set connect remote object. + * + */ + void SetConnRemoteObject(const sptr &remoteObject); + + /** + * get connect remote object. + * + */ + sptr GetConnRemoteObject() const; + +private: + void DumpUIExtensionRootHostInfo(std::vector &info) const; + + void DumpUIExtensionPid(std::vector &info, bool isUIExtension) const; + // service(ability) can be connected by multi-pages(abilities), so need to store this service's connections + mutable ffrt::mutex connRecordListMutex_; + std::list> connRecordList_ = {}; + // service(ability) onConnect() return proxy of service ability + sptr connRemoteObject_ = {}; + bool isConnected = false; +}; +} // namespace AAFwk +} // namespace OHOS +#endif // OHOS_ABILITY_RUNTIME_EXTENSION_RECORD_BASE_H \ No newline at end of file diff --git a/services/abilitymgr/include/extension_record/extension_record.h b/services/abilitymgr/include/extension_record/extension_record.h index 2433b49a3f..75fbc58caa 100644 --- a/services/abilitymgr/include/extension_record/extension_record.h +++ b/services/abilitymgr/include/extension_record/extension_record.h @@ -21,7 +21,7 @@ #include #include -#include "ability_record.h" +#include "base_extension_record.h" #include "preload_uiext_state_observer.h" namespace OHOS { @@ -31,7 +31,7 @@ constexpr int32_t INVALID_EXTENSION_RECORD_ID = 0; } class ExtensionRecord : public std::enable_shared_from_this { public: - ExtensionRecord(const std::shared_ptr &abilityRecord); + ExtensionRecord(const std::shared_ptr &abilityRecord); virtual ~ExtensionRecord(); @@ -57,7 +57,7 @@ public: int32_t extensionRecordId_ = INVALID_EXTENSION_RECORD_ID; uint32_t processMode_ = 0; pid_t hostPid_ = 0; - std::shared_ptr abilityRecord_ = nullptr; + std::shared_ptr abilityRecord_ = nullptr; std::string hostBundleName_; int32_t requestCode_ = -1; private: diff --git a/services/abilitymgr/include/extension_record/extension_record_manager.h b/services/abilitymgr/include/extension_record/extension_record_manager.h index 2b36cc2494..0924bd2d48 100644 --- a/services/abilitymgr/include/extension_record/extension_record_manager.h +++ b/services/abilitymgr/include/extension_record/extension_record_manager.h @@ -22,7 +22,7 @@ #include #include -#include "ability_record.h" +#include "base_extension_record.h" #include "extension_record.h" #include "preload_ui_extension_execute_callback_interface.h" #include "ui_extension/ui_extension_host_info.h" @@ -94,7 +94,7 @@ public: bool IsPreloadExtensionRecord(const AAFwk::AbilityRequest &abilityRequest, const pid_t &hostPid, std::shared_ptr &extensionRecord, bool &isLoaded); - int32_t AddPreloadUIExtensionRecord(const std::shared_ptr abilityRecord); + int32_t AddPreloadUIExtensionRecord(const std::shared_ptr abilityRecord); void RemoveAllPreloadUIExtensionRecord(PreLoadUIExtensionMapKey &preLoadUIExtensionInfo); @@ -106,9 +106,10 @@ public: int32_t extensionRecordId); int32_t GetOrCreateExtensionRecord(const AAFwk::AbilityRequest &abilityRequest, const std::string &hostBundleName, - std::shared_ptr &abilityRecord, bool &isLoaded); + std::shared_ptr &abilityRecord, bool &isLoaded); - std::shared_ptr GetAbilityRecordBySessionInfo(const sptr &sessionInfo); + std::shared_ptr GetAbilityRecordBySessionInfo( + const sptr &sessionInfo); std::shared_ptr GetUIExtensionRootHostInfo(const sptr token); @@ -177,7 +178,8 @@ private: int32_t UpdateProcessName(const AAFwk::AbilityRequest &abilityRequest, std::shared_ptr &record); int32_t SetAbilityProcessName(const AAFwk::AbilityRequest &abilityRequest, - const std::shared_ptr &abilityRecord, std::shared_ptr &extensionRecord); + const std::shared_ptr &abilityRecord, + std::shared_ptr &extensionRecord); void ConvertToUnloadExtensionRecords(std::vector> &records, std::vector> &recordsToUnload); bool IsHostSpecifiedProcessValid(const AAFwk::AbilityRequest &abilityRequest, diff --git a/services/abilitymgr/include/ui_extension_record/ui_extension_record.h b/services/abilitymgr/include/ui_extension_record/ui_extension_record.h index bedd08913d..efca5afbce 100644 --- a/services/abilitymgr/include/ui_extension_record/ui_extension_record.h +++ b/services/abilitymgr/include/ui_extension_record/ui_extension_record.h @@ -27,7 +27,7 @@ namespace OHOS { namespace AbilityRuntime { class UIExtensionRecord : public ExtensionRecord { public: - UIExtensionRecord(const std::shared_ptr &abilityRecord); + UIExtensionRecord(const std::shared_ptr &abilityRecord); ~UIExtensionRecord() override; diff --git a/services/abilitymgr/include/ui_extension_record/ui_extension_record_factory.h b/services/abilitymgr/include/ui_extension_record/ui_extension_record_factory.h index 0477e8cdcd..3d3c12db9e 100644 --- a/services/abilitymgr/include/ui_extension_record/ui_extension_record_factory.h +++ b/services/abilitymgr/include/ui_extension_record/ui_extension_record_factory.h @@ -33,7 +33,7 @@ public: const AAFwk::AbilityRequest &abilityRequest, std::shared_ptr &extensionRecord) override; private: void CreateDebugRecord( - const AAFwk::AbilityRequest &abilityRequest, std::shared_ptr abilityRecord); + const AAFwk::AbilityRequest &abilityRequest, std::shared_ptr abilityRecord); }; } // namespace AbilityRuntime } // namespace OHOS diff --git a/services/abilitymgr/libabilityms.map b/services/abilitymgr/libabilityms.map index 4b13fc91ec..59f08e388e 100644 --- a/services/abilitymgr/libabilityms.map +++ b/services/abilitymgr/libabilityms.map @@ -58,6 +58,7 @@ *EcologicalRuleInterceptor*; *ExtensionPermissionsUtil*; *DataAbilityManager*; + *BaseExtensionRecord*; *FreeInstallManager*; *FreeInstallObserverManager*; *ForegroundAppConnectionManager*; diff --git a/services/abilitymgr/src/ability_cache_manager.cpp b/services/abilitymgr/src/ability_cache_manager.cpp index 6f46e55d78..ed83757fa5 100644 --- a/services/abilitymgr/src/ability_cache_manager.cpp +++ b/services/abilitymgr/src/ability_cache_manager.cpp @@ -38,7 +38,7 @@ void AbilityCacheManager::Init(uint32_t devCapacity, uint32_t procCapacity) procLruCapacity_ = procCapacity; } -void AbilityCacheManager::RemoveAbilityRecInDevList(std::shared_ptr abilityRecord) +void AbilityCacheManager::RemoveAbilityRecInDevList(std::shared_ptr abilityRecord) { if (abilityRecord == nullptr) { return; @@ -56,7 +56,7 @@ void AbilityCacheManager::RemoveAbilityRecInDevList(std::shared_ptr abilityRecord) +void AbilityCacheManager::RemoveAbilityRecInProcList(std::shared_ptr abilityRecord) { if (abilityRecord == nullptr) { return; @@ -83,14 +83,15 @@ void AbilityCacheManager::RemoveAbilityRecInProcList(std::shared_ptr AbilityCacheManager::AddToProcLru(std::shared_ptr abilityRecord) +std::shared_ptr AbilityCacheManager::AddToProcLru( + std::shared_ptr abilityRecord) { if (abilityRecord == nullptr) { return nullptr; } auto findProcInfo = procLruMap_.find(abilityRecord->GetApplicationInfo().accessTokenId); if (findProcInfo == procLruMap_.end()) { - std::list> recList; + std::list> recList; ProcRecordsInfo procRecInfo = {recList, 1}; procRecInfo.recList.push_back(abilityRecord); procLruMap_[abilityRecord->GetApplicationInfo().accessTokenId] = procRecInfo; @@ -98,7 +99,7 @@ std::shared_ptr AbilityCacheManager::AddToProcLru(std::shared_ptr } if (findProcInfo->second.cnt == procLruCapacity_) { RemoveAbilityRecInDevList(findProcInfo->second.recList.front()); - std::shared_ptr rec = findProcInfo->second.recList.front(); + std::shared_ptr rec = findProcInfo->second.recList.front(); findProcInfo->second.recList.pop_front(); findProcInfo->second.recList.push_back(abilityRecord); return rec; @@ -108,8 +109,8 @@ std::shared_ptr AbilityCacheManager::AddToProcLru(std::shared_ptr return nullptr; } -std::shared_ptr AbilityCacheManager::AddToDevLru(std::shared_ptr abilityRecord, - std::shared_ptr rec) +std::shared_ptr AbilityCacheManager::AddToDevLru( + std::shared_ptr abilityRecord, std::shared_ptr rec) { if (rec != nullptr) { devRecLru_.push_back(abilityRecord); @@ -127,7 +128,7 @@ std::shared_ptr AbilityCacheManager::AddToDevLru(std::shared_ptr< return rec; } -std::shared_ptr AbilityCacheManager::Put(std::shared_ptr abilityRecord) +std::shared_ptr AbilityCacheManager::Put(std::shared_ptr abilityRecord) { if (abilityRecord == nullptr) { TAG_LOGE(AAFwkTag::SERVICE_EXT, "null abilityRecord"); @@ -136,11 +137,11 @@ std::shared_ptr AbilityCacheManager::Put(std::shared_ptrGetURI().c_str(), abilityRecord->GetAbilityInfo().extensionAbilityType); std::lock_guard lock(mutex_); - std::shared_ptr rec = AddToProcLru(abilityRecord); + std::shared_ptr rec = AddToProcLru(abilityRecord); return AddToDevLru(abilityRecord, rec); } -void AbilityCacheManager::Remove(std::shared_ptr abilityRecord) +void AbilityCacheManager::Remove(std::shared_ptr abilityRecord) { if (abilityRecord == nullptr) { TAG_LOGE(AAFwkTag::SERVICE_EXT, "null abilityRecord"); @@ -154,14 +155,14 @@ void AbilityCacheManager::Remove(std::shared_ptr abilityRecord) } bool AbilityCacheManager::IsRecInfoSame(const AbilityRequest& abilityRequest, - std::shared_ptr abilityRecord) + std::shared_ptr abilityRecord) { return abilityRecord != nullptr && abilityRequest.abilityInfo.moduleName == abilityRecord->GetAbilityInfo().moduleName && abilityRequest.want.GetElement().GetAbilityName() == abilityRecord->GetWant().GetElement().GetAbilityName(); } -std::shared_ptr AbilityCacheManager::GetAbilityRecInProcList(const AbilityRequest &abilityRequest) +std::shared_ptr AbilityCacheManager::GetAbilityRecInProcList(const AbilityRequest &abilityRequest) { auto findProcInfo = procLruMap_.find(abilityRequest.appInfo.accessTokenId); if (findProcInfo == procLruMap_.end()) { @@ -172,7 +173,7 @@ std::shared_ptr AbilityCacheManager::GetAbilityRecInProcList(cons auto recIter = procRecordsInfo.recList.begin(); while (recIter != procRecordsInfo.recList.end()) { if (IsRecInfoSame(abilityRequest, *recIter)) { - std::shared_ptr abilityRecord = *recIter; + std::shared_ptr abilityRecord = *recIter; procRecordsInfo.recList.erase(recIter); procRecordsInfo.cnt--; return abilityRecord; @@ -183,12 +184,12 @@ std::shared_ptr AbilityCacheManager::GetAbilityRecInProcList(cons return nullptr; } -std::shared_ptr AbilityCacheManager::Get(const AbilityRequest& abilityRequest) +std::shared_ptr AbilityCacheManager::Get(const AbilityRequest& abilityRequest) { TAG_LOGD(AAFwkTag::SERVICE_EXT, "Get the ability from lru, service:%{public}s, extension type %{public}d", abilityRequest.abilityInfo.uri.c_str(), abilityRequest.abilityInfo.extensionAbilityType); std::lock_guard lock(mutex_); - std::shared_ptr abilityRecord = GetAbilityRecInProcList(abilityRequest); + std::shared_ptr abilityRecord = GetAbilityRecInProcList(abilityRequest); if (abilityRecord == nullptr) { TAG_LOGD(AAFwkTag::SERVICE_EXT, "Can't found the abilityRecord for get."); return nullptr; @@ -197,7 +198,7 @@ std::shared_ptr AbilityCacheManager::Get(const AbilityRequest& ab return abilityRecord; } -std::shared_ptr AbilityCacheManager::FindRecordByToken(const sptr &token) +std::shared_ptr AbilityCacheManager::FindRecordByToken(const sptr &token) { if (token == nullptr) { TAG_LOGE(AAFwkTag::SERVICE_EXT, "null token"); @@ -209,7 +210,7 @@ std::shared_ptr AbilityCacheManager::FindRecordByToken(const sptr if (*it) { sptr srcToken = (*it)->GetToken(); if (srcToken == token) { - std::shared_ptr &abilityRecord = *it; + std::shared_ptr &abilityRecord = *it; TAG_LOGD(AAFwkTag::SERVICE_EXT, "Find the ability by token from lru, service:%{public}s, extension type %{public}d", abilityRecord->GetURI().c_str(), abilityRecord->GetAbilityInfo().extensionAbilityType); @@ -221,13 +222,13 @@ std::shared_ptr AbilityCacheManager::FindRecordByToken(const sptr return nullptr; } -std::list> AbilityCacheManager::GetAbilityList() +std::list> AbilityCacheManager::GetAbilityList() { std::lock_guard lock(mutex_); return devRecLru_; } -std::shared_ptr AbilityCacheManager::FindRecordBySessionId(const std::string &assertSessionId) +std::shared_ptr AbilityCacheManager::FindRecordBySessionId(const std::string &assertSessionId) { std::lock_guard lock(mutex_); auto it = devRecLru_.begin(); @@ -238,7 +239,7 @@ std::shared_ptr AbilityCacheManager::FindRecordBySessionId(const } auto assertSessionStr = (*it)->GetWant().GetStringParam(Want::PARAM_ASSERT_FAULT_SESSION_ID); if (assertSessionStr == assertSessionId) { - std::shared_ptr &abilityRecord = *it; + std::shared_ptr &abilityRecord = *it; TAG_LOGD(AAFwkTag::SERVICE_EXT, "Find the ability by sessionId from lru, service:%{public}s, extension type %{public}d", abilityRecord->GetURI().c_str(), abilityRecord->GetAbilityInfo().extensionAbilityType); @@ -250,7 +251,7 @@ std::shared_ptr AbilityCacheManager::FindRecordBySessionId(const return nullptr; } -std::shared_ptr AbilityCacheManager::FindRecordByServiceKey(const std::string &serviceKey) +std::shared_ptr AbilityCacheManager::FindRecordByServiceKey(const std::string &serviceKey) { std::lock_guard lock(mutex_); auto it = devRecLru_.begin(); @@ -264,7 +265,7 @@ std::shared_ptr AbilityCacheManager::FindRecordByServiceKey(const curServiceKey = curServiceKey + std::to_string((*it)->GetWant().GetIntParam(FRS_APP_INDEX, 0)); } if (curServiceKey.compare(serviceKey) == 0) { - std::shared_ptr &abilityRecord = *it; + std::shared_ptr &abilityRecord = *it; TAG_LOGD(AAFwkTag::SERVICE_EXT, "Find the ability by serviceKey from lru, service:%{public}s, extension type %{public}d", abilityRecord->GetURI().c_str(), abilityRecord->GetAbilityInfo().extensionAbilityType); diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp index 598c6bdc9f..7d7650828d 100644 --- a/services/abilitymgr/src/ability_connect_manager.cpp +++ b/services/abilitymgr/src/ability_connect_manager.cpp @@ -182,7 +182,7 @@ int AbilityConnectManager::StartAbilityLocked(const AbilityRequest &abilityReque return ERR_INVALID_VALUE; } - std::shared_ptr targetService; + std::shared_ptr targetService; bool isLoadedAbility = false; std::string hostBundleName; if (UIExtensionUtils::IsUIExtension(abilityRequest.abilityInfo.extensionAbilityType)) { @@ -241,7 +241,7 @@ int AbilityConnectManager::StartAbilityLocked(const AbilityRequest &abilityReque targetService->SetLaunchReason(LaunchReason::LAUNCHREASON_START_ABILITY); } auto updateRecordCallback = [mgr = shared_from_this()]( - const std::shared_ptr& targetService) { + const std::shared_ptr& targetService) { if (mgr != nullptr) { mgr->UpdateUIExtensionInfo(targetService, AAFwk::DEFAULT_INVAL_VALUE); } @@ -265,7 +265,7 @@ int AbilityConnectManager::StartAbilityLocked(const AbilityRequest &abilityReque } void AbilityConnectManager::SetLastExitReason( - const AbilityRequest &abilityRequest, std::shared_ptr &targetRecord) + const AbilityRequest &abilityRequest, std::shared_ptr &targetRecord) { TAG_LOGD(AAFwkTag::EXT, "called"); if (targetRecord == nullptr || !UIExtensionUtils::IsUIExtension(abilityRequest.abilityInfo.extensionAbilityType)) { @@ -293,7 +293,7 @@ void AbilityConnectManager::SetLastExitReason( targetRecord->SetLastExitReason(exitReason, processInfo, time_stamp, withKillMsg); } -void AbilityConnectManager::DoForegroundUIExtension(std::shared_ptr abilityRecord, +void AbilityConnectManager::DoForegroundUIExtension(std::shared_ptr abilityRecord, const AbilityRequest &abilityRequest) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); @@ -433,7 +433,7 @@ int AbilityConnectManager::StopServiceAbilityLocked(const AbilityRequest &abilit } int32_t AbilityConnectManager::GetOrCreateExtensionRecord(const AbilityRequest &abilityRequest, bool isCreatedByConnect, - const std::string &hostBundleName, std::shared_ptr &extensionRecord, bool &isLoaded) + const std::string &hostBundleName, std::shared_ptr &extensionRecord, bool &isLoaded) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); AppExecFwk::ElementName element(abilityRequest.abilityInfo.deviceId, abilityRequest.abilityInfo.bundleName, @@ -462,7 +462,7 @@ int32_t AbilityConnectManager::GetOrCreateExtensionRecord(const AbilityRequest & } void AbilityConnectManager::GetOrCreateServiceRecord(const AbilityRequest &abilityRequest, - const bool isCreatedByConnect, std::shared_ptr &targetService, bool &isLoadedAbility) + const bool isCreatedByConnect, std::shared_ptr &targetService, bool &isLoadedAbility) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); // lifecycle is not complete when window extension is reused @@ -495,7 +495,7 @@ void AbilityConnectManager::GetOrCreateServiceRecord(const AbilityRequest &abili } isLoadedAbility = true; if (noReuse || targetService == nullptr) { - targetService = AbilityRecord::CreateAbilityRecord(abilityRequest); + targetService = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); CHECK_POINTER(targetService); targetService->SetOwnerMissionUserId(userId_); if (isCreatedByConnect) { @@ -509,7 +509,7 @@ void AbilityConnectManager::GetOrCreateServiceRecord(const AbilityRequest &abili } void AbilityConnectManager::SetServiceAfterNewCreate(const AbilityRequest &abilityRequest, - AbilityRecord &targetService) + BaseExtensionRecord &targetService) { if (abilityRequest.abilityInfo.name == AbilityConfig::LAUNCHER_ABILITY_NAME) { targetService.SetLauncherRoot(); @@ -517,7 +517,8 @@ void AbilityConnectManager::SetServiceAfterNewCreate(const AbilityRequest &abili targetService.SetRestartTime(abilityRequest.restartTime); targetService.SetRestartCount(abilityRequest.restartCount); } - } else if (IsAbilityNeedKeepAlive(targetService.shared_from_this()) && abilityRequest.restart) { + } else if (IsAbilityNeedKeepAlive(BaseExtensionRecord::TransferToExtensionRecordBase( + targetService.shared_from_this())) && abilityRequest.restart) { targetService.SetRestartTime(abilityRequest.restartTime); targetService.SetRestartCount(abilityRequest.restartCount); } @@ -551,7 +552,7 @@ void AbilityConnectManager::GetConnectRecordListFromMap( int32_t AbilityConnectManager::GetOrCreateTargetServiceRecord( const AbilityRequest &abilityRequest, const sptr &connectInfo, - std::shared_ptr &targetService, bool &isLoadedAbility) + std::shared_ptr &targetService, bool &isLoadedAbility) { if (UIExtensionUtils::IsUIExtension(abilityRequest.abilityInfo.extensionAbilityType) && connectInfo != nullptr) { int32_t ret = GetOrCreateExtensionRecord( @@ -599,7 +600,7 @@ int AbilityConnectManager::PreloadUIExtensionAbilityInner( return ret; } CHECK_POINTER_AND_RETURN(extensionRecord, ERR_NULL_OBJECT); - std::shared_ptr targetService = extensionRecord->abilityRecord_; + std::shared_ptr targetService = extensionRecord->abilityRecord_; AppExecFwk::ElementName element(abilityRequest.abilityInfo.deviceId, abilityRequest.abilityInfo.bundleName, abilityRequest.abilityInfo.name, abilityRequest.abilityInfo.moduleName); CHECK_POINTER_AND_RETURN(targetService, ERR_INVALID_VALUE); @@ -608,7 +609,7 @@ int AbilityConnectManager::PreloadUIExtensionAbilityInner( AddToServiceMap(extensionRecordKey, targetService); auto updateRecordCallback = [hostPid, mgr = shared_from_this()]( - const std::shared_ptr& targetService) { + const std::shared_ptr& targetService) { if (mgr != nullptr) { mgr->UpdateUIExtensionInfo(targetService, hostPid); } @@ -619,7 +620,7 @@ int AbilityConnectManager::PreloadUIExtensionAbilityInner( return ERR_OK; } -int AbilityConnectManager::UnloadUIExtensionAbility(const std::shared_ptr &abilityRecord, +int AbilityConnectManager::UnloadUIExtensionAbility(const std::shared_ptr &abilityRecord, pid_t &hostPid) { TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); @@ -643,7 +644,7 @@ int AbilityConnectManager::UnloadUIExtensionAbility(const std::shared_ptr abilityRecord, sptr callerToken) + const std::shared_ptr abilityRecord, sptr callerToken) { if (taskHandler_ == nullptr || abilityRecord == nullptr || abilityRecord->GetPid() <= 0) { return; @@ -687,7 +688,7 @@ int AbilityConnectManager::ConnectAbilityLocked(const AbilityRequest &abilityReq // Do not distinguishing specific error codes return ERR_INVALID_VALUE; } - std::shared_ptr targetService; + std::shared_ptr targetService; bool isLoadedAbility = false; ret = GetOrCreateTargetServiceRecord(abilityRequest, connectInfo, targetService, isLoadedAbility); if (ret != ERR_OK) { @@ -740,7 +741,7 @@ int AbilityConnectManager::ConnectAbilityLocked(const AbilityRequest &abilityReq if (!isLoadedAbility) { TAG_LOGI(AAFwkTag::EXT, "load"); auto updateRecordCallback = [mgr = shared_from_this()]( - const std::shared_ptr& targetService) { + const std::shared_ptr& targetService) { if (mgr != nullptr) { mgr->UpdateUIExtensionInfo(targetService, AAFwk::DEFAULT_INVAL_VALUE); } @@ -789,7 +790,7 @@ void AbilityConnectManager::DecrementConnectionCountAndCleanup(int32_t pid) } } -void AbilityConnectManager::HandleActiveAbility(std::shared_ptr &targetService, +void AbilityConnectManager::HandleActiveAbility(std::shared_ptr &targetService, std::shared_ptr &connectRecord) { TAG_LOGI(AAFwkTag::EXT, "Active"); @@ -822,7 +823,7 @@ void AbilityConnectManager::HandleActiveAbility(std::shared_ptr & } std::shared_ptr AbilityConnectManager::GetAbilityConnectedRecordFromRecordList( - const std::shared_ptr &targetService, + const std::shared_ptr &targetService, std::list> &connectRecordList) { auto isMatch = [targetService](auto connectRecord) -> bool { @@ -965,7 +966,7 @@ int32_t AbilityConnectManager::ResumeExtensionAbilityLocked(const sptr abilityRecord) +void AbilityConnectManager::TerminateRecord(std::shared_ptr abilityRecord) { TAG_LOGD(AAFwkTag::EXT, "call"); if (!GetExtensionByIdFromServiceMap(abilityRecord->GetRecordId()) && @@ -1121,7 +1122,8 @@ void AbilityConnectManager::OnAppStateChanged(const AppInfo &info) }); auto cacheAbilityList = AbilityCacheManager::GetInstance().GetAbilityList(); - std::for_each(cacheAbilityList.begin(), cacheAbilityList.end(), [&info](std::shared_ptr &service) { + std::for_each(cacheAbilityList.begin(), cacheAbilityList.end(), [&info]( + std::shared_ptr &service) { if (service && info.bundleName == service->GetApplicationInfo().bundleName && info.appIndex == service->GetAppIndex() && info.instanceKey == service->GetInstanceKey()) { auto appName = service->GetApplicationInfo().name; @@ -1146,7 +1148,7 @@ int AbilityConnectManager::AbilityTransitionDone(const sptr &toke std::lock_guard guard(serialMutex_); int targetState = AbilityRecord::ConvertLifeCycleToAbilityState(static_cast(state)); std::string abilityState = AbilityRecord::ConvertAbilityState(static_cast(targetState)); - std::shared_ptr abilityRecord; + std::shared_ptr abilityRecord; if (targetState == AbilityState::INACTIVE) { abilityRecord = GetExtensionByTokenFromServiceMap(token); CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); @@ -1230,7 +1232,7 @@ int AbilityConnectManager::AbilityWindowConfigTransactionDone(const sptr &record) const +void AbilityConnectManager::ProcessPreload(const std::shared_ptr &record) const { auto bundleMgrHelper = AbilityUtil::GetBundleManagerHelper(); CHECK_POINTER(record); @@ -1250,7 +1252,7 @@ int AbilityConnectManager::ScheduleConnectAbilityDoneLocked( std::lock_guard guard(serialMutex_); CHECK_POINTER_AND_RETURN(token, ERR_INVALID_VALUE); - auto abilityRecord = Token::GetAbilityRecordByToken(token); + auto abilityRecord = BaseExtensionRecord::TransferToExtensionRecordBase(Token::GetAbilityRecordByToken(token)); CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); TAG_LOGI(AAFwkTag::EXT, "%{public}s/%{public}s", abilityRecord->GetElementName().GetBundleName().c_str(), @@ -1296,7 +1298,7 @@ int AbilityConnectManager::ScheduleConnectAbilityDoneLocked( return ERR_OK; } -void AbilityConnectManager::ProcessEliminateAbilityRecord(std::shared_ptr eliminateRecord) +void AbilityConnectManager::ProcessEliminateAbilityRecord(std::shared_ptr eliminateRecord) { CHECK_POINTER(eliminateRecord); std::string eliminateKey = eliminateRecord->GetURI(); @@ -1308,7 +1310,7 @@ void AbilityConnectManager::ProcessEliminateAbilityRecord(std::shared_ptr abilityRecord) +void AbilityConnectManager::TerminateOrCacheAbility(std::shared_ptr abilityRecord) { RemoveUIExtensionAbilityRecord(abilityRecord); if (abilityRecord->IsSceneBoard()) { @@ -1401,7 +1403,7 @@ int AbilityConnectManager::ScheduleCommandAbilityDoneLocked(const sptrGetURI(); TAG_LOGD(AAFwkTag::EXT, "Ability: %{public}s", element.c_str()); @@ -1486,7 +1488,7 @@ void AbilityConnectManager::HandleCommandDestroy(const sptr &sessio } } -void AbilityConnectManager::CompleteCommandAbility(std::shared_ptr abilityRecord) +void AbilityConnectManager::CompleteCommandAbility(std::shared_ptr abilityRecord) { CHECK_POINTER(abilityRecord); if (taskHandler_) { @@ -1530,7 +1532,7 @@ void AbilityConnectManager::CompleteStartServiceReq(const std::string &serviceUr } } -std::shared_ptr AbilityConnectManager::GetServiceRecordByAbilityRequest( +std::shared_ptr AbilityConnectManager::GetServiceRecordByAbilityRequest( const AbilityRequest &abilityRequest) { AppExecFwk::ElementName element(abilityRequest.abilityInfo.deviceId, GenerateBundleName(abilityRequest), @@ -1539,7 +1541,7 @@ std::shared_ptr AbilityConnectManager::GetServiceRecordByAbilityR return GetServiceRecordByElementName(serviceKey); } -std::shared_ptr AbilityConnectManager::GetServiceRecordByElementName(const std::string &element) +std::shared_ptr AbilityConnectManager::GetServiceRecordByElementName(const std::string &element) { std::lock_guard guard(serviceMapMutex_); auto mapIter = serviceMap_.find(element); @@ -1549,7 +1551,7 @@ std::shared_ptr AbilityConnectManager::GetServiceRecordByElementN return nullptr; } -std::shared_ptr AbilityConnectManager::GetExtensionByTokenFromServiceMap( +std::shared_ptr AbilityConnectManager::GetExtensionByTokenFromServiceMap( const sptr &token) { auto IsMatch = [token](auto service) { @@ -1567,7 +1569,7 @@ std::shared_ptr AbilityConnectManager::GetExtensionByTokenFromSer return nullptr; } -std::shared_ptr AbilityConnectManager::GetExtensionByIdFromServiceMap( +std::shared_ptr AbilityConnectManager::GetExtensionByIdFromServiceMap( const int64_t &abilityRecordId) { auto IsMatch = [abilityRecordId](auto &service) { @@ -1585,7 +1587,7 @@ std::shared_ptr AbilityConnectManager::GetExtensionByIdFromServic return nullptr; } -std::shared_ptr AbilityConnectManager::GetExtensionByIdFromTerminatingMap( +std::shared_ptr AbilityConnectManager::GetExtensionByIdFromTerminatingMap( const int64_t &abilityRecordId) { auto IsMatch = [abilityRecordId](auto &extensionRecord) { @@ -1603,7 +1605,7 @@ std::shared_ptr AbilityConnectManager::GetExtensionByIdFromTermin return nullptr; } -std::shared_ptr AbilityConnectManager::GetUIExtensionBySessionInfo( +std::shared_ptr AbilityConnectManager::GetUIExtensionBySessionInfo( const sptr &sessionInfo) { CHECK_POINTER_AND_RETURN(sessionInfo, nullptr); @@ -1633,7 +1635,7 @@ std::shared_ptr AbilityConnectManager::GetUIExtensionBySessionInf return nullptr; } -std::shared_ptr AbilityConnectManager::GetExtensionByTokenFromTerminatingMap( +std::shared_ptr AbilityConnectManager::GetExtensionByTokenFromTerminatingMap( const sptr &token) { auto IsMatch = [token](auto& extensionRecord) { @@ -1669,8 +1671,8 @@ std::list> AbilityConnectManager::GetConnectRe return connectList; } -void AbilityConnectManager::LoadAbility(const std::shared_ptr &abilityRecord, - std::function&)> updateRecordCallback) +void AbilityConnectManager::LoadAbility(const std::shared_ptr &abilityRecord, + std::function&)> updateRecordCallback) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); CHECK_POINTER(abilityRecord); @@ -1718,7 +1720,7 @@ void AbilityConnectManager::LoadAbility(const std::shared_ptr &ab } void AbilityConnectManager::HandleLoadAbilityOrStartSpecifiedProcess( - const AbilityRuntime::LoadParam &loadParam, const std::shared_ptr &abilityRecord) + const AbilityRuntime::LoadParam &loadParam, const std::shared_ptr &abilityRecord) { if (abilityRecord->GetAbilityInfo().isolationProcess && AAFwk::UIExtensionUtils::IsUIExtension(abilityRecord->GetAbilityInfo().extensionAbilityType)) { @@ -1736,7 +1738,7 @@ void AbilityConnectManager::HandleLoadAbilityOrStartSpecifiedProcess( } void AbilityConnectManager::StartSpecifiedProcess( - const LoadAbilityContext &context, const std::shared_ptr &abilityRecord) + const LoadAbilityContext &context, const std::shared_ptr &abilityRecord) { std::lock_guard guard(loadAbilityQueueLock_); auto requestId = RequestIdUtil::GetRequestId(); @@ -1791,7 +1793,7 @@ bool AbilityConnectManager::HasRequestIdInLoadAbilityQueue(int32_t requestId) } void AbilityConnectManager::SetExtensionLoadParam(AbilityRuntime::LoadParam &loadParam, - std::shared_ptr abilityRecord) + std::shared_ptr abilityRecord) { CHECK_POINTER(abilityRecord); if (!IsStrictMode(abilityRecord)) { @@ -1809,7 +1811,7 @@ void AbilityConnectManager::SetExtensionLoadParam(AbilityRuntime::LoadParam &loa extensionParam.networkEnableFlags, extensionParam.saEnableFlags, extensionParam.strictMode); } -bool AbilityConnectManager::IsStrictMode(std::shared_ptr abilityRecord) +bool AbilityConnectManager::IsStrictMode(std::shared_ptr abilityRecord) { CHECK_POINTER_AND_RETURN(abilityRecord, false); const auto &want = abilityRecord->GetWant(); @@ -1831,7 +1833,7 @@ bool AbilityConnectManager::IsStrictMode(std::shared_ptr abilityR return strictMode; } -bool AbilityConnectManager::NeedExtensionControl(std::shared_ptr abilityRecord) +bool AbilityConnectManager::NeedExtensionControl(std::shared_ptr abilityRecord) { CHECK_POINTER_AND_RETURN(abilityRecord, false); auto extensionType = abilityRecord->GetAbilityInfo().extensionAbilityType; @@ -1890,7 +1892,8 @@ void AbilityConnectManager::HandleRestartResidentTask(const AbilityRequest &abil StartAbilityLocked(abilityRequest); } -void AbilityConnectManager::PostTimeOutTask(const std::shared_ptr &abilityRecord, uint32_t messageId) +void AbilityConnectManager::PostTimeOutTask(const std::shared_ptr &abilityRecord, + uint32_t messageId) { CHECK_POINTER(abilityRecord); int connectRecordId = 0; @@ -1902,7 +1905,7 @@ void AbilityConnectManager::PostTimeOutTask(const std::shared_ptr PostTimeOutTask(abilityRecord, connectRecordId, messageId); } -void AbilityConnectManager::PostTimeOutTask(const std::shared_ptr &abilityRecord, +void AbilityConnectManager::PostTimeOutTask(const std::shared_ptr &abilityRecord, int connectRecordId, uint32_t messageId) { CHECK_POINTER(abilityRecord); @@ -1936,7 +1939,7 @@ void AbilityConnectManager::PostTimeOutTask(const std::shared_ptr } } -void AbilityConnectManager::HandleStartTimeoutTask(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::HandleStartTimeoutTask(const std::shared_ptr &abilityRecord) { TAG_LOGW(AAFwkTag::EXT, "load timeout"); std::lock_guard guard(serialMutex_); @@ -1983,7 +1986,7 @@ void AbilityConnectManager::HandleStartTimeoutTask(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::HandleCommandTimeoutTask(const std::shared_ptr &abilityRecord) { TAG_LOGI(AAFwkTag::EXT, "HandleCommandTimeoutTask start"); CHECK_POINTER(abilityRecord); @@ -1997,7 +2000,7 @@ void AbilityConnectManager::HandleCommandTimeoutTask(const std::shared_ptr abilityRecord) +void AbilityConnectManager::HandleConnectTimeoutTask(std::shared_ptr abilityRecord) { TAG_LOGW(AAFwkTag::EXT, "connect timeout"); CHECK_POINTER(abilityRecord); @@ -2019,7 +2022,7 @@ void AbilityConnectManager::HandleConnectTimeoutTask(std::shared_ptr &abilityRecord, +void AbilityConnectManager::HandleCommandWindowTimeoutTask(const std::shared_ptr &abilityRecord, const sptr &sessionInfo, WindowCommand winCmd) { TAG_LOGD(AAFwkTag::ABILITYMGR, "start"); @@ -2031,7 +2034,7 @@ void AbilityConnectManager::HandleCommandWindowTimeoutTask(const std::shared_ptr TAG_LOGD(AAFwkTag::ABILITYMGR, "end"); } -void AbilityConnectManager::HandleStopTimeoutTask(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::HandleStopTimeoutTask(const std::shared_ptr &abilityRecord) { TAG_LOGD(AAFwkTag::EXT, "Complete stop ability timeout start."); std::lock_guard guard(serialMutex_); @@ -2064,7 +2067,7 @@ void AbilityConnectManager::HandleTerminateDisconnectTask(const ConnectListType& } } -int AbilityConnectManager::DispatchInactive(const std::shared_ptr &abilityRecord, int state) +int AbilityConnectManager::DispatchInactive(const std::shared_ptr &abilityRecord, int state) { TAG_LOGD(AAFwkTag::EXT, "DispatchInactive call"); CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); @@ -2106,7 +2109,7 @@ int AbilityConnectManager::DispatchInactive(const std::shared_ptr return ERR_OK; } -int AbilityConnectManager::DispatchForeground(const std::shared_ptr &abilityRecord) +int AbilityConnectManager::DispatchForeground(const std::shared_ptr &abilityRecord) { CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); CHECK_POINTER_AND_RETURN(taskHandler_, ERR_INVALID_VALUE); @@ -2122,7 +2125,7 @@ int AbilityConnectManager::DispatchForeground(const std::shared_ptr &abilityRecord) +int AbilityConnectManager::DispatchBackground(const std::shared_ptr &abilityRecord) { CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); CHECK_POINTER_AND_RETURN(taskHandler_, ERR_INVALID_VALUE); @@ -2139,7 +2142,7 @@ int AbilityConnectManager::DispatchBackground(const std::shared_ptr &abilityRecord) +int AbilityConnectManager::DispatchTerminate(const std::shared_ptr &abilityRecord) { CHECK_POINTER_AND_RETURN(abilityRecord, ERR_INVALID_VALUE); // remove terminate timeout task @@ -2153,7 +2156,7 @@ int AbilityConnectManager::DispatchTerminate(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::ConnectAbility(const std::shared_ptr &abilityRecord) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); CHECK_POINTER(abilityRecord); @@ -2170,7 +2173,7 @@ void AbilityConnectManager::ConnectAbility(const std::shared_ptr } } -void AbilityConnectManager::ConnectUIServiceExtAbility(const std::shared_ptr &abilityRecord, +void AbilityConnectManager::ConnectUIServiceExtAbility(const std::shared_ptr &abilityRecord, int connectRecordId, const Want &want) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); @@ -2179,7 +2182,7 @@ void AbilityConnectManager::ConnectUIServiceExtAbility(const std::shared_ptrConnectAbilityWithWant(want); } -void AbilityConnectManager::ResumeConnectAbility(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::ResumeConnectAbility(const std::shared_ptr &abilityRecord) { TAG_LOGI(AAFwkTag::EXT, "ResumeConnectAbility"); HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); @@ -2196,7 +2199,7 @@ void AbilityConnectManager::ResumeConnectAbility(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::CommandAbility(const std::shared_ptr &abilityRecord) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); CHECK_POINTER(abilityRecord); @@ -2224,7 +2227,7 @@ void AbilityConnectManager::CommandAbility(const std::shared_ptr } } -void AbilityConnectManager::CommandAbilityWindow(const std::shared_ptr &abilityRecord, +void AbilityConnectManager::CommandAbilityWindow(const std::shared_ptr &abilityRecord, const sptr &sessionInfo, WindowCommand winCmd) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); @@ -2252,14 +2255,14 @@ void AbilityConnectManager::CommandAbilityWindow(const std::shared_ptr &abilityRecord, +void AbilityConnectManager::BackgroundAbilityWindowLocked(const std::shared_ptr &abilityRecord, const sptr &sessionInfo) { std::lock_guard guard(serialMutex_); DoBackgroundAbilityWindow(abilityRecord, sessionInfo); } -void AbilityConnectManager::DoBackgroundAbilityWindow(const std::shared_ptr &abilityRecord, +void AbilityConnectManager::DoBackgroundAbilityWindow(const std::shared_ptr &abilityRecord, const sptr &sessionInfo) { CHECK_POINTER(abilityRecord); @@ -2280,7 +2283,7 @@ void AbilityConnectManager::DoBackgroundAbilityWindow(const std::shared_ptr &abilityRecord, +void AbilityConnectManager::TerminateAbilityWindowLocked(const std::shared_ptr &abilityRecord, const sptr &sessionInfo) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); @@ -2302,7 +2305,7 @@ void AbilityConnectManager::TerminateAbilityWindowLocked(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::TerminateDone(const std::shared_ptr &abilityRecord) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); CHECK_POINTER(abilityRecord); @@ -2347,7 +2350,7 @@ void AbilityConnectManager::RemoveConnectionRecordFromMap(std::shared_ptr &abilityRecord) +void AbilityConnectManager::RemoveServiceAbility(const std::shared_ptr &abilityRecord) { CHECK_POINTER(abilityRecord); TAG_LOGD(AAFwkTag::EXT, "Remove service(%{public}s) from terminating map.", @@ -2461,14 +2464,14 @@ int32_t AbilityConnectManager::GetActiveUIExtensionList( return uiExtensionAbilityRecordMgr_->GetActiveUIExtensionList(bundleName, extensionList); } -void AbilityConnectManager::OnLoadAbilityFailed(std::shared_ptr abilityRecord) +void AbilityConnectManager::OnLoadAbilityFailed(std::shared_ptr abilityRecord) { CHECK_POINTER(abilityRecord); abilityRecord->RemoveLoadTimeoutTask(); HandleStartTimeoutTask(abilityRecord); } -void AbilityConnectManager::OnAbilityDied(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::OnAbilityDied(const std::shared_ptr abilityRecord) { CHECK_POINTER(abilityRecord); TAG_LOGI(AAFwkTag::EXT, "%{public}s/%{public}s", abilityRecord->GetElementName().GetBundleName().c_str(), @@ -2529,7 +2532,7 @@ void AbilityConnectManager::OnTimeOut(uint32_t msgId, int64_t abilityRecordId, b } } -void AbilityConnectManager::HandleInactiveTimeout(const std::shared_ptr &ability) +void AbilityConnectManager::HandleInactiveTimeout(const std::shared_ptr &ability) { TAG_LOGI(AAFwkTag::EXT, "HandleInactiveTimeout start"); CHECK_POINTER(ability); @@ -2543,7 +2546,7 @@ void AbilityConnectManager::HandleInactiveTimeout(const std::shared_ptr abilityRecord) +void AbilityConnectManager::CleanActivatingTimeoutAbility(std::shared_ptr abilityRecord) { CHECK_POINTER(abilityRecord); if (abilityRecord->IsAbilityState(AbilityState::ACTIVE)) { @@ -2573,7 +2576,7 @@ void AbilityConnectManager::CleanActivatingTimeoutAbility(std::shared_ptr &abilityRecord) +bool AbilityConnectManager::IsAbilityNeedKeepAlive(const std::shared_ptr &abilityRecord) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); CHECK_POINTER_AND_RETURN(abilityRecord, false); @@ -2585,7 +2588,7 @@ bool AbilityConnectManager::IsAbilityNeedKeepAlive(const std::shared_ptrIsKeepAliveBundle(); } -void AbilityConnectManager::ClearPreloadUIExtensionRecord(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::ClearPreloadUIExtensionRecord(const std::shared_ptr &abilityRecord) { TAG_LOGD(AAFwkTag::ABILITYMGR, "called"); CHECK_POINTER(abilityRecord); @@ -2603,7 +2606,7 @@ void AbilityConnectManager::ClearPreloadUIExtensionRecord(const std::shared_ptr< uiExtensionAbilityRecordMgr_->RemovePreloadUIExtensionRecordById(extensionRecordMapKey, extensionRecordId); } -void AbilityConnectManager::KeepAbilityAlive(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::KeepAbilityAlive(const std::shared_ptr &abilityRecord) { CHECK_POINTER(abilityRecord); auto abilityInfo = abilityRecord->GetAbilityInfo(); @@ -2653,7 +2656,7 @@ void AbilityConnectManager::KeepAbilityAlive(const std::shared_ptr &abilityRecord, +bool AbilityConnectManager::IsNeedToRestart(const std::shared_ptr &abilityRecord, const std::string &bundleName, const std::string &abilityName) { if (IsLauncher(abilityRecord) || abilityRecord->IsSceneBoard()) { @@ -2707,7 +2710,7 @@ void AbilityConnectManager::DisconnectBeforeCleanup() TAG_LOGI(AAFwkTag::EXT, "cleanup end"); } -void AbilityConnectManager::HandleAbilityDiedTask(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::HandleAbilityDiedTask(const std::shared_ptr &abilityRecord) { TAG_LOGD(AAFwkTag::EXT, "called"); std::lock_guard guard(serialMutex_); @@ -2774,7 +2777,8 @@ static bool CheckIsNumString(const std::string &numStr) return true; } -void AbilityConnectManager::HandleNotifyAssertFaultDialogDied(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::HandleNotifyAssertFaultDialogDied( + const std::shared_ptr &abilityRecord) { TAG_LOGD(AAFwkTag::EXT, "called"); CHECK_POINTER(abilityRecord); @@ -2802,7 +2806,7 @@ void AbilityConnectManager::HandleNotifyAssertFaultDialogDied(const std::shared_ void AbilityConnectManager::CloseAssertDialog(const std::string &assertSessionId) { TAG_LOGD(AAFwkTag::EXT, "Called"); - std::shared_ptr abilityRecord = nullptr; + std::shared_ptr abilityRecord = nullptr; { std::lock_guard lock(serviceMapMutex_); for (const auto &item : serviceMap_) { @@ -2835,13 +2839,13 @@ void AbilityConnectManager::CloseAssertDialog(const std::string &assertSessionId } } -void AbilityConnectManager::HandleUIExtensionDied(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::HandleUIExtensionDied(const std::shared_ptr &abilityRecord) { TAG_LOGD(AAFwkTag::ABILITYMGR, "called"); CHECK_POINTER(abilityRecord); std::lock_guard guard(uiExtensionMapMutex_); for (auto it = uiExtensionMap_.begin(); it != uiExtensionMap_.end();) { - std::shared_ptr uiExtAbility = it->second.first.lock(); + std::shared_ptr uiExtAbility = it->second.first.lock(); if (uiExtAbility == nullptr) { TAG_LOGW(AAFwkTag::ABILITYMGR, "uiExtAbility null"); RemoveUIExtWindowDeathRecipient(it->first); @@ -2864,7 +2868,8 @@ void AbilityConnectManager::HandleUIExtensionDied(const std::shared_ptr &abilityRecord, int32_t currentUserId) +void AbilityConnectManager::RestartAbility(const std::shared_ptr &abilityRecord, + int32_t currentUserId) { TAG_LOGI(AAFwkTag::EXT, "restart ability: %{public}s/%{public}s", abilityRecord->GetElementName().GetBundleName().c_str(), @@ -2926,7 +2931,7 @@ void AbilityConnectManager::RestartAbility(const std::shared_ptr } } -std::string AbilityConnectManager::GetServiceKey(const std::shared_ptr &service) +std::string AbilityConnectManager::GetServiceKey(const std::shared_ptr &service) { std::string serviceKey = service->GetURI(); if (FRS_BUNDLE_NAME == service->GetAbilityInfo().bundleName) { @@ -2988,7 +2993,7 @@ void AbilityConnectManager::DumpStateByUri(std::vector &info, bool std::vector ¶ms) { TAG_LOGI(AAFwkTag::EXT, "args:%{public}s, params size: %{public}zu", args.c_str(), params.size()); - std::shared_ptr extensionAbilityRecord = nullptr; + std::shared_ptr extensionAbilityRecord = nullptr; { std::lock_guard lock(serviceMapMutex_); auto it = std::find_if(serviceMap_.begin(), serviceMap_.end(), [&args](const auto &service) { @@ -3039,7 +3044,7 @@ void AbilityConnectManager::GetExtensionRunningInfos(int upperLimit, std::vector std::for_each(serviceMapBack.begin(), serviceMapBack.end(), queryInfo); auto cacheAbilityList = AbilityCacheManager::GetInstance().GetAbilityList(); - auto queryInfoForCache = [&](std::shared_ptr &service) { + auto queryInfoForCache = [&](std::shared_ptr &service) { if (static_cast(info.size()) >= upperLimit) { return; } @@ -3079,7 +3084,7 @@ void AbilityConnectManager::GetAbilityRunningInfos(std::vector &abilityRecord, +void AbilityConnectManager::GetExtensionRunningInfo(std::shared_ptr &abilityRecord, const int32_t userId, std::vector &info) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); @@ -3156,7 +3161,7 @@ void AbilityConnectManager::RemoveLauncherDeathRecipient() AbilityCacheManager::GetInstance().RemoveLauncherDeathRecipient(); } -bool AbilityConnectManager::IsLauncher(std::shared_ptr serviceExtension) const +bool AbilityConnectManager::IsLauncher(std::shared_ptr serviceExtension) const { if (serviceExtension == nullptr) { TAG_LOGE(AAFwkTag::EXT, "param null"); @@ -3176,7 +3181,7 @@ void AbilityConnectManager::KillProcessesByUserId() const IN_PROCESS_CALL_WITHOUT_RET(appScheduler->KillProcessesByUserId(userId_)); } -void AbilityConnectManager::MoveToBackground(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::MoveToBackground(const std::shared_ptr &abilityRecord) { HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); if (abilityRecord == nullptr) { @@ -3207,7 +3212,7 @@ void AbilityConnectManager::MoveToBackground(const std::shared_ptrBackgroundAbility(task); } -void AbilityConnectManager::CompleteForeground(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::CompleteForeground(const std::shared_ptr &abilityRecord) { std::lock_guard guard(serialMutex_); if (abilityRecord == nullptr) { @@ -3229,7 +3234,7 @@ void AbilityConnectManager::CompleteForeground(const std::shared_ptrGetURI()); } -void AbilityConnectManager::HandleForegroundTimeoutTask(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::HandleForegroundTimeoutTask(const std::shared_ptr &abilityRecord) { std::lock_guard guard(serialMutex_); if (abilityRecord == nullptr) { @@ -3246,7 +3251,7 @@ void AbilityConnectManager::HandleForegroundTimeoutTask(const std::shared_ptrGetURI()); } -void AbilityConnectManager::CompleteBackground(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::CompleteBackground(const std::shared_ptr &abilityRecord) { std::lock_guard lock(serialMutex_); if (abilityRecord == nullptr) { @@ -3267,7 +3272,8 @@ void AbilityConnectManager::CompleteBackground(const std::shared_ptrGetToken()); } -void AbilityConnectManager::PrintTimeOutLog(const std::shared_ptr &ability, uint32_t msgId, bool isHalf) +void AbilityConnectManager::PrintTimeOutLog(const std::shared_ptr &ability, uint32_t msgId, + bool isHalf) { CHECK_POINTER(ability); AppExecFwk::RunningProcessInfo processInfo = {}; @@ -3354,7 +3360,7 @@ bool AbilityConnectManager::GetTimeoutMsgContent(uint32_t msgId, std::string &ms } } -void AbilityConnectManager::MoveToTerminatingMap(const std::shared_ptr& abilityRecord) +void AbilityConnectManager::MoveToTerminatingMap(const std::shared_ptr& abilityRecord) { CHECK_POINTER(abilityRecord); auto& abilityInfo = abilityRecord->GetAbilityInfo(); @@ -3434,7 +3440,7 @@ void AbilityConnectManager::HandleUIExtWindowDiedTask(const sptr { TAG_LOGD(AAFwkTag::ABILITYMGR, "call."); CHECK_POINTER(remote); - std::shared_ptr abilityRecord; + std::shared_ptr abilityRecord; sptr sessionInfo; { std::lock_guard guard(uiExtensionMapMutex_); @@ -3597,7 +3603,7 @@ void AbilityConnectManager::HandleExtensionDisconnectTask(const std::shared_ptr< } } -bool AbilityConnectManager::IsUIExtensionAbility(const std::shared_ptr &abilityRecord) +bool AbilityConnectManager::IsUIExtensionAbility(const std::shared_ptr &abilityRecord) { CHECK_POINTER_AND_RETURN(abilityRecord, false); return UIExtensionUtils::IsUIExtension(abilityRecord->GetAbilityInfo().extensionAbilityType); @@ -3610,19 +3616,19 @@ bool AbilityConnectManager::IsCacheExtensionAbilityByInfo(const AppExecFwk::Abil abilityInfo.name)); } -bool AbilityConnectManager::IsCacheExtensionAbility(const std::shared_ptr &abilityRecord) +bool AbilityConnectManager::IsCacheExtensionAbility(const std::shared_ptr &abilityRecord) { CHECK_POINTER_AND_RETURN(abilityRecord, false); return IsCacheExtensionAbilityByInfo(abilityRecord->GetAbilityInfo()); } bool AbilityConnectManager::CheckUIExtensionAbilitySessionExist( - const std::shared_ptr &abilityRecord) + const std::shared_ptr &abilityRecord) { CHECK_POINTER_AND_RETURN(abilityRecord, false); std::lock_guard guard(uiExtensionMapMutex_); for (auto it = uiExtensionMap_.begin(); it != uiExtensionMap_.end(); ++it) { - std::shared_ptr uiExtAbility = it->second.first.lock(); + std::shared_ptr uiExtAbility = it->second.first.lock(); if (abilityRecord == uiExtAbility) { return true; } @@ -3631,7 +3637,7 @@ bool AbilityConnectManager::CheckUIExtensionAbilitySessionExist( return false; } -void AbilityConnectManager::RemoveUIExtensionAbilityRecord(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::RemoveUIExtensionAbilityRecord(const std::shared_ptr &abilityRecord) { CHECK_POINTER(abilityRecord); CHECK_POINTER(uiExtensionAbilityRecordMgr_); @@ -3642,14 +3648,14 @@ void AbilityConnectManager::RemoveUIExtensionAbilityRecord(const std::shared_ptr } void AbilityConnectManager::AddUIExtensionAbilityRecordToTerminatedList( - const std::shared_ptr &abilityRecord) + const std::shared_ptr &abilityRecord) { CHECK_POINTER(abilityRecord); CHECK_POINTER(uiExtensionAbilityRecordMgr_); uiExtensionAbilityRecordMgr_->AddExtensionRecordToTerminatedList(abilityRecord->GetUIExtensionAbilityId()); } -bool AbilityConnectManager::IsCallerValid(const std::shared_ptr &abilityRecord) +bool AbilityConnectManager::IsCallerValid(const std::shared_ptr &abilityRecord) { CHECK_POINTER_AND_RETURN_LOG(abilityRecord, false, "Invalid caller for UIExtension"); auto sessionInfo = abilityRecord->GetSessionInfo(); @@ -3709,7 +3715,7 @@ void AbilityConnectManager::SignRestartProcess(int32_t pid) AbilityCacheManager::GetInstance().SignRestartProcess(pid); } -bool AbilityConnectManager::AddToServiceMap(const std::string &key, std::shared_ptr abilityRecord) +bool AbilityConnectManager::AddToServiceMap(const std::string &key, std::shared_ptr abilityRecord) { std::lock_guard lock(serviceMapMutex_); if (abilityRecord == nullptr) { @@ -3739,7 +3745,7 @@ void AbilityConnectManager::AddConnectObjectToMap(sptr connectObj connectMap_[connectObject] = connectRecordList; } -EventInfo AbilityConnectManager::BuildEventInfo(const std::shared_ptr &abilityRecord) +EventInfo AbilityConnectManager::BuildEventInfo(const std::shared_ptr &abilityRecord) { EventInfo eventInfo; if (abilityRecord == nullptr) { @@ -3769,7 +3775,7 @@ EventInfo AbilityConnectManager::BuildEventInfo(const std::shared_ptr &abilityRecord, +void AbilityConnectManager::UpdateUIExtensionInfo(const std::shared_ptr &abilityRecord, int32_t hostPid) { if (abilityRecord == nullptr || @@ -3892,7 +3898,7 @@ int32_t AbilityConnectManager::QueryPreLoadUIExtensionRecordInner(const AppExecF element, moduleName, hostPid, recordNum); } -std::shared_ptr AbilityConnectManager::GetUIExtensionBySessionFromServiceMap( +std::shared_ptr AbilityConnectManager::GetUIExtensionBySessionFromServiceMap( const sptr &sessionInfo) { int32_t persistentId = sessionInfo->persistentId; @@ -3917,7 +3923,7 @@ std::shared_ptr AbilityConnectManager::GetUIExtensionBySessionFro } void AbilityConnectManager::UpdateUIExtensionBindInfo( - const std::shared_ptr &abilityRecord, std::string callerBundleName, int32_t notifyProcessBind) + const std::shared_ptr &abilityRecord, std::string callerBundleName, int32_t notifyProcessBind) { if (abilityRecord == nullptr || !UIExtensionUtils::IsUIExtension(abilityRecord->GetAbilityInfo().extensionAbilityType)) { diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index 7418d2be19..d114965121 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -3677,7 +3677,7 @@ int AbilityManagerService::PreloadUIExtensionAbilityInner( return result; } -int AbilityManagerService::UnloadUIExtensionAbility(const std::shared_ptr &abilityRecord, +int AbilityManagerService::UnloadUIExtensionAbility(const std::shared_ptr &abilityRecord, pid_t &hostPid) { TAG_LOGI(AAFwkTag::ABILITYMGR, "call"); @@ -4678,7 +4678,7 @@ int AbilityManagerService::TerminateUIExtensionAbility(const sptr & CHECK_POINTER_AND_RETURN(extensionSessionInfo, ERR_INVALID_VALUE); auto abilityRecord = Token::GetAbilityRecordByToken(extensionSessionInfo->callerToken); std::shared_ptr connectManager; - std::shared_ptr targetRecord; + std::shared_ptr targetRecord; GetConnectManagerAndUIExtensionBySessionInfo(extensionSessionInfo, connectManager, targetRecord, true); CHECK_POINTER_AND_RETURN(targetRecord, ERR_INVALID_VALUE); CHECK_POINTER_AND_RETURN(connectManager, ERR_INVALID_VALUE); @@ -4746,7 +4746,7 @@ int AbilityManagerService::CloseUIExtensionAbilityBySCB(const sptr connectManager; - std::shared_ptr targetRecord; + std::shared_ptr targetRecord; GetConnectManagerAndUIExtensionBySessionInfo(sessionInfo, connectManager, targetRecord, true); if (connectManager == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "connectManager null, ability: %{public}s/%{public}s", @@ -4765,7 +4765,8 @@ int AbilityManagerService::CloseUIExtensionAbilityBySCB(const sptrNotifyExtensionDetachToDisplay(); - connectManager->TerminateAbilityWindowLocked(abilityRecord, sessionInfo); + connectManager->TerminateAbilityWindowLocked(BaseExtensionRecord::TransferToExtensionRecordBase(abilityRecord), + sessionInfo); return ERR_OK; } @@ -5006,7 +5007,7 @@ int AbilityManagerService::MinimizeUIExtensionAbility(const sptr &e } std::shared_ptr connectManager; - std::shared_ptr targetRecord; + std::shared_ptr targetRecord; GetConnectManagerAndUIExtensionBySessionInfo(extensionSessionInfo, connectManager, targetRecord); CHECK_POINTER_AND_RETURN(targetRecord, ERR_INVALID_VALUE); CHECK_POINTER_AND_RETURN(connectManager, ERR_INVALID_VALUE); @@ -7999,10 +8000,10 @@ void AbilityManagerService::OnAbilityDied(std::shared_ptr ability auto userId = abilityRecord->GetOwnerMissionUserId(); auto connectManager = GetConnectManagerByUserId(userId); if (connectManager) { - connectManager->OnAbilityDied(abilityRecord); + connectManager->OnAbilityDied(BaseExtensionRecord::TransferToExtensionRecordBase(abilityRecord)); return; } else { - TAG_LOGW(AAFwkTag::ABILITYMGR, "connectManager not found"); + TAG_LOGW(AAFwkTag::ABILITYMGR, "no connectManager, type: %{public}d", abilityRecord->GetAbilityRecordType()); } auto dataAbilityManager = GetDataAbilityManagerByToken(abilityRecord->GetToken()); @@ -11333,7 +11334,7 @@ AAFwk::PermissionVerification::VerificationInfo AbilityManagerService::CreateVer } int32_t AbilityManagerService::CheckCallAppServiceExtensionPermission(const AbilityRequest &abilityRequest, - std::shared_ptr targetService, bool isFromConnect) + std::shared_ptr targetService, bool isFromConnect) { int32_t result = CheckCallServiceExtensionPermission(abilityRequest); if (result != ERR_OK) { @@ -12418,7 +12419,7 @@ bool AbilityManagerService::CheckCollaboratorType(int32_t type) } void AbilityManagerService::GetConnectManagerAndUIExtensionBySessionInfo(const sptr &sessionInfo, - std::shared_ptr &connectManager, std::shared_ptr &targetAbility, + std::shared_ptr &connectManager, std::shared_ptr &targetAbility, bool needCheck) { targetAbility = nullptr; @@ -13204,7 +13205,7 @@ void AbilityManagerService::OnStartProcessFailed(const std::vectorOnLoadAbilityFailed(abilityRecord); + connectManager->OnLoadAbilityFailed(BaseExtensionRecord::TransferToExtensionRecordBase(abilityRecord)); } } } diff --git a/services/abilitymgr/src/ability_record.cpp b/services/abilitymgr/src/ability_record.cpp index 0e9062187a..41b0b24edc 100644 --- a/services/abilitymgr/src/ability_record.cpp +++ b/services/abilitymgr/src/ability_record.cpp @@ -522,40 +522,6 @@ void AbilityRecord::RemoveLoadTimeoutTask() handler->RemoveEvent(AbilityManagerService::LOAD_TIMEOUT_MSG, GetAbilityRecordId()); } -void AbilityRecord::PostUIExtensionAbilityTimeoutTask(uint32_t messageId) -{ - if (IsDebug()) { - return; - } - - TAG_LOGD(AAFwkTag::ABILITYMGR, "post timeout %{public}d, id %{public}d", messageId, recordId_); - switch (messageId) { - case AbilityManagerService::LOAD_TIMEOUT_MSG: { - uint32_t timeout = AmsConfigurationParameter::GetInstance().GetAppStartTimeoutTime() * - static_cast(LOAD_TIMEOUT_MULTIPLE); - SendEvent(AbilityManagerService::LOAD_HALF_TIMEOUT_MSG, timeout / HALF_TIMEOUT, recordId_, true); - SendEvent(AbilityManagerService::LOAD_TIMEOUT_MSG, timeout, recordId_, true); - break; - } - case AbilityManagerService::FOREGROUND_TIMEOUT_MSG: { - uint32_t timeout = AmsConfigurationParameter::GetInstance().GetAppStartTimeoutTime() * - static_cast(FOREGROUND_TIMEOUT_MULTIPLE); - if (InsightIntentExecuteParam::IsInsightIntentExecute(GetWant())) { - timeout = AmsConfigurationParameter::GetInstance().GetAppStartTimeoutTime() * - static_cast(INSIGHT_INTENT_TIMEOUT_MULTIPLE); - } - SendEvent(AbilityManagerService::FOREGROUND_HALF_TIMEOUT_MSG, timeout / HALF_TIMEOUT, recordId_, true); - SendEvent(AbilityManagerService::FOREGROUND_TIMEOUT_MSG, timeout, recordId_, true); - ResSchedUtil::GetInstance().ReportLoadingEventToRss(LoadingStage::FOREGROUND_BEGIN, GetPid(), GetUid(), - timeout, GetAbilityRecordId()); - break; - } - default: { - break; - } - } -} - std::string AbilityRecord::GetLabel() { HITRACE_METER_NAME(HITRACE_TAG_APP, __PRETTY_FUNCTION__); @@ -1798,52 +1764,6 @@ void AbilityRecord::ShareData(const int32_t &uniqueId) lifecycleDeal_->ShareData(uniqueId); } -void AbilityRecord::ConnectAbility() -{ - TAG_LOGI(AAFwkTag::SERVICE_EXT, "%{public}s called.", __func__); - Want want = GetWant(); - UpdateDmsCallerInfo(want); - ConnectAbilityWithWant(want); -} - -void AbilityRecord::ConnectAbilityWithWant(const Want &want) -{ - TAG_LOGD(AAFwkTag::SERVICE_EXT, "Connect ability."); - CHECK_POINTER(lifecycleDeal_); - if (isConnected) { - TAG_LOGW(AAFwkTag::SERVICE_EXT, "state err"); - } - lifecycleDeal_->ConnectAbility(want); - isConnected = true; -} - -void AbilityRecord::DisconnectAbility() -{ - HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGI(AAFwkTag::SERVICE_EXT, "DisconnectAbility, bundle:%{public}s, ability:%{public}s.", - abilityInfo_.applicationInfo.bundleName.c_str(), abilityInfo_.name.c_str()); - CHECK_POINTER(lifecycleDeal_); - lifecycleDeal_->DisconnectAbility(GetWant()); - if (GetAbilityInfo().extensionAbilityType == AppExecFwk::ExtensionAbilityType::UI_SERVICE) { - if (GetInProgressRecordCount() == 0) { - isConnected = false; - } - } else { - isConnected = false; - } -} - -void AbilityRecord::DisconnectAbilityWithWant(const Want &want) -{ - HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::SERVICE_EXT, "DisconnectAbilityWithWant:%{public}s.", abilityInfo_.name.c_str()); - CHECK_POINTER(lifecycleDeal_); - lifecycleDeal_->DisconnectAbility(want); - if (GetInProgressRecordCount() == 0) { - isConnected = false; - } -} - void AbilityRecord::CommandAbility() { TAG_LOGD(AAFwkTag::SERVICE_EXT, "startId_:%{public}d.", startId_); @@ -2144,42 +2064,6 @@ void SystemAbilityCallerRecord::SendResultToSystemAbility(int requestCode, } } -bool AbilityRecord::NeedConnectAfterCommand() -{ - return !IsConnectListEmpty() && !isConnected; -} - -void AbilityRecord::AddConnectRecordToList(const std::shared_ptr &connRecord) -{ - CHECK_POINTER(connRecord); - std::lock_guard guard(connRecordListMutex_); - auto it = std::find(connRecordList_.begin(), connRecordList_.end(), connRecord); - // found it - if (it != connRecordList_.end()) { - TAG_LOGD(AAFwkTag::ABILITYMGR, "Found it in list, so no need to add same connection"); - return; - } - // no found then add new connection to list - TAG_LOGD(AAFwkTag::ABILITYMGR, "No found in list, so add new connection to list"); - connRecordList_.push_back(connRecord); -} - -std::list> AbilityRecord::GetConnectRecordList() const -{ - std::lock_guard guard(connRecordListMutex_); - return connRecordList_; -} - -void AbilityRecord::RemoveConnectRecordFromList(const std::shared_ptr &connRecord) -{ - CHECK_POINTER(connRecord); - std::lock_guard guard(connRecordListMutex_); - connRecordList_.remove(connRecord); - if (connRecordList_.empty()) { - isConnected = false; - } -} - void AbilityRecord::RemoveSpecifiedWantParam(const std::string &key) { std::lock_guard guard(wantLock_); @@ -2335,73 +2219,6 @@ std::shared_ptr AbilityRecord::GetCallerInfo() const return callerList_.back()->GetCallerInfo(); } -bool AbilityRecord::IsConnectListEmpty() -{ - std::lock_guard guard(connRecordListMutex_); - return connRecordList_.empty(); -} - -size_t AbilityRecord::GetConnectedListSize() -{ - std::lock_guard guard(connRecordListMutex_); - return std::count_if(connRecordList_.begin(), connRecordList_.end(), [](std::shared_ptr record) { - return record && record->GetConnectState() == ConnectionState::CONNECTED; - }); -} - -size_t AbilityRecord::GetConnectingListSize() -{ - std::lock_guard guard(connRecordListMutex_); - return std::count_if(connRecordList_.begin(), connRecordList_.end(), [](std::shared_ptr record) { - return record && record->GetConnectState() == ConnectionState::CONNECTING; - }); -} - -std::shared_ptr AbilityRecord::GetConnectingRecord() const -{ - std::lock_guard guard(connRecordListMutex_); - auto connect = - std::find_if(connRecordList_.begin(), connRecordList_.end(), [](std::shared_ptr record) { - return record->GetConnectState() == ConnectionState::CONNECTING; - }); - return (connect != connRecordList_.end()) ? *connect : nullptr; -} - -std::list> AbilityRecord::GetConnectingRecordList() -{ - std::lock_guard guard(connRecordListMutex_); - std::list> connectingList; - for (auto record : connRecordList_) { - if (record && record->GetConnectState() == ConnectionState::CONNECTING) { - connectingList.push_back(record); - } - } - return connectingList; -} - -uint32_t AbilityRecord::GetInProgressRecordCount() -{ - std::lock_guard guard(connRecordListMutex_); - uint32_t count = 0; - for (auto record : connRecordList_) { - if (record && (record->GetConnectState() == ConnectionState::CONNECTING || - record->GetConnectState() == ConnectionState::CONNECTED)) { - count++; - } - } - return count; -} - -std::shared_ptr AbilityRecord::GetDisconnectingRecord() const -{ - std::lock_guard guard(connRecordListMutex_); - auto connect = - std::find_if(connRecordList_.begin(), connRecordList_.end(), [](std::shared_ptr record) { - return record->GetConnectState() == ConnectionState::DISCONNECTING; - }); - return (connect != connRecordList_.end()) ? *connect : nullptr; -} - void AbilityRecord::GetAbilityTypeString(std::string &typeStr) { AppExecFwk::AbilityType type = GetAbilityInfo().type; @@ -2501,34 +2318,6 @@ void AbilityRecord::Dump(std::vector &info) } } -void AbilityRecord::DumpUIExtensionRootHostInfo(std::vector &info) const -{ - if (!UIExtensionUtils::IsUIExtension(GetAbilityInfo().extensionAbilityType)) { - // Dump host info only for uiextension. - return; - } - - sptr token = GetToken(); - if (token == nullptr) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "null token"); - return; - } - - UIExtensionHostInfo hostInfo; - auto ret = IN_PROCESS_CALL(AAFwk::AbilityManagerClient::GetInstance()->GetUIExtensionRootHostInfo(token, hostInfo)); - if (ret != ERR_OK) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "failed: %{public}d", ret); - return; - } - - std::string dumpInfo = " root host bundle name [" + hostInfo.elementName_.GetBundleName() + "]"; - info.emplace_back(dumpInfo); - dumpInfo = " root host module name [" + hostInfo.elementName_.GetModuleName() + "]"; - info.emplace_back(dumpInfo); - dumpInfo = " root host ability name [" + hostInfo.elementName_.GetAbilityName() + "]"; - info.emplace_back(dumpInfo); -} - void AbilityRecord::DumpAbilityState( std::vector &info, bool isClient, const std::vector ¶ms) { @@ -2589,75 +2378,6 @@ int64_t AbilityRecord::GetStartTime() const return startTime_; } -void AbilityRecord::DumpService(std::vector &info, bool isClient) const -{ - std::vector params; - DumpService(info, params, isClient); -} - -void AbilityRecord::DumpService(std::vector &info, std::vector ¶ms, bool isClient) const -{ - info.emplace_back(" AbilityRecord ID #" + std::to_string(GetRecordId()) + " state #" + - AbilityRecord::ConvertAbilityState(GetAbilityState()) + " start time [" + - std::to_string(GetStartTime()) + "]"); - info.emplace_back(" main name [" + GetAbilityInfo().name + "]"); - info.emplace_back(" bundle name [" + GetAbilityInfo().bundleName + "]"); - bool isUIExtension = UIExtensionUtils::IsUIExtension(GetAbilityInfo().extensionAbilityType); - if (isUIExtension) { - info.emplace_back(" ability type [UIEXTENSION]"); - } else { - if (GetAbilityInfo().extensionAbilityType == AppExecFwk::ExtensionAbilityType::UI_SERVICE) { - info.emplace_back(" ability type [UI_SERVICE]"); - info.emplace_back(" windowConfig windowType [" + - std::to_string(GetAbilityWindowConfig().windowType) + "]"); - info.emplace_back(" windowConfig windowId [" + - std::to_string(GetAbilityWindowConfig().windowId) + "]"); - } else { - info.emplace_back(" ability type [SERVICE]"); - } - } - info.emplace_back(" app state #" + AbilityRecord::ConvertAppState(appState_)); - - std::string isKeepAlive = GetKeepAlive() ? "true" : "false"; - info.emplace_back(" isKeepAlive: " + isKeepAlive); - if (isLauncherRoot_) { - info.emplace_back(" can restart num #" + std::to_string(restartCount_)); - } - decltype(connRecordList_) connRecordListCpy; - { - std::lock_guard guard(connRecordListMutex_); - connRecordListCpy = connRecordList_; - } - - info.emplace_back(" Connections: " + std::to_string(connRecordListCpy.size())); - for (auto &&conn : connRecordListCpy) { - if (conn) { - conn->Dump(info); - } - } - // add dump client info - DumpClientInfo(info, params, isClient); - DumpUIExtensionRootHostInfo(info); - DumpUIExtensionPid(info, isUIExtension); -} - -void AbilityRecord::DumpUIExtensionPid(std::vector &info, bool isUIExtension) const -{ - if (!isUIExtension) { - TAG_LOGD(AAFwkTag::ABILITYMGR, "Not ui extension type."); - return; - } - - auto appScheduler = DelayedSingleton::GetInstance(); - if (appScheduler == nullptr) { - TAG_LOGE(AAFwkTag::ABILITYMGR, "null appScheduler"); - return; - } - AppExecFwk::RunningProcessInfo processInfo; - appScheduler->GetRunningProcessInfoByToken(GetToken(), processInfo); - info.emplace_back(" pid: " + std::to_string(processInfo.pid_)); -} - void AbilityRecord::RemoveAbilityDeathRecipient() const { if (scheduler_ == nullptr) { @@ -2782,16 +2502,6 @@ void AbilityRecord::NotifyAnimationAbilityDied() } } -void AbilityRecord::SetConnRemoteObject(const sptr &remoteObject) -{ - connRemoteObject_ = remoteObject; -} - -sptr AbilityRecord::GetConnRemoteObject() const -{ - return connRemoteObject_; -} - bool AbilityRecord::IsNeverStarted() const { if (UIExtensionUtils::IsUIExtension(GetAbilityInfo().extensionAbilityType)) { diff --git a/services/abilitymgr/src/connection_record.cpp b/services/abilitymgr/src/connection_record.cpp index 7f2fdc542e..c9d3492ffd 100644 --- a/services/abilitymgr/src/connection_record.cpp +++ b/services/abilitymgr/src/connection_record.cpp @@ -31,7 +31,7 @@ const int DISCONNECT_TIMEOUT_MULTIPLE = 1; #endif ConnectionRecord::ConnectionRecord(const sptr &callerToken, - const std::shared_ptr &targetService, const sptr &connCallback, + const std::shared_ptr &targetService, const sptr &connCallback, std::shared_ptr abilityConnectManager) : state_(ConnectionState::INIT), callerToken_(callerToken), @@ -46,7 +46,7 @@ ConnectionRecord::~ConnectionRecord() {} std::shared_ptr ConnectionRecord::CreateConnectionRecord(const sptr &callerToken, - const std::shared_ptr &targetService, const sptr &connCallback, + const std::shared_ptr &targetService, const sptr &connCallback, std::shared_ptr abilityConnectManager) { auto connRecord = std::make_shared( @@ -71,7 +71,7 @@ sptr ConnectionRecord::GetToken() const return callerToken_; } -std::shared_ptr ConnectionRecord::GetAbilityRecord() const +std::shared_ptr ConnectionRecord::GetAbilityRecord() const { return targetService_; } diff --git a/services/abilitymgr/src/connection_state_item.cpp b/services/abilitymgr/src/connection_state_item.cpp index c7a44e7ce3..12fc0abbb7 100644 --- a/services/abilitymgr/src/connection_state_item.cpp +++ b/services/abilitymgr/src/connection_state_item.cpp @@ -45,7 +45,7 @@ public: extensionType_ = AppExecFwk::ExtensionAbilityType::UNSPECIFIED; } - explicit ConnectedExtension(std::shared_ptr target) + explicit ConnectedExtension(std::shared_ptr target) { if (!target) { return; diff --git a/services/abilitymgr/src/extension_record/base_extension_record.cpp b/services/abilitymgr/src/extension_record/base_extension_record.cpp new file mode 100644 index 0000000000..d86c8c24f2 --- /dev/null +++ b/services/abilitymgr/src/extension_record/base_extension_record.cpp @@ -0,0 +1,355 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "base_extension_record.h" + +#include + +#include "ability_manager_service.h" +#include "ability_util.h" +#include "ams_configuration_parameter.h" +#include "connection_state_manager.h" +#include "global_constant.h" +#include "hitrace_meter.h" +#include "res_sched_util.h" +#include "ui_extension_utils.h" + +namespace OHOS { +namespace AAFwk { +using namespace OHOS::AbilityRuntime::GlobalConstant; +const int HALF_TIMEOUT = 2; + +BaseExtensionRecord::BaseExtensionRecord(const Want &want, const AppExecFwk::AbilityInfo &abilityInfo, + const AppExecFwk::ApplicationInfo &applicationInfo, int requestCode) + : AbilityRecord(want, abilityInfo, applicationInfo, requestCode) {} + +std::shared_ptr BaseExtensionRecord::CreateBaseExtensionRecord( + const AbilityRequest &abilityRequest) +{ + auto abilityRecord = std::make_shared(abilityRequest.want, abilityRequest.abilityInfo, + abilityRequest.appInfo, abilityRequest.requestCode); + abilityRecord->Init(abilityRequest); + return abilityRecord; +} + +AbilityRecordType BaseExtensionRecord::GetAbilityRecordType() +{ + return AbilityRecordType::EXTENSION_ABILITY; +} + +std::shared_ptr BaseExtensionRecord::TransferToExtensionRecordBase( + const std::shared_ptr &abilityRecord) +{ + if (abilityRecord == nullptr) { + return nullptr; + } + if (abilityRecord->GetAbilityRecordType() == AbilityRecordType::EXTENSION_ABILITY) { + return std::static_pointer_cast(abilityRecord); + } + return nullptr; +} + +void BaseExtensionRecord::AddConnectRecordToList(const std::shared_ptr &connRecord) +{ + CHECK_POINTER(connRecord); + std::lock_guard guard(connRecordListMutex_); + auto it = std::find(connRecordList_.begin(), connRecordList_.end(), connRecord); + // found it + if (it != connRecordList_.end()) { + TAG_LOGD(AAFwkTag::ABILITYMGR, "Found it in list, so no need to add same connection"); + return; + } + // no found then add new connection to list + TAG_LOGD(AAFwkTag::ABILITYMGR, "No found in list, so add new connection to list"); + connRecordList_.push_back(connRecord); +} + +std::list> BaseExtensionRecord::GetConnectRecordList() const +{ + std::lock_guard guard(connRecordListMutex_); + return connRecordList_; +} + +void BaseExtensionRecord::RemoveConnectRecordFromList(const std::shared_ptr &connRecord) +{ + CHECK_POINTER(connRecord); + std::lock_guard guard(connRecordListMutex_); + connRecordList_.remove(connRecord); + if (connRecordList_.empty()) { + isConnected = false; + } +} + +std::shared_ptr BaseExtensionRecord::GetConnectingRecord() const +{ + std::lock_guard guard(connRecordListMutex_); + auto connect = + std::find_if(connRecordList_.begin(), connRecordList_.end(), [](std::shared_ptr record) { + return record->GetConnectState() == ConnectionState::CONNECTING; + }); + return (connect != connRecordList_.end()) ? *connect : nullptr; +} + +std::list> BaseExtensionRecord::GetConnectingRecordList() +{ + std::lock_guard guard(connRecordListMutex_); + std::list> connectingList; + for (auto record : connRecordList_) { + if (record && record->GetConnectState() == ConnectionState::CONNECTING) { + connectingList.push_back(record); + } + } + return connectingList; +} + +std::shared_ptr BaseExtensionRecord::GetDisconnectingRecord() const +{ + std::lock_guard guard(connRecordListMutex_); + auto connect = + std::find_if(connRecordList_.begin(), connRecordList_.end(), [](std::shared_ptr record) { + return record->GetConnectState() == ConnectionState::DISCONNECTING; + }); + return (connect != connRecordList_.end()) ? *connect : nullptr; +} + +size_t BaseExtensionRecord::GetConnectedListSize() +{ + std::lock_guard guard(connRecordListMutex_); + return std::count_if(connRecordList_.begin(), connRecordList_.end(), [](std::shared_ptr record) { + return record && record->GetConnectState() == ConnectionState::CONNECTED; + }); +} + +bool BaseExtensionRecord::IsConnectListEmpty() +{ + std::lock_guard guard(connRecordListMutex_); + return connRecordList_.empty(); +} + +bool BaseExtensionRecord::NeedConnectAfterCommand() +{ + return !IsConnectListEmpty() && !isConnected; +} + +size_t BaseExtensionRecord::GetConnectingListSize() +{ + std::lock_guard guard(connRecordListMutex_); + return std::count_if(connRecordList_.begin(), connRecordList_.end(), [](std::shared_ptr record) { + return record && record->GetConnectState() == ConnectionState::CONNECTING; + }); +} + +uint32_t BaseExtensionRecord::GetInProgressRecordCount() +{ + std::lock_guard guard(connRecordListMutex_); + uint32_t count = 0; + for (auto record : connRecordList_) { + if (record && (record->GetConnectState() == ConnectionState::CONNECTING || + record->GetConnectState() == ConnectionState::CONNECTED)) { + count++; + } + } + return count; +} + +void BaseExtensionRecord::DisconnectAbility() +{ + HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); + TAG_LOGI(AAFwkTag::SERVICE_EXT, "DisconnectAbility, bundle:%{public}s, ability:%{public}s.", + GetAbilityInfo().applicationInfo.bundleName.c_str(), GetAbilityInfo().name.c_str()); + CHECK_POINTER(lifecycleDeal_); + lifecycleDeal_->DisconnectAbility(GetWant()); + if (GetAbilityInfo().extensionAbilityType == AppExecFwk::ExtensionAbilityType::UI_SERVICE) { + if (GetInProgressRecordCount() == 0) { + isConnected = false; + } + } else { + isConnected = false; + } +} + +void BaseExtensionRecord::DisconnectAbilityWithWant(const Want &want) +{ + HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); + TAG_LOGD(AAFwkTag::SERVICE_EXT, "DisconnectAbilityWithWant:%{public}s.", GetAbilityInfo().name.c_str()); + CHECK_POINTER(lifecycleDeal_); + lifecycleDeal_->DisconnectAbility(want); + if (GetInProgressRecordCount() == 0) { + isConnected = false; + } +} + +void BaseExtensionRecord::DumpService(std::vector &info, bool isClient) const +{ + std::vector params; + DumpService(info, params, isClient); +} + +void BaseExtensionRecord::DumpService(std::vector &info, std::vector ¶ms, + bool isClient) const +{ + info.emplace_back(" AbilityRecord ID #" + std::to_string(GetRecordId()) + " state #" + + AbilityRecord::ConvertAbilityState(GetAbilityState()) + " start time [" + + std::to_string(GetStartTime()) + "]"); + info.emplace_back(" main name [" + GetAbilityInfo().name + "]"); + info.emplace_back(" bundle name [" + GetAbilityInfo().bundleName + "]"); + bool isUIExtension = UIExtensionUtils::IsUIExtension(GetAbilityInfo().extensionAbilityType); + if (isUIExtension) { + info.emplace_back(" ability type [UIEXTENSION]"); + } else { + if (GetAbilityInfo().extensionAbilityType == AppExecFwk::ExtensionAbilityType::UI_SERVICE) { + info.emplace_back(" ability type [UI_SERVICE]"); + info.emplace_back(" windowConfig windowType [" + + std::to_string(GetAbilityWindowConfig().windowType) + "]"); + info.emplace_back(" windowConfig windowId [" + + std::to_string(GetAbilityWindowConfig().windowId) + "]"); + } else { + info.emplace_back(" ability type [SERVICE]"); + } + } + info.emplace_back(" app state #" + AbilityRecord::ConvertAppState(GetAppState())); + + std::string isKeepAlive = GetKeepAlive() ? "true" : "false"; + info.emplace_back(" isKeepAlive: " + isKeepAlive); + if (IsLauncherRoot()) { + info.emplace_back(" can restart num #" + std::to_string(GetRestartCount())); + } + decltype(connRecordList_) connRecordListCpy; + { + std::lock_guard guard(connRecordListMutex_); + connRecordListCpy = connRecordList_; + } + + info.emplace_back(" Connections: " + std::to_string(connRecordListCpy.size())); + for (auto &&conn : connRecordListCpy) { + if (conn) { + conn->Dump(info); + } + } + // add dump client info + DumpClientInfo(info, params, isClient); + DumpUIExtensionRootHostInfo(info); + DumpUIExtensionPid(info, isUIExtension); +} + +void BaseExtensionRecord::DumpUIExtensionRootHostInfo(std::vector &info) const +{ + if (!UIExtensionUtils::IsUIExtension(GetAbilityInfo().extensionAbilityType)) { + // Dump host info only for uiextension. + return; + } + + sptr token = GetToken(); + if (token == nullptr) { + TAG_LOGE(AAFwkTag::ABILITYMGR, "null token"); + return; + } + + UIExtensionHostInfo hostInfo; + auto ret = IN_PROCESS_CALL(AAFwk::AbilityManagerClient::GetInstance()->GetUIExtensionRootHostInfo(token, hostInfo)); + if (ret != ERR_OK) { + TAG_LOGE(AAFwkTag::ABILITYMGR, "failed: %{public}d", ret); + return; + } + + std::string dumpInfo = " root host bundle name [" + hostInfo.elementName_.GetBundleName() + "]"; + info.emplace_back(dumpInfo); + dumpInfo = " root host module name [" + hostInfo.elementName_.GetModuleName() + "]"; + info.emplace_back(dumpInfo); + dumpInfo = " root host ability name [" + hostInfo.elementName_.GetAbilityName() + "]"; + info.emplace_back(dumpInfo); +} + +void BaseExtensionRecord::DumpUIExtensionPid(std::vector &info, bool isUIExtension) const +{ + if (!isUIExtension) { + TAG_LOGD(AAFwkTag::ABILITYMGR, "Not ui extension type."); + return; + } + + auto appScheduler = DelayedSingleton::GetInstance(); + if (appScheduler == nullptr) { + TAG_LOGE(AAFwkTag::ABILITYMGR, "null appScheduler"); + return; + } + AppExecFwk::RunningProcessInfo processInfo; + appScheduler->GetRunningProcessInfoByToken(GetToken(), processInfo); + info.emplace_back(" pid: " + std::to_string(processInfo.pid_)); +} + +void BaseExtensionRecord::ConnectAbilityWithWant(const Want &want) +{ + TAG_LOGD(AAFwkTag::SERVICE_EXT, "Connect ability."); + CHECK_POINTER(lifecycleDeal_); + if (isConnected) { + TAG_LOGW(AAFwkTag::SERVICE_EXT, "state err"); + } + lifecycleDeal_->ConnectAbility(want); + isConnected = true; +} + +void BaseExtensionRecord::ConnectAbility() +{ + TAG_LOGI(AAFwkTag::SERVICE_EXT, "%{public}s called.", __func__); + Want want = GetWant(); + UpdateDmsCallerInfo(want); + ConnectAbilityWithWant(want); +} + +void BaseExtensionRecord::SetConnRemoteObject(const sptr &remoteObject) +{ + connRemoteObject_ = remoteObject; +} + +sptr BaseExtensionRecord::GetConnRemoteObject() const +{ + return connRemoteObject_; +} + +void BaseExtensionRecord::PostUIExtensionAbilityTimeoutTask(uint32_t messageId) +{ + if (IsDebug()) { + return; + } + int32_t recordId = GetRecordId(); + TAG_LOGD(AAFwkTag::ABILITYMGR, "post timeout %{public}d, id %{public}d", messageId, recordId); + switch (messageId) { + case AbilityManagerService::LOAD_TIMEOUT_MSG: { + uint32_t timeout = AmsConfigurationParameter::GetInstance().GetAppStartTimeoutTime() * + static_cast(LOAD_TIMEOUT_MULTIPLE); + SendEvent(AbilityManagerService::LOAD_HALF_TIMEOUT_MSG, timeout / HALF_TIMEOUT, recordId, true); + SendEvent(AbilityManagerService::LOAD_TIMEOUT_MSG, timeout, recordId, true); + break; + } + case AbilityManagerService::FOREGROUND_TIMEOUT_MSG: { + uint32_t timeout = AmsConfigurationParameter::GetInstance().GetAppStartTimeoutTime() * + static_cast(FOREGROUND_TIMEOUT_MULTIPLE); + if (InsightIntentExecuteParam::IsInsightIntentExecute(GetWant())) { + timeout = AmsConfigurationParameter::GetInstance().GetAppStartTimeoutTime() * + static_cast(INSIGHT_INTENT_TIMEOUT_MULTIPLE); + } + SendEvent(AbilityManagerService::FOREGROUND_HALF_TIMEOUT_MSG, timeout / HALF_TIMEOUT, recordId, true); + SendEvent(AbilityManagerService::FOREGROUND_TIMEOUT_MSG, timeout, recordId, true); + ResSchedUtil::GetInstance().ReportLoadingEventToRss(LoadingStage::FOREGROUND_BEGIN, GetPid(), GetUid(), + timeout, GetAbilityRecordId()); + break; + } + default: { + break; + } + } +} +} // namespace AAFwk +} // namespace OHOS \ No newline at end of file diff --git a/services/abilitymgr/src/extension_record/extension_record.cpp b/services/abilitymgr/src/extension_record/extension_record.cpp index 5f5968875b..826f033576 100644 --- a/services/abilitymgr/src/extension_record/extension_record.cpp +++ b/services/abilitymgr/src/extension_record/extension_record.cpp @@ -20,7 +20,7 @@ namespace OHOS { namespace AbilityRuntime { -ExtensionRecord::ExtensionRecord(const std::shared_ptr &abilityRecord) +ExtensionRecord::ExtensionRecord(const std::shared_ptr &abilityRecord) : abilityRecord_(abilityRecord) {} diff --git a/services/abilitymgr/src/extension_record/extension_record_factory.cpp b/services/abilitymgr/src/extension_record/extension_record_factory.cpp index 493d7ee649..24e2c1f933 100644 --- a/services/abilitymgr/src/extension_record/extension_record_factory.cpp +++ b/services/abilitymgr/src/extension_record/extension_record_factory.cpp @@ -17,6 +17,7 @@ #include "ability_util.h" #include "app_utils.h" +#include "base_extension_record.h" #include "multi_instance_utils.h" namespace OHOS { @@ -138,7 +139,7 @@ uint32_t ExtensionRecordFactory::GetExtensionProcessMode( int32_t ExtensionRecordFactory::CreateRecord( const AAFwk::AbilityRequest &abilityRequest, std::shared_ptr &extensionRecord) { - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); if (abilityRecord == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "abilityRecord create failed"); return ERR_NULL_OBJECT; diff --git a/services/abilitymgr/src/extension_record/extension_record_manager.cpp b/services/abilitymgr/src/extension_record/extension_record_manager.cpp index 8ff715c569..c5f419428a 100644 --- a/services/abilitymgr/src/extension_record/extension_record_manager.cpp +++ b/services/abilitymgr/src/extension_record/extension_record_manager.cpp @@ -155,7 +155,7 @@ int32_t ExtensionRecordManager::GetActiveUIExtensionList( } int32_t ExtensionRecordManager::GetOrCreateExtensionRecord(const AAFwk::AbilityRequest &abilityRequest, - const std::string &hostBundleName, std::shared_ptr &abilityRecord, bool &isLoaded) + const std::string &hostBundleName, std::shared_ptr &abilityRecord, bool &isLoaded) { CHECK_POINTER_AND_RETURN(abilityRequest.sessionInfo, ERR_INVALID_VALUE); abilityRecord = GetAbilityRecordBySessionInfo(abilityRequest.sessionInfo); @@ -187,7 +187,7 @@ int32_t ExtensionRecordManager::GetOrCreateExtensionRecord(const AAFwk::AbilityR return ERR_OK; } -std::shared_ptr ExtensionRecordManager::GetAbilityRecordBySessionInfo( +std::shared_ptr ExtensionRecordManager::GetAbilityRecordBySessionInfo( const sptr &sessionInfo) { CHECK_POINTER_AND_RETURN(sessionInfo, nullptr); @@ -201,7 +201,7 @@ std::shared_ptr ExtensionRecordManager::GetAbilityRecordBy if (it.second == nullptr) { continue; } - std::shared_ptr abilityRecord = it.second->abilityRecord_; + std::shared_ptr abilityRecord = it.second->abilityRecord_; if (abilityRecord == nullptr) { continue; } @@ -321,7 +321,8 @@ int32_t ExtensionRecordManager::GetHostPidForExtensionId(int32_t extensionRecord return ERR_INVALID_VALUE; } -int32_t ExtensionRecordManager::AddPreloadUIExtensionRecord(const std::shared_ptr abilityRecord) +int32_t ExtensionRecordManager::AddPreloadUIExtensionRecord( + const std::shared_ptr abilityRecord) { TAG_LOGD(AAFwkTag::ABILITYMGR, "call"); std::lock_guard lock(mutex_); @@ -468,7 +469,7 @@ int32_t ExtensionRecordManager::GetOrCreateExtensionRecordInner(const AAFwk::Abi return result; } CHECK_POINTER_AND_RETURN(extensionRecord, ERR_NULL_OBJECT); - std::shared_ptr abilityRecord = extensionRecord->abilityRecord_; + std::shared_ptr abilityRecord = extensionRecord->abilityRecord_; CHECK_POINTER_AND_RETURN(abilityRecord, ERR_NULL_OBJECT); isLoaded = false; // Reuse id or not has been checked, so alloc a new id here. @@ -490,7 +491,8 @@ int32_t ExtensionRecordManager::GetOrCreateExtensionRecordInner(const AAFwk::Abi } int32_t ExtensionRecordManager::SetAbilityProcessName(const AAFwk::AbilityRequest &abilityRequest, - const std::shared_ptr &abilityRecord, std::shared_ptr &extensionRecord) + const std::shared_ptr &abilityRecord, + std::shared_ptr &extensionRecord) { if (abilityRequest.abilityInfo.isolationProcess && AAFwk::UIExtensionUtils::IsUIExtension(abilityRecord->GetAbilityInfo().extensionAbilityType)) { @@ -573,7 +575,7 @@ int32_t ExtensionRecordManager::CreateExtensionRecord(const AAFwk::AbilityReques return result; } CHECK_POINTER_AND_RETURN(extensionRecord, ERR_NULL_OBJECT); - std::shared_ptr abilityRecord = extensionRecord->abilityRecord_; + std::shared_ptr abilityRecord = extensionRecord->abilityRecord_; CHECK_POINTER_AND_RETURN(abilityRecord, ERR_NULL_OBJECT); extensionRecordId = GenerateExtensionRecordId(extensionRecordId); extensionRecord->extensionRecordId_ = extensionRecordId; diff --git a/services/abilitymgr/src/ui_extension_record/ui_extension_record.cpp b/services/abilitymgr/src/ui_extension_record/ui_extension_record.cpp index 91fb065e2d..3a702da34c 100644 --- a/services/abilitymgr/src/ui_extension_record/ui_extension_record.cpp +++ b/services/abilitymgr/src/ui_extension_record/ui_extension_record.cpp @@ -20,7 +20,7 @@ namespace OHOS { namespace AbilityRuntime { -UIExtensionRecord::UIExtensionRecord(const std::shared_ptr &abilityRecord) +UIExtensionRecord::UIExtensionRecord(const std::shared_ptr &abilityRecord) : ExtensionRecord(abilityRecord) {} diff --git a/services/abilitymgr/src/ui_extension_record/ui_extension_record_factory.cpp b/services/abilitymgr/src/ui_extension_record/ui_extension_record_factory.cpp index 0f4b2c99eb..33200d885f 100644 --- a/services/abilitymgr/src/ui_extension_record/ui_extension_record_factory.cpp +++ b/services/abilitymgr/src/ui_extension_record/ui_extension_record_factory.cpp @@ -56,7 +56,7 @@ int32_t UIExtensionRecordFactory::PreCheck( int32_t UIExtensionRecordFactory::CreateRecord( const AAFwk::AbilityRequest &abilityRequest, std::shared_ptr &extensionRecord) { - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); if (abilityRecord == nullptr) { TAG_LOGE(AAFwkTag::ABILITYMGR, "create record failed"); return ERR_NULL_OBJECT; @@ -83,7 +83,7 @@ int32_t UIExtensionRecordFactory::CreateRecord( } void UIExtensionRecordFactory::CreateDebugRecord( - const AAFwk::AbilityRequest &abilityRequest, std::shared_ptr abilityRecord) + const AAFwk::AbilityRequest &abilityRequest, std::shared_ptr abilityRecord) { auto callerRecord = AAFwk::Token::GetAbilityRecordByToken(abilityRequest.callerToken); if (!callerRecord) { diff --git a/test/fuzztest/abilitycachemanagera_fuzzer/abilitycachemanagera_fuzzer.cpp b/test/fuzztest/abilitycachemanagera_fuzzer/abilitycachemanagera_fuzzer.cpp index a03e935960..840e1e59a6 100755 --- a/test/fuzztest/abilitycachemanagera_fuzzer/abilitycachemanagera_fuzzer.cpp +++ b/test/fuzztest/abilitycachemanagera_fuzzer/abilitycachemanagera_fuzzer.cpp @@ -24,8 +24,6 @@ #undef protected #undef private -#include "ability_record.h" - using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; using namespace OHOS::AbilityRuntime; @@ -56,7 +54,8 @@ sptr GetFuzzAbilityToken() abilityRequest.appInfo.bundleName = "com.example.fuzzTest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AbilityType::DATA; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); if (abilityRecord) { token = abilityRecord->GetToken(); } @@ -72,13 +71,15 @@ void AbilityCacheManagerFuzztest1(bool boolParam, std::string &stringParam, int3 { AbilityCacheManager& mgr = AbilityCacheManager::GetInstance(); mgr.Init(int32Param, int32Param); - std::shared_ptr abilityRecord1; + std::shared_ptr abilityRecord1; Want want; AppExecFwk::AbilityInfo abilityInfo; AppExecFwk::ApplicationInfo applicationInfo; - std::shared_ptr abilityRecord2 = std::make_shared(want, abilityInfo, applicationInfo); + std::shared_ptr abilityRecord2 = std::make_shared(want, + abilityInfo, applicationInfo); abilityRecord2->recordId_ = 2; // 2 means recordId - std::shared_ptr abilityRecord3 = std::make_shared(want, abilityInfo, applicationInfo); + std::shared_ptr abilityRecord3 = std::make_shared(want, + abilityInfo, applicationInfo); abilityRecord3->recordId_ = 3; // 3 means recordId mgr.AddToProcLru(abilityRecord2); mgr.AddToDevLru(abilityRecord2, abilityRecord2); @@ -94,7 +95,8 @@ void AbilityCacheManagerFuzztest1(bool boolParam, std::string &stringParam, int3 abilityInfo.moduleName = "moduleName"; abilityRequest.abilityInfo.moduleName = abilityInfo.moduleName; SetElement(want); - std::shared_ptr abilityRecord4 = std::make_shared(want, abilityInfo, applicationInfo); + std::shared_ptr abilityRecord4 = std::make_shared(want, + abilityInfo, applicationInfo); ret = mgr.IsRecInfoSame(abilityRequest, abilityRecord4); abilityInfo.moduleName = "moduleName1"; mgr.IsRecInfoSame(abilityRequest, abilityRecord4); diff --git a/test/fuzztest/abilityconnectmanager_fuzzer/abilityconnectmanager_fuzzer.cpp b/test/fuzztest/abilityconnectmanager_fuzzer/abilityconnectmanager_fuzzer.cpp index bc6d1607ef..a9b8a7af8d 100755 --- a/test/fuzztest/abilityconnectmanager_fuzzer/abilityconnectmanager_fuzzer.cpp +++ b/test/fuzztest/abilityconnectmanager_fuzzer/abilityconnectmanager_fuzzer.cpp @@ -57,14 +57,15 @@ uint32_t GetU32Data(const char* ptr) ptr[INPUT_THREE]; } -std::shared_ptr GetFuzzAbilityRecord() +std::shared_ptr GetFuzzAbilityRecord() { sptr token = nullptr; AbilityRequest abilityRequest; abilityRequest.appInfo.bundleName = "com.example.fuzzTest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AbilityType::DATA; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); if (!abilityRecord) { return nullptr; } @@ -74,7 +75,7 @@ std::shared_ptr GetFuzzAbilityRecord() sptr GetFuzzAbilityToken() { sptr token = nullptr; - std::shared_ptr abilityRecord = GetFuzzAbilityRecord(); + std::shared_ptr abilityRecord = GetFuzzAbilityRecord(); if (abilityRecord) { token = abilityRecord->GetToken(); } @@ -94,7 +95,7 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) abilityConnectManager->TerminateAbilityLocked(token); abilityConnectManager->StopServiceAbilityLocked(abilityRequest); bool boolParam = *data % ENABLE; - std::shared_ptr targetService = GetFuzzAbilityRecord(); + std::shared_ptr targetService = GetFuzzAbilityRecord(); abilityConnectManager->GetOrCreateServiceRecord(abilityRequest, boolParam, targetService, boolParam); const sptr connect = new AbilityConnectCallback(); std::list> connectRecordList; @@ -111,7 +112,7 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) abilityConnectManager->ScheduleConnectAbilityDoneLocked(token, remoteObject); abilityConnectManager->ScheduleDisconnectAbilityDoneLocked(token); abilityConnectManager->ScheduleCommandAbilityDoneLocked(token); - std::shared_ptr abilityRecord = GetFuzzAbilityRecord(); + std::shared_ptr abilityRecord = GetFuzzAbilityRecord(); abilityConnectManager->CompleteCommandAbility(abilityRecord); std::string stringParam(data, size); abilityConnectManager->GetServiceRecordByElementName(stringParam); diff --git a/test/fuzztest/abilitymgrextensionrecord_fuzzer/abilitymgrextensionrecord_fuzzer.cpp b/test/fuzztest/abilitymgrextensionrecord_fuzzer/abilitymgrextensionrecord_fuzzer.cpp index f3d0e927af..736969fb9b 100644 --- a/test/fuzztest/abilitymgrextensionrecord_fuzzer/abilitymgrextensionrecord_fuzzer.cpp +++ b/test/fuzztest/abilitymgrextensionrecord_fuzzer/abilitymgrextensionrecord_fuzzer.cpp @@ -54,7 +54,7 @@ sptr GetFuzzAbilityToken() abilityRequest.appInfo.bundleName = "com.example.fuzzTest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AbilityType::DATA; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); if (abilityRecord) { token = abilityRecord->GetToken(); } @@ -63,7 +63,7 @@ sptr GetFuzzAbilityToken() bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) { - std::shared_ptr abilityRecord; + std::shared_ptr abilityRecord; AbilityRuntime::ExtensionRecord infos(abilityRecord); infos.GetCallToken(); infos.GetRootCallerToken(); diff --git a/test/fuzztest/abilitymgruiextensionrecord_fuzzer/abilitymgruiextensionrecord_fuzzer.cpp b/test/fuzztest/abilitymgruiextensionrecord_fuzzer/abilitymgruiextensionrecord_fuzzer.cpp index 952534f5fa..b8d9a00cf6 100644 --- a/test/fuzztest/abilitymgruiextensionrecord_fuzzer/abilitymgruiextensionrecord_fuzzer.cpp +++ b/test/fuzztest/abilitymgruiextensionrecord_fuzzer/abilitymgruiextensionrecord_fuzzer.cpp @@ -32,7 +32,7 @@ using namespace OHOS::AppExecFwk; namespace OHOS { bool DoSomethingInterestingWithMyAPI(FuzzedDataProvider *fdp) { - std::shared_ptr abilityRecord; + std::shared_ptr abilityRecord; AbilityRuntime::UIExtensionRecord infos(abilityRecord); infos.ContinueToGetCallerToken(); AAFwk::AbilityRequest abilityRequest; diff --git a/test/fuzztest/abilitytransitiondone_fuzzer/abilitytransitiondone_fuzzer.cpp b/test/fuzztest/abilitytransitiondone_fuzzer/abilitytransitiondone_fuzzer.cpp index 00d3f067ad..e678cfdcf0 100644 --- a/test/fuzztest/abilitytransitiondone_fuzzer/abilitytransitiondone_fuzzer.cpp +++ b/test/fuzztest/abilitytransitiondone_fuzzer/abilitytransitiondone_fuzzer.cpp @@ -19,8 +19,8 @@ #include #include "ability_manager_client.h" -#include "ability_record.h" #include "ability_connect_manager.h" +#include "base_extension_record.h" #include "data_ability_manager.h" using namespace OHOS::AAFwk; @@ -54,6 +54,25 @@ sptr GetFuzzAbilityToken(AbilityType type) return token; } + +sptr GetFuzzExtensionAbilityToken(AbilityType type) +{ + sptr token = nullptr; + + AbilityRequest abilityRequest; + abilityRequest.uid = UID_TEST; + abilityRequest.appInfo.bundleName = "com.example.fuzzTest"; + abilityRequest.abilityInfo.name = "MainAbility"; + abilityRequest.abilityInfo.type = type; + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); + if (abilityRecord) { + token = abilityRecord->GetToken(); + } + + return token; +} + uint32_t GetU32Data(const char* ptr) { // convert fuzz input data to an integer @@ -80,7 +99,7 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) } // get serviceToken - sptr serviceToken = GetFuzzAbilityToken(AbilityType::SERVICE); + sptr serviceToken = GetFuzzExtensionAbilityToken(AbilityType::SERVICE); if (!serviceToken) { std::cout << "Get service ability token failed." << std::endl; return false; diff --git a/test/fuzztest/attachabilitythread_fuzzer/attachabilitythread_fuzzer.cpp b/test/fuzztest/attachabilitythread_fuzzer/attachabilitythread_fuzzer.cpp index bb72e9d209..0bb41fa5ea 100755 --- a/test/fuzztest/attachabilitythread_fuzzer/attachabilitythread_fuzzer.cpp +++ b/test/fuzztest/attachabilitythread_fuzzer/attachabilitythread_fuzzer.cpp @@ -20,8 +20,8 @@ #include "ability_manager_client.h" #include "ability_connect_manager.h" -#include "ability_record.h" #include "ability_scheduler_stub.h" +#include "base_extension_record.h" #include "data_ability_manager.h" using namespace OHOS::AAFwk; @@ -184,6 +184,25 @@ sptr GetFuzzAbilityToken(AbilityType type) return token; } + +sptr GetFuzzExtensionAbilityToken(AbilityType type) +{ + sptr token = nullptr; + + AbilityRequest abilityRequest; + abilityRequest.uid = UID_TEST; + abilityRequest.appInfo.bundleName = "com.example.fuzzTest"; + abilityRequest.abilityInfo.name = "MainAbility"; + abilityRequest.abilityInfo.type = type; + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); + if (abilityRecord) { + token = abilityRecord->GetToken(); + } + + return token; +} + uint32_t GetU32Data(const char* ptr) { // convert fuzz input data to an integer @@ -214,7 +233,7 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) } // get serviceToken - sptr serviceToken = GetFuzzAbilityToken(AbilityType::SERVICE); + sptr serviceToken = GetFuzzExtensionAbilityToken(AbilityType::SERVICE); if (!serviceToken) { std::cout << "Get service ability token failed." << std::endl; return false; diff --git a/test/fuzztest/connectionstatemanager_fuzzer/connectionstatemanager_fuzzer.cpp b/test/fuzztest/connectionstatemanager_fuzzer/connectionstatemanager_fuzzer.cpp index 33bb00ae36..b932e005f7 100755 --- a/test/fuzztest/connectionstatemanager_fuzzer/connectionstatemanager_fuzzer.cpp +++ b/test/fuzztest/connectionstatemanager_fuzzer/connectionstatemanager_fuzzer.cpp @@ -27,7 +27,7 @@ #undef protected #undef private -#include "ability_record.h" +#include "base_extension_record.h" #include "continuous_task_callback_info.h" using namespace OHOS::AAFwk; @@ -83,6 +83,21 @@ uint32_t GetU32Data(const char* ptr) return (ptr[0] << 24) | (ptr[1] << 16) | (ptr[2] << 8) | ptr[3]; } +std::shared_ptr GetFuzzExtensionRecord() +{ + sptr token = nullptr; + AbilityRequest abilityRequest; + abilityRequest.appInfo.bundleName = "com.example.fuzzTest"; + abilityRequest.abilityInfo.name = "MainAbility"; + abilityRequest.abilityInfo.type = AbilityType::EXTENSION; + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); + if (!abilityRecord) { + return nullptr; + } + return abilityRecord; +} + std::shared_ptr GetFuzzAbilityRecord() { sptr token = nullptr; @@ -148,7 +163,7 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) observerDeathRecipient->OnRemoteDied(remote); // fuzz for ConnectionRecord - std::shared_ptr targetService = GetFuzzAbilityRecord(); + std::shared_ptr targetService = GetFuzzExtensionRecord(); auto connectionRecord = std::make_shared(token, targetService, connect, nullptr); connectionRecord->CreateConnectionRecord(token, targetService, connect, nullptr); ConnectionState state = ConnectionState::CONNECTED; diff --git a/test/fuzztest/extensionrecordmanager_fuzzer/extensionrecordmanager_fuzzer.cpp b/test/fuzztest/extensionrecordmanager_fuzzer/extensionrecordmanager_fuzzer.cpp index fabb48f5eb..fc2311a82f 100644 --- a/test/fuzztest/extensionrecordmanager_fuzzer/extensionrecordmanager_fuzzer.cpp +++ b/test/fuzztest/extensionrecordmanager_fuzzer/extensionrecordmanager_fuzzer.cpp @@ -19,7 +19,7 @@ #include #include -#include "ability_record.h" +#include "base_extension_record.h" #include "extension_record_factory.h" #define private public #define inline @@ -48,7 +48,7 @@ bool DoSomethingInterestingWithMyAPI(const uint8_t* data, size_t size) int32_t recordNum; std::shared_ptr record; std::shared_ptr extensionRecord; - std::shared_ptr abilityRecord; + std::shared_ptr abilityRecord; std::list> callerList; std::string hostBundleName; std::string bundleName; diff --git a/test/fuzztest/extensionrecordmanagera_fuzzer/extensionrecordmanagera_fuzzer.cpp b/test/fuzztest/extensionrecordmanagera_fuzzer/extensionrecordmanagera_fuzzer.cpp index 13b27c9875..e33f05c178 100755 --- a/test/fuzztest/extensionrecordmanagera_fuzzer/extensionrecordmanagera_fuzzer.cpp +++ b/test/fuzztest/extensionrecordmanagera_fuzzer/extensionrecordmanagera_fuzzer.cpp @@ -24,7 +24,7 @@ #undef protected #undef private -#include "ability_record.h" +#include "base_extension_record.h" #include "extension_record.h" #include "extension_record_factory.h" @@ -58,7 +58,8 @@ sptr GetFuzzAbilityToken() abilityRequest.appInfo.bundleName = "com.example.fuzzTest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AbilityType::DATA; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); if (abilityRecord) { token = abilityRecord->GetToken(); } @@ -71,8 +72,8 @@ void FuzztestExtensionRecordManagerFunc1(std::shared_ptr Want want; AppExecFwk::AbilityInfo abilityInfo; AppExecFwk::ApplicationInfo applicationInfo; - std::shared_ptr abilityRecord = - std::make_shared(want, abilityInfo, applicationInfo); + std::shared_ptr abilityRecord = + std::make_shared(want, abilityInfo, applicationInfo); std::shared_ptr record = std::make_shared(abilityRecord); mgr->GenerateExtensionRecordId(int32Param); mgr->AddExtensionRecord(int32Param, record); @@ -105,7 +106,8 @@ void FuzztestExtensionRecordManagerFunc2(std::shared_ptr Want want; AppExecFwk::AbilityInfo abilityInfo; AppExecFwk::ApplicationInfo applicationInfo; - std::shared_ptr abilityRecord = std::make_shared(want, abilityInfo, applicationInfo); + std::shared_ptr abilityRecord = std::make_shared(want, + abilityInfo, applicationInfo); std::shared_ptr record = std::make_shared(abilityRecord); AAFwk::AbilityRequest abilityRequest; sptr sessionInfo = new (std::nothrow) SessionInfo(); @@ -156,7 +158,8 @@ void FuzztestExtensionRecordManagerFunc3(std::shared_ptr Want want; AppExecFwk::AbilityInfo abilityInfo; AppExecFwk::ApplicationInfo applicationInfo; - std::shared_ptr abilityRecord = std::make_shared(want, abilityInfo, applicationInfo); + std::shared_ptr abilityRecord = std::make_shared(want, + abilityInfo, applicationInfo); std::shared_ptr record = std::make_shared(abilityRecord); AAFwk::AbilityRequest abilityRequest; UIExtensionSessionInfo uiExtensionSessionInfo; diff --git a/test/fuzztest/preloaduiextstateobserver_fuzzer/preloaduiextstateobserver_fuzzer.cpp b/test/fuzztest/preloaduiextstateobserver_fuzzer/preloaduiextstateobserver_fuzzer.cpp index d80d3c037f..9daf3c6b5e 100644 --- a/test/fuzztest/preloaduiextstateobserver_fuzzer/preloaduiextstateobserver_fuzzer.cpp +++ b/test/fuzztest/preloaduiextstateobserver_fuzzer/preloaduiextstateobserver_fuzzer.cpp @@ -20,7 +20,7 @@ #include #include -#include "ability_record.h" +#include "base_extension_record.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; @@ -39,7 +39,7 @@ bool DoSomethingInterestingWithMyAPI(const uint8_t *data, size_t size) abilityRequest.appInfo.bundleName = fdp.ConsumeRandomLengthString(STRING_MAX_LENGTH); abilityRequest.abilityInfo.name = fdp.ConsumeRandomLengthString(STRING_MAX_LENGTH); abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); std::shared_ptr extRecord; std::weak_ptr weakExtRecord = extRecord; std::shared_ptr preLoad = diff --git a/test/fuzztest/schedulecommandabilitydone_fuzzer/schedulecommandabilitydone_fuzzer.cpp b/test/fuzztest/schedulecommandabilitydone_fuzzer/schedulecommandabilitydone_fuzzer.cpp index ed11b41842..2a7f42bff2 100755 --- a/test/fuzztest/schedulecommandabilitydone_fuzzer/schedulecommandabilitydone_fuzzer.cpp +++ b/test/fuzztest/schedulecommandabilitydone_fuzzer/schedulecommandabilitydone_fuzzer.cpp @@ -20,7 +20,7 @@ #include "ability_manager_client.h" #include "ability_connect_manager.h" -#include "ability_record.h" +#include "base_extension_record.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; @@ -47,6 +47,25 @@ sptr GetFuzzAbilityToken(AbilityType type) return token; } + +sptr GetFuzzExtensionAbilityToken(AbilityType type) +{ + sptr token = nullptr; + + AbilityRequest abilityRequest; + abilityRequest.uid = UID_TEST; + abilityRequest.appInfo.bundleName = "com.example.fuzzTest"; + abilityRequest.abilityInfo.name = "MainAbility"; + abilityRequest.abilityInfo.type = type; + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); + if (abilityRecord) { + token = abilityRecord->GetToken(); + } + + return token; +} + uint32_t GetU32Data(const char* ptr) { // convert fuzz input data to an integer @@ -72,7 +91,7 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) } // get serviceToken - sptr serviceToken = GetFuzzAbilityToken(AbilityType::SERVICE); + sptr serviceToken = GetFuzzExtensionAbilityToken(AbilityType::SERVICE); if (!serviceToken) { std::cout << "Get service ability token failed." << std::endl; return false; diff --git a/test/fuzztest/scheduleconnectabilitydone_fuzzer/scheduleconnectabilitydone_fuzzer.cpp b/test/fuzztest/scheduleconnectabilitydone_fuzzer/scheduleconnectabilitydone_fuzzer.cpp index 29913b91f7..d41bd6d616 100755 --- a/test/fuzztest/scheduleconnectabilitydone_fuzzer/scheduleconnectabilitydone_fuzzer.cpp +++ b/test/fuzztest/scheduleconnectabilitydone_fuzzer/scheduleconnectabilitydone_fuzzer.cpp @@ -19,8 +19,8 @@ #include #include "ability_manager_client.h" -#include "ability_record.h" #include "ability_connect_manager.h" +#include "base_extension_record.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; @@ -47,6 +47,23 @@ sptr GetFuzzAbilityToken(AbilityType type) return token; } +sptr GetFuzzExtensionAbilityToken(AbilityType type) +{ + sptr token = nullptr; + + AbilityRequest abilityRequest; + abilityRequest.uid = UID_TEST; + abilityRequest.appInfo.bundleName = "com.example.fuzzTest"; + abilityRequest.abilityInfo.name = "MainAbility"; + abilityRequest.abilityInfo.type = type; + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); + if (abilityRecord) { + token = abilityRecord->GetToken(); + } + + return token; +} uint32_t GetU32Data(const char* ptr) { // convert fuzz input data to an integer @@ -73,7 +90,7 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) } // get serviceToken - sptr serviceToken = GetFuzzAbilityToken(AbilityType::SERVICE); + sptr serviceToken = GetFuzzExtensionAbilityToken(AbilityType::SERVICE); if (!serviceToken) { std::cout << "Get service ability token failed." << std::endl; return false; diff --git a/test/fuzztest/scheduledisconnectabilitydone_fuzzer/scheduledisconnectabilitydone_fuzzer.cpp b/test/fuzztest/scheduledisconnectabilitydone_fuzzer/scheduledisconnectabilitydone_fuzzer.cpp index b4b88c2ec0..9b7611a967 100755 --- a/test/fuzztest/scheduledisconnectabilitydone_fuzzer/scheduledisconnectabilitydone_fuzzer.cpp +++ b/test/fuzztest/scheduledisconnectabilitydone_fuzzer/scheduledisconnectabilitydone_fuzzer.cpp @@ -20,7 +20,7 @@ #include "ability_manager_client.h" #include "ability_connect_manager.h" -#include "ability_record.h" +#include "base_extension_record.h" using namespace OHOS::AAFwk; using namespace OHOS::AppExecFwk; @@ -47,6 +47,22 @@ sptr GetFuzzAbilityToken(AbilityType type) return token; } +sptr GetFuzzExtensionAbilityToken(AbilityType type) +{ + sptr token = nullptr; + + AbilityRequest abilityRequest; + abilityRequest.uid = UID_TEST; + abilityRequest.appInfo.bundleName = "com.example.fuzzTest"; + abilityRequest.abilityInfo.name = "MainAbility"; + abilityRequest.abilityInfo.type = type; + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); + if (abilityRecord) { + token = abilityRecord->GetToken(); + } + + return token; +} uint32_t GetU32Data(const char* ptr) { // convert fuzz input data to an integer @@ -72,7 +88,7 @@ bool DoSomethingInterestingWithMyAPI(const char* data, size_t size) } // get serviceToken - sptr serviceToken = GetFuzzAbilityToken(AbilityType::SERVICE); + sptr serviceToken = GetFuzzExtensionAbilityToken(AbilityType::SERVICE); if (!serviceToken) { std::cout << "Get service ability token failed." << std::endl; return false; diff --git a/test/fuzztest/uiextensionrecordfactory_fuzzer/uiextensionrecordfactory_fuzzer.cpp b/test/fuzztest/uiextensionrecordfactory_fuzzer/uiextensionrecordfactory_fuzzer.cpp index 44565b965a..fcd88c2668 100644 --- a/test/fuzztest/uiextensionrecordfactory_fuzzer/uiextensionrecordfactory_fuzzer.cpp +++ b/test/fuzztest/uiextensionrecordfactory_fuzzer/uiextensionrecordfactory_fuzzer.cpp @@ -60,7 +60,7 @@ bool DoSomethingInterestingWithMyAPI(const char *data, size_t size) std::shared_ptr extensionRecord; factory->CreateRecord(abilityRequest, extensionRecord); factory->NeedReuse(abilityRequest, int32Param); - std::shared_ptr abilityRecord; + std::shared_ptr abilityRecord; factory->CreateDebugRecord(abilityRequest, abilityRecord); abilityRequest.appInfo.bundleName = "com.example.unittest"; diff --git a/test/moduletest/BUILD.gn b/test/moduletest/BUILD.gn index 6139092bc2..9e243b233b 100644 --- a/test/moduletest/BUILD.gn +++ b/test/moduletest/BUILD.gn @@ -55,6 +55,7 @@ group("moduletest") { "app_mgr_client_test:moduletest", "call_module_test:moduletest", "common/ams:moduletest", + "extension_record_base_module_test:moduletest", "ipc_ability_connect_test:moduletest", "ipc_ability_mgr_test:moduletest", "ipc_ability_scheduler_test:moduletest", diff --git a/test/moduletest/ability_record_test/ability_record_module_test.cpp b/test/moduletest/ability_record_test/ability_record_module_test.cpp index 4e2adc6839..a2caae382c 100644 --- a/test/moduletest/ability_record_test/ability_record_module_test.cpp +++ b/test/moduletest/ability_record_test/ability_record_module_test.cpp @@ -244,97 +244,6 @@ HWTEST_F(AbilityRecordModuleTest, TerminateAbility_001, TestSize.Level3) } } -/* - * Feature: AbilityRecord - * Function: Scheduler - * SubFunction: Activate/Inactivate/Terminate/ConnectAbility/DisconnectAbility/SendResult - * FunctionPoints: Check scheduler work flow. - * CaseDescription: Change ability state and check if the work flow reachs the 'AbilityScheduler' mocker. - */ -HWTEST_F(AbilityRecordModuleTest, AbilityScheduler_001, TestSize.Level3) -{ - auto& abilityRequest = MakeDefaultAbilityRequest(); - auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); - EXPECT_TRUE(abilityRecord); - - sptr mockAbilityScheduerStub(new MockAbilitySchedulerStub); - EXPECT_TRUE(mockAbilityScheduerStub); - - bool testResult = false; - abilityRecord->SetScheduler(mockAbilityScheduerStub); - EXPECT_TRUE(abilityRecord->IsReady()); - - for (int i = 0; i < COUNT; ++i) { - // Activate - auto mockActivateHandler = [&](const Want& want, const LifeCycleStateInfo& lifeCycleStateInfo, - sptr sessionInfo) { - testResult = (lifeCycleStateInfo.state == AbilityLifeCycleState::ABILITY_STATE_ACTIVE); - }; - testResult = false; - EXPECT_CALL(*mockAbilityScheduerStub, ScheduleAbilityTransaction(_, _, _)) - .Times(1) - .WillOnce(testing::DoAll(Invoke(mockActivateHandler), testing::Return(true))); - - abilityRecord->Activate(); - EXPECT_TRUE(testResult); - EXPECT_EQ(abilityRecord->GetAbilityState(), ACTIVATING); - - // Inactivate - testResult = false; - auto mockInactivateHandler = [&](const Want& want, const LifeCycleStateInfo& lifeCycleStateInfo, - sptr sessionInfo) { - testResult = (lifeCycleStateInfo.state == AbilityLifeCycleState::ABILITY_STATE_INACTIVE); - }; - EXPECT_CALL(*mockAbilityScheduerStub, ScheduleAbilityTransaction(_, _, _)) - .Times(1) - .WillOnce(testing::DoAll(Invoke(mockInactivateHandler), testing::Return(true))); - - abilityRecord->Inactivate(); - EXPECT_TRUE(testResult); - EXPECT_EQ(abilityRecord->GetAbilityState(), INACTIVATING); - - testResult = false; - - // Terminate - EXPECT_CALL(*mockAbilityScheduerStub, ScheduleAbilityTransaction(_, _, _)).Times(1); - abilityRecord->Terminate([] {}); - EXPECT_EQ(abilityRecord->GetAbilityState(), TERMINATING); - - // Connect - testResult = false; - auto mockConnectHandler = [&](const Want& want) { testResult = want == abilityRequest.want; }; - EXPECT_CALL(*mockAbilityScheduerStub, ScheduleConnectAbility(_)).Times(1).WillOnce(Invoke(mockConnectHandler)); - abilityRecord->ConnectAbility(); - EXPECT_TRUE(testResult); - - // Disconnect - testResult = false; - auto mockDisconnectHandler = [&](const Want& want) { testResult = want == abilityRequest.want; }; - EXPECT_CALL(*mockAbilityScheduerStub, ScheduleDisconnectAbility(_)) - .Times(1) - .WillOnce(Invoke(mockDisconnectHandler)); - abilityRecord->DisconnectAbility(); - EXPECT_TRUE(testResult); - - // SendResult - testResult = false; - int testResultCode = 123; - auto mockSendResultHandler = [&](int requestCode, int resultCode, const Want& want) { - testResult = requestCode == abilityRequest.requestCode && resultCode == testResultCode && - want == abilityRequest.want; - }; - EXPECT_CALL(*mockAbilityScheduerStub, SendResult(_, _, _)).Times(1).WillOnce(Invoke(mockSendResultHandler)); - auto abilityResult = - std::make_shared(abilityRequest.requestCode, testResultCode, abilityRequest.want); - EXPECT_TRUE(abilityResult); - abilityRecord->SetResult(abilityResult); - abilityRecord->SendResult(0, 0); - EXPECT_TRUE(testResult); - } - - abilityRecord->SetScheduler(nullptr); -} - /* * Feature: AbilityRecord * Function: Pre and Next Abilities @@ -411,47 +320,6 @@ HWTEST_F(AbilityRecordModuleTest, Want_001, TestSize.Level1) } } -/* - * Feature: AbilityRecord - * Function: ConnectionRecord - * SubFunction: AddConnectRecordToList/GetConnectRecordList/GetConnectingRecord/GetDisconnectingRecord - * FunctionPoints: Ability connect record getter and setter - * CaseDescription: Check ability connect record getter and setter. - */ -HWTEST_F(AbilityRecordModuleTest, ConnectionRecord_001, TestSize.Level2) -{ - auto& abilityRequest = MakeDefaultAbilityRequest(); - - auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); - EXPECT_TRUE(abilityRecord); - EXPECT_TRUE(abilityRecord->IsConnectListEmpty()); - - auto connectionRecord = ConnectionRecord::CreateConnectionRecord(nullptr, nullptr, nullptr, nullptr); - EXPECT_TRUE(connectionRecord); - - for (int i = 0; i < COUNT; ++i) { - abilityRecord->AddConnectRecordToList(connectionRecord); - EXPECT_FALSE(abilityRecord->IsConnectListEmpty()); - auto connectionRecordList = abilityRecord->GetConnectRecordList(); - auto it = std::find(connectionRecordList.begin(), connectionRecordList.end(), connectionRecord); - EXPECT_TRUE(it != connectionRecordList.end()); - - EXPECT_FALSE(abilityRecord->GetConnectingRecord()); - connectionRecord->SetConnectState(ConnectionState::CONNECTING); - EXPECT_TRUE(abilityRecord->GetConnectingRecord()); - - EXPECT_FALSE(abilityRecord->GetDisconnectingRecord()); - connectionRecord->SetConnectState(ConnectionState::DISCONNECTING); - EXPECT_TRUE(abilityRecord->GetDisconnectingRecord()); - - abilityRecord->RemoveConnectRecordFromList(connectionRecord); - EXPECT_TRUE(abilityRecord->IsConnectListEmpty()); - connectionRecordList = abilityRecord->GetConnectRecordList(); - it = std::find(connectionRecordList.begin(), connectionRecordList.end(), connectionRecord); - EXPECT_TRUE(it == connectionRecordList.end()); - } -} - /* * Feature: AbilityRecord * Function: Terminating diff --git a/test/moduletest/extension_record_base_module_test/BUILD.gn b/test/moduletest/extension_record_base_module_test/BUILD.gn new file mode 100644 index 0000000000..ebe0c79ff0 --- /dev/null +++ b/test/moduletest/extension_record_base_module_test/BUILD.gn @@ -0,0 +1,111 @@ +# Copyright (c) 2021-2024 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/test.gni") +import("//foundation/ability/ability_runtime/ability_runtime.gni") + +module_output_path = "ability_runtime/ability_runtime/mstabilitymgrservice" + +ohos_moduletest("ExtensionRecordBaseModuleTest") { + module_out_path = module_output_path + cflags_cc = [] + include_dirs = [ + "${ability_runtime_path}/interfaces/kits/native/ability/native/distributed_ability_runtime", + "${ability_runtime_path}/interfaces/inner_api/dataobs_manager/include", + ] + + sources = [ + "${ability_runtime_test_path}/moduletest/mock/src/mock_app_mgr_client.cpp", + ] + + sources += [ "extension_record_base_module_test.cpp" ] + + configs = + [ "${ability_runtime_test_path}/moduletest:aafwk_module_test_config" ] + cflags = [] + if (target_cpu == "arm") { + cflags += [ "-DBINDER_IPC_32BIT" ] + } + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_innerkits_path}/app_manager:app_manager", + "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", + "${ability_runtime_native_path}/ability/native:abilitykit_native", + "${ability_runtime_path}/utils/server/startup:startup_util", + "${ability_runtime_services_path}/abilitymgr:abilityms", + "${ability_runtime_services_path}/common:perm_verification", + ] + + external_deps = [ + "ability_base:base", + "ability_base:configuration", + "ability_base:session_info", + "ability_base:want", + "ability_base:zuri", + "access_token:libaccesstoken_sdk", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", + "c_utils:utils", + "common_event_service:cesfwk_core", + "common_event_service:cesfwk_innerkits", + "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", + "hicollie:libhicollie", + "hilog:libhilog", + "hisysevent:libhisysevent", + "hitrace:hitrace_meter", + "init:libbegetutil", + "ipc:ipc_core", + "napi:ace_napi", + "relational_store:native_appdatafwk", + "relational_store:native_dataability", + "relational_store:native_rdb", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", + ] + + if (ability_runtime_dsoftbus_enable) { + external_deps += [ "dsoftbus:softbus_client" ] + } + + if (resource_schedule_service_enable) { + cflags_cc += [ "-RESOURCE_SCHEDULE_SERVICE_ENABLE" ] + external_deps += [ "resource_schedule_service:ressched_client" ] + } + + if (background_task_mgr_continuous_task_enable) { + external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] + } + + if (ability_runtime_graphics) { + external_deps += [ + "i18n:intl_util", + "icu:shared_icuuc", + "image_framework:image_native", + "input:libmmi-client", + "window_manager:libdm", + ] + } + if (ability_runtime_upms) { + deps += [ + "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr", + ] + } +} + +group("moduletest") { + testonly = true + + deps = [ ":ExtensionRecordBaseModuleTest" ] +} diff --git a/test/moduletest/extension_record_base_module_test/extension_record_base_module_test.cpp b/test/moduletest/extension_record_base_module_test/extension_record_base_module_test.cpp new file mode 100644 index 0000000000..909eccdc4a --- /dev/null +++ b/test/moduletest/extension_record_base_module_test/extension_record_base_module_test.cpp @@ -0,0 +1,303 @@ +/* + * Copyright (c) 2021-2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +#include +#include + +#include "abs_shared_result_set.h" +#include "data_ability_predicates.h" +#include "param.h" +#include "values_bucket.h" + +#include "want.h" + +#define private public +#include "app_scheduler.h" +#include "base_extension_record.h" +#include "connection_record.h" +#include "mock_app_mgr_client.h" +#include "mock_ability_scheduler_stub.h" +#undef private + +using namespace testing::ext; +using namespace OHOS::AppExecFwk; +using OHOS::iface_cast; +using OHOS::sptr; +using testing::_; +using testing::Invoke; +using testing::Return; + +namespace { +constexpr int COUNT = 1000; +} // namespace + +namespace OHOS::AppExecFwk { +bool operator==(const AbilityInfo& a, const AbilityInfo& b) +{ + if (&a != &b) { + return a.package == b.package && a.name == b.name && a.label == b.label && a.description == b.description && + a.iconPath == b.iconPath && a.visible == b.visible && a.kind == b.kind && + a.permissions == b.permissions && a.bundleName == b.bundleName && + a.applicationName == b.applicationName && a.deviceId == b.deviceId && a.codePath == b.codePath && + a.resourcePath == b.resourcePath && a.libPath == b.libPath; + } + + return true; +} + +bool operator!=(const AbilityInfo& a, const AbilityInfo& b) +{ + return !(a == b); +} + +bool operator==(const ApplicationInfo& a, const ApplicationInfo& b) +{ + if (&a != &b) { + return a.name == b.name && a.bundleName == b.bundleName && a.deviceId == b.deviceId && + a.signatureKey == b.signatureKey; + } + + return true; +} + +bool operator!=(const ApplicationInfo& a, const ApplicationInfo& b) +{ + return !(a == b); +} +} // namespace OHOS::AppExecFwk + +namespace OHOS::AAFwk { +bool operator==(const Want& a, const Want& b) +{ + if (&a != &b) { + return a.GetAction() == b.GetAction() && a.GetEntities() == b.GetEntities(); + } + + return true; +} + +bool operator!=(const Want& a, const Want& b) +{ + return !(a == b); +} +} // namespace OHOS::AAFwk + +namespace OHOS { +namespace AAFwk { +class ExtensionRecordBaseModuleTest : public testing::Test { +public: + static void SetUpTestCase(); + static void TearDownTestCase(); + void SetUp(); + void TearDown(); + +protected: + static const AbilityRequest& MakeDefaultAbilityRequest(); + static const AbilityRequest& MakeHomeAbilityRequest(); + +private: + inline static AbilityRequest testAbilityRequest_; +}; + +void ExtensionRecordBaseModuleTest::SetUpTestCase() +{ + int testCode = 123; + testAbilityRequest_.requestCode = testCode; + + testAbilityRequest_.abilityInfo.package = "test"; + testAbilityRequest_.abilityInfo.name = "test"; + testAbilityRequest_.abilityInfo.label = "test"; + testAbilityRequest_.abilityInfo.description = "test"; + testAbilityRequest_.abilityInfo.iconPath = "/test"; + testAbilityRequest_.abilityInfo.visible = false; + testAbilityRequest_.abilityInfo.kind = "page"; + testAbilityRequest_.abilityInfo.permissions = {}; + testAbilityRequest_.abilityInfo.bundleName = "test"; + testAbilityRequest_.abilityInfo.applicationName = "test"; + testAbilityRequest_.abilityInfo.deviceId = "test"; + testAbilityRequest_.abilityInfo.codePath = "/test"; + testAbilityRequest_.abilityInfo.resourcePath = "/test"; + testAbilityRequest_.abilityInfo.libPath = "/test"; + + testAbilityRequest_.appInfo.name = "test"; + testAbilityRequest_.appInfo.bundleName = "test"; + testAbilityRequest_.appInfo.deviceId = "test"; + testAbilityRequest_.appInfo.signatureKey = "test"; +} + +void ExtensionRecordBaseModuleTest::TearDownTestCase() +{} + +void ExtensionRecordBaseModuleTest::SetUp() +{} + +void ExtensionRecordBaseModuleTest::TearDown() +{} + +const AbilityRequest& ExtensionRecordBaseModuleTest::MakeDefaultAbilityRequest() +{ + Want::ClearWant(&testAbilityRequest_.want); + testAbilityRequest_.want.SetAction("test"); + testAbilityRequest_.want.AddEntity("test"); + + return testAbilityRequest_; +} + +const AbilityRequest& ExtensionRecordBaseModuleTest::MakeHomeAbilityRequest() +{ + Want::ClearWant(&testAbilityRequest_.want); + testAbilityRequest_.want.SetAction(Want::ACTION_HOME); + testAbilityRequest_.want.AddEntity(Want::ENTITY_HOME); + testAbilityRequest_.appInfo.isLauncherApp = true; + + return testAbilityRequest_; +} + +/* + * Feature: BaseExtensionRecord + * Function: ConnectionRecord + * SubFunction: AddConnectRecordToList/GetConnectRecordList/GetConnectingRecord/GetDisconnectingRecord + * FunctionPoints: Ability connect record getter and setter + * CaseDescription: Check ability connect record getter and setter. + */ +HWTEST_F(ExtensionRecordBaseModuleTest, ConnectionRecord_001, TestSize.Level2) +{ + auto& abilityRequest = MakeDefaultAbilityRequest(); + + auto abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); + EXPECT_TRUE(abilityRecord); + EXPECT_TRUE(abilityRecord->IsConnectListEmpty()); + + auto connectionRecord = ConnectionRecord::CreateConnectionRecord(nullptr, nullptr, nullptr, nullptr); + EXPECT_TRUE(connectionRecord); + + for (int i = 0; i < COUNT; ++i) { + abilityRecord->AddConnectRecordToList(connectionRecord); + EXPECT_FALSE(abilityRecord->IsConnectListEmpty()); + auto connectionRecordList = abilityRecord->GetConnectRecordList(); + auto it = std::find(connectionRecordList.begin(), connectionRecordList.end(), connectionRecord); + EXPECT_TRUE(it != connectionRecordList.end()); + + EXPECT_FALSE(abilityRecord->GetConnectingRecord()); + connectionRecord->SetConnectState(ConnectionState::CONNECTING); + EXPECT_TRUE(abilityRecord->GetConnectingRecord()); + + EXPECT_FALSE(abilityRecord->GetDisconnectingRecord()); + connectionRecord->SetConnectState(ConnectionState::DISCONNECTING); + EXPECT_TRUE(abilityRecord->GetDisconnectingRecord()); + + abilityRecord->RemoveConnectRecordFromList(connectionRecord); + EXPECT_TRUE(abilityRecord->IsConnectListEmpty()); + connectionRecordList = abilityRecord->GetConnectRecordList(); + it = std::find(connectionRecordList.begin(), connectionRecordList.end(), connectionRecord); + EXPECT_TRUE(it == connectionRecordList.end()); + } +} + +/* + * Feature: BaseExtensionRecord + * Function: Scheduler + * SubFunction: Activate/Inactivate/Terminate/ConnectAbility/DisconnectAbility/SendResult + * FunctionPoints: Check scheduler work flow. + * CaseDescription: Change ability state and check if the work flow reachs the 'AbilityScheduler' mocker. + */ +HWTEST_F(ExtensionRecordBaseModuleTest, AbilityScheduler_001, TestSize.Level3) +{ + auto& abilityRequest = MakeDefaultAbilityRequest(); + auto abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); + EXPECT_TRUE(abilityRecord); + + sptr mockAbilityScheduerStub(new MockAbilitySchedulerStub); + EXPECT_TRUE(mockAbilityScheduerStub); + + bool testResult = false; + abilityRecord->SetScheduler(mockAbilityScheduerStub); + EXPECT_TRUE(abilityRecord->IsReady()); + + for (int i = 0; i < COUNT; ++i) { + // Activate + auto mockActivateHandler = [&](const Want& want, const LifeCycleStateInfo& lifeCycleStateInfo, + sptr sessionInfo) { + testResult = (lifeCycleStateInfo.state == AbilityLifeCycleState::ABILITY_STATE_ACTIVE); + }; + testResult = false; + EXPECT_CALL(*mockAbilityScheduerStub, ScheduleAbilityTransaction(_, _, _)) + .Times(1) + .WillOnce(testing::DoAll(Invoke(mockActivateHandler), testing::Return(true))); + + abilityRecord->Activate(); + EXPECT_TRUE(testResult); + EXPECT_EQ(abilityRecord->GetAbilityState(), ACTIVATING); + + // Inactivate + testResult = false; + auto mockInactivateHandler = [&](const Want& want, const LifeCycleStateInfo& lifeCycleStateInfo, + sptr sessionInfo) { + testResult = (lifeCycleStateInfo.state == AbilityLifeCycleState::ABILITY_STATE_INACTIVE); + }; + EXPECT_CALL(*mockAbilityScheduerStub, ScheduleAbilityTransaction(_, _, _)) + .Times(1) + .WillOnce(testing::DoAll(Invoke(mockInactivateHandler), testing::Return(true))); + + abilityRecord->Inactivate(); + EXPECT_TRUE(testResult); + EXPECT_EQ(abilityRecord->GetAbilityState(), INACTIVATING); + + testResult = false; + + // Terminate + EXPECT_CALL(*mockAbilityScheduerStub, ScheduleAbilityTransaction(_, _, _)).Times(1); + abilityRecord->Terminate([] {}); + EXPECT_EQ(abilityRecord->GetAbilityState(), TERMINATING); + + // Connect + testResult = false; + auto mockConnectHandler = [&](const Want& want) { testResult = want == abilityRequest.want; }; + EXPECT_CALL(*mockAbilityScheduerStub, ScheduleConnectAbility(_)).Times(1).WillOnce(Invoke(mockConnectHandler)); + abilityRecord->ConnectAbility(); + EXPECT_TRUE(testResult); + + // Disconnect + testResult = false; + auto mockDisconnectHandler = [&](const Want& want) { testResult = want == abilityRequest.want; }; + EXPECT_CALL(*mockAbilityScheduerStub, ScheduleDisconnectAbility(_)) + .Times(1) + .WillOnce(Invoke(mockDisconnectHandler)); + abilityRecord->DisconnectAbility(); + EXPECT_TRUE(testResult); + + // SendResult + testResult = false; + int testResultCode = 123; + auto mockSendResultHandler = [&](int requestCode, int resultCode, const Want& want) { + testResult = requestCode == abilityRequest.requestCode && resultCode == testResultCode && + want == abilityRequest.want; + }; + EXPECT_CALL(*mockAbilityScheduerStub, SendResult(_, _, _)).Times(1).WillOnce(Invoke(mockSendResultHandler)); + auto abilityResult = + std::make_shared(abilityRequest.requestCode, testResultCode, abilityRequest.want); + EXPECT_TRUE(abilityResult); + abilityRecord->SetResult(abilityResult); + abilityRecord->SendResult(0, 0); + EXPECT_TRUE(testResult); + } + + abilityRecord->SetScheduler(nullptr); +} +} // namespace AAFwk +} // namespace OHOS \ No newline at end of file diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 21ebf8b927..15f3d0b686 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -369,6 +369,7 @@ group("unittest") { "extension_control_interceptor_test:unittest", "extension_manager_client_test:unittest", "extension_permissions_util_test:unittest", + "extension_record_base_first_test:unittest", "extension_record_factory_test:unittest", "extension_record_test:unittest", "extract_insight_intent_profile_test:unittest", diff --git a/test/unittest/ability_cache_manager_test/ability_cache_manager_test.cpp b/test/unittest/ability_cache_manager_test/ability_cache_manager_test.cpp index 339177243e..70b172cd67 100644 --- a/test/unittest/ability_cache_manager_test/ability_cache_manager_test.cpp +++ b/test/unittest/ability_cache_manager_test/ability_cache_manager_test.cpp @@ -74,9 +74,9 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutAndGetTest_001, TestSize Want want; ElementName element("", "", "ability", ""); want.SetElement(element); - auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); + auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); abilityRecord_->Init(AbilityRequest()); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); EXPECT_EQ(rec, nullptr); int recId = abilityRecord_->GetRecordId(); AbilityRequest abilityRequest; @@ -122,9 +122,9 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutAndGetTest_002, TestSize Want want; ElementName element("", "", "ability", ""); want.SetElement(element); - auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); + auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); abilityRecord_->Init(AbilityRequest()); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); EXPECT_EQ(rec, nullptr); int recId = abilityRecord_->GetRecordId(); AbilityRequest abilityRequest; @@ -170,9 +170,9 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutAndGetTest_003, TestSize Want want; ElementName element("", "", "ability", ""); want.SetElement(element); - auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); + auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); abilityRecord_->Init(AbilityRequest()); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); EXPECT_EQ(rec, nullptr); int recId = abilityRecord_->GetRecordId(); AbilityRequest abilityRequest; @@ -218,9 +218,9 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutAndGetTest_004, TestSize Want want; ElementName element("", "", "ability", ""); want.SetElement(element); - auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); + auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); abilityRecord_->Init(AbilityRequest()); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); EXPECT_EQ(rec, nullptr); int recId = abilityRecord_->GetRecordId(); AbilityRequest abilityRequest; @@ -266,13 +266,13 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerRemoveTest_001, TestSize.Le Want want; ElementName element("", "", "ability", ""); want.SetElement(element); - auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); + auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); abilityRecord_->Init(AbilityRequest()); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); int recId = abilityRecord_->GetRecordId(); EXPECT_EQ(rec, nullptr); applicationInfo.accessTokenId = 0; - auto removeRec = std::make_shared(want, abilityInfo, applicationInfo); + auto removeRec = std::make_shared(want, abilityInfo, applicationInfo); OHOS::AAFwk::AbilityCacheManager::GetInstance().Remove(removeRec); applicationInfo.accessTokenId = 1; AbilityRequest abilityRequest; @@ -306,13 +306,13 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerRemoveTest_002, TestSize.Le Want want; ElementName element("", "", "ability", ""); want.SetElement(element); - auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); + auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); abilityRecord_->Init(AbilityRequest()); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); int recId = abilityRecord_->GetRecordId(); EXPECT_EQ(rec, nullptr); abilityInfo.moduleName = "WrongModuleName"; - auto removeRec = std::make_shared(want, abilityInfo, applicationInfo); + auto removeRec = std::make_shared(want, abilityInfo, applicationInfo); OHOS::AAFwk::AbilityCacheManager::GetInstance().Remove(removeRec); abilityInfo.moduleName = "TestModuleName"; AbilityRequest abilityRequest; @@ -346,14 +346,14 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerRemoveTest_003, TestSize.Le Want want; ElementName element("", "", "ability", ""); want.SetElement(element); - auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); + auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); abilityRecord_->Init(AbilityRequest()); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); int recId = abilityRecord_->GetRecordId(); EXPECT_EQ(rec, nullptr); ElementName wrongeElement("", "", "wrongAbility", ""); want.SetElement(wrongeElement); - auto removeRec = std::make_shared(want, abilityInfo, applicationInfo); + auto removeRec = std::make_shared(want, abilityInfo, applicationInfo); OHOS::AAFwk::AbilityCacheManager::GetInstance().Remove(removeRec); AbilityRequest abilityRequest; abilityRequest.abilityInfo = abilityInfo; @@ -386,14 +386,14 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerRemoveTest_004, TestSize.Le Want want; ElementName element("", "", "ability", ""); want.SetElement(element); - auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); + auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); abilityRecord_->Init(AbilityRequest()); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); int recId = abilityRecord_->GetRecordId(); EXPECT_EQ(rec, nullptr); ElementName wrongeElement("", "", "wrongAbility", ""); want.SetElement(wrongeElement); - auto removeRec = std::make_shared(want, abilityInfo, applicationInfo); + auto removeRec = std::make_shared(want, abilityInfo, applicationInfo); OHOS::AAFwk::AbilityCacheManager::GetInstance().Remove(removeRec); AbilityRequest abilityRequest; abilityRequest.abilityInfo = abilityInfo; @@ -427,14 +427,14 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerRemoveTest_005, TestSize.Le Want want; ElementName element("", "", "ability", ""); want.SetElement(element); - auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); + auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); abilityRecord_->Init(AbilityRequest()); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); int recId = abilityRecord_->GetRecordId(); EXPECT_EQ(rec, nullptr); ElementName wrongeElement("", "", "wrongAbility", ""); want.SetElement(wrongeElement); - auto removeRec = std::make_shared(want, abilityInfo, applicationInfo); + auto removeRec = std::make_shared(want, abilityInfo, applicationInfo); OHOS::AAFwk::AbilityCacheManager::GetInstance().Remove(removeRec); AbilityRequest abilityRequest; abilityRequest.abilityInfo = abilityInfo; @@ -466,9 +466,9 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_001, TestSize.Level OHOS::AppExecFwk::ApplicationInfo applicationInfo1; applicationInfo1.accessTokenId = 1; Want want; - auto abilityRecord1 = std::make_shared(want, abilityInfo1, applicationInfo1); + auto abilityRecord1 = std::make_shared(want, abilityInfo1, applicationInfo1); abilityRecord1->Init(AbilityRequest()); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord1); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord1); EXPECT_EQ(rec, nullptr); int recId1 = abilityRecord1->GetRecordId(); OHOS::AppExecFwk::AbilityInfo abilityInfo2; @@ -476,7 +476,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_001, TestSize.Level abilityInfo2.bundleName = "TestBundleName2"; OHOS::AppExecFwk::ApplicationInfo applicationInfo2; applicationInfo2.accessTokenId = 2; - auto abilityRecord2 = std::make_shared(want, abilityInfo2, applicationInfo2); + auto abilityRecord2 = std::make_shared(want, abilityInfo2, applicationInfo2); abilityRecord2->Init(AbilityRequest()); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord2); EXPECT_EQ(rec, nullptr); @@ -486,7 +486,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_001, TestSize.Level abilityInfo3.bundleName = "TestBundleName3"; OHOS::AppExecFwk::ApplicationInfo applicationInfo3; applicationInfo3.accessTokenId = 3; - auto abilityRecord3 = std::make_shared(want, abilityInfo3, applicationInfo3); + auto abilityRecord3 = std::make_shared(want, abilityInfo3, applicationInfo3); abilityRecord3->Init(AbilityRequest()); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord3); @@ -513,9 +513,9 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_002, TestSize.Level OHOS::AppExecFwk::ApplicationInfo applicationInfo1; applicationInfo1.accessTokenId = 1; Want want; - auto abilityRecord1 = std::make_shared(want, abilityInfo1, applicationInfo1); + auto abilityRecord1 = std::make_shared(want, abilityInfo1, applicationInfo1); abilityRecord1->Init(AbilityRequest()); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord1); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord1); EXPECT_EQ(rec, nullptr); OHOS::AppExecFwk::AbilityInfo abilityInfo2; @@ -523,7 +523,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_002, TestSize.Level abilityInfo2.bundleName = "TestBundleName2"; OHOS::AppExecFwk::ApplicationInfo applicationInfo2; applicationInfo2.accessTokenId = 2; - auto abilityRecord2 = std::make_shared(want, abilityInfo2, applicationInfo2); + auto abilityRecord2 = std::make_shared(want, abilityInfo2, applicationInfo2); abilityRecord2->Init(AbilityRequest()); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord2); EXPECT_EQ(rec, nullptr); @@ -533,7 +533,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_002, TestSize.Level abilityInfo3.bundleName = "TestBundleName3"; OHOS::AppExecFwk::ApplicationInfo applicationInfo3; applicationInfo3.accessTokenId = 2; - auto abilityRecord3 = std::make_shared(want, abilityInfo3, applicationInfo3); + auto abilityRecord3 = std::make_shared(want, abilityInfo3, applicationInfo3); abilityRecord3->Init(AbilityRequest()); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord3); @@ -561,9 +561,9 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_003, TestSize.Level OHOS::AppExecFwk::ApplicationInfo applicationInfo1; applicationInfo1.accessTokenId = 1; Want want; - auto abilityRecord1 = std::make_shared(want, abilityInfo1, applicationInfo1); + auto abilityRecord1 = std::make_shared(want, abilityInfo1, applicationInfo1); abilityRecord1->Init(AbilityRequest()); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord1); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord1); EXPECT_EQ(rec, nullptr); OHOS::AppExecFwk::AbilityInfo abilityInfo2; @@ -572,7 +572,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_003, TestSize.Level OHOS::AppExecFwk::ApplicationInfo applicationInfo2; applicationInfo2.accessTokenId = 2; - auto abilityRecord2 = std::make_shared(want, abilityInfo2, applicationInfo2); + auto abilityRecord2 = std::make_shared(want, abilityInfo2, applicationInfo2); abilityRecord2->Init(AbilityRequest()); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord2); EXPECT_EQ(rec, nullptr); @@ -582,7 +582,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_003, TestSize.Level abilityInfo3.bundleName = "TestBundleName3"; OHOS::AppExecFwk::ApplicationInfo applicationInfo3; applicationInfo3.accessTokenId = 3; - auto abilityRecord3 = std::make_shared(want, abilityInfo3, applicationInfo3); + auto abilityRecord3 = std::make_shared(want, abilityInfo3, applicationInfo3); abilityRecord3->Init(AbilityRequest()); int recId3 = abilityRecord3->GetRecordId(); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord3); @@ -594,7 +594,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_003, TestSize.Level OHOS::AppExecFwk::ApplicationInfo applicationInfo4; applicationInfo4.accessTokenId = 3; - auto abilityRecord4 = std::make_shared(want, abilityInfo4, applicationInfo4); + auto abilityRecord4 = std::make_shared(want, abilityInfo4, applicationInfo4); abilityRecord4->Init(AbilityRequest()); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord4); EXPECT_EQ(rec->GetApplicationInfo().accessTokenId, applicationInfo3.accessTokenId); @@ -622,9 +622,9 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_004, TestSize.Level OHOS::AppExecFwk::ApplicationInfo applicationInfo1; applicationInfo1.accessTokenId = 1; Want want; - auto abilityRecord1 = std::make_shared(want, abilityInfo1, applicationInfo1); + auto abilityRecord1 = std::make_shared(want, abilityInfo1, applicationInfo1); abilityRecord1->Init(AbilityRequest()); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord1); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord1); EXPECT_EQ(rec, nullptr); int recId1 = abilityRecord1->GetRecordId(); OHOS::AppExecFwk::AbilityInfo abilityInfo2; @@ -632,7 +632,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_004, TestSize.Level abilityInfo2.bundleName = "TestBundleName2"; OHOS::AppExecFwk::ApplicationInfo applicationInfo2; applicationInfo2.accessTokenId = 2; - auto abilityRecord2 = std::make_shared(want, abilityInfo2, applicationInfo2); + auto abilityRecord2 = std::make_shared(want, abilityInfo2, applicationInfo2); abilityRecord2->Init(AbilityRequest()); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord2); EXPECT_EQ(rec, nullptr); @@ -642,7 +642,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_004, TestSize.Level abilityInfo3.bundleName = "TestBundleName3"; OHOS::AppExecFwk::ApplicationInfo applicationInfo3; applicationInfo3.accessTokenId = 3; - auto abilityRecord3 = std::make_shared(want, abilityInfo3, applicationInfo3); + auto abilityRecord3 = std::make_shared(want, abilityInfo3, applicationInfo3); abilityRecord3->Init(AbilityRequest()); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord3); @@ -671,9 +671,9 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_005, TestSize.Level OHOS::AppExecFwk::ApplicationInfo applicationInfo1; applicationInfo1.accessTokenId = 1; Want want; - auto abilityRecord1 = std::make_shared(want, abilityInfo1, applicationInfo1); + auto abilityRecord1 = std::make_shared(want, abilityInfo1, applicationInfo1); abilityRecord1->Init(AbilityRequest()); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord1); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord1); EXPECT_EQ(rec, nullptr); OHOS::AppExecFwk::AbilityInfo abilityInfo2; @@ -682,7 +682,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_005, TestSize.Level OHOS::AppExecFwk::ApplicationInfo applicationInfo2; applicationInfo2.accessTokenId = 2; - auto abilityRecord2 = std::make_shared(want, abilityInfo2, applicationInfo2); + auto abilityRecord2 = std::make_shared(want, abilityInfo2, applicationInfo2); abilityRecord2->Init(AbilityRequest()); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord2); EXPECT_EQ(rec, nullptr); @@ -692,7 +692,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_005, TestSize.Level abilityInfo3.bundleName = "TestBundleName3"; OHOS::AppExecFwk::ApplicationInfo applicationInfo3; applicationInfo3.accessTokenId = 3; - auto abilityRecord3 = std::make_shared(want, abilityInfo3, applicationInfo3); + auto abilityRecord3 = std::make_shared(want, abilityInfo3, applicationInfo3); abilityRecord3->Init(AbilityRequest()); int recId3 = abilityRecord3->GetRecordId(); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord3); @@ -704,7 +704,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_005, TestSize.Level OHOS::AppExecFwk::ApplicationInfo applicationInfo4; applicationInfo4.accessTokenId = 3; - auto abilityRecord4 = std::make_shared(want, abilityInfo4, applicationInfo4); + auto abilityRecord4 = std::make_shared(want, abilityInfo4, applicationInfo4); abilityRecord4->Init(AbilityRequest()); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord4); EXPECT_EQ(rec->GetApplicationInfo().accessTokenId, applicationInfo3.accessTokenId); @@ -733,9 +733,9 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_006, TestSize.Level OHOS::AppExecFwk::ApplicationInfo applicationInfo1; applicationInfo1.accessTokenId = 1; Want want; - auto abilityRecord1 = std::make_shared(want, abilityInfo1, applicationInfo1); + auto abilityRecord1 = std::make_shared(want, abilityInfo1, applicationInfo1); abilityRecord1->Init(AbilityRequest()); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord1); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord1); EXPECT_EQ(rec, nullptr); OHOS::AppExecFwk::AbilityInfo abilityInfo2; @@ -744,7 +744,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_006, TestSize.Level OHOS::AppExecFwk::ApplicationInfo applicationInfo2; applicationInfo2.accessTokenId = 2; - auto abilityRecord2 = std::make_shared(want, abilityInfo2, applicationInfo2); + auto abilityRecord2 = std::make_shared(want, abilityInfo2, applicationInfo2); abilityRecord2->Init(AbilityRequest()); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord2); EXPECT_EQ(rec, nullptr); @@ -754,7 +754,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_006, TestSize.Level abilityInfo3.bundleName = "TestBundleName3"; OHOS::AppExecFwk::ApplicationInfo applicationInfo3; applicationInfo3.accessTokenId = 3; - auto abilityRecord3 = std::make_shared(want, abilityInfo3, applicationInfo3); + auto abilityRecord3 = std::make_shared(want, abilityInfo3, applicationInfo3); abilityRecord3->Init(AbilityRequest()); int recId3 = abilityRecord3->GetRecordId(); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord3); @@ -766,7 +766,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_006, TestSize.Level OHOS::AppExecFwk::ApplicationInfo applicationInfo4; applicationInfo4.accessTokenId = 3; - auto abilityRecord4 = std::make_shared(want, abilityInfo4, applicationInfo4); + auto abilityRecord4 = std::make_shared(want, abilityInfo4, applicationInfo4); abilityRecord4->Init(AbilityRequest()); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord4); EXPECT_EQ(rec->GetApplicationInfo().accessTokenId, applicationInfo3.accessTokenId); @@ -795,9 +795,9 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_007, TestSize.Level OHOS::AppExecFwk::ApplicationInfo applicationInfo1; applicationInfo1.accessTokenId = 1; Want want; - auto abilityRecord1 = std::make_shared(want, abilityInfo1, applicationInfo1); + auto abilityRecord1 = std::make_shared(want, abilityInfo1, applicationInfo1); abilityRecord1->Init(AbilityRequest()); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord1); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord1); EXPECT_EQ(rec, nullptr); OHOS::AppExecFwk::AbilityInfo abilityInfo2; @@ -806,7 +806,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_007, TestSize.Level OHOS::AppExecFwk::ApplicationInfo applicationInfo2; applicationInfo2.accessTokenId = 2; - auto abilityRecord2 = std::make_shared(want, abilityInfo2, applicationInfo2); + auto abilityRecord2 = std::make_shared(want, abilityInfo2, applicationInfo2); abilityRecord2->Init(AbilityRequest()); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord2); EXPECT_EQ(rec, nullptr); @@ -816,7 +816,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_007, TestSize.Level abilityInfo3.bundleName = "TestBundleName7"; OHOS::AppExecFwk::ApplicationInfo applicationInfo3; applicationInfo3.accessTokenId = 3; - auto abilityRecord3 = std::make_shared(want, abilityInfo3, applicationInfo3); + auto abilityRecord3 = std::make_shared(want, abilityInfo3, applicationInfo3); abilityRecord3->Init(AbilityRequest()); int recId3 = abilityRecord3->GetRecordId(); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord3); @@ -828,7 +828,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_007, TestSize.Level OHOS::AppExecFwk::ApplicationInfo applicationInfo4; applicationInfo4.accessTokenId = 3; - auto abilityRecord4 = std::make_shared(want, abilityInfo4, applicationInfo4); + auto abilityRecord4 = std::make_shared(want, abilityInfo4, applicationInfo4); abilityRecord4->Init(AbilityRequest()); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord4); EXPECT_EQ(rec->GetApplicationInfo().accessTokenId, applicationInfo3.accessTokenId); @@ -857,9 +857,9 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_008, TestSize.Level OHOS::AppExecFwk::ApplicationInfo applicationInfo1; applicationInfo1.accessTokenId = 1; Want want; - auto abilityRecord1 = std::make_shared(want, abilityInfo1, applicationInfo1); + auto abilityRecord1 = std::make_shared(want, abilityInfo1, applicationInfo1); abilityRecord1->Init(AbilityRequest()); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord1); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord1); EXPECT_EQ(rec, nullptr); OHOS::AppExecFwk::AbilityInfo abilityInfo2; @@ -868,7 +868,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_008, TestSize.Level OHOS::AppExecFwk::ApplicationInfo applicationInfo2; applicationInfo2.accessTokenId = 2; - auto abilityRecord2 = std::make_shared(want, abilityInfo2, applicationInfo2); + auto abilityRecord2 = std::make_shared(want, abilityInfo2, applicationInfo2); abilityRecord2->Init(AbilityRequest()); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord2); EXPECT_EQ(rec, nullptr); @@ -878,7 +878,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_008, TestSize.Level abilityInfo3.bundleName = "TestBundleName7"; OHOS::AppExecFwk::ApplicationInfo applicationInfo3; applicationInfo3.accessTokenId = 3; - auto abilityRecord3 = std::make_shared(want, abilityInfo3, applicationInfo3); + auto abilityRecord3 = std::make_shared(want, abilityInfo3, applicationInfo3); abilityRecord3->Init(AbilityRequest()); int recId3 = abilityRecord3->GetRecordId(); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord3); @@ -890,7 +890,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutTest_008, TestSize.Level OHOS::AppExecFwk::ApplicationInfo applicationInfo4; applicationInfo4.accessTokenId = 3; - auto abilityRecord4 = std::make_shared(want, abilityInfo4, applicationInfo4); + auto abilityRecord4 = std::make_shared(want, abilityInfo4, applicationInfo4); abilityRecord4->Init(AbilityRequest()); rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord4); EXPECT_EQ(rec->GetApplicationInfo().accessTokenId, applicationInfo3.accessTokenId); @@ -918,9 +918,9 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutAndRemoveTest_001, TestS OHOS::AppExecFwk::ApplicationInfo applicationInfo; applicationInfo.accessTokenId = 0; Want want; - auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); + auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); abilityRecord_->Init(AbilityRequest()); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); EXPECT_EQ(rec, nullptr); OHOS::AAFwk::AbilityCacheManager::GetInstance().Remove(abilityRecord_); AbilityRequest abilityRequest; @@ -933,7 +933,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerPutAndRemoveTest_001, TestS abilityInfo.bundleName = "TestBundleName1"; OHOS::AppExecFwk::ApplicationInfo applicationInfo1; applicationInfo.accessTokenId = 1; - auto abilityRecord1 = std::make_shared(want, abilityInfo, applicationInfo); + auto abilityRecord1 = std::make_shared(want, abilityInfo, applicationInfo); abilityRecord1->Init(AbilityRequest()); OHOS::AAFwk::AbilityCacheManager::GetInstance().Remove(abilityRecord1); } @@ -953,10 +953,10 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerFindByToken_001, TestSize.L OHOS::AppExecFwk::ApplicationInfo applicationInfo; applicationInfo.accessTokenId = 0; Want want; - auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); + auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); abilityRecord_->Init(AbilityRequest()); int recId = abilityRecord_->GetRecordId(); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); EXPECT_EQ(rec, nullptr); auto recordFind = OHOS::AAFwk::AbilityCacheManager::GetInstance().FindRecordByToken(abilityRecord_->GetToken()); EXPECT_EQ(recordFind->GetApplicationInfo().accessTokenId, applicationInfo.accessTokenId); @@ -988,10 +988,10 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerGetAbilityList_001, TestSiz OHOS::AppExecFwk::ApplicationInfo applicationInfo; applicationInfo.accessTokenId = 0; Want want; - auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); + auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); abilityRecord_->Init(AbilityRequest()); int recId = abilityRecord_->GetRecordId(); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); EXPECT_EQ(rec, nullptr); auto abilityList = OHOS::AAFwk::AbilityCacheManager::GetInstance().GetAbilityList(); EXPECT_EQ(abilityList.size(), 1); @@ -1020,10 +1020,10 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerFindBySessionId_001, TestSi applicationInfo.accessTokenId = 0; Want want; want.SetParam(Want::PARAM_ASSERT_FAULT_SESSION_ID, sessionId); - auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); + auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); abilityRecord_->Init(AbilityRequest()); int recId = abilityRecord_->GetRecordId(); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); EXPECT_EQ(rec, nullptr); auto recordFind = OHOS::AAFwk::AbilityCacheManager::GetInstance().FindRecordBySessionId(sessionId); EXPECT_EQ(recordFind->GetApplicationInfo().accessTokenId, applicationInfo.accessTokenId); @@ -1055,11 +1055,11 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerFindByServiceKey_001, TestS OHOS::AppExecFwk::ApplicationInfo applicationInfo; applicationInfo.accessTokenId = 0; Want want; - auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); + auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); abilityRecord_->Init(AbilityRequest()); int recId = abilityRecord_->GetRecordId(); std::string serviceKey = abilityRecord_->GetURI(); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); EXPECT_EQ(rec, nullptr); auto recordFind = OHOS::AAFwk::AbilityCacheManager::GetInstance().FindRecordByServiceKey(serviceKey); EXPECT_EQ(recordFind->GetApplicationInfo().accessTokenId, applicationInfo.accessTokenId); @@ -1092,10 +1092,10 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerSignRestartAppFlag_001, Tes applicationInfo.accessTokenId = 0; applicationInfo.bundleName = abilityInfo.bundleName; Want want; - auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); + auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); abilityRecord_->Init(AbilityRequest()); int recId = abilityRecord_->GetRecordId(); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); EXPECT_EQ(rec, nullptr); OHOS::AAFwk::AbilityCacheManager::GetInstance().SignRestartAppFlag(applicationInfo.uid, ""); AbilityRequest abilityRequest; @@ -1120,10 +1120,10 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerDeleteInvalidRecord_001, Te OHOS::AppExecFwk::ApplicationInfo applicationInfo; applicationInfo.accessTokenId = 0; Want want; - auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); + auto abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); abilityRecord_->Init(AbilityRequest()); int recId = abilityRecord_->GetRecordId(); - std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); + std::shared_ptr rec = OHOS::AAFwk::AbilityCacheManager::GetInstance().Put(abilityRecord_); EXPECT_EQ(rec, nullptr); AbilityRequest abilityRequest; abilityRequest.abilityInfo = abilityInfo; @@ -1155,7 +1155,7 @@ HWTEST_F(AbilityCacheManagerTest, AbilityCacheManagerSignRestartProcess_001, Tes AbilityRequest abilityRequest; abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; - auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); abilityRecMgr.devRecLru_.push_back(abilityRecord); abilityRecMgr.SignRestartProcess(pid); EXPECT_FALSE(abilityRecord->GetRestartAppFlag()); diff --git a/test/unittest/ability_connect_manager_first_test/ability_connect_manager_first_test.cpp b/test/unittest/ability_connect_manager_first_test/ability_connect_manager_first_test.cpp index b3fa0ac165..1e57347a05 100644 --- a/test/unittest/ability_connect_manager_first_test/ability_connect_manager_first_test.cpp +++ b/test/unittest/ability_connect_manager_first_test/ability_connect_manager_first_test.cpp @@ -67,15 +67,15 @@ public: const std::string& appName, const std::string& bundleName, const std::string& moduleName); sptr MockSessionInfo(int32_t persistentId); - std::shared_ptr InitAbilityRecord(); + std::shared_ptr InitAbilityRecord(); std::shared_ptr taskHandler_; protected: AbilityRequest abilityRequest_{}; AbilityRequest abilityRequest1_{}; AbilityRequest abilityRequest2_{}; - std::shared_ptr serviceRecord_{ nullptr }; - std::shared_ptr serviceRecord1_{ nullptr }; - std::shared_ptr serviceRecord2_{ nullptr }; + std::shared_ptr serviceRecord_{ nullptr }; + std::shared_ptr serviceRecord1_{ nullptr }; + std::shared_ptr serviceRecord2_{ nullptr }; OHOS::sptr serviceToken_{ nullptr }; OHOS::sptr serviceToken1_{ nullptr }; OHOS::sptr serviceToken2_{ nullptr }; @@ -126,13 +126,14 @@ sptr AbilityConnectManagerTest::MockSessionInfo(int32_t persistentI return sessionInfo; } -std::shared_ptr AbilityConnectManagerTest::InitAbilityRecord() +std::shared_ptr AbilityConnectManagerTest::InitAbilityRecord() { AbilityRequest abilityRequest; abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AbilityType::PAGE; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); return abilityRecord; } @@ -154,7 +155,7 @@ void AbilityConnectManagerTest::SetUp(void) std::string bundleName = "com.ix.hiservcie"; std::string moduleName = "entry"; abilityRequest_ = GenerateAbilityRequest(deviceName, abilityName, appName, bundleName, moduleName); - serviceRecord_ = AbilityRecord::CreateAbilityRecord(abilityRequest_); + serviceRecord_ = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest_); serviceToken_ = serviceRecord_->GetToken(); std::string deviceName1 = "device"; std::string abilityName1 = "musicServiceAbility"; @@ -162,14 +163,14 @@ void AbilityConnectManagerTest::SetUp(void) std::string bundleName1 = "com.ix.musicservcie"; std::string moduleName1 = "entry"; abilityRequest1_ = GenerateAbilityRequest(deviceName1, abilityName1, appName1, bundleName1, moduleName1); - serviceRecord1_ = AbilityRecord::CreateAbilityRecord(abilityRequest1_); + serviceRecord1_ = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest1_); std::string deviceName2 = "device"; std::string abilityName2 = "residentServiceAbility"; std::string appName2 = "residentservcie"; std::string bundleName2 = "com.ix.residentservcie"; std::string moduleName2 = "entry"; abilityRequest2_ = GenerateAbilityRequest(deviceName2, abilityName2, appName2, bundleName2, moduleName2); - serviceRecord2_ = AbilityRecord::CreateAbilityRecord(abilityRequest2_); + serviceRecord2_ = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest2_); serviceToken2_ = serviceRecord_->GetToken(); serviceToken1_ = serviceRecord_->GetToken(); callbackA_ = new AbilityConnectCallback(); @@ -219,7 +220,7 @@ HWTEST_F(AbilityConnectManagerTest, GetUIExtensionBySessionInfo_001, TestSize.Le std::string bundleName1 = "com.ix.uiExtensionProvider1"; std::string moduleName1 = "entry"; auto request1 = GenerateAbilityRequest(device, abilityName1, appName1, bundleName1, moduleName1); - auto uiExtension1 = AbilityRecord::CreateAbilityRecord(request1); + auto uiExtension1 = BaseExtensionRecord::CreateBaseExtensionRecord(request1); EXPECT_NE(uiExtension1, nullptr); uiExtension1->abilityInfo_.extensionAbilityType = ExtensionAbilityType::SYS_COMMON_UI; uiExtension1 = nullptr; @@ -250,7 +251,7 @@ HWTEST_F(AbilityConnectManagerTest, GetUIExtensionBySessionInfo_002, TestSize.Le std::string bundleName1 = "com.ix.uiExtensionProvider1"; std::string moduleName1 = "entry"; auto request1 = GenerateAbilityRequest(device, abilityName1, appName1, bundleName1, moduleName1); - auto uiExtension1 = AbilityRecord::CreateAbilityRecord(request1); + auto uiExtension1 = BaseExtensionRecord::CreateBaseExtensionRecord(request1); EXPECT_NE(uiExtension1, nullptr); uiExtension1->abilityInfo_.extensionAbilityType = ExtensionAbilityType::SYS_COMMON_UI; Rosen::SessionInfo infos; @@ -283,7 +284,7 @@ HWTEST_F(AbilityConnectManagerTest, GetUIExtensionBySessionInfo_003, TestSize.Le std::string bundleName1 = "com.ix.uiExtensionProvider1"; std::string moduleName1 = "entry"; auto request1 = GenerateAbilityRequest(device, abilityName1, appName1, bundleName1, moduleName1); - auto uiExtension1 = AbilityRecord::CreateAbilityRecord(request1); + auto uiExtension1 = BaseExtensionRecord::CreateBaseExtensionRecord(request1); EXPECT_NE(uiExtension1, nullptr); uiExtension1->abilityInfo_.extensionAbilityType = ExtensionAbilityType::SYS_COMMON_UI; @@ -317,7 +318,7 @@ HWTEST_F(AbilityConnectManagerTest, GetUIExtensionBySessionInfo_004, TestSize.Le std::string bundleName1 = "com.ix.uiExtensionProvider1"; std::string moduleName1 = "entry"; auto request1 = GenerateAbilityRequest(device, abilityName1, appName1, bundleName1, moduleName1); - auto uiExtension1 = AbilityRecord::CreateAbilityRecord(request1); + auto uiExtension1 = BaseExtensionRecord::CreateBaseExtensionRecord(request1); EXPECT_NE(uiExtension1, nullptr); uiExtension1->abilityInfo_.extensionAbilityType = ExtensionAbilityType::SYS_COMMON_UI; Rosen::SessionInfo infos; @@ -339,13 +340,13 @@ HWTEST_F(AbilityConnectManagerTest, HandleActiveAbility_001, TestSize.Level1) { TAG_LOGI(AAFwkTag::TEST, "HandleActiveAbility_001 start"); std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; AbilityRequest abilityRequest; sptr callerToken = abilityRecord->GetToken(); OHOS::sptr callback1 = new AbilityConnectCallback(); std::shared_ptr connectRecord = std::make_shared(callerToken, abilityRecord, callback1, nullptr); - std::shared_ptr targetService = nullptr; + std::shared_ptr targetService = nullptr; connectManager->HandleActiveAbility(targetService, connectRecord); abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::UI_SERVICE; Want want; @@ -372,7 +373,7 @@ HWTEST_F(AbilityConnectManagerTest, HandleActiveAbility_002, TestSize.Level1) auto elementName = abilityRequest_.want.GetElement(); auto elementNameUri = elementName.GetURI(); auto serviceMap = connectManager->GetServiceMap(); - std::shared_ptr abilityRecord = serviceMap.at(elementNameUri); + std::shared_ptr abilityRecord = serviceMap.at(elementNameUri); //AbilityRequest abilityRequest; sptr callerToken = abilityRecord->GetToken(); Want want; @@ -443,7 +444,7 @@ HWTEST_F(AbilityConnectManagerTest, HandleRestartResidentTask_001, TestSize.Leve std::string bundleName = "com.example.bundle"; std::string moduleName = "entry"; abilityRequest_ = GenerateAbilityRequest(deviceName, abilityName, appName, bundleName, moduleName); - serviceRecord_ = AbilityRecord::CreateAbilityRecord(abilityRequest_); + serviceRecord_ = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest_); connectManager->HandleRestartResidentTask(abilityRequest_); ASSERT_TRUE(connectManager->restartResidentTaskList_.empty()); @@ -467,7 +468,7 @@ HWTEST_F(AbilityConnectManagerTest, HandleRestartResidentTask_002, TestSize.Leve std::string bundleName = "com.example.bundle"; std::string moduleName = "entry"; abilityRequest_ = GenerateAbilityRequest(deviceName, abilityName, appName, bundleName, moduleName); - serviceRecord_ = AbilityRecord::CreateAbilityRecord(abilityRequest_); + serviceRecord_ = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest_); connectManager->HandleRestartResidentTask(abilityRequest_); ASSERT_EQ(connectManager->restartResidentTaskList_.size(), 0); @@ -484,7 +485,7 @@ HWTEST_F(AbilityConnectManagerTest, IsNeedToRestart_001, TestSize.Level1) std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; bool result = connectManager->IsNeedToRestart(abilityRecord, "com.example.bundle", "TestAbility"); ASSERT_TRUE(result); TAG_LOGI(AAFwkTag::TEST, "IsNeedToRestart_001 end"); @@ -500,7 +501,7 @@ HWTEST_F(AbilityConnectManagerTest, HandleUIExtensionDied_001, TestSize.Level1) std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; connectManager->HandleUIExtensionDied(abilityRecord); EXPECT_EQ(connectManager->uiExtensionMap_.size(), 0); TAG_LOGI(AAFwkTag::TEST, "HandleUIExtensionDied_001 end"); @@ -516,7 +517,7 @@ HWTEST_F(AbilityConnectManagerTest, GetUIExtensionSessionInfo_001, TestSize.Leve std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; AbilityRequest abilityRequest; sptr callerToken = abilityRecord->GetToken(); UIExtensionSessionInfo info; @@ -544,8 +545,8 @@ HWTEST_F(AbilityConnectManagerTest, GetUIExtensionSessionInfo_002, TestSize.Leve std::string bundleName = "com.ix.hiservcie"; std::string moduleName = "entry"; abilityRequest_ = GenerateAbilityRequest(deviceName, abilityName, appName, bundleName, moduleName); - serviceRecord_ = AbilityRecord::CreateAbilityRecord(abilityRequest_); - std::shared_ptr abilityRecord = serviceRecord_; + serviceRecord_ = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest_); + std::shared_ptr abilityRecord = serviceRecord_; sptr token = abilityRecord->GetToken(); connectManager->uiExtensionAbilityRecordMgr_ = nullptr; @@ -579,7 +580,7 @@ HWTEST_F(AbilityConnectManagerTest, IsStrictMode_002, TestSize.Level1) std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::INPUTMETHOD; Want want; want.SetParam("strictMode", true); @@ -600,7 +601,8 @@ HWTEST_F(AbilityConnectManagerTest, TerminateAbilityInner_001, TestSize.Level1) std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); auto abilityInfo = abilityRecord->GetAbilityInfo(); abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::UI; auto result = ConnectManager()->TerminateAbilityInner(abilityRecord->GetToken()); @@ -618,7 +620,7 @@ HWTEST_F(AbilityConnectManagerTest, TerminateAbilityInner_002, TestSize.Level1) std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; auto abilityInfo = abilityRecord->GetAbilityInfo(); abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::UI; OHOS::sptr callback = new AbilityConnectCallback(); @@ -643,7 +645,7 @@ HWTEST_F(AbilityConnectManagerTest, TerminateAbilityInner_003, TestSize.Level1) std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; auto abilityInfo = abilityRecord->GetAbilityInfo(); abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::UI; abilityRecord->connRecordList_.clear(); @@ -663,7 +665,7 @@ HWTEST_F(AbilityConnectManagerTest, IsWindowExtensionFocused_001, TestSize.Level ASSERT_NE(connectManager, nullptr); uint32_t extensionTokenId = 12345; - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr focusToken = abilityRecord->GetToken(); ASSERT_NE(focusToken, nullptr); @@ -691,7 +693,7 @@ HWTEST_F(AbilityConnectManagerTest, IsWindowExtensionFocused_0002, TestSize.Leve ASSERT_NE(connectManager, nullptr); uint32_t extensionTokenId = 12345; - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr focusToken = abilityRecord->GetToken(); ASSERT_NE(focusToken, nullptr); @@ -714,11 +716,11 @@ HWTEST_F(AbilityConnectManagerTest, NeedExtensionControl_001, TestSize.Level1) std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr nullRecord = nullptr; + std::shared_ptr nullRecord = nullptr; bool result = connectManager->NeedExtensionControl(nullRecord); EXPECT_FALSE(result); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::SERVICE; result = connectManager->NeedExtensionControl(abilityRecord); EXPECT_FALSE(result); @@ -739,7 +741,7 @@ HWTEST_F(AbilityConnectManagerTest, NeedExtensionControl_002, TestSize.Level1) std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::FORM; abilityRecord->SetCustomProcessFlag(""); bool result = connectManager->NeedExtensionControl(abilityRecord); @@ -763,7 +765,7 @@ HWTEST_F(AbilityConnectManagerTest, StartAbilityLocked_001, TestSize.Level1) std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr focusToken = abilityRecord->GetToken(); AbilityRequest abilityRequest; abilityRequest.abilityInfo.deviceId = "id"; @@ -793,7 +795,7 @@ HWTEST_F(AbilityConnectManagerTest, DoForegroundUIExtension_001, TestSize.Level1 std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr nullRecord = nullptr; + std::shared_ptr nullRecord = nullptr; AbilityRequest abilityRequest; abilityRequest.abilityInfo.deviceId = "id"; abilityRequest.abilityInfo.bundleName = "bundle"; @@ -802,7 +804,8 @@ HWTEST_F(AbilityConnectManagerTest, DoForegroundUIExtension_001, TestSize.Level1 abilityRequest.abilityInfo.extensionAbilityType = ExtensionAbilityType::UI; connectManager->DoForegroundUIExtension(nullRecord, abilityRequest); - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); abilityRecord->isReady_ = true; abilityRecord->currentState_ = AbilityState::FOREGROUND; @@ -826,7 +829,8 @@ HWTEST_F(AbilityConnectManagerTest, GetOrCreateExtensionRecord_001, TestSize.Lev abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AbilityType::PAGE; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); std::string hostBundName = "bundleName"; bool isCreate = false; bool isLoadedAbility = false; @@ -853,7 +857,7 @@ HWTEST_F(AbilityConnectManagerTest, GetOrCreateServiceRecord_001, TestSize.Level abilityRequest.abilityInfo.bundleName = "com.example.test"; abilityRequest.abilityInfo.name = "TestAbility"; - std::shared_ptr resultService = nullptr; + std::shared_ptr resultService = nullptr; bool isLoadedAbility = false; connectManager->GetOrCreateServiceRecord(abilityRequest, false, resultService, isLoadedAbility); @@ -876,7 +880,8 @@ HWTEST_F(AbilityConnectManagerTest, UnloadUIExtensionAbility_001, TestSize.Level abilityRequest.abilityInfo.extensionAbilityType = AppExecFwk::ExtensionAbilityType::WORK_SCHEDULER; abilityRequest.abilityInfo.bundleName = "com.example.test"; abilityRequest.abilityInfo.name = "TestAbility"; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); OHOS::sptr callback = new AbilityConnectCallback(); std::shared_ptr connection = std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); @@ -906,7 +911,8 @@ HWTEST_F(AbilityConnectManagerTest, HandleActiveAbility_004, TestSize.Level1) abilityRequest.abilityInfo.extensionAbilityType = AppExecFwk::ExtensionAbilityType::WORK_SCHEDULER; abilityRequest.abilityInfo.bundleName = "com.example.test"; abilityRequest.abilityInfo.name = "TestAbility"; - std::shared_ptr targetService = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr targetService = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); Want want; want.SetParam(PARAM_RESV_CALLER_APP_ID, std::string("app")); targetService->SetWant(want); @@ -928,12 +934,13 @@ HWTEST_F(AbilityConnectManagerTest, HandleActiveAbility_005, TestSize.Level1) std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; AbilityRequest abilityRequest; abilityRequest.abilityInfo.extensionAbilityType = AppExecFwk::ExtensionAbilityType::UI_SERVICE; abilityRequest.abilityInfo.bundleName = "com.example.test"; abilityRequest.abilityInfo.name = "TestAbility"; - std::shared_ptr targetService = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr targetService = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); Want want; want.SetParam(PARAM_RESV_CALLER_APP_ID, std::string("app")); targetService->SetWant(want); @@ -1021,7 +1028,7 @@ HWTEST_F(AbilityConnectManagerTest, SetServiceAfterNewCreate_001, TestSize.Level std::string bundleName = "com.ix.hiservcie"; std::string moduleName = "entry"; auto abilityRequest = GenerateAbilityRequest(deviceName, abilityName, appName, bundleName, moduleName); - auto targetService = AbilityRecord::CreateAbilityRecord(abilityRequest); + auto targetService = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); connectManager->SetServiceAfterNewCreate(abilityRequest, *targetService); EXPECT_TRUE(targetService->IsLauncherRoot()); @@ -1041,7 +1048,7 @@ HWTEST_F(AbilityConnectManagerTest, SetServiceAfterNewCreate_002, TestSize.Level std::string bundleName = "com.ix.hiservcie"; std::string moduleName = "entry"; auto abilityRequest = GenerateAbilityRequest(deviceName, abilityName, appName, bundleName, moduleName); - auto targetService = AbilityRecord::CreateAbilityRecord(abilityRequest); + auto targetService = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); targetService->SetKeepAliveBundle(true); connectManager->SetServiceAfterNewCreate(abilityRequest, *targetService); @@ -1062,7 +1069,7 @@ HWTEST_F(AbilityConnectManagerTest, SetServiceAfterNewCreate_003, TestSize.Level std::string bundleName = AbilityConfig::SCENEBOARD_BUNDLE_NAME; std::string moduleName = "entry"; auto abilityRequest = GenerateAbilityRequest(deviceName, abilityName, appName, bundleName, moduleName); - auto targetService = AbilityRecord::CreateAbilityRecord(abilityRequest); + auto targetService = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); abilityRequest.appInfo.accessTokenId = FAKE_TOKENID; connectManager->SetServiceAfterNewCreate(abilityRequest, *targetService); EXPECT_EQ(connectManager->sceneBoardTokenId_, FAKE_TOKENID); @@ -1083,7 +1090,7 @@ HWTEST_F(AbilityConnectManagerTest, SetServiceAfterNewCreate_004, TestSize.Level std::string moduleName = "entry"; auto abilityRequest = GenerateAbilityRequest(deviceName, abilityName, appName, bundleName, moduleName); abilityRequest.restart = true; - auto targetService = AbilityRecord::CreateAbilityRecord(abilityRequest); + auto targetService = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); abilityRequest.appInfo.accessTokenId = FAKE_TOKENID; connectManager->SetServiceAfterNewCreate(abilityRequest, *targetService); EXPECT_EQ(connectManager->sceneBoardTokenId_, FAKE_TOKENID); @@ -1104,7 +1111,7 @@ HWTEST_F(AbilityConnectManagerTest, SetServiceAfterNewCreate_005, TestSize.Level std::string moduleName = "entry"; auto abilityRequest = GenerateAbilityRequest(deviceName, abilityName, appName, bundleName, moduleName); abilityRequest.restart = true; - auto targetService = AbilityRecord::CreateAbilityRecord(abilityRequest); + auto targetService = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); targetService->SetKeepAliveBundle(true); connectManager->SetServiceAfterNewCreate(abilityRequest, *targetService); diff --git a/test/unittest/ability_connect_manager_fourth_test/ability_connect_manager_fourth_test.cpp b/test/unittest/ability_connect_manager_fourth_test/ability_connect_manager_fourth_test.cpp index 7dec337b97..1214d7b577 100644 --- a/test/unittest/ability_connect_manager_fourth_test/ability_connect_manager_fourth_test.cpp +++ b/test/unittest/ability_connect_manager_fourth_test/ability_connect_manager_fourth_test.cpp @@ -66,15 +66,15 @@ public: const std::string& appName, const std::string& bundleName, const std::string& moduleName); sptr MockSessionInfo(int32_t persistentId); - std::shared_ptr InitAbilityRecord(); + std::shared_ptr InitAbilityRecord(); std::shared_ptr taskHandler_; protected: AbilityRequest abilityRequest_{}; AbilityRequest abilityRequest1_{}; AbilityRequest abilityRequest2_{}; - std::shared_ptr serviceRecord_{ nullptr }; - std::shared_ptr serviceRecord1_{ nullptr }; - std::shared_ptr serviceRecord2_{ nullptr }; + std::shared_ptr serviceRecord_{ nullptr }; + std::shared_ptr serviceRecord1_{ nullptr }; + std::shared_ptr serviceRecord2_{ nullptr }; OHOS::sptr serviceToken_{ nullptr }; OHOS::sptr serviceToken1_{ nullptr }; OHOS::sptr serviceToken2_{ nullptr }; @@ -125,13 +125,14 @@ sptr AbilityConnectManagerFourthTest::MockSessionInfo(int32_t persi return sessionInfo; } -std::shared_ptr AbilityConnectManagerFourthTest::InitAbilityRecord() +std::shared_ptr AbilityConnectManagerFourthTest::InitAbilityRecord() { AbilityRequest abilityRequest; abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AbilityType::PAGE; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); return abilityRecord; } @@ -153,7 +154,7 @@ void AbilityConnectManagerFourthTest::SetUp(void) std::string bundleName = "com.ix.hiservcie"; std::string moduleName = "entry"; abilityRequest_ = GenerateAbilityRequest(deviceName, abilityName, appName, bundleName, moduleName); - serviceRecord_ = AbilityRecord::CreateAbilityRecord(abilityRequest_); + serviceRecord_ = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest_); serviceToken_ = serviceRecord_->GetToken(); std::string deviceName1 = "device"; std::string abilityName1 = "musicServiceAbility"; @@ -161,14 +162,14 @@ void AbilityConnectManagerFourthTest::SetUp(void) std::string bundleName1 = "com.ix.musicservcie"; std::string moduleName1 = "entry"; abilityRequest1_ = GenerateAbilityRequest(deviceName1, abilityName1, appName1, bundleName1, moduleName1); - serviceRecord1_ = AbilityRecord::CreateAbilityRecord(abilityRequest1_); + serviceRecord1_ = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest1_); std::string deviceName2 = "device"; std::string abilityName2 = "residentServiceAbility"; std::string appName2 = "residentservcie"; std::string bundleName2 = "com.ix.residentservcie"; std::string moduleName2 = "entry"; abilityRequest2_ = GenerateAbilityRequest(deviceName2, abilityName2, appName2, bundleName2, moduleName2); - serviceRecord2_ = AbilityRecord::CreateAbilityRecord(abilityRequest2_); + serviceRecord2_ = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest2_); serviceToken2_ = serviceRecord_->GetToken(); serviceToken1_ = serviceRecord_->GetToken(); callbackA_ = new AbilityConnectCallback(); @@ -208,7 +209,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, DispatchForeground_001, TestSize.Level std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); EXPECT_NE(abilityRecord, nullptr); taskHandler_ = MockTaskHandlerWrap::CreateQueueHandler("AbilityConnectManagerFourthTest"); connectManager->taskHandler_ = taskHandler_; @@ -228,7 +230,7 @@ HWTEST_F(AbilityConnectManagerFourthTest, NeedExtensionControl_003, TestSize.Lev std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::UI; abilityRecord->customProcessFlag_ = "true"; abilityRecord->extensionProcessMode_ = 0; @@ -249,7 +251,7 @@ HWTEST_F(AbilityConnectManagerFourthTest, NeedExtensionControl_004, TestSize.Lev std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::UI; abilityRecord->customProcessFlag_ = "true"; abilityRecord->extensionProcessMode_ = 1; @@ -274,7 +276,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, TerminateRecord_001, TestSize.Level1) abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AbilityType::PAGE; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); ASSERT_NE(abilityRecord, nullptr); abilityRecord->recordId_ = 1; EXPECT_EQ(connectManager->GetExtensionByIdFromServiceMap(abilityRecord->GetRecordId()), nullptr); @@ -317,7 +320,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, GetExtensionByTokenFromTerminatingMap_ abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AbilityType::PAGE; abilityRequest.abilityInfo.extensionAbilityType = AppExecFwk::ExtensionAbilityType::SHARE; - std::shared_ptr validRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr validRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); OHOS::sptr validToken = new OHOS::AAFwk::Token(validRecord); auto result = connectManager->GetExtensionByTokenFromTerminatingMap(validToken); EXPECT_EQ(result, nullptr); @@ -335,7 +339,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, DispatchInactive_001, TestSize.Level1) std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - const std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + const std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); abilityRecord->currentState_ = AbilityState::INACTIVATING; abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::SERVICE; EXPECT_NE(abilityRecord, nullptr); @@ -359,7 +364,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, DispatchInactive_002, TestSize.Level1) std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); abilityRecord->currentState_ = AbilityState::INACTIVATING; abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::SERVICE; EXPECT_NE(abilityRecord, nullptr); @@ -388,7 +394,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, DispatchInactive_003, TestSize.Level1) std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); abilityRecord->currentState_ = AbilityState::INACTIVATING; abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::SERVICE; abilityRecord->SetUIExtensionAbilityId(1); @@ -417,7 +424,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, DispatchInactive_004, TestSize.Level1) std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); abilityRecord->currentState_ = AbilityState::INACTIVATING; abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::SERVICE; abilityRecord->SetUIExtensionAbilityId(1); @@ -448,11 +456,12 @@ HWTEST_F(AbilityConnectManagerFourthTest, HandleUIExtensionDied_002, TestSize.Le EXPECT_NE(connectManager, nullptr); sptr token = serviceToken_; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); ASSERT_NE(abilityRecord, nullptr); sptr sessionToken = abilityRecord->GetToken(); connectManager->AddUIExtWindowDeathRecipient(sessionToken); - connectManager->uiExtensionMap_[sessionToken] = {std::weak_ptr(), nullptr}; + connectManager->uiExtensionMap_[sessionToken] = {std::weak_ptr(), nullptr}; EXPECT_EQ(connectManager->uiExtensionMap_.size(), 1); connectManager->HandleUIExtensionDied(abilityRecord); @@ -471,7 +480,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, HandleUIExtensionDied_003, TestSize.Le EXPECT_NE(connectManager, nullptr); sptr token = serviceToken_; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); ASSERT_NE(abilityRecord, nullptr); sptr sessionToken = abilityRecord->GetToken(); connectManager->uiExtensionMap_[sessionToken] = {abilityRecord, nullptr}; @@ -493,9 +503,11 @@ HWTEST_F(AbilityConnectManagerFourthTest, HandleUIExtensionDied_004, TestSize.Le EXPECT_NE(connectManager, nullptr); sptr token = serviceToken_; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); ASSERT_NE(abilityRecord, nullptr); - std::shared_ptr anotherAbilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest1_); + std::shared_ptr anotherAbilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest1_); ASSERT_NE(anotherAbilityRecord, nullptr); sptr sessionToken = abilityRecord->GetToken(); connectManager->uiExtensionMap_[sessionToken] = {anotherAbilityRecord, nullptr}; @@ -516,7 +528,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, GetServiceKey_001, TestSize.Level1) std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); ASSERT_NE(abilityRecord, nullptr); abilityRecord->uri_ = "com.example.test"; abilityRecord->abilityInfo_.bundleName = "com.ohos.formrenderservice"; @@ -542,7 +555,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, GetExtensionRunningInfos_001, TestSize std::vector info; int upperLimit = 2; int32_t userId = 0; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); ASSERT_NE(abilityRecord, nullptr); connectManager->AddToServiceMap("testServiceKey1", abilityRecord); info.emplace_back(); @@ -585,7 +599,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, GetExtensionRunningInfos_003, TestSize std::vector info; int upperLimit = 2; int32_t userId = 0; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); ASSERT_NE(abilityRecord, nullptr); connectManager->AddToServiceMap("testServiceKey3", abilityRecord); @@ -623,7 +638,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, GetAbilityRunningInfos_002, TestSize.L EXPECT_NE(connectManager, nullptr); std::vector info; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); ASSERT_NE(abilityRecord, nullptr); connectManager->AddToServiceMap("testServiceKey2", abilityRecord); @@ -643,7 +659,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, GetAbilityRunningInfos_003, TestSize.L EXPECT_NE(connectManager, nullptr); std::vector info; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); ASSERT_NE(abilityRecord, nullptr); abilityRecord->abilityInfo_.applicationInfo.accessTokenId = IPCSkeleton::GetCallingTokenID(); connectManager->AddToServiceMap("testServiceKey3", abilityRecord); @@ -663,7 +680,7 @@ HWTEST_F(AbilityConnectManagerFourthTest, IsLauncher_001, TestSize.Level1) std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr nullAbilityRecord = nullptr; + std::shared_ptr nullAbilityRecord = nullptr; bool result = connectManager->IsLauncher(nullAbilityRecord); EXPECT_FALSE(result); TAG_LOGI(AAFwkTag::TEST, "IsLauncher_001 end"); @@ -679,7 +696,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, IsLauncher_002, TestSize.Level1) std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); ASSERT_NE(abilityRecord, nullptr); abilityRecord->abilityInfo_.name = "NotLauncher"; abilityRecord->abilityInfo_.bundleName = "com.ohos.launcher"; @@ -699,7 +717,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, IsLauncher_003, TestSize.Level1) std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); ASSERT_NE(abilityRecord, nullptr); abilityRecord->abilityInfo_.name = "com.ohos.launcher.MainAbility"; abilityRecord->abilityInfo_.bundleName = "NotLauncherBundle"; @@ -719,7 +738,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, IsLauncher_004, TestSize.Level1) std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); ASSERT_NE(abilityRecord, nullptr); abilityRecord->abilityInfo_.name = "com.ohos.launcher.MainAbility"; abilityRecord->abilityInfo_.bundleName = "com.ohos.launcher"; @@ -740,7 +760,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, IsUIExtensionFocused_001, TestSize.Lev EXPECT_NE(connectManager, nullptr); uint32_t uiExtensionTokenId = 1; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); ASSERT_NE(abilityRecord, nullptr); sptr focusToken = abilityRecord->GetToken(); abilityRecord->abilityInfo_.applicationInfo.accessTokenId = 5; @@ -763,7 +784,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, IsUIExtensionFocused_002, TestSize.Lev EXPECT_NE(connectManager, nullptr); uint32_t uiExtensionTokenId = 1; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); ASSERT_NE(abilityRecord, nullptr); sptr focusToken = abilityRecord->GetToken(); abilityRecord->abilityInfo_.applicationInfo.accessTokenId = uiExtensionTokenId; @@ -803,7 +825,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, GetUIExtensionSourceToken_002, TestSiz std::shared_ptr connectManager = std::make_shared(0); EXPECT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); ASSERT_NE(abilityRecord, nullptr); sptr token = abilityRecord->GetToken(); connectManager->uiExtensionMap_.emplace(token, std::make_pair(abilityRecord, nullptr)); @@ -824,7 +847,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, GetUIExtensionSourceToken_003, TestSiz EXPECT_NE(connectManager, nullptr); sptr sessionInfo = new SessionInfo(); - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); ASSERT_NE(abilityRecord, nullptr); sptr token = abilityRecord->GetToken(); connectManager->uiExtensionMap_.clear(); @@ -871,7 +895,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, StopServiceAbilityLocked_002, TestSize abilityRequest.abilityInfo.bundleName ="testBundle"; abilityRequest.abilityInfo.name = "testAbility"; abilityRequest.abilityInfo.moduleName = "testModule"; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); ASSERT_NE(abilityRecord, nullptr); abilityRecord->SetAbilityState(AbilityState::TERMINATING); connectManager->AddToServiceMap("testServiceKey", abilityRecord); @@ -896,7 +921,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, StopServiceAbilityLocked_003, TestSize abilityRequest.abilityInfo.bundleName ="testBundle"; abilityRequest.abilityInfo.name = "testAbility"; abilityRequest.abilityInfo.moduleName = "testModule"; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); ASSERT_NE(abilityRecord, nullptr); sptr callerToken = abilityRecord->GetToken(); OHOS::sptr callback1 = new AbilityConnectCallback(); @@ -921,7 +947,8 @@ HWTEST_F(AbilityConnectManagerFourthTest, RemoveServiceFromMapSafe_001, TestSize EXPECT_NE(connectManager, nullptr); std::string existingKey = "existingServiceKey"; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); ASSERT_NE(abilityRecord, nullptr); connectManager->AddToServiceMap(existingKey, abilityRecord); EXPECT_EQ(connectManager->GetServiceMap().size(), 1); @@ -1068,7 +1095,7 @@ HWTEST_F(AbilityConnectManagerFourthTest, SignRestartProcess_001, TestSize.Level AbilityRequest abilityRequest; abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; - auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); connectManager->serviceMap_.emplace("TestKey", abilityRecord); connectManager->SignRestartProcess(pid); EXPECT_FALSE(abilityRecord->GetRestartAppFlag()); diff --git a/test/unittest/ability_connect_manager_second_test/ability_connect_manager_second_test.cpp b/test/unittest/ability_connect_manager_second_test/ability_connect_manager_second_test.cpp index 74e7baa3a9..37d7a6495a 100644 --- a/test/unittest/ability_connect_manager_second_test/ability_connect_manager_second_test.cpp +++ b/test/unittest/ability_connect_manager_second_test/ability_connect_manager_second_test.cpp @@ -54,7 +54,7 @@ public: protected: AbilityRequest abilityRequest_{}; - std::shared_ptr serviceRecord_{ nullptr }; + std::shared_ptr serviceRecord_{ nullptr }; private: std::shared_ptr connectManager_; @@ -103,7 +103,7 @@ void AbilityConnectManagerSecondTest::SetUp(void) std::string bundleName = "com.ix.hiservcie"; std::string moduleName = "entry"; abilityRequest_ = GenerateAbilityRequest(deviceName, abilityName, appName, bundleName, moduleName); - serviceRecord_ = AbilityRecord::CreateAbilityRecord(abilityRequest_); + serviceRecord_ = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest_); } void AbilityConnectManagerSecondTest::TearDown(void) @@ -152,7 +152,8 @@ HWTEST_F(AbilityConnectManagerSecondTest, GetExtensionByIdFromTerminatingMap_001 EXPECT_NE(connectManager, nullptr); int64_t abilityRecordId = 1; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); connectManager->terminatingExtensionList_.push_back(nullptr); auto res = connectManager->GetExtensionByIdFromTerminatingMap(abilityRecordId); EXPECT_EQ(res, nullptr); @@ -468,7 +469,7 @@ HWTEST_F(AbilityConnectManagerSecondTest, DisconnectRecordForce_ConnectRecordIsN AbilityRequest req; req.want.SetElementName("com.example.bundle", "com.example.module", "MainAbility"); - auto abilityRecord = AbilityRecord::CreateAbilityRecord(req); + auto abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord(req); EXPECT_TRUE(abilityRecord); EXPECT_TRUE(abilityRecord->IsConnectListEmpty()); @@ -504,7 +505,7 @@ HWTEST_F(AbilityConnectManagerSecondTest, DisconnectRecordForce_ConnectRecordIsL AbilityRequest req; req.want.SetElementName("com.example.bundle", "com.example.module", "MainAbility"); - auto abilityRecord = AbilityRecord::CreateAbilityRecord(req); + auto abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord(req); EXPECT_TRUE(abilityRecord); EXPECT_TRUE(abilityRecord->IsConnectListEmpty()); @@ -533,7 +534,7 @@ HWTEST_F(AbilityConnectManagerSecondTest, DisconnectRecordForce_ConnectRecordIsL AbilityRequest req; req.want.SetElementName("com.example.bundle", "com.example.module", "MainAbility"); - auto abilityRecord = AbilityRecord::CreateAbilityRecord(req); + auto abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord(req); EXPECT_TRUE(abilityRecord); EXPECT_TRUE(abilityRecord->IsConnectListEmpty()); @@ -565,7 +566,7 @@ HWTEST_F(AbilityConnectManagerSecondTest, DisconnectRecordForce_StartButNotActiv AbilityRequest req; req.want.SetElementName("com.example.bundle", "com.example.module", "MainAbility"); - auto abilityRecord = AbilityRecord::CreateAbilityRecord(req); + auto abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord(req); EXPECT_TRUE(abilityRecord); EXPECT_TRUE(abilityRecord->IsConnectListEmpty()); @@ -601,7 +602,7 @@ HWTEST_F(AbilityConnectManagerSecondTest, DisconnectRecordForce_StartButIsActive AbilityRequest req; req.want.SetElementName("com.example.bundle", "com.example.module", "MainAbility"); - auto abilityRecord = AbilityRecord::CreateAbilityRecord(req); + auto abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord(req); EXPECT_TRUE(abilityRecord); EXPECT_TRUE(abilityRecord->IsConnectListEmpty()); diff --git a/test/unittest/ability_connect_manager_test/ability_connect_manager_test.cpp b/test/unittest/ability_connect_manager_test/ability_connect_manager_test.cpp index 0425bbb6d8..c9c6c4e451 100644 --- a/test/unittest/ability_connect_manager_test/ability_connect_manager_test.cpp +++ b/test/unittest/ability_connect_manager_test/ability_connect_manager_test.cpp @@ -93,16 +93,16 @@ public: static constexpr int TEST_WAIT_TIME = 1000000; sptr MockSessionInfo(int32_t persistentId); - std::shared_ptr InitAbilityRecord(); + std::shared_ptr InitAbilityRecord(); std::shared_ptr taskHandler_; protected: AbilityRequest abilityRequest_{}; AbilityRequest abilityRequest1_{}; AbilityRequest abilityRequest2_{}; - std::shared_ptr serviceRecord_{ nullptr }; - std::shared_ptr serviceRecord1_{ nullptr }; - std::shared_ptr serviceRecord2_{ nullptr }; + std::shared_ptr serviceRecord_{ nullptr }; + std::shared_ptr serviceRecord1_{ nullptr }; + std::shared_ptr serviceRecord2_{ nullptr }; OHOS::sptr serviceToken_{ nullptr }; OHOS::sptr serviceToken1_{ nullptr }; OHOS::sptr serviceToken2_{ nullptr }; @@ -153,13 +153,14 @@ sptr AbilityConnectManagerTest::MockSessionInfo(int32_t persistentI return sessionInfo; } -std::shared_ptr AbilityConnectManagerTest::InitAbilityRecord() +std::shared_ptr AbilityConnectManagerTest::InitAbilityRecord() { AbilityRequest abilityRequest; abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AbilityType::PAGE; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); return abilityRecord; } @@ -182,7 +183,7 @@ void AbilityConnectManagerTest::SetUp(void) std::string bundleName = "com.ix.hiservcie"; std::string moduleName = "entry"; abilityRequest_ = GenerateAbilityRequest(deviceName, abilityName, appName, bundleName, moduleName); - serviceRecord_ = AbilityRecord::CreateAbilityRecord(abilityRequest_); + serviceRecord_ = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest_); serviceToken_ = serviceRecord_->GetToken(); std::string deviceName1 = "device"; std::string abilityName1 = "musicServiceAbility"; @@ -190,14 +191,14 @@ void AbilityConnectManagerTest::SetUp(void) std::string bundleName1 = "com.ix.musicservcie"; std::string moduleName1 = "entry"; abilityRequest1_ = GenerateAbilityRequest(deviceName1, abilityName1, appName1, bundleName1, moduleName1); - serviceRecord1_ = AbilityRecord::CreateAbilityRecord(abilityRequest1_); + serviceRecord1_ = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest1_); std::string deviceName2 = "device"; std::string abilityName2 = "residentServiceAbility"; std::string appName2 = "residentservcie"; std::string bundleName2 = "com.ix.residentservcie"; std::string moduleName2 = "entry"; abilityRequest2_ = GenerateAbilityRequest(deviceName2, abilityName2, appName2, bundleName2, moduleName2); - serviceRecord2_ = AbilityRecord::CreateAbilityRecord(abilityRequest2_); + serviceRecord2_ = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest2_); serviceToken2_ = serviceRecord_->GetToken(); serviceToken1_ = serviceRecord_->GetToken(); callbackA_ = new AbilityConnectCallback(); @@ -719,7 +720,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFWK_Connect_Service_017, TestSize.Level1) abilityRecord->SetAbilityState(OHOS::AAFwk::AbilityState::ACTIVE); ConnectManager()->ScheduleConnectAbilityDoneLocked(token, callback); - auto abilityRecordB = Token::GetAbilityRecordByToken(token); + auto abilityRecordB = std::static_pointer_cast(Token::GetAbilityRecordByToken(token)); EXPECT_TRUE(abilityRecordB); auto connectRecordList = abilityRecordB->GetConnectRecordList(); int size = connectRecordList.size(); @@ -1191,7 +1192,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFWK_Connect_Service_020, TestSize.Level1) auto result = ConnectManager()->ScheduleDisconnectAbilityDoneLocked(nullToken); EXPECT_EQ(result, OHOS::AAFwk::CONNECTION_NOT_EXIST); - std::shared_ptr ability = nullptr; + std::shared_ptr ability = nullptr; OHOS::sptr token1 = new OHOS::AAFwk::Token(ability); auto result1 = ConnectManager()->ScheduleDisconnectAbilityDoneLocked(token1); EXPECT_EQ(result1, OHOS::AAFwk::CONNECTION_NOT_EXIST); @@ -1238,7 +1239,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFWK_Connect_Service_021, TestSize.Level1) auto result = ConnectManager()->ScheduleCommandAbilityDoneLocked(nullToken); EXPECT_EQ(result, OHOS::ERR_INVALID_VALUE); - std::shared_ptr ability = nullptr; + std::shared_ptr ability = nullptr; OHOS::sptr token1 = new OHOS::AAFwk::Token(ability); auto result1 = ConnectManager()->ScheduleCommandAbilityDoneLocked(token1); EXPECT_EQ(result1, OHOS::ERR_INVALID_VALUE); @@ -1366,7 +1367,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFWK_Connect_Service_024, TestSize.Level1) */ HWTEST_F(AbilityConnectManagerTest, AAFWK_Connect_Service_025, TestSize.Level1) { - std::shared_ptr ability = nullptr; + std::shared_ptr ability = nullptr; auto result = ConnectManager()->DispatchInactive(ability, OHOS::AAFwk::AbilityState::INACTIVATING); EXPECT_EQ(result, OHOS::ERR_INVALID_VALUE); @@ -1402,7 +1403,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFWK_Connect_Service_025, TestSize.Level1) */ HWTEST_F(AbilityConnectManagerTest, AAFWK_Connect_Service_026, TestSize.Level1) { - std::shared_ptr ability = nullptr; + std::shared_ptr ability = nullptr; auto result = ConnectManager()->DispatchInactive(ability, OHOS::AAFwk::AbilityState::INACTIVATING); EXPECT_EQ(result, OHOS::ERR_INVALID_VALUE); @@ -1524,7 +1525,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFWK_Connect_Service_029, TestSize.Level1) HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_StartAbilityLocked_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; AbilityRequest abilityRequest; abilityRequest.abilityInfo.deviceId = "id"; abilityRequest.abilityInfo.bundleName = "bundle"; @@ -1555,7 +1556,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_GetOrCreateServiceRecord_001 ASSERT_NE(connectManager, nullptr); AbilityRequest abilityRequest; bool isCreatedByConnect = false; - std::shared_ptr targetService = nullptr; + std::shared_ptr targetService = nullptr; bool isLoadedAbility = false; abilityRequest.abilityInfo.name = AbilityConfig::LAUNCHER_ABILITY_NAME; connectManager->serviceMap_.clear(); @@ -1576,7 +1577,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ConnectAbilityLocked_001, Te ASSERT_NE(connectManager, nullptr); ConnectManager()->SetTaskHandler(TaskHandler()); ConnectManager()->SetEventHandler(EventHandler()); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; AbilityRequest abilityRequest; sptr callerToken = abilityRecord->GetToken(); OHOS::sptr connect = new AbilityConnectCallback(); @@ -1613,7 +1614,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ConnectAbilityLocked_001, Te HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_AttachAbilityThreadLocked_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr scheduler = nullptr; sptr token = abilityRecord->GetToken(); connectManager->serviceMap_.emplace("first", abilityRecord); @@ -1635,7 +1636,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_OnAppStateChanged_001, TestS { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; AppInfo info; std::string bundleName = "bundleName"; std::string name = "name"; @@ -1661,7 +1662,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_OnAppStateChanged_002, TestS { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; AppInfo info; std::string bundleName = "bundleName"; std::string name = "name"; @@ -1687,7 +1688,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_OnAppStateChanged_002, TestS HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_AbilityTransitionDone_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr token = abilityRecord->GetToken(); int state = AbilityState::INACTIVE; abilityRecord->abilityInfo_.type = AbilityType::PAGE; @@ -1712,7 +1713,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_AbilityTransitionDone_001, T HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLocked_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr token = abilityRecord->GetToken(); sptr remoteObject = nullptr; abilityRecord->abilityInfo_.type = AbilityType::PAGE; @@ -1733,7 +1734,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLo HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDoneLocked_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; OHOS::sptr callback = new AbilityConnectCallback(); std::shared_ptr connection = std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); @@ -1763,7 +1764,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDon HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleCommandAbilityDoneLocked_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr token = abilityRecord->GetToken(); abilityRecord->abilityInfo_.type = AbilityType::PAGE; abilityRecord->SetAbilityState(AbilityState::INACTIVE); @@ -1784,7 +1785,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleCommandAbilityDoneLo HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_CompleteCommandAbility_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; connectManager->taskHandler_ = nullptr; connectManager->CompleteCommandAbility(abilityRecord); EXPECT_TRUE(abilityRecord->IsAbilityState(AbilityState::ACTIVE)); @@ -1801,7 +1802,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_CompleteCommandAbility_001, HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_GetServiceRecordByElementName_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; std::string element = "first"; connectManager->serviceMap_.emplace(element, abilityRecord); auto res = connectManager->GetServiceRecordByElementName(element); @@ -1819,7 +1820,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_GetServiceRecordByElementNam HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_GetExtensionByTokenFromServiceMap_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr token = abilityRecord->GetToken(); connectManager->serviceMap_.emplace("first", nullptr); auto res = connectManager->GetExtensionByTokenFromServiceMap(token); @@ -1837,7 +1838,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_GetExtensionByTokenFromServi HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_GetConnectRecordListByCallback_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr callback = new AbilityConnectCallback(); connectManager->connectMap_.clear(); auto res = connectManager->GetConnectRecordListByCallback(callback); @@ -1855,7 +1856,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_GetConnectRecordListByCallba HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_GetAbilityRecordById_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; int64_t abilityRecordId = abilityRecord->GetRecordId(); connectManager->serviceMap_.emplace("first", abilityRecord); connectManager->serviceMap_.emplace("second", nullptr); @@ -1874,7 +1875,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_GetAbilityRecordById_001, Te HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_LoadAbility_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; abilityRecord->isLauncherRoot_ = true; abilityRecord->isRestarting_ = true; abilityRecord->isLauncherAbility_ = true; @@ -1894,7 +1895,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_LoadAbility_001, TestSize.Le HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_LoadAbility_002, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; std::shared_ptr caller1 = std::make_shared(0, abilityRecord); std::shared_ptr caller2 = std::make_shared(); abilityRecord->isLauncherRoot_ = false; @@ -1920,7 +1921,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_PostTimeOutTask_001, TestSiz { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; uint32_t messageId = 2; connectManager->PostTimeOutTask(abilityRecord, messageId); } @@ -1937,7 +1938,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_HandleStartTimeoutTask_001, { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; abilityRecord->abilityInfo_.name = "abilityName"; connectManager->HandleStartTimeoutTask(abilityRecord); } @@ -1954,7 +1955,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_HandleStartTimeoutTask_002, { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; abilityRecord->abilityInfo_.name = AbilityConfig::LAUNCHER_ABILITY_NAME; connectManager->HandleStartTimeoutTask(abilityRecord); } @@ -1971,7 +1972,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_HandleConnectTimeoutTask_001 { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; abilityRecord->abilityInfo_.name = AbilityConfig::LAUNCHER_ABILITY_NAME; connectManager->HandleConnectTimeoutTask(abilityRecord); } @@ -1988,7 +1989,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_HandleCommandTimeoutTask_001 { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; abilityRecord->abilityInfo_.name = AbilityConfig::LAUNCHER_ABILITY_NAME; connectManager->HandleCommandTimeoutTask(abilityRecord); abilityRecord->abilityInfo_.name = "abilityName"; @@ -2027,7 +2028,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_HandleTerminateDisconnectTas HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_DispatchInactive_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; int state = 0; abilityRecord->SetAbilityState(AbilityState::INACTIVATING); abilityRecord->isCreateByConnect_ = false; @@ -2048,7 +2049,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_DispatchInactive_001, TestSi HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_DispatchTerminate_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; connectManager->SetTaskHandler(TaskHandler()); connectManager->SetEventHandler(EventHandler()); int res = connectManager->DispatchTerminate(abilityRecord); @@ -2067,7 +2068,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_CommandAbility_001, TestSize { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; connectManager->SetEventHandler(nullptr); connectManager->CommandAbility(abilityRecord); } @@ -2084,7 +2085,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_TerminateDone_001, TestSize. { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; abilityRecord->SetAbilityState(AbilityState::TERMINATING); connectManager->TerminateDone(abilityRecord); } @@ -2100,7 +2101,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_TerminateDone_001, TestSize. HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_GetAbilityConnectedRecordFromRecordList_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; std::list> connectRecordList; OHOS::sptr callback = new AbilityConnectCallback(); std::shared_ptr connection = @@ -2125,7 +2126,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_RemoveServiceAbility_001, Te { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; AbilityInfo abilityInfo; abilityRecord->abilityInfo_ = abilityInfo; connectManager->serviceMap_.clear(); @@ -2144,7 +2145,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_OnCallBackDied_001, TestSize { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; wptr remote{ abilityRecord->GetToken() }; connectManager->SetEventHandler(nullptr); connectManager->OnCallBackDied(remote); @@ -2162,7 +2163,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_HandleCallBackDiedTask_001, { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr connect = abilityRecord->GetToken(); connectManager->connectMap_.clear(); connectManager->HandleCallBackDiedTask(connect); @@ -2180,7 +2181,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_OnAbilityDied_001, TestSize. { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; abilityRecord->abilityInfo_.type = AbilityType::PAGE; connectManager->SetEventHandler(nullptr); connectManager->OnAbilityDied(abilityRecord); @@ -2200,7 +2201,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_OnTimeOut_001, TestSize.Leve { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; uint32_t msgId = 2; connectManager->serviceMap_.emplace("first", abilityRecord); int64_t abilityRecordId = 1; @@ -2221,7 +2222,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_HandleInactiveTimeout_001, T { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; abilityRecord->abilityInfo_.name = AbilityConfig::LAUNCHER_ABILITY_NAME; connectManager->HandleInactiveTimeout(abilityRecord); abilityRecord->abilityInfo_.name = "abilityName"; @@ -2240,7 +2241,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_HandleAbilityDiedTask_001, T { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; connectManager->serviceMap_.clear(); connectManager->HandleAbilityDiedTask(abilityRecord); } @@ -2260,7 +2261,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_DisconnectBeforeCleanup_001, ConnectManager()->SetTaskHandler(TaskHandler()); ConnectManager()->SetEventHandler(EventHandler()); serviceRecord1_->SetUid(102 * 200000); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; AbilityRequest abilityRequest; sptr callerToken = abilityRecord->GetToken(); OHOS::sptr callback1 = new AbilityConnectCallback(); @@ -2293,7 +2294,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_RestartAbility_001, TestSize { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; int32_t currentUserId = 0; connectManager->userId_ = 1; abilityRecord->abilityInfo_.name = AbilityConfig::LAUNCHER_ABILITY_NAME; @@ -2314,7 +2315,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_RestartAbility_002, TestSize { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; int32_t currentUserId = 0; connectManager->userId_ = currentUserId; abilityRecord->abilityInfo_.name = "abilityName"; @@ -2334,7 +2335,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_RestartAbility_003, TestSize { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; connectManager->userId_ = 1; abilityRecord->abilityInfo_.bundleName = AbilityConfig::SCENEBOARD_BUNDLE_NAME; abilityRecord->abilityInfo_.name = AbilityConfig::SCENEBOARD_ABILITY_NAME; @@ -2354,7 +2355,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_DumpState_001, TestSize.Leve { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; std::vector info; bool isClient = false; std::string args = "args"; @@ -2378,7 +2379,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_DumpStateByUri_001, TestSize { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; std::vector info; bool isClient = false; std::string args = "args"; @@ -2401,7 +2402,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_GetExtensionRunningInfos_001 { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; int upperLimit = 1; std::vector info; int32_t userId = 0; @@ -2424,7 +2425,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_GetExtensionRunningInfo_001, { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; OHOS::sptr callback = new AbilityConnectCallback(); std::shared_ptr connection = std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); @@ -2477,7 +2478,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFWK_RestartAbility_001, TestSize.Level1) EXPECT_EQ(OHOS::ERR_OK, result); auto elementName = abilityRequest_.want.GetElement().GetURI(); - std::shared_ptr service = ConnectManager()->GetServiceRecordByElementName(elementName); + std::shared_ptr service = ConnectManager()->GetServiceRecordByElementName(elementName); EXPECT_NE(service, nullptr); EXPECT_EQ(static_cast(ConnectManager()->GetServiceMap().size()), 1); @@ -2538,7 +2539,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFWK_RestartAbility_003, TestSize.Level1) WaitUntilTaskDone(TaskHandler()); auto elementName = abilityRequest2_.want.GetElement().GetURI(); - std::shared_ptr service = ConnectManager()->GetServiceRecordByElementName(elementName); + std::shared_ptr service = ConnectManager()->GetServiceRecordByElementName(elementName); EXPECT_NE(service, nullptr); EXPECT_EQ(static_cast(ConnectManager()->GetServiceMap().size()), 1); // set the over interval time according the config; without init config, the interval time is 0. @@ -2604,7 +2605,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFWK_Start_Service_With_SessionInfo_001, Te HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_StartAbilityLocked_With_SessionInfo_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; AbilityRequest abilityRequest; abilityRequest.abilityInfo.deviceId = "id"; abilityRequest.abilityInfo.bundleName = "bundle"; @@ -2634,7 +2635,7 @@ HWTEST_F(AbilityConnectManagerTest, MoveToBackground_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(3); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord; + std::shared_ptr abilityRecord; connectManager->MoveToBackground(abilityRecord); connectManager.reset(); } @@ -2651,7 +2652,7 @@ HWTEST_F(AbilityConnectManagerTest, MoveToBackground_002, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(3); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitAbilityRecord(); abilityRecord->lifeCycleStateInfo_.sceneFlag = 1; connectManager->MoveToBackground(abilityRecord); connectManager.reset(); @@ -2669,7 +2670,7 @@ HWTEST_F(AbilityConnectManagerTest, MoveToBackground_003, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(3); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitAbilityRecord(); abilityRecord->lifeCycleStateInfo_.sceneFlag = 2; abilityRecord->SetClearMissionFlag(true); connectManager->MoveToBackground(abilityRecord); @@ -2689,7 +2690,7 @@ HWTEST_F(AbilityConnectManagerTest, CompleteBackground_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(3); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitAbilityRecord(); abilityRecord->currentState_ = AbilityState::FOREGROUND; connectManager->CompleteBackground(abilityRecord); connectManager.reset(); @@ -2707,7 +2708,7 @@ HWTEST_F(AbilityConnectManagerTest, CompleteBackground_002, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(3); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitAbilityRecord(); abilityRecord->currentState_ = AbilityState::BACKGROUNDING; abilityRecord->SetPendingState(AbilityState::FOREGROUND); abilityRecord->SetSwitchingPause(true); @@ -2727,7 +2728,7 @@ HWTEST_F(AbilityConnectManagerTest, CompleteBackground_003, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(3); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitAbilityRecord(); abilityRecord->currentState_ = AbilityState::BACKGROUNDING; abilityRecord->SetPendingState(AbilityState::BACKGROUND); abilityRecord->SetSwitchingPause(false); @@ -2750,8 +2751,8 @@ HWTEST_F(AbilityConnectManagerTest, CompleteBackground_004, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(3); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = InitAbilityRecord(); - std::shared_ptr abilityRecord2 = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord2 = InitAbilityRecord(); abilityRecord->currentState_ = AbilityState::BACKGROUNDING; abilityRecord->SetPendingState(AbilityState::BACKGROUND); abilityRecord->SetSwitchingPause(false); @@ -2775,8 +2776,8 @@ HWTEST_F(AbilityConnectManagerTest, CompleteBackground_005, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(3); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = InitAbilityRecord(); - std::shared_ptr abilityRecord2 = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord2 = InitAbilityRecord(); abilityRecord->currentState_ = AbilityState::BACKGROUNDING; abilityRecord->SetPendingState(AbilityState::BACKGROUND); abilityRecord->SetSwitchingPause(false); @@ -2800,8 +2801,8 @@ HWTEST_F(AbilityConnectManagerTest, CompleteBackground_006, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(3); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = InitAbilityRecord(); - std::shared_ptr abilityRecord2 = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord2 = InitAbilityRecord(); abilityRecord->currentState_ = AbilityState::BACKGROUNDING; abilityRecord->SetPendingState(AbilityState::BACKGROUND); abilityRecord->SetSwitchingPause(false); @@ -2842,7 +2843,7 @@ HWTEST_F(AbilityConnectManagerTest, PrintTimeOutLog_002, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(3); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitAbilityRecord(); uint32_t msgId = 0; connectManager->PrintTimeOutLog(abilityRecord, msgId); connectManager.reset(); @@ -2860,7 +2861,7 @@ HWTEST_F(AbilityConnectManagerTest, PrintTimeOutLog_003, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(3); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitAbilityRecord(); uint32_t msgId = 1; connectManager->PrintTimeOutLog(abilityRecord, msgId); connectManager.reset(); @@ -2878,7 +2879,7 @@ HWTEST_F(AbilityConnectManagerTest, PrintTimeOutLog_004, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(3); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitAbilityRecord(); uint32_t msgId = 2; connectManager->PrintTimeOutLog(abilityRecord, msgId); connectManager.reset(); @@ -2896,7 +2897,7 @@ HWTEST_F(AbilityConnectManagerTest, PrintTimeOutLog_005, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(3); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitAbilityRecord(); uint32_t msgId = 4; connectManager->PrintTimeOutLog(abilityRecord, msgId); connectManager.reset(); @@ -2914,7 +2915,7 @@ HWTEST_F(AbilityConnectManagerTest, PrintTimeOutLog_006, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(3); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitAbilityRecord(); uint32_t msgId = 5; connectManager->PrintTimeOutLog(abilityRecord, msgId); connectManager.reset(); @@ -2932,7 +2933,7 @@ HWTEST_F(AbilityConnectManagerTest, PrintTimeOutLog_007, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(3); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitAbilityRecord(); uint32_t msgId = 6; connectManager->PrintTimeOutLog(abilityRecord, msgId); connectManager.reset(); @@ -2950,7 +2951,7 @@ HWTEST_F(AbilityConnectManagerTest, PrintTimeOutLog_008, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(3); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitAbilityRecord(); uint32_t msgId = 3; connectManager->PrintTimeOutLog(abilityRecord, msgId); connectManager.reset(); @@ -2968,7 +2969,7 @@ HWTEST_F(AbilityConnectManagerTest, PrintTimeOutLog_008, TestSize.Level1) HWTEST_F(AbilityConnectManagerTest, OnAbilityRequestDone_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr token = abilityRecord->GetToken(); abilityRecord->abilityInfo_.extensionAbilityType = ExtensionAbilityType::UI; abilityRecord->SetAbilityState(AbilityState::INACTIVE); @@ -3000,7 +3001,7 @@ HWTEST_F(AbilityConnectManagerTest, ScheduleCommandAbilityWindowDone_001, TestSi nullToken, sessionInfo, WIN_CMD_FOREGROUND, ABILITY_CMD_FOREGROUND); EXPECT_EQ(result, OHOS::ERR_INVALID_VALUE); - std::shared_ptr ability = nullptr; + std::shared_ptr ability = nullptr; OHOS::sptr token1 = new OHOS::AAFwk::Token(ability); auto result1 = ConnectManager()->ScheduleCommandAbilityWindowDone( token1, sessionInfo, WIN_CMD_FOREGROUND, ABILITY_CMD_FOREGROUND); @@ -3045,7 +3046,7 @@ HWTEST_F(AbilityConnectManagerTest, DispatchForeground_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(3); ASSERT_NE(connectManager, nullptr); - std::shared_ptr ability = nullptr; + std::shared_ptr ability = nullptr; auto result = connectManager->DispatchForeground(ability); EXPECT_EQ(result, OHOS::ERR_INVALID_VALUE); @@ -3071,7 +3072,7 @@ HWTEST_F(AbilityConnectManagerTest, DispatchBackground_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(3); ASSERT_NE(connectManager, nullptr); - std::shared_ptr ability = nullptr; + std::shared_ptr ability = nullptr; auto result = connectManager->DispatchBackground(ability); EXPECT_EQ(result, OHOS::ERR_INVALID_VALUE); @@ -3131,7 +3132,7 @@ HWTEST_F(AbilityConnectManagerTest, CompleteForeground_001, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(3); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitAbilityRecord(); abilityRecord->currentState_ = AbilityState::BACKGROUND; connectManager->CompleteForeground(abilityRecord); EXPECT_EQ(abilityRecord->GetAbilityState(), AbilityState::BACKGROUND); @@ -3286,7 +3287,7 @@ HWTEST_F(AbilityConnectManagerTest, IsUIExtensionFocused_002, TestSize.Level1) std::string bundleName = "com.ix.uiExtensionUser"; std::string moduleName = "entry"; auto request = GenerateAbilityRequest(device, abilityName, appName, bundleName, moduleName); - auto uiExtensionUser = AbilityRecord::CreateAbilityRecord(request); + auto uiExtensionUser = BaseExtensionRecord::CreateBaseExtensionRecord(request); EXPECT_NE(uiExtensionUser, nullptr); std::string abilityName1 = "uiExtensionAbility1"; @@ -3294,7 +3295,7 @@ HWTEST_F(AbilityConnectManagerTest, IsUIExtensionFocused_002, TestSize.Level1) std::string bundleName1 = "com.ix.uiExtensionProvider1"; std::string moduleName1 = "entry"; auto request1 = GenerateAbilityRequest(device, abilityName1, appName1, bundleName1, moduleName1); - auto uiExtension1 = AbilityRecord::CreateAbilityRecord(request1); + auto uiExtension1 = BaseExtensionRecord::CreateBaseExtensionRecord(request1); EXPECT_NE(uiExtension1, nullptr); uiExtension1->abilityInfo_.extensionAbilityType = ExtensionAbilityType::SYS_COMMON_UI; sptr sessionInfo1 = new (std::nothrow) SessionInfo(); @@ -3310,7 +3311,7 @@ HWTEST_F(AbilityConnectManagerTest, IsUIExtensionFocused_002, TestSize.Level1) std::string bundleName2 = "com.ix.uiExtensionProvider2"; std::string moduleName2 = "entry"; auto request2 = GenerateAbilityRequest(device, abilityName2, appName2, bundleName2, moduleName2); - auto uiExtension2 = AbilityRecord::CreateAbilityRecord(request2); + auto uiExtension2 = BaseExtensionRecord::CreateBaseExtensionRecord(request2); EXPECT_NE(uiExtension2, nullptr); uiExtension2->abilityInfo_.extensionAbilityType = ExtensionAbilityType::SYS_COMMON_UI; sptr sessionInfo2 = new (std::nothrow) SessionInfo(); @@ -3354,10 +3355,11 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_PauseExtensions_001, TestSiz { std::shared_ptr connectManager = std::make_shared(0); ASSERT_NE(connectManager, nullptr); - std::shared_ptr abilityRecord1 = serviceRecord_; + std::shared_ptr abilityRecord1 = serviceRecord_; abilityRecord1->abilityInfo_.type = AbilityType::PAGE; connectManager->serviceMap_.emplace("first", abilityRecord1); - std::shared_ptr abilityRecord2 = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord2 = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); abilityRecord2->abilityInfo_.type = AbilityType::EXTENSION; abilityRecord2->abilityInfo_.name = AbilityConfig::LAUNCHER_ABILITY_NAME; abilityRecord2->abilityInfo_.bundleName = AbilityConfig::LAUNCHER_BUNDLE_NAME; @@ -3376,10 +3378,11 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_SignRestartAppFlag_001, Test ASSERT_NE(connectManager, nullptr); std::string bundleName = "testBundleName"; - std::shared_ptr abilityRecord1 = serviceRecord_; + std::shared_ptr abilityRecord1 = serviceRecord_; abilityRecord1->abilityInfo_.bundleName = bundleName; connectManager->serviceMap_.emplace("first", abilityRecord1); - std::shared_ptr abilityRecord2 = AbilityRecord::CreateAbilityRecord(abilityRequest_); + std::shared_ptr abilityRecord2 = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest_); abilityRecord2->abilityInfo_.bundleName = "errTestBundleName"; connectManager->serviceMap_.emplace("second", abilityRecord2); int32_t uid = 100; @@ -3397,7 +3400,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_BuildEventInfo_001, TestSize ASSERT_NE(connectManager, nullptr); connectManager->BuildEventInfo(nullptr); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitAbilityRecord(); connectManager->BuildEventInfo(abilityRecord); abilityRecord->SetCreateByConnectMode(true); connectManager->BuildEventInfo(abilityRecord); @@ -3417,7 +3420,7 @@ HWTEST_F(AbilityConnectManagerTest, UpdateUIExtensionInfo_0100, TestSize.Level1) AppExecFwk::AbilityInfo abilityInfo; abilityInfo.extensionAbilityType = ExtensionAbilityType::SYS_COMMON_UI; AppExecFwk::ApplicationInfo applicationInfo; - auto abilityRecord = std::make_shared(want, abilityInfo, applicationInfo); + auto abilityRecord = std::make_shared(want, abilityInfo, applicationInfo); abilityRecord->SetUIExtensionAbilityId(1000); connectManager->UpdateUIExtensionInfo(abilityRecord); EXPECT_EQ(abilityRecord->GetWant().HasParameter("ability.want.params.uiExtensionAbilityId"), true); @@ -3460,7 +3463,8 @@ HWTEST_F(AbilityConnectManagerTest, UnloadUIExtensionAbility_0100, TestSize.Leve AbilityRequest abilityRequest; AppExecFwk::ElementName providerElement("0", "com.ohos.uiextensionprovider", "UIExtensionProvider", "entry"); abilityRequest.want.SetElement(providerElement); - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); int32_t hostPid = 0; auto ret = connectManager->UnloadUIExtensionAbility(abilityRecord, hostPid); EXPECT_EQ(ret, ERR_CONNECT_MANAGER_NULL_ABILITY_RECORD); @@ -3506,7 +3510,7 @@ HWTEST_F(AbilityConnectManagerTest, UpdateKeepAliveEnableState_0100, TestSize.Le HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLocked_002, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr token = abilityRecord->GetToken(); sptr remoteObject = nullptr; abilityRecord->abilityInfo_.type = AbilityType::EXTENSION; @@ -3527,7 +3531,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLo HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLocked_003, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr token = abilityRecord->GetToken(); sptr remoteObject = nullptr; abilityRecord->abilityInfo_.type = AbilityType::SERVICE; @@ -3548,7 +3552,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLo HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLocked_004, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr token = abilityRecord->GetToken(); sptr remoteObject = nullptr; abilityRecord->abilityInfo_.type = AbilityType::DATA; @@ -3569,7 +3573,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLo HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLocked_005, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr token = abilityRecord->GetToken(); sptr remoteObject = nullptr; abilityRecord->abilityInfo_.type = AbilityType::FORM; @@ -3590,7 +3594,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLo HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLocked_006, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr token = abilityRecord->GetToken(); sptr remoteObject = nullptr; abilityRecord->abilityInfo_.type = AbilityType::UNKNOWN; @@ -3611,7 +3615,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLo HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLocked_007, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr token = abilityRecord->GetToken(); sptr remoteObject = nullptr; abilityRecord->abilityInfo_.type = AbilityType::PAGE; @@ -3632,7 +3636,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLo HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLocked_008, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr token = abilityRecord->GetToken(); sptr remoteObject = nullptr; abilityRecord->abilityInfo_.type = AbilityType::EXTENSION; @@ -3653,7 +3657,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLo HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLocked_009, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr token = abilityRecord->GetToken(); sptr remoteObject = nullptr; abilityRecord->abilityInfo_.type = AbilityType::SERVICE; @@ -3674,7 +3678,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLo HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLocked_010, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr token = abilityRecord->GetToken(); sptr remoteObject = nullptr; abilityRecord->abilityInfo_.type = AbilityType::DATA; @@ -3695,7 +3699,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLo HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLocked_011, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr token = abilityRecord->GetToken(); sptr remoteObject = nullptr; abilityRecord->abilityInfo_.type = AbilityType::FORM; @@ -3716,7 +3720,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLo HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLocked_012, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; sptr token = abilityRecord->GetToken(); sptr remoteObject = nullptr; abilityRecord->abilityInfo_.type = AbilityType::UNKNOWN; @@ -3737,7 +3741,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleConnectAbilityDoneLo HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDoneLocked_002, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; OHOS::sptr callback = new AbilityConnectCallback(); std::shared_ptr connection = std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); @@ -3767,7 +3771,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDon HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDoneLocked_003, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; OHOS::sptr callback = new AbilityConnectCallback(); std::shared_ptr connection = std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); @@ -3797,7 +3801,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDon HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDoneLocked_004, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; OHOS::sptr callback = new AbilityConnectCallback(); std::shared_ptr connection = std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); @@ -3827,7 +3831,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDon HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDoneLocked_005, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; OHOS::sptr callback = new AbilityConnectCallback(); std::shared_ptr connection = std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); @@ -3857,7 +3861,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDon HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDoneLocked_006, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; OHOS::sptr callback = new AbilityConnectCallback(); std::shared_ptr connection = std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); @@ -3887,7 +3891,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDon HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDoneLocked_007, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; OHOS::sptr callback = new AbilityConnectCallback(); std::shared_ptr connection = std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); @@ -3917,7 +3921,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDon HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDoneLocked_008, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; OHOS::sptr callback = new AbilityConnectCallback(); std::shared_ptr connection = std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); @@ -3947,7 +3951,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDon HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDoneLocked_009, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; OHOS::sptr callback = new AbilityConnectCallback(); std::shared_ptr connection = std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); @@ -3977,7 +3981,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDon HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDoneLocked_010, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; OHOS::sptr callback = new AbilityConnectCallback(); std::shared_ptr connection = std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); @@ -4007,7 +4011,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDon HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDoneLocked_011, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; OHOS::sptr callback = new AbilityConnectCallback(); std::shared_ptr connection = std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); @@ -4037,7 +4041,7 @@ HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDon HWTEST_F(AbilityConnectManagerTest, AAFwk_AbilityMS_ScheduleDisconnectAbilityDoneLocked_012, TestSize.Level1) { std::shared_ptr connectManager = std::make_shared(0); - std::shared_ptr abilityRecord = serviceRecord_; + std::shared_ptr abilityRecord = serviceRecord_; OHOS::sptr callback = new AbilityConnectCallback(); std::shared_ptr connection = std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); diff --git a/test/unittest/ability_manager_service_eighth_test/ability_manager_service_eighth_test.cpp b/test/unittest/ability_manager_service_eighth_test/ability_manager_service_eighth_test.cpp index 38018b6b04..a4e8b8a3fa 100644 --- a/test/unittest/ability_manager_service_eighth_test/ability_manager_service_eighth_test.cpp +++ b/test/unittest/ability_manager_service_eighth_test/ability_manager_service_eighth_test.cpp @@ -577,7 +577,7 @@ HWTEST_F(AbilityManagerServiceEighthTest, TerminateUIServiceExtensionAbility_001 std::string bundleName = "com.ix.hiservcie"; std::string moduleName = "entry"; abilityRequest = GenerateAbilityRequest(deviceName, abilityName, appName, bundleName, moduleName); - auto abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); token = abilityRecord->GetToken(); auto connectManager = std::make_shared(1); connectManager->sceneBoardTokenId_ = 1; diff --git a/test/unittest/ability_manager_service_first_test/abilitymgr.gni b/test/unittest/ability_manager_service_first_test/abilitymgr.gni index a0a5441344..525507573c 100644 --- a/test/unittest/ability_manager_service_first_test/abilitymgr.gni +++ b/test/unittest/ability_manager_service_first_test/abilitymgr.gni @@ -41,6 +41,7 @@ abilityms_files = [ "${ability_runtime_services_path}/abilitymgr/src/ecological_rule/ability_ecological_rule_mgr_service.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_config.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_running_info.cpp", + "${ability_runtime_services_path}/abilitymgr/src/extension_record/base_extension_record.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_manager.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_factory.cpp", diff --git a/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn b/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn index 4acae7c609..fd941d2fe2 100644 --- a/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_fourteenth_test/BUILD.gn @@ -117,6 +117,7 @@ ohos_unittest("ability_manager_service_fourteenth_test") { "${ability_runtime_services_path}/abilitymgr/src/ecological_rule/ability_ecological_rule_mgr_service_param.cpp", "${ability_runtime_services_path}/abilitymgr/src/exit_info_data_manager.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_config.cpp", + "${ability_runtime_services_path}/abilitymgr/src/extension_record/base_extension_record.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_factory.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_manager.cpp", diff --git a/test/unittest/ability_manager_service_fourteenth_test/ability_manager_service_fourteenth_test.cpp b/test/unittest/ability_manager_service_fourteenth_test/ability_manager_service_fourteenth_test.cpp index 866427ce6d..785255828a 100644 --- a/test/unittest/ability_manager_service_fourteenth_test/ability_manager_service_fourteenth_test.cpp +++ b/test/unittest/ability_manager_service_fourteenth_test/ability_manager_service_fourteenth_test.cpp @@ -39,6 +39,7 @@ public: void SetUp(); void TearDown(); std::shared_ptr MockAbilityRecord(AbilityType); + std::shared_ptr MockExtensionRecordBase(AbilityType); sptr MockToken(AbilityType); sptr MockSessionInfo(int32_t persistentId); AbilityRequest GenerateAbilityRequest(const std::string& deviceName, const std::string& abilityName, @@ -65,6 +66,16 @@ std::shared_ptr AbilityManagerServiceFourteenthTest::MockAbilityR return AbilityRecord::CreateAbilityRecord(abilityRequest); } +std::shared_ptr AbilityManagerServiceFourteenthTest::MockExtensionRecordBase( + AbilityType abilityType) +{ + AbilityRequest abilityRequest; + abilityRequest.appInfo.bundleName = "com.test.demo"; + abilityRequest.abilityInfo.name = "MainAbility"; + abilityRequest.abilityInfo.type = abilityType; + return BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); +} + sptr AbilityManagerServiceFourteenthTest::MockToken(AbilityType abilityType) { std::shared_ptr abilityRecord = MockAbilityRecord(abilityType); @@ -822,7 +833,7 @@ HWTEST_F(AbilityManagerServiceFourteenthTest, GetConnectManagerAndUIExtensionByS auto abilityMs_ = std::make_shared(); EXPECT_NE(abilityMs_, nullptr); std::shared_ptr connectManager = nullptr; - std::shared_ptr targetAbility = nullptr; + std::shared_ptr targetAbility = nullptr; abilityMs_->GetConnectManagerAndUIExtensionBySessionInfo(MockSessionInfo(0), connectManager, targetAbility, true); EXPECT_EQ(connectManager, nullptr); TAG_LOGI(AAFwkTag::TEST, @@ -842,7 +853,7 @@ HWTEST_F(AbilityManagerServiceFourteenthTest, GetConnectManagerAndUIExtensionByS "AbilityManagerServiceFourteenthTest GetConnectManagerAndUIExtensionBySessionInfo_002 start"); MyStatus::GetInstance().smhGetConnectManagerByToken_ = true; MyStatus::GetInstance().acmGetUIExtensionBySessionInfo_ = nullptr; - MyStatus::GetInstance().acmGetUIExtensionBySessionFromServiceMap_ = MockAbilityRecord(AbilityType::SERVICE); + MyStatus::GetInstance().acmGetUIExtensionBySessionFromServiceMap_ = MockExtensionRecordBase(AbilityType::SERVICE); auto abilityMs_ = std::make_shared(); EXPECT_NE(abilityMs_, nullptr); @@ -856,7 +867,7 @@ HWTEST_F(AbilityManagerServiceFourteenthTest, GetConnectManagerAndUIExtensionByS abilityMs_->subManagersHelper_->currentConnectManager_ = mockCurrentConnectManager; std::shared_ptr connectManager = nullptr; - std::shared_ptr targetAbility = nullptr; + std::shared_ptr targetAbility = nullptr; abilityMs_->GetConnectManagerAndUIExtensionBySessionInfo(MockSessionInfo(0), connectManager, targetAbility, true); EXPECT_NE(connectManager, nullptr); EXPECT_NE(targetAbility, nullptr); @@ -890,7 +901,7 @@ HWTEST_F(AbilityManagerServiceFourteenthTest, GetConnectManagerAndUIExtensionByS abilityMs_->subManagersHelper_->currentConnectManager_ = mockCurrentConnectManager; std::shared_ptr connectManager = nullptr; - std::shared_ptr targetAbility = nullptr; + std::shared_ptr targetAbility = nullptr; abilityMs_->GetConnectManagerAndUIExtensionBySessionInfo( MockSessionInfo(0), connectManager, targetAbility, false); EXPECT_NE(connectManager, nullptr); @@ -926,7 +937,7 @@ HWTEST_F(AbilityManagerServiceFourteenthTest, GetConnectManagerAndUIExtensionByS abilityMs_->subManagersHelper_->currentConnectManager_ = mockCurrentConnectManager; std::shared_ptr connectManager = nullptr; - std::shared_ptr targetAbility = nullptr; + std::shared_ptr targetAbility = nullptr; abilityMs_->GetConnectManagerAndUIExtensionBySessionInfo(MockSessionInfo(0), connectManager, targetAbility, true); EXPECT_NE(connectManager, nullptr); EXPECT_EQ(targetAbility, nullptr); @@ -960,7 +971,7 @@ HWTEST_F(AbilityManagerServiceFourteenthTest, GetConnectManagerAndUIExtensionByS abilityMs_->subManagersHelper_->currentConnectManager_ = mockCurrentConnectManager; std::shared_ptr connectManager = nullptr; - std::shared_ptr targetAbility = nullptr; + std::shared_ptr targetAbility = nullptr; abilityMs_->GetConnectManagerAndUIExtensionBySessionInfo(MockSessionInfo(0), connectManager, targetAbility, false); EXPECT_NE(connectManager, nullptr); EXPECT_EQ(targetAbility, nullptr); @@ -985,7 +996,7 @@ HWTEST_F(AbilityManagerServiceFourteenthTest, GetConnectManagerAndUIExtensionByS auto abilityMs_ = std::make_shared(); EXPECT_NE(abilityMs_, nullptr); std::shared_ptr connectManager = nullptr; - std::shared_ptr targetAbility = nullptr; + std::shared_ptr targetAbility = nullptr; abilityMs_->GetConnectManagerAndUIExtensionBySessionInfo(MockSessionInfo(0), connectManager, targetAbility, false); EXPECT_EQ(connectManager, nullptr); EXPECT_EQ(targetAbility, nullptr); @@ -1024,7 +1035,7 @@ HWTEST_F(AbilityManagerServiceFourteenthTest, TerminateUIExtensionAbility_002, T { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFourteenthTest TerminateUIExtensionAbility_002 start"); MyStatus::GetInstance().smhGetConnectManagerByToken_ = true; - MyStatus::GetInstance().acmGetUIExtensionBySessionInfo_ = MockAbilityRecord(AbilityType::SERVICE); + MyStatus::GetInstance().acmGetUIExtensionBySessionInfo_ = MockExtensionRecordBase(AbilityType::SERVICE); MyStatus::GetInstance().ipcGetCallingTokenID_ = -1; MyStatus::GetInstance().arGetAbilityInfo_.applicationInfo.accessTokenId = 1; MyStatus::GetInstance().arGetAbilityRecord_ = nullptr; @@ -1054,7 +1065,7 @@ HWTEST_F(AbilityManagerServiceFourteenthTest, TerminateUIExtensionAbility_003, T { TAG_LOGI(AAFwkTag::TEST, "AbilityManagerServiceFourteenthTest TerminateUIExtensionAbility_003 start"); MyStatus::GetInstance().smhGetConnectManagerByToken_ = true; - MyStatus::GetInstance().acmGetUIExtensionBySessionInfo_ = MockAbilityRecord(AbilityType::SERVICE); + MyStatus::GetInstance().acmGetUIExtensionBySessionInfo_ = MockExtensionRecordBase(AbilityType::SERVICE); MyStatus::GetInstance().ipcGetCallingTokenID_ = 1; MyStatus::GetInstance().arGetAbilityInfo_.applicationInfo.accessTokenId = 1; MyStatus::GetInstance().arGetAbilityInfo_.visible = false; diff --git a/test/unittest/ability_manager_service_fourteenth_test/mock/src/mock_ability_record.cpp b/test/unittest/ability_manager_service_fourteenth_test/mock/src/mock_ability_record.cpp index 8278e007af..17c4d8e697 100644 --- a/test/unittest/ability_manager_service_fourteenth_test/mock/src/mock_ability_record.cpp +++ b/test/unittest/ability_manager_service_fourteenth_test/mock/src/mock_ability_record.cpp @@ -387,10 +387,6 @@ void AbilityRecord::RemoveLoadTimeoutTask() { } -void AbilityRecord::PostUIExtensionAbilityTimeoutTask(uint32_t messageId) -{ -} - std::string AbilityRecord::GetLabel() { return abilityInfo_.applicationInfo.label; @@ -737,22 +733,6 @@ void AbilityRecord::ShareData(const int32_t &uniqueId) { } -void AbilityRecord::ConnectAbility() -{ -} - -void AbilityRecord::ConnectAbilityWithWant(const Want &want) -{ -} - -void AbilityRecord::DisconnectAbility() -{ -} - -void AbilityRecord::DisconnectAbilityWithWant(const Want &want) -{ -} - void AbilityRecord::CommandAbility() { } @@ -965,42 +945,6 @@ void SystemAbilityCallerRecord::SendResultToSystemAbility(int requestCode, } } -bool AbilityRecord::NeedConnectAfterCommand() -{ - return !IsConnectListEmpty() && !isConnected; -} - -void AbilityRecord::AddConnectRecordToList(const std::shared_ptr &connRecord) -{ - CHECK_POINTER(connRecord); - std::lock_guard guard(connRecordListMutex_); - auto it = std::find(connRecordList_.begin(), connRecordList_.end(), connRecord); - // found it - if (it != connRecordList_.end()) { - TAG_LOGD(AAFwkTag::ABILITYMGR, "Found it in list, so no need to add same connection"); - return; - } - // no found then add new connection to list - TAG_LOGD(AAFwkTag::ABILITYMGR, "No found in list, so add new connection to list"); - connRecordList_.push_back(connRecord); -} - -std::list> AbilityRecord::GetConnectRecordList() const -{ - std::lock_guard guard(connRecordListMutex_); - return connRecordList_; -} - -void AbilityRecord::RemoveConnectRecordFromList(const std::shared_ptr &connRecord) -{ - CHECK_POINTER(connRecord); - std::lock_guard guard(connRecordListMutex_); - connRecordList_.remove(connRecord); - if (connRecordList_.empty()) { - isConnected = false; - } -} - void AbilityRecord::RemoveSpecifiedWantParam(const std::string &key) { std::lock_guard guard(wantLock_); @@ -1152,68 +1096,6 @@ std::shared_ptr AbilityRecord::GetCallerInfo() const return callerList_.back()->GetCallerInfo(); } -bool AbilityRecord::IsConnectListEmpty() -{ - std::lock_guard guard(connRecordListMutex_); - return connRecordList_.empty(); -} - -size_t AbilityRecord::GetConnectedListSize() -{ - std::lock_guard guard(connRecordListMutex_); - return std::count_if(connRecordList_.begin(), connRecordList_.end(), [](std::shared_ptr record) { - return record && record->GetConnectState() == ConnectionState::CONNECTED; - }); -} - -size_t AbilityRecord::GetConnectingListSize() -{ - std::lock_guard guard(connRecordListMutex_); - return std::count_if(connRecordList_.begin(), connRecordList_.end(), [](std::shared_ptr record) { - return record && record->GetConnectState() == ConnectionState::CONNECTING; - }); -} - -std::shared_ptr AbilityRecord::GetConnectingRecord() const -{ - std::lock_guard guard(connRecordListMutex_); - auto connect = - std::find_if(connRecordList_.begin(), connRecordList_.end(), [](std::shared_ptr record) { - return record->GetConnectState() == ConnectionState::CONNECTING; - }); - return (connect != connRecordList_.end()) ? *connect : nullptr; -} - -std::list> AbilityRecord::GetConnectingRecordList() -{ - std::lock_guard guard(connRecordListMutex_); - std::list> connectingList; - for (auto record : connRecordList_) { - if (record && record->GetConnectState() == ConnectionState::CONNECTING) { - connectingList.push_back(record); - } - } - return connectingList; -} - -uint32_t AbilityRecord::GetInProgressRecordCount() -{ - std::lock_guard guard(connRecordListMutex_); - uint32_t count = 0; - for (auto record : connRecordList_) { - if (record && (record->GetConnectState() == ConnectionState::CONNECTING || - record->GetConnectState() == ConnectionState::CONNECTED)) { - count++; - } - } - return count; -} - -std::shared_ptr AbilityRecord::GetDisconnectingRecord() const -{ - return nullptr; -} - void AbilityRecord::GetAbilityTypeString(std::string &typeStr) { } @@ -1237,10 +1119,6 @@ void AbilityRecord::Dump(std::vector &info) { } -void AbilityRecord::DumpUIExtensionRootHostInfo(std::vector &info) const -{ -} - void AbilityRecord::DumpAbilityState( std::vector &info, bool isClient, const std::vector ¶ms) { @@ -1258,18 +1136,6 @@ int64_t AbilityRecord::GetStartTime() const return startTime_; } -void AbilityRecord::DumpService(std::vector &info, bool isClient) const -{ -} - -void AbilityRecord::DumpService(std::vector &info, std::vector ¶ms, bool isClient) const -{ -} - -void AbilityRecord::DumpUIExtensionPid(std::vector &info, bool isUIExtension) const -{ -} - void AbilityRecord::RemoveAbilityDeathRecipient() const { } @@ -1286,16 +1152,6 @@ void AbilityRecord::NotifyAnimationAbilityDied() { } -void AbilityRecord::SetConnRemoteObject(const sptr &remoteObject) -{ - connRemoteObject_ = remoteObject; -} - -sptr AbilityRecord::GetConnRemoteObject() const -{ - return connRemoteObject_; -} - bool AbilityRecord::IsNeverStarted() const { if (UIExtensionUtils::IsUIExtension(GetAbilityInfo().extensionAbilityType)) { diff --git a/test/unittest/ability_manager_service_second_test/BUILD.gn b/test/unittest/ability_manager_service_second_test/BUILD.gn index 2847f4349a..e7e3aa8688 100644 --- a/test/unittest/ability_manager_service_second_test/BUILD.gn +++ b/test/unittest/ability_manager_service_second_test/BUILD.gn @@ -119,6 +119,7 @@ ohos_unittest("ability_manager_service_second_test") { "${ability_runtime_services_path}/abilitymgr/src/ecological_rule/ability_ecological_rule_mgr_service_param.cpp", "${ability_runtime_services_path}/abilitymgr/src/exit_info_data_manager.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_config.cpp", + "${ability_runtime_services_path}/abilitymgr/src/extension_record/base_extension_record.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_factory.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_manager.cpp", diff --git a/test/unittest/ability_manager_service_sixth_test/abilitymgr.gni b/test/unittest/ability_manager_service_sixth_test/abilitymgr.gni index a0a5441344..525507573c 100644 --- a/test/unittest/ability_manager_service_sixth_test/abilitymgr.gni +++ b/test/unittest/ability_manager_service_sixth_test/abilitymgr.gni @@ -41,6 +41,7 @@ abilityms_files = [ "${ability_runtime_services_path}/abilitymgr/src/ecological_rule/ability_ecological_rule_mgr_service.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_config.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_running_info.cpp", + "${ability_runtime_services_path}/abilitymgr/src/extension_record/base_extension_record.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_manager.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_factory.cpp", diff --git a/test/unittest/ability_manager_service_tenth_test/ability_manager_service_tenth_test.cpp b/test/unittest/ability_manager_service_tenth_test/ability_manager_service_tenth_test.cpp index d8925a2848..536c4fc68b 100644 --- a/test/unittest/ability_manager_service_tenth_test/ability_manager_service_tenth_test.cpp +++ b/test/unittest/ability_manager_service_tenth_test/ability_manager_service_tenth_test.cpp @@ -190,7 +190,7 @@ HWTEST_F(AbilityManagerServiceTenhtTest, ScheduleConnectAbilityDone_001, TestSiz auto connectManager = std::make_shared(0); abilityMs_->subManagersHelper_->connectManagers_[2000 / BASE_USER_RANGE] = connectManager; ret = abilityMs_->ScheduleConnectAbilityDone(callerToken, token); - ASSERT_NE(ret, ERR_INVALID_VALUE); + ASSERT_EQ(ret, ERR_INVALID_VALUE); } /* @@ -283,7 +283,7 @@ HWTEST_F(AbilityManagerServiceTenhtTest, ScheduleCommandAbilityDone_001, TestSiz auto connectManager = std::make_shared(0); abilityMs_->subManagersHelper_->connectManagers_[2000 / BASE_USER_RANGE] = connectManager; ret = abilityMs_->ScheduleCommandAbilityDone(callerToken); - ASSERT_NE(ret, ERR_INVALID_VALUE); + ASSERT_EQ(ret, ERR_INVALID_VALUE); } /* diff --git a/test/unittest/ability_manager_service_third_test/ability_manager_service_third_test.cpp b/test/unittest/ability_manager_service_third_test/ability_manager_service_third_test.cpp index 97159cc268..eb08fdbec3 100644 --- a/test/unittest/ability_manager_service_third_test/ability_manager_service_third_test.cpp +++ b/test/unittest/ability_manager_service_third_test/ability_manager_service_third_test.cpp @@ -74,6 +74,7 @@ public: static void SetUpTestCase(); static void TearDownTestCase(); std::shared_ptr MockAbilityRecord(AbilityType); + std::shared_ptr MockExtensionRecordBase(AbilityType abilityType); sptr MockToken(AbilityType); void SetUp(); void TearDown(); @@ -129,6 +130,15 @@ std::shared_ptr AbilityManagerServiceThirdTest::MockAbilityRecord return AbilityRecord::CreateAbilityRecord(abilityRequest); } +std::shared_ptr AbilityManagerServiceThirdTest::MockExtensionRecordBase(AbilityType abilityType) +{ + AbilityRequest abilityRequest; + abilityRequest.appInfo.bundleName = "com.test.demo"; + abilityRequest.abilityInfo.name = "MainAbility"; + abilityRequest.abilityInfo.type = abilityType; + return BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); +} + sptr AbilityManagerServiceThirdTest::MockToken(AbilityType abilityType) { std::shared_ptr abilityRecord = MockAbilityRecord(abilityType); @@ -584,7 +594,7 @@ HWTEST_F(AbilityManagerServiceThirdTest, DisconnectBeforeCleanupByUserId_001, Te abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); abilityMs_->subManagersHelper_->InitConnectManager(100, false); - auto abilityRecord = MockAbilityRecord(AbilityType::SERVICE); + auto abilityRecord = MockExtensionRecordBase(AbilityType::SERVICE); sptr callerToken = abilityRecord->GetToken(); OHOS::sptr callback1 = new AbilityConnectCallback(); std::shared_ptr connection1 = @@ -1096,7 +1106,8 @@ HWTEST_F(AbilityManagerServiceThirdTest, UnloadUIExtensionAbility_001, TestSize. AppExecFwk::ElementName providerElement("0", "com.ohos.uiextensionprovider", "UIExtensionProvider", "entry"); abilityRequest.want.SetElement(providerElement); abilityRequest.abilityInfo.type = AbilityType::EXTENSION; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); int32_t hostPid = 0; auto result = abilityMs->UnloadUIExtensionAbility(abilityRecord, hostPid); EXPECT_EQ(result, ERR_INVALID_VALUE); diff --git a/test/unittest/ability_manager_service_third_test/abilitymgr.gni b/test/unittest/ability_manager_service_third_test/abilitymgr.gni index 4e449a6300..335091d5fc 100644 --- a/test/unittest/ability_manager_service_third_test/abilitymgr.gni +++ b/test/unittest/ability_manager_service_third_test/abilitymgr.gni @@ -41,6 +41,7 @@ abilityms_files = [ "${ability_runtime_services_path}/abilitymgr/src/ecological_rule/ability_ecological_rule_mgr_service.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_config.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_running_info.cpp", + "${ability_runtime_services_path}/abilitymgr/src/extension_record/base_extension_record.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_manager.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_factory.cpp", diff --git a/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn b/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn index 19acc42947..a06518535a 100644 --- a/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_thirteenth_test/BUILD.gn @@ -117,6 +117,7 @@ ohos_unittest("ability_manager_service_thirteenth_test") { "${ability_runtime_services_path}/abilitymgr/src/ecological_rule/ability_ecological_rule_mgr_service_param.cpp", "${ability_runtime_services_path}/abilitymgr/src/exit_info_data_manager.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_config.cpp", + "${ability_runtime_services_path}/abilitymgr/src/extension_record/base_extension_record.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_factory.cpp", "${ability_runtime_services_path}/abilitymgr/src/extension_record/extension_record_manager.cpp", diff --git a/test/unittest/ability_manager_service_thirteenth_test/mock/include/mock_my_status.h b/test/unittest/ability_manager_service_thirteenth_test/mock/include/mock_my_status.h index 7fea5f52c7..60228f64ee 100644 --- a/test/unittest/ability_manager_service_thirteenth_test/mock/include/mock_my_status.h +++ b/test/unittest/ability_manager_service_thirteenth_test/mock/include/mock_my_status.h @@ -17,6 +17,7 @@ #define MOCK_MY_STATUS_H #include "scene_board/ui_ability_record.h" +#include "base_extension_record.h" namespace OHOS { namespace AAFwk { @@ -50,8 +51,8 @@ public: int permPermission_ = 1; bool perJudgeCallerIsAllowedToUseSystemAPI_ = true; bool paramGetBoolParameter_ = true; - std::shared_ptr acmGetUIExtensionBySessionInfo_ = nullptr; - std::shared_ptr acmGetUIExtensionBySessionFromServiceMap_ = nullptr; + std::shared_ptr acmGetUIExtensionBySessionInfo_ = nullptr; + std::shared_ptr acmGetUIExtensionBySessionFromServiceMap_ = nullptr; bool isSupportStartAbilities_ = true; bool isSupportMultiInstance_ = true; bool isSystemAppCall_ = true; diff --git a/test/unittest/ability_manager_service_thirteenth_test/mock/src/mock_ability_connect_manager.cpp b/test/unittest/ability_manager_service_thirteenth_test/mock/src/mock_ability_connect_manager.cpp index 7a9cf5a341..7223ead86b 100644 --- a/test/unittest/ability_manager_service_thirteenth_test/mock/src/mock_ability_connect_manager.cpp +++ b/test/unittest/ability_manager_service_thirteenth_test/mock/src/mock_ability_connect_manager.cpp @@ -38,7 +38,7 @@ void AbilityConnectManager::OnStartSpecifiedProcessTimeoutResponse(int32_t reque {} void AbilityConnectManager::StartSpecifiedProcess( - const LoadAbilityContext &context, const std::shared_ptr &abilityRecord) + const LoadAbilityContext &context, const std::shared_ptr &abilityRecord) {} @@ -68,11 +68,11 @@ int AbilityConnectManager::StartAbilityLocked(const AbilityRequest &abilityReque } void AbilityConnectManager::SetLastExitReason( - const AbilityRequest &abilityRequest, std::shared_ptr &targetRecord) + const AbilityRequest &abilityRequest, std::shared_ptr &targetRecord) { } -void AbilityConnectManager::DoForegroundUIExtension(std::shared_ptr abilityRecord, +void AbilityConnectManager::DoForegroundUIExtension(std::shared_ptr abilityRecord, const AbilityRequest &abilityRequest) { } @@ -92,13 +92,13 @@ int AbilityConnectManager::StopServiceAbilityLocked(const AbilityRequest &abilit } int32_t AbilityConnectManager::GetOrCreateExtensionRecord(const AbilityRequest &abilityRequest, bool isCreatedByConnect, - const std::string &hostBundleName, std::shared_ptr &extensionRecord, bool &isLoaded) + const std::string &hostBundleName, std::shared_ptr &extensionRecord, bool &isLoaded) { return ERR_OK; } void AbilityConnectManager::GetOrCreateServiceRecord(const AbilityRequest &abilityRequest, - const bool isCreatedByConnect, std::shared_ptr &targetService, bool &isLoadedAbility) + const bool isCreatedByConnect, std::shared_ptr &targetService, bool &isLoadedAbility) { } @@ -114,7 +114,7 @@ void AbilityConnectManager::GetConnectRecordListFromMap( int32_t AbilityConnectManager::GetOrCreateTargetServiceRecord( const AbilityRequest &abilityRequest, const sptr &connectInfo, - std::shared_ptr &targetService, bool &isLoadedAbility) + std::shared_ptr &targetService, bool &isLoadedAbility) { return ERR_OK; } @@ -131,14 +131,14 @@ int AbilityConnectManager::PreloadUIExtensionAbilityInner(const AbilityRequest & return ERR_OK; } -int AbilityConnectManager::UnloadUIExtensionAbility(const std::shared_ptr &abilityRecord, +int AbilityConnectManager::UnloadUIExtensionAbility(const std::shared_ptr &abilityRecord, int32_t &hostPid) { return ERR_OK; } void AbilityConnectManager::ReportEventToRSS(const AppExecFwk::AbilityInfo &abilityInfo, - const std::shared_ptr abilityRecord, sptr callerToken) + const std::shared_ptr abilityRecord, sptr callerToken) { } @@ -149,13 +149,13 @@ int AbilityConnectManager::ConnectAbilityLocked(const AbilityRequest &abilityReq return ERR_OK; } -void AbilityConnectManager::HandleActiveAbility(std::shared_ptr &targetService, +void AbilityConnectManager::HandleActiveAbility(std::shared_ptr &targetService, std::shared_ptr &connectRecord) { } std::shared_ptr AbilityConnectManager::GetAbilityConnectedRecordFromRecordList( - const std::shared_ptr &targetService, + const std::shared_ptr &targetService, std::list> &connectRecordList) { return nullptr; @@ -181,7 +181,7 @@ int32_t AbilityConnectManager::ResumeExtensionAbilityLocked(const sptr abilityRecord) +void AbilityConnectManager::TerminateRecord(std::shared_ptr abilityRecord) { } @@ -221,7 +221,7 @@ int AbilityConnectManager::AbilityWindowConfigTransactionDone(const sptr &record) const +void AbilityConnectManager::ProcessPreload(const std::shared_ptr &record) const { } @@ -231,11 +231,11 @@ int AbilityConnectManager::ScheduleConnectAbilityDoneLocked( return ERR_OK; } -void AbilityConnectManager::ProcessEliminateAbilityRecord(std::shared_ptr eliminateRecord) +void AbilityConnectManager::ProcessEliminateAbilityRecord(std::shared_ptr eliminateRecord) { } -void AbilityConnectManager::TerminateOrCacheAbility(std::shared_ptr abilityRecord) +void AbilityConnectManager::TerminateOrCacheAbility(std::shared_ptr abilityRecord) { } @@ -262,7 +262,7 @@ void AbilityConnectManager::HandleCommandDestroy(const sptr &sessio { } -void AbilityConnectManager::CompleteCommandAbility(std::shared_ptr abilityRecord) +void AbilityConnectManager::CompleteCommandAbility(std::shared_ptr abilityRecord) { } @@ -270,63 +270,63 @@ void AbilityConnectManager::CompleteStartServiceReq(const std::string &serviceUr { } -std::shared_ptr AbilityConnectManager::GetServiceRecordByAbilityRequest( +std::shared_ptr AbilityConnectManager::GetServiceRecordByAbilityRequest( const AbilityRequest &abilityRequest) { return nullptr; } -std::shared_ptr AbilityConnectManager::GetServiceRecordByElementName(const std::string &element) +std::shared_ptr AbilityConnectManager::GetServiceRecordByElementName(const std::string &element) { return nullptr; } -std::shared_ptr AbilityConnectManager::GetExtensionByTokenFromServiceMap( +std::shared_ptr AbilityConnectManager::GetExtensionByTokenFromServiceMap( const sptr &token) { return nullptr; } -std::shared_ptr AbilityConnectManager::GetExtensionByIdFromServiceMap( +std::shared_ptr AbilityConnectManager::GetExtensionByIdFromServiceMap( const int64_t &abilityRecordId) { return nullptr; } -std::shared_ptr AbilityConnectManager::GetExtensionByIdFromTerminatingMap( +std::shared_ptr AbilityConnectManager::GetExtensionByIdFromTerminatingMap( const int64_t &abilityRecordId) { return nullptr; } -std::shared_ptr AbilityConnectManager::GetUIExtensionBySessionInfo( +std::shared_ptr AbilityConnectManager::GetUIExtensionBySessionInfo( const sptr &sessionInfo) { return MyStatus::GetInstance().acmGetUIExtensionBySessionInfo_; } -std::shared_ptr AbilityConnectManager::GetExtensionByTokenFromTerminatingMap( +std::shared_ptr AbilityConnectManager::GetExtensionByTokenFromTerminatingMap( const sptr &token) { return nullptr; } -void AbilityConnectManager::LoadAbility(const std::shared_ptr &abilityRecord, - std::function&)> updateRecordCallback) +void AbilityConnectManager::LoadAbility(const std::shared_ptr &abilityRecord, + std::function&)> updateRecordCallback) { } void AbilityConnectManager::SetExtensionLoadParam(AbilityRuntime::LoadParam &loadParam, - std::shared_ptr abilityRecord) + std::shared_ptr abilityRecord) { } -bool AbilityConnectManager::IsStrictMode(std::shared_ptr abilityRecord) +bool AbilityConnectManager::IsStrictMode(std::shared_ptr abilityRecord) { return true; } -bool AbilityConnectManager::NeedExtensionControl(std::shared_ptr abilityRecord) +bool AbilityConnectManager::NeedExtensionControl(std::shared_ptr abilityRecord) { return true; } @@ -339,33 +339,34 @@ void AbilityConnectManager::HandleRestartResidentTask(const AbilityRequest &abil { } -void AbilityConnectManager::PostTimeOutTask(const std::shared_ptr &abilityRecord, uint32_t messageId) +void AbilityConnectManager::PostTimeOutTask(const std::shared_ptr &abilityRecord, + uint32_t messageId) { } -void AbilityConnectManager::PostTimeOutTask(const std::shared_ptr &abilityRecord, +void AbilityConnectManager::PostTimeOutTask(const std::shared_ptr &abilityRecord, int connectRecordId, uint32_t messageId) { } -void AbilityConnectManager::HandleStartTimeoutTask(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::HandleStartTimeoutTask(const std::shared_ptr &abilityRecord) { } -void AbilityConnectManager::HandleCommandTimeoutTask(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::HandleCommandTimeoutTask(const std::shared_ptr &abilityRecord) { } -void AbilityConnectManager::HandleConnectTimeoutTask(std::shared_ptr abilityRecord) +void AbilityConnectManager::HandleConnectTimeoutTask(std::shared_ptr abilityRecord) { } -void AbilityConnectManager::HandleCommandWindowTimeoutTask(const std::shared_ptr &abilityRecord, +void AbilityConnectManager::HandleCommandWindowTimeoutTask(const std::shared_ptr &abilityRecord, const sptr &sessionInfo, WindowCommand winCmd) { } -void AbilityConnectManager::HandleStopTimeoutTask(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::HandleStopTimeoutTask(const std::shared_ptr &abilityRecord) { } @@ -373,64 +374,64 @@ void AbilityConnectManager::HandleTerminateDisconnectTask(const ConnectListType& { } -int AbilityConnectManager::DispatchInactive(const std::shared_ptr &abilityRecord, int state) +int AbilityConnectManager::DispatchInactive(const std::shared_ptr &abilityRecord, int state) { return ERR_OK; } -int AbilityConnectManager::DispatchForeground(const std::shared_ptr &abilityRecord) +int AbilityConnectManager::DispatchForeground(const std::shared_ptr &abilityRecord) { return ERR_OK; } -int AbilityConnectManager::DispatchBackground(const std::shared_ptr &abilityRecord) +int AbilityConnectManager::DispatchBackground(const std::shared_ptr &abilityRecord) { return ERR_OK; } -int AbilityConnectManager::DispatchTerminate(const std::shared_ptr &abilityRecord) +int AbilityConnectManager::DispatchTerminate(const std::shared_ptr &abilityRecord) { return ERR_OK; } -void AbilityConnectManager::ConnectAbility(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::ConnectAbility(const std::shared_ptr &abilityRecord) { } -void AbilityConnectManager::ConnectUIServiceExtAbility(const std::shared_ptr &abilityRecord, +void AbilityConnectManager::ConnectUIServiceExtAbility(const std::shared_ptr &abilityRecord, int connectRecordId, const Want &want) { } -void AbilityConnectManager::ResumeConnectAbility(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::ResumeConnectAbility(const std::shared_ptr &abilityRecord) { } -void AbilityConnectManager::CommandAbility(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::CommandAbility(const std::shared_ptr &abilityRecord) { } -void AbilityConnectManager::CommandAbilityWindow(const std::shared_ptr &abilityRecord, +void AbilityConnectManager::CommandAbilityWindow(const std::shared_ptr &abilityRecord, const sptr &sessionInfo, WindowCommand winCmd) { } -void AbilityConnectManager::BackgroundAbilityWindowLocked(const std::shared_ptr &abilityRecord, +void AbilityConnectManager::BackgroundAbilityWindowLocked(const std::shared_ptr &abilityRecord, const sptr &sessionInfo) { } -void AbilityConnectManager::DoBackgroundAbilityWindow(const std::shared_ptr &abilityRecord, +void AbilityConnectManager::DoBackgroundAbilityWindow(const std::shared_ptr &abilityRecord, const sptr &sessionInfo) { } -void AbilityConnectManager::TerminateAbilityWindowLocked(const std::shared_ptr &abilityRecord, +void AbilityConnectManager::TerminateAbilityWindowLocked(const std::shared_ptr &abilityRecord, const sptr &sessionInfo) { } -void AbilityConnectManager::TerminateDone(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::TerminateDone(const std::shared_ptr &abilityRecord) { } @@ -438,7 +439,7 @@ void AbilityConnectManager::RemoveConnectionRecordFromMap(std::shared_ptr &abilityRecord) +void AbilityConnectManager::RemoveServiceAbility(const std::shared_ptr &abilityRecord) { } @@ -470,11 +471,11 @@ int32_t AbilityConnectManager::GetActiveUIExtensionList( return 0; } -void AbilityConnectManager::OnLoadAbilityFailed(std::shared_ptr abilityRecord) +void AbilityConnectManager::OnLoadAbilityFailed(std::shared_ptr abilityRecord) { } -void AbilityConnectManager::OnAbilityDied(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::OnAbilityDied(const std::shared_ptr abilityRecord) { } @@ -482,28 +483,28 @@ void AbilityConnectManager::OnTimeOut(uint32_t msgId, int64_t abilityRecordId, b { } -void AbilityConnectManager::HandleInactiveTimeout(const std::shared_ptr &ability) +void AbilityConnectManager::HandleInactiveTimeout(const std::shared_ptr &ability) { } -void AbilityConnectManager::CleanActivatingTimeoutAbility(std::shared_ptr abilityRecord) +void AbilityConnectManager::CleanActivatingTimeoutAbility(std::shared_ptr abilityRecord) { } -bool AbilityConnectManager::IsAbilityNeedKeepAlive(const std::shared_ptr &abilityRecord) +bool AbilityConnectManager::IsAbilityNeedKeepAlive(const std::shared_ptr &abilityRecord) { return true; } -void AbilityConnectManager::ClearPreloadUIExtensionRecord(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::ClearPreloadUIExtensionRecord(const std::shared_ptr &abilityRecord) { } -void AbilityConnectManager::KeepAbilityAlive(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::KeepAbilityAlive(const std::shared_ptr &abilityRecord) { } -bool AbilityConnectManager::IsNeedToRestart(const std::shared_ptr &abilityRecord, +bool AbilityConnectManager::IsNeedToRestart(const std::shared_ptr &abilityRecord, const std::string &bundleName, const std::string &abilityName) { return true; @@ -514,7 +515,7 @@ void AbilityConnectManager::DisconnectBeforeCleanup() } void AbilityConnectManager::HandleAbilityDiedTask( - const std::shared_ptr &abilityRecord) + const std::shared_ptr &abilityRecord) { } @@ -523,7 +524,7 @@ static bool CheckIsNumString(const std::string &numStr) return true; } -void AbilityConnectManager::HandleNotifyAssertFaultDialogDied(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::HandleNotifyAssertFaultDialogDied(const std::shared_ptr &abilityRecord) { } @@ -531,15 +532,16 @@ void AbilityConnectManager::CloseAssertDialog(const std::string &assertSessionId { } -void AbilityConnectManager::HandleUIExtensionDied(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::HandleUIExtensionDied(const std::shared_ptr &abilityRecord) { } -void AbilityConnectManager::RestartAbility(const std::shared_ptr &abilityRecord, int32_t currentUserId) +void AbilityConnectManager::RestartAbility(const std::shared_ptr &abilityRecord, + int32_t currentUserId) { } -std::string AbilityConnectManager::GetServiceKey(const std::shared_ptr &service) +std::string AbilityConnectManager::GetServiceKey(const std::shared_ptr &service) { return ""; } @@ -562,7 +564,7 @@ void AbilityConnectManager::GetAbilityRunningInfos(std::vector &abilityRecord, +void AbilityConnectManager::GetExtensionRunningInfo(std::shared_ptr &abilityRecord, const int32_t userId, std::vector &info) { } @@ -575,7 +577,7 @@ void AbilityConnectManager::RemoveLauncherDeathRecipient() { } -bool AbilityConnectManager::IsLauncher(std::shared_ptr serviceExtension) const +bool AbilityConnectManager::IsLauncher(std::shared_ptr serviceExtension) const { return true; } @@ -584,23 +586,24 @@ void AbilityConnectManager::KillProcessesByUserId() const { } -void AbilityConnectManager::MoveToBackground(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::MoveToBackground(const std::shared_ptr &abilityRecord) { } -void AbilityConnectManager::CompleteForeground(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::CompleteForeground(const std::shared_ptr &abilityRecord) { } -void AbilityConnectManager::HandleForegroundTimeoutTask(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::HandleForegroundTimeoutTask(const std::shared_ptr &abilityRecord) { } -void AbilityConnectManager::CompleteBackground(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::CompleteBackground(const std::shared_ptr &abilityRecord) { } -void AbilityConnectManager::PrintTimeOutLog(const std::shared_ptr &ability, uint32_t msgId, bool isHalf) +void AbilityConnectManager::PrintTimeOutLog(const std::shared_ptr &ability, + uint32_t msgId, bool isHalf) { } @@ -609,7 +612,7 @@ bool AbilityConnectManager::GetTimeoutMsgContent(uint32_t msgId, std::string &ms return true; } -void AbilityConnectManager::MoveToTerminatingMap(const std::shared_ptr& abilityRecord) +void AbilityConnectManager::MoveToTerminatingMap(const std::shared_ptr& abilityRecord) { } @@ -665,7 +668,7 @@ void AbilityConnectManager::HandleExtensionDisconnectTask(const std::shared_ptr< { } -bool AbilityConnectManager::IsUIExtensionAbility(const std::shared_ptr &abilityRecord) +bool AbilityConnectManager::IsUIExtensionAbility(const std::shared_ptr &abilityRecord) { return true; } @@ -675,27 +678,27 @@ bool AbilityConnectManager::IsCacheExtensionAbilityByInfo(const AppExecFwk::Abil return true; } -bool AbilityConnectManager::IsCacheExtensionAbility(const std::shared_ptr &abilityRecord) +bool AbilityConnectManager::IsCacheExtensionAbility(const std::shared_ptr &abilityRecord) { return true; } bool AbilityConnectManager::CheckUIExtensionAbilitySessionExist( - const std::shared_ptr &abilityRecord) + const std::shared_ptr &abilityRecord) { return true; } -void AbilityConnectManager::RemoveUIExtensionAbilityRecord(const std::shared_ptr &abilityRecord) +void AbilityConnectManager::RemoveUIExtensionAbilityRecord(const std::shared_ptr &abilityRecord) { } void AbilityConnectManager::AddUIExtensionAbilityRecordToTerminatedList( - const std::shared_ptr &abilityRecord) + const std::shared_ptr &abilityRecord) { } -bool AbilityConnectManager::IsCallerValid(const std::shared_ptr &abilityRecord) +bool AbilityConnectManager::IsCallerValid(const std::shared_ptr &abilityRecord) { return true; } @@ -715,7 +718,7 @@ void AbilityConnectManager::SignRestartAppFlag(int32_t uid, const std::string &i { } -bool AbilityConnectManager::AddToServiceMap(const std::string &key, std::shared_ptr abilityRecord) +bool AbilityConnectManager::AddToServiceMap(const std::string &key, std::shared_ptr abilityRecord) { return true; } @@ -731,13 +734,13 @@ void AbilityConnectManager::AddConnectObjectToMap(sptr connectObj { } -EventInfo AbilityConnectManager::BuildEventInfo(const std::shared_ptr &abilityRecord) +EventInfo AbilityConnectManager::BuildEventInfo(const std::shared_ptr &abilityRecord) { EventInfo eventInfo; return eventInfo; } -void AbilityConnectManager::UpdateUIExtensionInfo(const std::shared_ptr &abilityRecord, +void AbilityConnectManager::UpdateUIExtensionInfo(const std::shared_ptr &abilityRecord, int32_t hostPid) { } @@ -775,14 +778,14 @@ int32_t AbilityConnectManager::QueryPreLoadUIExtensionRecordInner(const AppExecF return ERR_OK; } -std::shared_ptr AbilityConnectManager::GetUIExtensionBySessionFromServiceMap( +std::shared_ptr AbilityConnectManager::GetUIExtensionBySessionFromServiceMap( const sptr &sessionInfo) { return MyStatus::GetInstance().acmGetUIExtensionBySessionFromServiceMap_; } void AbilityConnectManager::UpdateUIExtensionBindInfo( - const std::shared_ptr &abilityRecord, std::string callerBundleName, int32_t notifyProcessBind) + const std::shared_ptr &abilityRecord, std::string callerBundleName, int32_t notifyProcessBind) { } diff --git a/test/unittest/ability_manager_service_thirteenth_test/mock/src/mock_ability_record.cpp b/test/unittest/ability_manager_service_thirteenth_test/mock/src/mock_ability_record.cpp index daf726ec0c..3432a07222 100644 --- a/test/unittest/ability_manager_service_thirteenth_test/mock/src/mock_ability_record.cpp +++ b/test/unittest/ability_manager_service_thirteenth_test/mock/src/mock_ability_record.cpp @@ -391,10 +391,6 @@ void AbilityRecord::RemoveLoadTimeoutTask() { } -void AbilityRecord::PostUIExtensionAbilityTimeoutTask(uint32_t messageId) -{ -} - std::string AbilityRecord::GetLabel() { return abilityInfo_.applicationInfo.label; @@ -741,29 +737,6 @@ void AbilityRecord::ShareData(const int32_t &uniqueId) { } -void AbilityRecord::ConnectAbility() -{ -} - -void AbilityRecord::ConnectAbilityWithWant(const Want &want) -{ -} - -void AbilityRecord::DisconnectAbility() -{ -} - -void AbilityRecord::DisconnectAbilityWithWant(const Want &want) -{ - HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); - TAG_LOGD(AAFwkTag::SERVICE_EXT, "ability:%{public}s.", abilityInfo_.name.c_str()); - CHECK_POINTER(lifecycleDeal_); - lifecycleDeal_->DisconnectAbility(want); - if (GetInProgressRecordCount() == 0) { - isConnected = false; - } -} - void AbilityRecord::CommandAbility() { TAG_LOGI(AAFwkTag::SERVICE_EXT, "startId_:%{public}d.", startId_); @@ -986,42 +959,6 @@ void SystemAbilityCallerRecord::SendResultToSystemAbility(int requestCode, } } -bool AbilityRecord::NeedConnectAfterCommand() -{ - return !IsConnectListEmpty() && !isConnected; -} - -void AbilityRecord::AddConnectRecordToList(const std::shared_ptr &connRecord) -{ - CHECK_POINTER(connRecord); - std::lock_guard guard(connRecordListMutex_); - auto it = std::find(connRecordList_.begin(), connRecordList_.end(), connRecord); - // found it - if (it != connRecordList_.end()) { - TAG_LOGD(AAFwkTag::ABILITYMGR, "Found it in list, so no need to add same connection"); - return; - } - // no found then add new connection to list - TAG_LOGD(AAFwkTag::ABILITYMGR, "No found in list, so add new connection to list"); - connRecordList_.push_back(connRecord); -} - -std::list> AbilityRecord::GetConnectRecordList() const -{ - std::lock_guard guard(connRecordListMutex_); - return connRecordList_; -} - -void AbilityRecord::RemoveConnectRecordFromList(const std::shared_ptr &connRecord) -{ - CHECK_POINTER(connRecord); - std::lock_guard guard(connRecordListMutex_); - connRecordList_.remove(connRecord); - if (connRecordList_.empty()) { - isConnected = false; - } -} - void AbilityRecord::RemoveSpecifiedWantParam(const std::string &key) { std::lock_guard guard(wantLock_); @@ -1173,68 +1110,6 @@ std::shared_ptr AbilityRecord::GetCallerInfo() const return callerList_.back()->GetCallerInfo(); } -bool AbilityRecord::IsConnectListEmpty() -{ - std::lock_guard guard(connRecordListMutex_); - return connRecordList_.empty(); -} - -size_t AbilityRecord::GetConnectedListSize() -{ - std::lock_guard guard(connRecordListMutex_); - return std::count_if(connRecordList_.begin(), connRecordList_.end(), [](std::shared_ptr record) { - return record && record->GetConnectState() == ConnectionState::CONNECTED; - }); -} - -size_t AbilityRecord::GetConnectingListSize() -{ - std::lock_guard guard(connRecordListMutex_); - return std::count_if(connRecordList_.begin(), connRecordList_.end(), [](std::shared_ptr record) { - return record && record->GetConnectState() == ConnectionState::CONNECTING; - }); -} - -std::shared_ptr AbilityRecord::GetConnectingRecord() const -{ - std::lock_guard guard(connRecordListMutex_); - auto connect = - std::find_if(connRecordList_.begin(), connRecordList_.end(), [](std::shared_ptr record) { - return record->GetConnectState() == ConnectionState::CONNECTING; - }); - return (connect != connRecordList_.end()) ? *connect : nullptr; -} - -std::list> AbilityRecord::GetConnectingRecordList() -{ - std::lock_guard guard(connRecordListMutex_); - std::list> connectingList; - for (auto record : connRecordList_) { - if (record && record->GetConnectState() == ConnectionState::CONNECTING) { - connectingList.push_back(record); - } - } - return connectingList; -} - -uint32_t AbilityRecord::GetInProgressRecordCount() -{ - std::lock_guard guard(connRecordListMutex_); - uint32_t count = 0; - for (auto record : connRecordList_) { - if (record && (record->GetConnectState() == ConnectionState::CONNECTING || - record->GetConnectState() == ConnectionState::CONNECTED)) { - count++; - } - } - return count; -} - -std::shared_ptr AbilityRecord::GetDisconnectingRecord() const -{ - return nullptr; -} - void AbilityRecord::GetAbilityTypeString(std::string &typeStr) { } @@ -1258,10 +1133,6 @@ void AbilityRecord::Dump(std::vector &info) { } -void AbilityRecord::DumpUIExtensionRootHostInfo(std::vector &info) const -{ -} - void AbilityRecord::DumpAbilityState( std::vector &info, bool isClient, const std::vector ¶ms) { @@ -1279,18 +1150,6 @@ int64_t AbilityRecord::GetStartTime() const return startTime_; } -void AbilityRecord::DumpService(std::vector &info, bool isClient) const -{ -} - -void AbilityRecord::DumpService(std::vector &info, std::vector ¶ms, bool isClient) const -{ -} - -void AbilityRecord::DumpUIExtensionPid(std::vector &info, bool isUIExtension) const -{ -} - void AbilityRecord::RemoveAbilityDeathRecipient() const { } @@ -1307,16 +1166,6 @@ void AbilityRecord::NotifyAnimationAbilityDied() { } -void AbilityRecord::SetConnRemoteObject(const sptr &remoteObject) -{ - connRemoteObject_ = remoteObject; -} - -sptr AbilityRecord::GetConnRemoteObject() const -{ - return connRemoteObject_; -} - bool AbilityRecord::IsNeverStarted() const { if (UIExtensionUtils::IsUIExtension(GetAbilityInfo().extensionAbilityType)) { diff --git a/test/unittest/ability_manager_service_twelfth_test/ability_manager_service_twelfth_test.cpp b/test/unittest/ability_manager_service_twelfth_test/ability_manager_service_twelfth_test.cpp index 5bc03053fc..e8d8e0d17e 100644 --- a/test/unittest/ability_manager_service_twelfth_test/ability_manager_service_twelfth_test.cpp +++ b/test/unittest/ability_manager_service_twelfth_test/ability_manager_service_twelfth_test.cpp @@ -333,7 +333,8 @@ HWTEST_F(AbilityManagerServiceTwelfthTest, MinimizeUIExtensionAbility_001, TestS AppExecFwk::ApplicationInfo appInfo; appInfo.accessTokenId = ONE; abilityRequest.appInfo = appInfo; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); extensionSessionInfo->callerToken = abilityRecord->GetToken(); IPCSkeleton::SetCallingTokenID(ONE); abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); @@ -376,7 +377,8 @@ HWTEST_F(AbilityManagerServiceTwelfthTest, MinimizeUIExtensionAbility_002, TestS AppExecFwk::ApplicationInfo appInfo; appInfo.accessTokenId = ONE; abilityRequest.appInfo = appInfo; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); extensionSessionInfo->callerToken = abilityRecord->GetToken(); IPCSkeleton::SetCallingTokenID(ONE); abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); @@ -615,7 +617,8 @@ HWTEST_F(AbilityManagerServiceTwelfthTest, TerminateUIExtensionAbility_001, Test AppExecFwk::ApplicationInfo appInfo; appInfo.accessTokenId = ONE; abilityRequest.appInfo = appInfo; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); extensionSessionInfo->callerToken = abilityRecord->GetToken(); IPCSkeleton::SetCallingTokenID(ONE); abilityMs_->subManagersHelper_ = std::make_shared(nullptr, nullptr); diff --git a/test/unittest/ability_record_dump_test/ability_record_dump_test.cpp b/test/unittest/ability_record_dump_test/ability_record_dump_test.cpp index f429431aed..4842cc4b77 100644 --- a/test/unittest/ability_record_dump_test/ability_record_dump_test.cpp +++ b/test/unittest/ability_record_dump_test/ability_record_dump_test.cpp @@ -81,33 +81,5 @@ HWTEST_F(AbilityRecordDumpTest, AbilityRecordDump_DumpAbilityState_0100, TestSiz TAG_LOGI(AAFwkTag::TEST, "AbilityRecordDump_DumpAbilityState_0100 end"); } -/** - * @tc.name: AbilityRecordDump_DumpService_0100 - * @tc.desc: DumpService - * @tc.type: FUNC - * @tc.require: SR000GH1GO - */ -HWTEST_F(AbilityRecordDumpTest, AbilityRecordDump_DumpService_0100, TestSize.Level1) -{ - TAG_LOGI(AAFwkTag::TEST, "AbilityRecordDump_DumpService_0100 start"); - - Want want; - OHOS::AppExecFwk::AbilityInfo abilityInfo; - OHOS::AppExecFwk::ApplicationInfo applicationInfo; - auto abilityRecord = std::make_shared(want, abilityInfo, applicationInfo); - EXPECT_NE(abilityRecord, nullptr); - - std::vector info; - bool isClient = false; - abilityRecord->DumpService(info, isClient); - EXPECT_GT(info.size(), SIZE_ONE); - - TAG_LOGI(AAFwkTag::TEST, "info.size() = %{public}zu", info.size()); - for (auto item : info) { - TAG_LOGI(AAFwkTag::TEST, "item = %{public}s", item.c_str()); - } - - TAG_LOGI(AAFwkTag::TEST, "AbilityRecordDump_DumpService_0100 end"); -} } // namespace AAFwk } // namespace OHOS diff --git a/test/unittest/ability_record_second_test/ability_record_second_test.cpp b/test/unittest/ability_record_second_test/ability_record_second_test.cpp index 15b0f89c61..cf117d19f4 100644 --- a/test/unittest/ability_record_second_test/ability_record_second_test.cpp +++ b/test/unittest/ability_record_second_test/ability_record_second_test.cpp @@ -153,38 +153,6 @@ HWTEST_F(AbilityRecordSecondTest, AbilityRecord_IsSystemAbilityCall_001, TestSiz TAG_LOGE(AAFwkTag::TEST, "AbilityRecord_IsSystemAbilityCall_001 end."); } -/* -* Feature: AbilityRecord -* Function: GetInProgressRecordCount -* SubFunction: NA -*/ -HWTEST_F(AbilityRecordSecondTest, AbilityRecord_GetInProgressRecordCount_001, TestSize.Level1) -{ - TAG_LOGE(AAFwkTag::TEST, "AbilityRecord_GetInProgressRecordCount_001 start."); - std::shared_ptr abilityRecord = GetAbilityRecord(); - std::shared_ptr connections = nullptr; - abilityRecord->connRecordList_.push_back(connections); - auto res = abilityRecord->GetInProgressRecordCount(); - EXPECT_EQ(res, 0); - abilityRecord->connRecordList_.clear(); - OHOS::sptr callback = new AbilityConnectCallback(); - std::shared_ptr connection1 = - std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); - connection1->SetConnectState(ConnectionState::CONNECTING); - std::shared_ptr connection2 = - std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); - connection2->SetConnectState(ConnectionState::CONNECTED); - std::shared_ptr connection3 = - std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); - connection3->SetConnectState(ConnectionState::DISCONNECTING); - abilityRecord->connRecordList_.push_back(connection1); - abilityRecord->connRecordList_.push_back(connection2); - abilityRecord->connRecordList_.push_back(connection3); - res = abilityRecord->GetInProgressRecordCount(); - EXPECT_EQ(res, 2); - TAG_LOGE(AAFwkTag::TEST, "AbilityRecord_GetInProgressRecordCount_001 end."); -} - /* * Feature: AbilityRecord * Function: CovertAppExitReasonToLastReason @@ -363,47 +331,6 @@ HWTEST_F(AbilityRecordSecondTest, AaFwk_AbilityMS_Terminate, TestSize.Level1) EXPECT_EQ(abilityRecord->lifeCycleStateInfo_.state, AbilityLifeCycleState::ABILITY_STATE_INITIAL); } -/* - * Feature: AbilityRecord - * Function: DisconnectAbility - * SubFunction: DisconnectAbility - * FunctionPoints: NA - * EnvConditions: NA - * CaseDescription: Verify AbilityRecord DisconnectAbility - */ -HWTEST_F(AbilityRecordSecondTest, AbilityRecord_DisconnectAbility_001, TestSize.Level1) -{ - std::shared_ptr abilityRecord = GetAbilityRecord(); - abilityRecord->lifecycleDeal_ = std::make_unique(); - abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::UI_SERVICE; - abilityRecord->connRecordList_.clear(); - abilityRecord->isConnected = true; - abilityRecord->DisconnectAbility(); - EXPECT_FALSE(abilityRecord->isConnected); -} - -/* - * Feature: AbilityRecord - * Function: DisconnectAbilityWithWant - * SubFunction: DisconnectAbilityWithWant - * FunctionPoints: NA - * EnvConditions: NA - * CaseDescription: Verify AbilityRecord DisconnectAbilityWithWant - */ -HWTEST_F(AbilityRecordSecondTest, AbilityRecord_DisconnectAbilityWithWant_001, TestSize.Level1) -{ - std::shared_ptr abilityRecord = GetAbilityRecord(); - abilityRecord->abilityInfo_.name = "test"; - abilityRecord->lifecycleDeal_ = std::make_unique(); - abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::UI_SERVICE; - abilityRecord->connRecordList_.clear(); - abilityRecord->isConnected = true; - - Want want; - abilityRecord->DisconnectAbilityWithWant(want); - EXPECT_FALSE(abilityRecord->isConnected); -} - /* * Feature: AbilityRecord * Function: RemoveSpecifiedWantParam @@ -437,24 +364,6 @@ HWTEST_F(AbilityRecordSecondTest, AaFwk_AbilityMS_Dump, TestSize.Level1) EXPECT_TRUE(info.size() == 12); } -/* - * Feature: AbilityRecord - * Function: DumpUIExtensionRootHostInfo - * SubFunction: DumpUIExtensionRootHostInfo - * FunctionPoints: NA - * EnvConditions: NA - * CaseDescription: Verify DumpUIExtensionRootHostInfo - */ -HWTEST_F(AbilityRecordSecondTest, AbilityRecord_DumpUIExtensionRootHostInfo_001, TestSize.Level1) -{ - std::shared_ptr abilityRecord = GetAbilityRecord(); - std::vector info; - abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::SYSDIALOG_COMMON; - abilityRecord->token_ = nullptr; - abilityRecord->DumpUIExtensionRootHostInfo(info); - EXPECT_TRUE(info.size() == 0); -} - /* * Feature: AbilityRecord * Function: DumpAbilityState @@ -474,68 +383,6 @@ HWTEST_F(AbilityRecordSecondTest, AbilityRecord_DumpAbilityState_001, TestSize.L EXPECT_FALSE(abilityRecord->GetMissionAffinity().empty()); } -/* - * Feature: AbilityRecord - * Function: DumpService - * SubFunction: DumpService - * FunctionPoints: NA - * EnvConditions: NA - * CaseDescription: Verify AbilityRecord DumpService - */ -HWTEST_F(AbilityRecordSecondTest, AbilityRecord_DumpService_001, TestSize.Level1) -{ - std::shared_ptr abilityRecord = GetAbilityRecord(); - std::vector info; - std::vector params; - abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::HMS_ACCOUNT; - abilityRecord->scheduler_ = nullptr; - abilityRecord->isReady_ = false; - abilityRecord->isLauncherRoot_ = false; - abilityRecord->token_ = nullptr; - abilityRecord->connRecordList_.clear(); - abilityRecord->DumpService(info, params, false); - EXPECT_TRUE(info.size() == 8); -} - -/* - * Feature: AbilityRecord - * Function: DumpService - * SubFunction: DumpService - * FunctionPoints: NA - * EnvConditions: NA - * CaseDescription: Verify AbilityRecord DumpService - */ -HWTEST_F(AbilityRecordSecondTest, AbilityRecord_DumpService_002, TestSize.Level1) -{ - std::shared_ptr abilityRecord = GetAbilityRecord(); - std::vector info; - std::vector params; - abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::UI_SERVICE; - abilityRecord->scheduler_ = nullptr; - abilityRecord->isReady_ = false; - abilityRecord->isLauncherRoot_ = false; - abilityRecord->token_ = nullptr; - abilityRecord->connRecordList_.clear(); - abilityRecord->DumpService(info, params, false); - EXPECT_TRUE(info.size() == 9); -} - -/* - * Feature: AbilityRecord - * Function: DumpUIExtensionPid - * SubFunction: DumpUIExtensionPid - * FunctionPoints: NA - * EnvConditions: NA - * CaseDescription: Verify AbilityRecord DumpUIExtensionPid - */ -HWTEST_F(AbilityRecordSecondTest, AbilityRecord_DumpUIExtensionPid_001, TestSize.Level1) -{ - std::shared_ptr abilityRecord = GetAbilityRecord(); - std::vector info; - abilityRecord->DumpUIExtensionPid(info, true); - EXPECT_TRUE(info.size() == 1); -} - /* * Feature: AbilityRecord * Function: OnSchedulerDied @@ -931,24 +778,6 @@ HWTEST_F(AbilityRecordSecondTest, AbilityRecord_SetAbilityWindowState_003, TestS EXPECT_EQ(itr->second, AbilityWindowState::BACKGROUND); } -/* - * Feature: AbilityRecord - * Function: DumpUIExtensionRootHostInfo - * SubFunction: DumpUIExtensionRootHostInfo - * FunctionPoints: NA - * EnvConditions: NA - * CaseDescription: Verify DumpUIExtensionRootHostInfo - */ -HWTEST_F(AbilityRecordSecondTest, AbilityRecord_DumpUIExtensionRootHostInfo_002, TestSize.Level1) -{ - std::shared_ptr abilityRecord = GetAbilityRecord(); - std::vector info; - abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::SYSDIALOG_COMMON; - abilityRecord->token_ = sptr::MakeSptr(abilityRecord); - abilityRecord->DumpUIExtensionRootHostInfo(info); - EXPECT_TRUE(info.size() == 0); -} - /* * Feature: AbilityRecord * Function: SetAbilityWindowState diff --git a/test/unittest/ability_record_test/ability_record_test.cpp b/test/unittest/ability_record_test/ability_record_test.cpp index 690d34040b..a616c42482 100644 --- a/test/unittest/ability_record_test/ability_record_test.cpp +++ b/test/unittest/ability_record_test/ability_record_test.cpp @@ -325,63 +325,6 @@ HWTEST_F(AbilityRecordTest, AaFwk_AbilityMS_IsLauncherAbility, TestSize.Level1) EXPECT_EQ(false, launcherAbilityRecord->IsLauncherAbility()); } -/* - * Feature: AbilityRecord - * Function: Add connection record to ability record' list - * SubFunction: NA - * FunctionPoints: AddConnectRecordToList - * EnvConditions: NA - * CaseDescription: AddConnectRecordToList UT. - */ -HWTEST_F(AbilityRecordTest, AaFwk_AbilityMS_AddConnectRecordToList, TestSize.Level1) -{ - // test1 for input param is null - abilityRecord_->AddConnectRecordToList(nullptr); - auto connList = abilityRecord_->GetConnectRecordList(); - EXPECT_EQ(0, static_cast(connList.size())); - - // test2 for adding new connection record to empty list - OHOS::sptr callback1 = new AbilityConnectCallback(); - auto newConnRecord1 = - ConnectionRecord::CreateConnectionRecord(abilityRecord_->GetToken(), abilityRecord_, callback1, nullptr); - abilityRecord_->AddConnectRecordToList(newConnRecord1); - connList = abilityRecord_->GetConnectRecordList(); - EXPECT_EQ(1, static_cast(connList.size())); - - // test3 for adding new connection record to non-empty list - OHOS::sptr callback2 = new AbilityConnectCallback(); - auto newConnRecord2 = - ConnectionRecord::CreateConnectionRecord(abilityRecord_->GetToken(), abilityRecord_, callback2, nullptr); - abilityRecord_->AddConnectRecordToList(newConnRecord2); - connList = abilityRecord_->GetConnectRecordList(); - EXPECT_EQ(2, static_cast(connList.size())); - - // test4 for adding old connection record to non-empty list - abilityRecord_->AddConnectRecordToList(newConnRecord2); - connList = abilityRecord_->GetConnectRecordList(); - EXPECT_EQ(2, static_cast(connList.size())); - - // test5 for delete nullptr from list - abilityRecord_->RemoveConnectRecordFromList(nullptr); - connList = abilityRecord_->GetConnectRecordList(); - EXPECT_EQ(2, static_cast(connList.size())); - - // test6 for delete no-match member from list - auto newConnRecord3 = - ConnectionRecord::CreateConnectionRecord(abilityRecord_->GetToken(), abilityRecord_, callback2, nullptr); - abilityRecord_->RemoveConnectRecordFromList(newConnRecord3); - connList = abilityRecord_->GetConnectRecordList(); - EXPECT_EQ(2, static_cast(connList.size())); - - // test7 for delete match member from list - abilityRecord_->RemoveConnectRecordFromList(newConnRecord2); - connList = abilityRecord_->GetConnectRecordList(); - EXPECT_EQ(1, static_cast(connList.size())); - - // test8 for get ability unknown type - EXPECT_EQ(OHOS::AppExecFwk::AbilityType::UNKNOWN, abilityRecord_->GetAbilityInfo().type); -} - /* * Feature: AbilityRecord * Function: ConvertAbilityState @@ -574,21 +517,6 @@ HWTEST_F(AbilityRecordTest, AaFwk_AbilityMS_GetAbilityTypeString, TestSize.Level EXPECT_EQ(typeStr, "DATA"); } -/* - * Feature: AbilityRecord - * Function: SetConnRemoteObject GetConnRemoteObject - * SubFunction: SetConnRemoteObject GetConnRemoteObject - * FunctionPoints: NA - * EnvConditions: NA - * CaseDescription: Verify SetConnRemoteObject GetConnRemoteObject UT - */ -HWTEST_F(AbilityRecordTest, AaFwk_AbilityMS_ConnRemoteObject, TestSize.Level1) -{ - OHOS::sptr remote; - abilityRecord_->SetConnRemoteObject(remote); - EXPECT_EQ(remote, abilityRecord_->GetConnRemoteObject()); -} - /* * Feature: AbilityRecord * Function: IsCreateByConnect SetCreateByConnectMode @@ -1634,30 +1562,6 @@ HWTEST_F(AbilityRecordTest, AbilityRecord_AddSystemAbilityCallerRecord_001, Test abilityRecord->AddSystemAbilityCallerRecord(callerToken, requestCode, srcAbilityId); } -/* - * Feature: AbilityRecord - * Function: GetConnectingRecordList - * SubFunction: GetConnectingRecordList - * FunctionPoints: NA - * EnvConditions: NA - * CaseDescription: Verify AbilityRecord GetConnectingRecordList - */ -HWTEST_F(AbilityRecordTest, AbilityRecord_GetConnectingRecordList_001, TestSize.Level1) -{ - std::shared_ptr abilityRecord = GetAbilityRecord(); - EXPECT_NE(abilityRecord, nullptr); - OHOS::sptr callback = new AbilityConnectCallback(); - std::shared_ptr connection1 = - std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); - std::shared_ptr connection2 = - std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); - connection1->SetConnectState(ConnectionState::CONNECTING); - connection2->SetConnectState(ConnectionState::CONNECTED); - abilityRecord->connRecordList_.push_back(connection1); - abilityRecord->connRecordList_.push_back(connection2); - abilityRecord->GetConnectingRecordList(); -} - /* * Feature: AbilityRecord * Function: DumpAbilityState @@ -1694,30 +1598,6 @@ HWTEST_F(AbilityRecordTest, AbilityRecord_SetStartTime_001, TestSize.Level1) abilityRecord->SetStartTime(); } -/* - * Feature: AbilityRecord - * Function: DumpService - * SubFunction: DumpService - * FunctionPoints: NA - * EnvConditions: NA - * CaseDescription: Verify AbilityRecord DumpService - */ -HWTEST_F(AbilityRecordTest, AbilityRecord_DumpService_001, TestSize.Level1) -{ - std::shared_ptr abilityRecord = GetAbilityRecord(); - EXPECT_NE(abilityRecord, nullptr); - std::vector info; - std::vector params; - bool isClient = false; - OHOS::sptr callback = new AbilityConnectCallback(); - std::shared_ptr connection = - std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); - abilityRecord->isLauncherRoot_ = true; - abilityRecord->connRecordList_.push_back(nullptr); - abilityRecord->connRecordList_.push_back(connection); - abilityRecord->DumpService(info, params, isClient); -} - /* * Feature: AbilityRecord * Function: SendEvent @@ -2615,24 +2495,6 @@ HWTEST_F(AbilityRecordTest, AbilityRecord_ForegroundAbility_002, TestSize.Level1 EXPECT_NE(abilityRecord_, nullptr); } -/* - * Feature: AbilityRecord - * Function: PostUIExtensionAbilityTimeoutTask - * SubFunction: PostUIExtensionAbilityTimeoutTask - * FunctionPoints: NA - * EnvConditions: NA - * CaseDescription: Verify AbilityRecord PostUIExtensionAbilityTimeoutTask - */ -HWTEST_F(AbilityRecordTest, AbilityRecord_PostUIExtensionAbilityTimeoutTask_001, TestSize.Level1) -{ - std::shared_ptr abilityRecord = GetAbilityRecord(); - ASSERT_NE(abilityRecord, nullptr); - abilityRecord->PostUIExtensionAbilityTimeoutTask(AbilityManagerService::LOAD_TIMEOUT_MSG); - abilityRecord->PostUIExtensionAbilityTimeoutTask(AbilityManagerService::FOREGROUND_TIMEOUT_MSG); - abilityRecord->PostUIExtensionAbilityTimeoutTask(AbilityManagerService::BACKGROUND_TIMEOUT_MSG); - EXPECT_TRUE(abilityRecord != nullptr); -} - /* * Feature: AbilityRecord * Function: IsHistoryRequestCode diff --git a/test/unittest/ability_record_test/ability_record_test_call.cpp b/test/unittest/ability_record_test/ability_record_test_call.cpp index 1418023c2e..c6b6174eb1 100644 --- a/test/unittest/ability_record_test/ability_record_test_call.cpp +++ b/test/unittest/ability_record_test/ability_record_test_call.cpp @@ -821,24 +821,6 @@ HWTEST_F(AbilityRecordTest, AbilityRecord_AddSystemAbilityCallerRecord_002, Test abilityRecord->AddSystemAbilityCallerRecord(callerToken, requestCode, srcAbilityId); } -/* - * Feature: AbilityRecord - * Function: ConnectAbility - * SubFunction: ConnectAbility - * FunctionPoints: NA - * EnvConditions: NA - * CaseDescription: Verify AbilityRecord ConnectAbility - */ -HWTEST_F(AbilityRecordTest, AbilityRecord_ConnectAbility_001, TestSize.Level1) -{ - std::shared_ptr abilityRecord = GetAbilityRecord(); - abilityRecord->lifecycleDeal_ = nullptr; - abilityRecord->lifecycleDeal_ = std::make_unique(); - bool isConnected = true; - abilityRecord->ConnectAbility(); - EXPECT_NE(abilityRecord_, nullptr); -} - /* * Feature: AbilityRecord * Function: CommandAbility diff --git a/test/unittest/app_exit_reason_helper_third_test/app_exit_reason_helper_third_test.cpp b/test/unittest/app_exit_reason_helper_third_test/app_exit_reason_helper_third_test.cpp index b9c20d70d1..e03b052d71 100644 --- a/test/unittest/app_exit_reason_helper_third_test/app_exit_reason_helper_third_test.cpp +++ b/test/unittest/app_exit_reason_helper_third_test/app_exit_reason_helper_third_test.cpp @@ -84,7 +84,7 @@ HWTEST_F(AppExitReasonHelperThirdTest, RecordProcessExtensionExitReason_0100, Te abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); auto extRecord = std::make_shared(abilityRecord); appExitReasonHelper_->subManagersHelper_->currentConnectManager_ diff --git a/test/unittest/connection_record_test/connection_record_test.cpp b/test/unittest/connection_record_test/connection_record_test.cpp index ed992cba3c..0f55520ee2 100644 --- a/test/unittest/connection_record_test/connection_record_test.cpp +++ b/test/unittest/connection_record_test/connection_record_test.cpp @@ -18,7 +18,7 @@ #define private public #define protected public -#include "ability_record.h" +#include "base_extension_record.h" #include "connection_record.h" #undef private #undef protected @@ -57,7 +57,7 @@ public: std::shared_ptr connectionRecord_{ nullptr }; OHOS::sptr callback_{ nullptr }; - std::shared_ptr service_{ nullptr }; + std::shared_ptr service_{ nullptr }; }; AbilityRequest ConnectionRecordTest::GenerateAbilityRequest(const std::string& deviceName, @@ -96,7 +96,7 @@ void ConnectionRecordTest::SetUp(void) std::string appName = "hiservcie"; std::string bundleName = "com.ix.hiservcie"; AbilityRequest abilityRequest = GenerateAbilityRequest(deviceName, abilityName, appName, bundleName); - service_ = AbilityRecord::CreateAbilityRecord(abilityRequest); + service_ = BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); connectionRecord_ = std::make_shared(service_->GetToken(), service_, callback_, nullptr); } diff --git a/test/unittest/connection_state_item_test/connection_state_item_test.cpp b/test/unittest/connection_state_item_test/connection_state_item_test.cpp index 103ac91493..bc304a6b40 100755 --- a/test/unittest/connection_state_item_test/connection_state_item_test.cpp +++ b/test/unittest/connection_state_item_test/connection_state_item_test.cpp @@ -16,7 +16,7 @@ #include #define private public -#include "ability_record.h" +#include "base_extension_record.h" #include "connection_state_item.h" #include "connection_record.h" #undef private @@ -49,7 +49,7 @@ public: std::shared_ptr Init(); std::shared_ptr InitAbilityRecord(); std::shared_ptr InitDataAbilityRecord(); - std::shared_ptr InitAbilityRecord1(); + std::shared_ptr InitExtensionRecordBase(); }; void ConnectionStateItemTest::SetUpTestCase(void) @@ -76,13 +76,13 @@ std::shared_ptr ConnectionStateItemTest::InitAbilityRecord() return AbilityRecord::CreateAbilityRecord(abilityRequest); } -std::shared_ptr ConnectionStateItemTest::InitAbilityRecord1() +std::shared_ptr ConnectionStateItemTest::InitExtensionRecordBase() { AbilityRequest abilityRequest; - abilityRequest.appInfo.bundleName = "com.example.unittest1"; - abilityRequest.abilityInfo.name = "MainAbility1"; + abilityRequest.appInfo.bundleName = "com.example.unittest"; + abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AbilityType::PAGE; - return AbilityRecord::CreateAbilityRecord(abilityRequest); + return BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); } std::shared_ptr ConnectionStateItemTest::InitDataAbilityRecord() @@ -121,7 +121,7 @@ HWTEST_F(ConnectionStateItemTest, CreateConnectionStateItem_001, TestSize.Level1 HWTEST_F(ConnectionStateItemTest, CreateConnectionStateItem_002, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback; std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -175,7 +175,7 @@ HWTEST_F(ConnectionStateItemTest, AddConnection_002, TestSize.Level1) { auto connectionStateItem = Init(); sptr callerToken; - std::shared_ptr abilityRecord; + std::shared_ptr abilityRecord; sptr connCallback; std::shared_ptr record = std::make_shared( callerToken, abilityRecord, connCallback, nullptr); @@ -196,7 +196,7 @@ HWTEST_F(ConnectionStateItemTest, AddConnection_002, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, AddConnection_003, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback; std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -217,7 +217,7 @@ HWTEST_F(ConnectionStateItemTest, AddConnection_003, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, AddConnection_004, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -238,7 +238,7 @@ HWTEST_F(ConnectionStateItemTest, AddConnection_004, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, AddConnection_005, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -279,7 +279,7 @@ HWTEST_F(ConnectionStateItemTest, RemoveConnection_002, TestSize.Level1) { auto connectionStateItem = Init(); sptr callerToken; - std::shared_ptr abilityRecord; + std::shared_ptr abilityRecord; sptr connCallback; std::shared_ptr record = std::make_shared( callerToken, abilityRecord, connCallback, nullptr); @@ -300,7 +300,7 @@ HWTEST_F(ConnectionStateItemTest, RemoveConnection_002, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, RemoveConnection_003, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback; std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -321,7 +321,7 @@ HWTEST_F(ConnectionStateItemTest, RemoveConnection_003, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, RemoveConnection_004, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -342,7 +342,7 @@ HWTEST_F(ConnectionStateItemTest, RemoveConnection_004, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, RemoveConnection_005, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -364,7 +364,7 @@ HWTEST_F(ConnectionStateItemTest, RemoveConnection_005, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, RemoveConnection_006, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -386,7 +386,7 @@ HWTEST_F(ConnectionStateItemTest, RemoveConnection_006, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, RemoveConnection_007, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -410,7 +410,7 @@ HWTEST_F(ConnectionStateItemTest, RemoveConnection_007, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, RemoveConnection_008, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -438,7 +438,7 @@ HWTEST_F(ConnectionStateItemTest, RemoveConnection_008, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, RemoveConnection_009, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -465,7 +465,7 @@ HWTEST_F(ConnectionStateItemTest, RemoveConnection_009, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, RemoveConnection_010, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -491,7 +491,7 @@ HWTEST_F(ConnectionStateItemTest, RemoveConnection_010, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, RemoveConnection_011, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -518,7 +518,7 @@ HWTEST_F(ConnectionStateItemTest, RemoveConnection_011, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, RemoveConnection_012, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -562,7 +562,7 @@ HWTEST_F(ConnectionStateItemTest, SuspendConnection_001, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, SuspendConnection_002, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -584,7 +584,7 @@ HWTEST_F(ConnectionStateItemTest, SuspendConnection_002, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, SuspendConnection_003, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -607,7 +607,7 @@ HWTEST_F(ConnectionStateItemTest, SuspendConnection_003, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, SuspendConnection_004, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, nullptr, nullptr); ConnectionData data; @@ -626,7 +626,7 @@ HWTEST_F(ConnectionStateItemTest, SuspendConnection_004, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, SuspendConnection_005, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -646,7 +646,7 @@ HWTEST_F(ConnectionStateItemTest, SuspendConnection_005, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, SuspendConnection_006, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -686,7 +686,7 @@ HWTEST_F(ConnectionStateItemTest, ResumeConnection_001, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, ResumeConnection_002, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -708,7 +708,7 @@ HWTEST_F(ConnectionStateItemTest, ResumeConnection_002, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, ResumeConnection_003, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -731,7 +731,7 @@ HWTEST_F(ConnectionStateItemTest, ResumeConnection_003, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, ResumeConnection_004, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, nullptr, nullptr); ConnectionData data; @@ -750,7 +750,7 @@ HWTEST_F(ConnectionStateItemTest, ResumeConnection_004, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, ResumeConnection_005, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -774,7 +774,7 @@ HWTEST_F(ConnectionStateItemTest, ResumeConnection_005, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, ResumeConnection_006, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -794,7 +794,7 @@ HWTEST_F(ConnectionStateItemTest, ResumeConnection_006, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, ResumeConnection_007, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -817,7 +817,7 @@ HWTEST_F(ConnectionStateItemTest, ResumeConnection_007, TestSize.Level1) HWTEST_F(ConnectionStateItemTest, ResumeConnection_008, TestSize.Level1) { auto connectionStateItem = Init(); - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); @@ -1162,7 +1162,7 @@ HWTEST_F(ConnectionStateItemTest, GenerateAllConnectionData_001, TestSize.Level1 { auto connectionStateItem = Init(); std::vector datas; - std::shared_ptr abilityRecord = InitAbilityRecord(); + std::shared_ptr abilityRecord = InitExtensionRecordBase(); sptr connCallback = new MyAbilityConnection(); std::shared_ptr record = std::make_shared( abilityRecord->GetToken(), abilityRecord, connCallback, nullptr); diff --git a/test/unittest/connection_state_manager_test/connection_state_manager_test.cpp b/test/unittest/connection_state_manager_test/connection_state_manager_test.cpp index e9a548a4a4..5c852f90b4 100755 --- a/test/unittest/connection_state_manager_test/connection_state_manager_test.cpp +++ b/test/unittest/connection_state_manager_test/connection_state_manager_test.cpp @@ -18,7 +18,7 @@ #include "connection_state_manager.h" #undef private #include "ability_connection.h" -#include "ability_record.h" +#include "base_extension_record.h" #include "connection_observer_errors.h" #include "data_ability_record.h" #ifdef WITH_DLP @@ -38,7 +38,7 @@ public: void SetUp(); void TearDown(); std::shared_ptr manager_ {nullptr}; - std::shared_ptr abilityRecord_ {nullptr}; + std::shared_ptr abilityRecord_ {nullptr}; std::shared_ptr dataAbilityRecord_ {nullptr}; sptr callback_ {nullptr}; @@ -70,7 +70,7 @@ void ConnectionStateManagerTest::SetUp() AbilityInfo abilityInfo; ApplicationInfo applicationInfo; AbilityRequest abilityRequest; - abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); + abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); dataAbilityRecord_ = std::make_shared(abilityRequest); manager_ = std::make_shared(); callback_ = new AbilityConnectionMock(); diff --git a/test/unittest/extension_record_base_first_test/BUILD.gn b/test/unittest/extension_record_base_first_test/BUILD.gn new file mode 100644 index 0000000000..a704cd8e04 --- /dev/null +++ b/test/unittest/extension_record_base_first_test/BUILD.gn @@ -0,0 +1,99 @@ +# Copyright (c) 2025 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/test.gni") +import("//foundation/ability/ability_runtime/ability_runtime.gni") + +module_output_path = "ability_runtime/ability_runtime/abilitymgr" + +ohos_unittest("extension_record_base_first_test") { + module_out_path = module_output_path + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + blocklist = "../../cfi_blocklist.txt" + } + branch_protector_ret = "pac_ret" + include_dirs = [ + "${ability_runtime_services_path}/common/include", + "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit/include" + ] + + sources = [ + "${ability_runtime_services_path}/abilitymgr/src/lifecycle_deal.cpp", + "${ability_runtime_services_path}/abilitymgr/src/utils/uri_utils.cpp", + "extension_record_base_first_test.cpp", + ] + + configs = [ "${ability_runtime_services_path}/abilitymgr:abilityms_config" ] + cflags = [] + if (target_cpu == "arm") { + cflags += [ "-DBINDER_IPC_32BIT" ] + } + deps = [ + "${ability_runtime_innerkits_path}/ability_manager:ability_connect_callback_stub", + "${ability_runtime_innerkits_path}/ability_manager:ability_manager", + "${ability_runtime_native_path}/appkit:appkit_manager_helper", + "${ability_runtime_services_path}/abilitymgr:abilityms", + "${ability_runtime_services_path}/common:app_util", + "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", + ] + + external_deps = [ + "ability_base:configuration", + "ability_base:extractortool", + "ability_base:session_info", + "ability_base:want", + "access_token:libaccesstoken_sdk", + "access_token:libtokenid_sdk", + "c_utils:utils", + "common_event_service:cesfwk_innerkits", + "eventhandler:libeventhandler", + "ffrt:libffrt", + "googletest:gmock_main", + "googletest:gtest_main", + "hilog:libhilog", + "hisysevent:libhisysevent", + "hitrace:hitrace_meter", + "ipc:ipc_core", + "safwk:system_ability_fwk", + ] + + defines = [] + if (background_task_mgr_continuous_task_enable) { + external_deps += [ "background_task_mgr:bgtaskmgr_innerkits" ] + } + + if (ability_runtime_graphics) { + external_deps += [ "image_framework:image_native" ] + } + if (ability_runtime_upms) { + defines += [ "SUPPORT_UPMS" ] + configs += [ "${ability_runtime_innerkits_path}/uri_permission:uripermkit_public_config" ] + + deps += [ + "${ability_runtime_innerkits_path}/uri_permission:uri_permission_mgr", + ] + } + cflags_cc = [] + if (os_dlp_part_enabled) { + cflags_cc += [ "-DWITH_DLP" ] + } +} + +group("unittest") { + testonly = true + + deps = [ ":extension_record_base_first_test" ] +} diff --git a/test/unittest/extension_record_base_first_test/extension_record_base_first_test.cpp b/test/unittest/extension_record_base_first_test/extension_record_base_first_test.cpp new file mode 100644 index 0000000000..dc0e8a1fd5 --- /dev/null +++ b/test/unittest/extension_record_base_first_test/extension_record_base_first_test.cpp @@ -0,0 +1,411 @@ +/* + * Copyright (c) 2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include + +#define private public +#define protected public +#include "base_extension_record.h" +#include "lifecycle_deal.h" +#undef private +#undef protected +#include "ability_manager_service.h" +#include "ability_util.h" +#include "app_utils.h" +#include "connection_record.h" +#include "hilog_tag_wrapper.h" +#include "mock_ability_connect_callback.h" +#include "uri_utils.h" + +using namespace testing::ext; +using namespace OHOS::AppExecFwk; + +namespace OHOS { +namespace AAFwk { +namespace { +const std::string TEST_NATIVE_DEBUG = "nativeDebug"; +const std::string TEST_PERF_CMD = "perfCmd"; +const std::string TEST_MULTI_THREAD = "multiThread"; +const std::string TEST_ERROR_INFO_ENHANCE = "errorInfoEnhance"; +const std::string TEST_PARAMS_STREAM = "ability.params.stream"; +} + +class ExtensionRecordBaseFirstTest : public testing::Test { +public: + static void SetUpTestCase(void); + static void TearDownTestCase(void); + void SetUp(); + void TearDown(); + std::shared_ptr GetAbilityRecord(); + + std::shared_ptr abilityRecord_{ nullptr }; +}; + +void ExtensionRecordBaseFirstTest::SetUpTestCase(void) +{} + +void ExtensionRecordBaseFirstTest::TearDownTestCase(void) +{} + +void ExtensionRecordBaseFirstTest::SetUp(void) +{ + OHOS::AppExecFwk::AbilityInfo abilityInfo; + OHOS::AppExecFwk::ApplicationInfo applicationInfo; + Want want; + abilityRecord_ = std::make_shared(want, abilityInfo, applicationInfo); + abilityRecord_->Init(AbilityRequest()); +} + +void ExtensionRecordBaseFirstTest::TearDown(void) +{ + abilityRecord_.reset(); +} + +std::shared_ptr ExtensionRecordBaseFirstTest::GetAbilityRecord() +{ + Want want; + OHOS::AppExecFwk::AbilityInfo abilityInfo; + OHOS::AppExecFwk::ApplicationInfo applicationInfo; + return std::make_shared(want, abilityInfo, applicationInfo); +} + +/* +* Feature: BaseExtensionRecord +* Function: GetInProgressRecordCount +* SubFunction: NA +*/ +HWTEST_F(ExtensionRecordBaseFirstTest, ExtensionRecordBase_GetInProgressRecordCount_001, TestSize.Level1) +{ + TAG_LOGE(AAFwkTag::TEST, "AbilityRecord_GetInProgressRecordCount_001 start."); + std::shared_ptr abilityRecord = GetAbilityRecord(); + std::shared_ptr connections = nullptr; + abilityRecord->connRecordList_.push_back(connections); + auto res = abilityRecord->GetInProgressRecordCount(); + EXPECT_EQ(res, 0); + abilityRecord->connRecordList_.clear(); + OHOS::sptr callback = new AbilityConnectCallback(); + std::shared_ptr connection1 = + std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); + connection1->SetConnectState(ConnectionState::CONNECTING); + std::shared_ptr connection2 = + std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); + connection2->SetConnectState(ConnectionState::CONNECTED); + std::shared_ptr connection3 = + std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); + connection3->SetConnectState(ConnectionState::DISCONNECTING); + abilityRecord->connRecordList_.push_back(connection1); + abilityRecord->connRecordList_.push_back(connection2); + abilityRecord->connRecordList_.push_back(connection3); + res = abilityRecord->GetInProgressRecordCount(); + EXPECT_EQ(res, 2); + TAG_LOGE(AAFwkTag::TEST, "AbilityRecord_GetInProgressRecordCount_001 end."); +} + +/* + * Feature: BaseExtensionRecord + * Function: Add connection record to ability record' list + * SubFunction: NA + * FunctionPoints: AddConnectRecordToList + * EnvConditions: NA + * CaseDescription: AddConnectRecordToList UT. + */ +HWTEST_F(ExtensionRecordBaseFirstTest, AaFwk_AbilityMS_AddConnectRecordToList, TestSize.Level1) +{ + // test1 for input param is null + abilityRecord_->AddConnectRecordToList(nullptr); + auto connList = abilityRecord_->GetConnectRecordList(); + EXPECT_EQ(0, static_cast(connList.size())); + + // test2 for adding new connection record to empty list + OHOS::sptr callback1 = new AbilityConnectCallback(); + auto newConnRecord1 = + ConnectionRecord::CreateConnectionRecord(abilityRecord_->GetToken(), abilityRecord_, callback1, nullptr); + abilityRecord_->AddConnectRecordToList(newConnRecord1); + connList = abilityRecord_->GetConnectRecordList(); + EXPECT_EQ(1, static_cast(connList.size())); + + // test3 for adding new connection record to non-empty list + OHOS::sptr callback2 = new AbilityConnectCallback(); + auto newConnRecord2 = + ConnectionRecord::CreateConnectionRecord(abilityRecord_->GetToken(), abilityRecord_, callback2, nullptr); + abilityRecord_->AddConnectRecordToList(newConnRecord2); + connList = abilityRecord_->GetConnectRecordList(); + EXPECT_EQ(2, static_cast(connList.size())); + + // test4 for adding old connection record to non-empty list + abilityRecord_->AddConnectRecordToList(newConnRecord2); + connList = abilityRecord_->GetConnectRecordList(); + EXPECT_EQ(2, static_cast(connList.size())); + + // test5 for delete nullptr from list + abilityRecord_->RemoveConnectRecordFromList(nullptr); + connList = abilityRecord_->GetConnectRecordList(); + EXPECT_EQ(2, static_cast(connList.size())); + + // test6 for delete no-match member from list + auto newConnRecord3 = + ConnectionRecord::CreateConnectionRecord(abilityRecord_->GetToken(), abilityRecord_, callback2, nullptr); + abilityRecord_->RemoveConnectRecordFromList(newConnRecord3); + connList = abilityRecord_->GetConnectRecordList(); + EXPECT_EQ(2, static_cast(connList.size())); + + // test7 for delete match member from list + abilityRecord_->RemoveConnectRecordFromList(newConnRecord2); + connList = abilityRecord_->GetConnectRecordList(); + EXPECT_EQ(1, static_cast(connList.size())); + + // test8 for get ability unknown type + EXPECT_EQ(OHOS::AppExecFwk::AbilityType::UNKNOWN, abilityRecord_->GetAbilityInfo().type); +} + +/* + * Feature: BaseExtensionRecord + * Function: GetConnectingRecordList + * SubFunction: GetConnectingRecordList + * FunctionPoints: NA + * EnvConditions: NA + * CaseDescription: Verify AbilityRecord GetConnectingRecordList + */ +HWTEST_F(ExtensionRecordBaseFirstTest, AbilityRecord_GetConnectingRecordList_001, TestSize.Level1) +{ + std::shared_ptr abilityRecord = GetAbilityRecord(); + EXPECT_NE(abilityRecord, nullptr); + OHOS::sptr callback = new AbilityConnectCallback(); + std::shared_ptr connection1 = + std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); + std::shared_ptr connection2 = + std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); + connection1->SetConnectState(ConnectionState::CONNECTING); + connection2->SetConnectState(ConnectionState::CONNECTED); + abilityRecord->connRecordList_.push_back(connection1); + abilityRecord->connRecordList_.push_back(connection2); + abilityRecord->GetConnectingRecordList(); +} + +/* + * Feature: BaseExtensionRecord + * Function: DumpService + * SubFunction: DumpService + * FunctionPoints: NA + * EnvConditions: NA + * CaseDescription: Verify AbilityRecord DumpService + */ +HWTEST_F(ExtensionRecordBaseFirstTest, AbilityRecord_DumpService_001, TestSize.Level1) +{ + std::shared_ptr abilityRecord = GetAbilityRecord(); + EXPECT_NE(abilityRecord, nullptr); + std::vector info; + std::vector params; + bool isClient = false; + OHOS::sptr callback = new AbilityConnectCallback(); + std::shared_ptr connection = + std::make_shared(abilityRecord->GetToken(), abilityRecord, callback, nullptr); + abilityRecord->isLauncherRoot_ = true; + abilityRecord->connRecordList_.push_back(nullptr); + abilityRecord->connRecordList_.push_back(connection); + abilityRecord->DumpService(info, params, isClient); +} + +/* + * Feature: BaseExtensionRecord + * Function: DisconnectAbility + * SubFunction: DisconnectAbility + * FunctionPoints: NA + * EnvConditions: NA + * CaseDescription: Verify AbilityRecord DisconnectAbility + */ +HWTEST_F(ExtensionRecordBaseFirstTest, AbilityRecord_DisconnectAbility_001, TestSize.Level1) +{ + std::shared_ptr abilityRecord = GetAbilityRecord(); + abilityRecord->lifecycleDeal_ = std::make_unique(); + abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::UI_SERVICE; + abilityRecord->connRecordList_.clear(); + abilityRecord->isConnected = true; + abilityRecord->DisconnectAbility(); + EXPECT_FALSE(abilityRecord->isConnected); +} + +/* + * Feature: BaseExtensionRecord + * Function: DisconnectAbilityWithWant + * SubFunction: DisconnectAbilityWithWant + * FunctionPoints: NA + * EnvConditions: NA + * CaseDescription: Verify AbilityRecord DisconnectAbilityWithWant + */ +HWTEST_F(ExtensionRecordBaseFirstTest, AbilityRecord_DisconnectAbilityWithWant_001, TestSize.Level1) +{ + std::shared_ptr abilityRecord = GetAbilityRecord(); + abilityRecord->abilityInfo_.name = "test"; + abilityRecord->lifecycleDeal_ = std::make_unique(); + abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::UI_SERVICE; + abilityRecord->connRecordList_.clear(); + abilityRecord->isConnected = true; + + Want want; + abilityRecord->DisconnectAbilityWithWant(want); + EXPECT_FALSE(abilityRecord->isConnected); +} + +/* + * Feature: BaseExtensionRecord + * Function: DumpService + * SubFunction: DumpService + * FunctionPoints: NA + * EnvConditions: NA + * CaseDescription: Verify AbilityRecord DumpService + */ +HWTEST_F(ExtensionRecordBaseFirstTest, AbilityRecord_DumpService_002, TestSize.Level1) +{ + std::shared_ptr abilityRecord = GetAbilityRecord(); + std::vector info; + std::vector params; + abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::HMS_ACCOUNT; + abilityRecord->scheduler_ = nullptr; + abilityRecord->isReady_ = false; + abilityRecord->isLauncherRoot_ = false; + abilityRecord->token_ = nullptr; + abilityRecord->connRecordList_.clear(); + abilityRecord->DumpService(info, params, false); + EXPECT_TRUE(info.size() == 8); +} + +/* + * Feature: BaseExtensionRecord + * Function: DumpService + * SubFunction: DumpService + * FunctionPoints: NA + * EnvConditions: NA + * CaseDescription: Verify BaseExtensionRecord DumpService + */ +HWTEST_F(ExtensionRecordBaseFirstTest, AbilityRecord_DumpService_003, TestSize.Level1) +{ + std::shared_ptr abilityRecord = GetAbilityRecord(); + std::vector info; + std::vector params; + abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::UI_SERVICE; + abilityRecord->scheduler_ = nullptr; + abilityRecord->isReady_ = false; + abilityRecord->isLauncherRoot_ = false; + abilityRecord->token_ = nullptr; + abilityRecord->connRecordList_.clear(); + abilityRecord->DumpService(info, params, false); + EXPECT_TRUE(info.size() == 9); +} + +/* + * Feature: BaseExtensionRecord + * Function: SetConnRemoteObject GetConnRemoteObject + * SubFunction: SetConnRemoteObject GetConnRemoteObject + * FunctionPoints: NA + * EnvConditions: NA + * CaseDescription: Verify SetConnRemoteObject GetConnRemoteObject UT + */ +HWTEST_F(ExtensionRecordBaseFirstTest, AaFwk_AbilityMS_ConnRemoteObject, TestSize.Level1) +{ + OHOS::sptr remote; + abilityRecord_->SetConnRemoteObject(remote); + EXPECT_EQ(remote, abilityRecord_->GetConnRemoteObject()); +} + +/* + * Feature: BaseExtensionRecord + * Function: DumpUIExtensionRootHostInfo + * SubFunction: DumpUIExtensionRootHostInfo + * FunctionPoints: NA + * EnvConditions: NA + * CaseDescription: Verify DumpUIExtensionRootHostInfo + */ +HWTEST_F(ExtensionRecordBaseFirstTest, AbilityRecord_DumpUIExtensionRootHostInfo_001, TestSize.Level1) +{ + std::shared_ptr abilityRecord = GetAbilityRecord(); + std::vector info; + abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::SYSDIALOG_COMMON; + abilityRecord->token_ = nullptr; + abilityRecord->DumpUIExtensionRootHostInfo(info); + EXPECT_TRUE(info.size() == 0); +} + +/* + * Feature: BaseExtensionRecord + * Function: DumpUIExtensionRootHostInfo + * SubFunction: DumpUIExtensionRootHostInfo + * FunctionPoints: NA + * EnvConditions: NA + * CaseDescription: Verify DumpUIExtensionRootHostInfo + */ +HWTEST_F(ExtensionRecordBaseFirstTest, AbilityRecord_DumpUIExtensionRootHostInfo_002, TestSize.Level1) +{ + std::shared_ptr abilityRecord = GetAbilityRecord(); + std::vector info; + abilityRecord->abilityInfo_.extensionAbilityType = AppExecFwk::ExtensionAbilityType::SYSDIALOG_COMMON; + abilityRecord->token_ = sptr::MakeSptr(abilityRecord); + abilityRecord->DumpUIExtensionRootHostInfo(info); + EXPECT_TRUE(info.size() == 0); +} + +/* + * Feature: BaseExtensionRecord + * Function: DumpUIExtensionPid + * SubFunction: DumpUIExtensionPid + * FunctionPoints: NA + * EnvConditions: NA + * CaseDescription: Verify AbilityRecord DumpUIExtensionPid + */ +HWTEST_F(ExtensionRecordBaseFirstTest, AbilityRecord_DumpUIExtensionPid_001, TestSize.Level1) +{ + std::shared_ptr abilityRecord = GetAbilityRecord(); + std::vector info; + abilityRecord->DumpUIExtensionPid(info, true); + EXPECT_TRUE(info.size() == 1); +} + +/* + * Feature: BaseExtensionRecord + * Function: ConnectAbility + * SubFunction: ConnectAbility + * FunctionPoints: NA + * EnvConditions: NA + * CaseDescription: Verify BaseExtensionRecord ConnectAbility + */ +HWTEST_F(ExtensionRecordBaseFirstTest, AbilityRecord_ConnectAbility_001, TestSize.Level1) +{ + std::shared_ptr abilityRecord = GetAbilityRecord(); + abilityRecord->lifecycleDeal_ = nullptr; + abilityRecord->lifecycleDeal_ = std::make_unique(); + bool isConnected = true; + abilityRecord->ConnectAbility(); + EXPECT_NE(abilityRecord, nullptr); +} + +/* + * Feature: BaseExtensionRecord + * Function: PostUIExtensionAbilityTimeoutTask + * SubFunction: PostUIExtensionAbilityTimeoutTask + * FunctionPoints: NA + * EnvConditions: NA + * CaseDescription: Verify BaseExtensionRecord PostUIExtensionAbilityTimeoutTask + */ +HWTEST_F(ExtensionRecordBaseFirstTest, AbilityRecord_PostUIExtensionAbilityTimeoutTask_001, TestSize.Level1) +{ + std::shared_ptr abilityRecord = GetAbilityRecord(); + ASSERT_NE(abilityRecord, nullptr); + abilityRecord->PostUIExtensionAbilityTimeoutTask(AbilityManagerService::LOAD_TIMEOUT_MSG); + abilityRecord->PostUIExtensionAbilityTimeoutTask(AbilityManagerService::FOREGROUND_TIMEOUT_MSG); + abilityRecord->PostUIExtensionAbilityTimeoutTask(AbilityManagerService::BACKGROUND_TIMEOUT_MSG); + EXPECT_TRUE(abilityRecord != nullptr); +} +} // namespace AAFwk +} // namespace OHOS diff --git a/test/unittest/extension_record_test/extension_record_test.cpp b/test/unittest/extension_record_test/extension_record_test.cpp index 3e5e7a44ba..74ef7aac89 100644 --- a/test/unittest/extension_record_test/extension_record_test.cpp +++ b/test/unittest/extension_record_test/extension_record_test.cpp @@ -80,7 +80,8 @@ HWTEST_F(ExtensionRecordTest, UnloadUIExtensionAbility_001, TestSize.Level1) abilityRequest.appInfo.bundleName = "com.example.fuzzTest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AbilityType::DATA; - std::shared_ptr abilityRecord = AbilityRecord::CreateAbilityRecord(abilityRequest); + std::shared_ptr abilityRecord = BaseExtensionRecord::CreateBaseExtensionRecord( + abilityRequest); auto Info = std::make_shared(abilityRecord); Info->hostBundleName_ = "ExtensionRecordTest"; Info->UnloadUIExtensionAbility(); diff --git a/test/unittest/preload_uiext_state_observer_test/preload_uiext_state_observer_test.cpp b/test/unittest/preload_uiext_state_observer_test/preload_uiext_state_observer_test.cpp index 73c1ac97f4..8cc7520e04 100644 --- a/test/unittest/preload_uiext_state_observer_test/preload_uiext_state_observer_test.cpp +++ b/test/unittest/preload_uiext_state_observer_test/preload_uiext_state_observer_test.cpp @@ -60,8 +60,8 @@ HWTEST_F(PreloadUIextStateObserverTest, OnProcessDied_001, Function | MediumTest Want want; AppExecFwk::AbilityInfo abilityInfo; AppExecFwk::ApplicationInfo applicationInfo; - std::shared_ptr abilityRecord = - std::make_shared(want, abilityInfo, applicationInfo); + std::shared_ptr abilityRecord = + std::make_shared(want, abilityInfo, applicationInfo); auto extensionRecordSharedPtr = std::make_shared(abilityRecord); auto hostPid = extensionRecordSharedPtr->hostPid_ = 10; std::weak_ptr extensionRecord = extensionRecordSharedPtr; @@ -124,8 +124,8 @@ HWTEST_F(PreloadUIextStateObserverTest, OnAppCacheStateChanged_002, Function | M Want want; AppExecFwk::AbilityInfo abilityInfo; AppExecFwk::ApplicationInfo applicationInfo; - std::shared_ptr abilityRecord = - std::make_shared(want, abilityInfo, applicationInfo); + std::shared_ptr abilityRecord = + std::make_shared(want, abilityInfo, applicationInfo); auto extensionRecordSharedPtr = std::make_shared(abilityRecord); auto hostPid = extensionRecordSharedPtr->hostPid_ = 10; std::weak_ptr extensionRecord = extensionRecordSharedPtr; @@ -151,8 +151,8 @@ HWTEST_F(PreloadUIextStateObserverTest, OnAppCacheStateChanged_003, Function | M Want want; AppExecFwk::AbilityInfo abilityInfo; AppExecFwk::ApplicationInfo applicationInfo; - std::shared_ptr abilityRecord = - std::make_shared(want, abilityInfo, applicationInfo); + std::shared_ptr abilityRecord = + std::make_shared(want, abilityInfo, applicationInfo); auto extensionRecordSharedPtr = std::make_shared(abilityRecord); std::weak_ptr extensionRecord = extensionRecordSharedPtr; PreLoadUIExtStateObserver preLoadUIExtStateObserver(extensionRecord); diff --git a/test/unittest/ui_extension/extension_record_manager_second_test/extension_record_manager_second_test.cpp b/test/unittest/ui_extension/extension_record_manager_second_test/extension_record_manager_second_test.cpp index 3333032093..c819145dba 100644 --- a/test/unittest/ui_extension/extension_record_manager_second_test/extension_record_manager_second_test.cpp +++ b/test/unittest/ui_extension/extension_record_manager_second_test/extension_record_manager_second_test.cpp @@ -83,7 +83,7 @@ HWTEST_F(ExtensionRecordManagerSecondTest, RemovePreloadUIExtensionRecord_0100, abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); auto extRecord = std::make_shared(abilityRecord); v_ExtensionRecord.push_back(extRecord); @@ -107,7 +107,7 @@ HWTEST_F(ExtensionRecordManagerSecondTest, GetRootCallerTokenLocked_0100, TestSi abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); EXPECT_EQ(extRecordMgr->GetRootCallerTokenLocked(extensionRecordId, abilityRecord), nullptr); std::shared_ptr extRecord = nullptr; @@ -150,7 +150,7 @@ HWTEST_F(ExtensionRecordManagerSecondTest, GetUIExtensionSessionInfo_0100, TestS abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); token = abilityRecord->GetToken(); EXPECT_EQ(extRecordMgr->GetUIExtensionSessionInfo(token, uiExtensionSessionInfo), ERR_INVALID_VALUE); @@ -183,7 +183,7 @@ HWTEST_F(ExtensionRecordManagerSecondTest, CreateExtensionRecord_0100, TestSize. abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; abilityRequest.abilityInfo.extensionAbilityType = AppExecFwk::ExtensionAbilityType::SHARE; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); extensionRecord = std::make_shared(abilityRecord); EXPECT_EQ(extRecordMgr->CreateExtensionRecord( abilityRequest, hostBundleName, extensionRecord, extensionRecordId), ERR_OK); @@ -231,7 +231,7 @@ HWTEST_F(ExtensionRecordManagerSecondTest, RemovePreloadUIExtensionRecordById_01 abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); auto extRecord = std::make_shared(abilityRecord); extRecord->extensionRecordId_ = 0; @@ -322,7 +322,7 @@ HWTEST_F(ExtensionRecordManagerSecondTest, RemovePreloadUIExtensionRecordById_03 abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); auto extensionRecord = std::make_shared(abilityRecord); extensionRecord->extensionRecordId_ = extensionRecordId; @@ -360,7 +360,7 @@ HWTEST_F(ExtensionRecordManagerSecondTest, RemovePreloadUIExtensionRecordById_04 abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); auto extensionRecord = std::make_shared(abilityRecord); extensionRecord->extensionRecordId_ = extensionRecordId; @@ -401,7 +401,7 @@ HWTEST_F(ExtensionRecordManagerSecondTest, RemovePreloadUIExtensionRecordById_05 abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); auto extensionRecord = std::make_shared(abilityRecord); extensionRecord->extensionRecordId_ = extensionRecordId; @@ -455,7 +455,7 @@ HWTEST_F(ExtensionRecordManagerSecondTest, GetRootCallerTokenLocked_0200, TestSi abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); extRecordMgr->extensionRecords_.clear(); @@ -510,7 +510,7 @@ HWTEST_F(ExtensionRecordManagerSecondTest, GetExtensionRecordById_0100, TestSize abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); auto extensionRecord = std::make_shared(abilityRecord); @@ -540,7 +540,7 @@ HWTEST_F(ExtensionRecordManagerSecondTest, GetExtensionRecordById_0200, TestSize abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); auto extensionRecord = std::make_shared(abilityRecord); extensionRecord->extensionRecordId_ = extensionRecordId; @@ -567,7 +567,7 @@ HWTEST_F(ExtensionRecordManagerSecondTest, GetExtensionRecordById_0300, TestSize abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); auto extensionRecord = std::make_shared(abilityRecord); extensionRecord->extensionRecordId_ = extensionRecordId; @@ -680,7 +680,7 @@ HWTEST_F(ExtensionRecordManagerSecondTest, QueryPreLoadUIExtensionRecord_0400, T abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); auto extensionRecord = std::make_shared(abilityRecord); extRecordMgr->preloadUIExtensionMap_ = { @@ -712,7 +712,7 @@ HWTEST_F(ExtensionRecordManagerSecondTest, GetOrCreateExtensionRecordInner_0100, abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; abilityRequest.abilityInfo.extensionAbilityType = static_cast(1000); - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); std::shared_ptr extRecord = std::make_shared(abilityRecord); auto extRecordMgr = std::make_shared(0); @@ -744,7 +744,7 @@ HWTEST_F(ExtensionRecordManagerSecondTest, GetOrCreateExtensionRecordInner_0200, abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; abilityRequest.extensionType = AppExecFwk::ExtensionAbilityType::STATUS_BAR_VIEW; abilityRequest.abilityInfo.extensionAbilityType = AppExecFwk::ExtensionAbilityType::STATUS_BAR_VIEW; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); std::shared_ptr extRecord = std::make_shared(abilityRecord); auto extRecordMgr = std::make_shared(0); @@ -771,7 +771,7 @@ HWTEST_F(ExtensionRecordManagerSecondTest, GetHostBundleNameForExtensionId_0200, abilityRequest.appInfo.bundleName = bundleName; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); std::shared_ptr extRecord = std::make_shared(abilityRecord); auto extRecordMgr = std::make_shared(0); diff --git a/test/unittest/ui_extension/extension_record_manager_test/extension_record_manager_test.cpp b/test/unittest/ui_extension/extension_record_manager_test/extension_record_manager_test.cpp index 17508bf876..cdcbd58ef5 100755 --- a/test/unittest/ui_extension/extension_record_manager_test/extension_record_manager_test.cpp +++ b/test/unittest/ui_extension/extension_record_manager_test/extension_record_manager_test.cpp @@ -18,6 +18,7 @@ #include "hilog_tag_wrapper.h" #include "ability_manager_client.h" #include "ability_record.h" +#include "base_extension_record.h" #include "extension_record.h" #include "extension_record_factory.h" #define private public @@ -109,7 +110,7 @@ HWTEST_F(ExtensionRecordManagerTest, IsFocused_0100, TestSize.Level1) abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); auto extRecord = std::make_shared(abilityRecord); int32_t extensionRecordId = 1; @@ -143,7 +144,7 @@ HWTEST_F(ExtensionRecordManagerTest, GetCallerTokenList_0100, TestSize.Level1) abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); auto extRecord = std::make_shared(abilityRecord); ASSERT_NE(extRecord, nullptr); @@ -198,7 +199,7 @@ HWTEST_F(ExtensionRecordManagerTest, AddExtensionRecord_0100, TestSize.Level1) abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); auto extRecord = std::make_shared(abilityRecord); int32_t extensionRecordId = 5; @@ -232,7 +233,7 @@ HWTEST_F(ExtensionRecordManagerTest, GetActiveUIExtensionList_0100, TestSize.Lev abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); auto extRecord = std::make_shared(abilityRecord); int32_t extensionRecordId = 5; @@ -262,7 +263,7 @@ HWTEST_F(ExtensionRecordManagerTest, GetAbilityRecordBySessionInfo_0100, TestSiz sptr sessionInfo(new AAFwk::SessionInfo()); sessionInfo->uiExtensionComponentId = 10; abilityRequest.sessionInfo = sessionInfo; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); auto extRecord = std::make_shared(abilityRecord); int32_t extensionRecordId = 5; @@ -283,7 +284,7 @@ HWTEST_F(ExtensionRecordManagerTest, GetAbilityRecordBySessionInfo_0100, TestSiz extRecordMgr->GetAbilityRecordBySessionInfo(sessionParam); AAFwk::AbilityRequest abilityRequest2; - auto abilityRecord2 = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord2 = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); bool bLoaded = false; std::string bundleName = ""; extRecordMgr->GetOrCreateExtensionRecord(abilityRequest, bundleName, abilityRecord2, bLoaded); @@ -308,7 +309,7 @@ HWTEST_F(ExtensionRecordManagerTest, AddPreloadUIExtensionRecord_0100, TestSize. abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); @@ -339,7 +340,7 @@ HWTEST_F(ExtensionRecordManagerTest, CreateExtensionRecord_0100, TestSize.Level1 abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; abilityRequest.abilityInfo.extensionAbilityType = AppExecFwk::ExtensionAbilityType::UNSPECIFIED; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); std::string bundleName = "com.example.unittest"; @@ -360,7 +361,7 @@ HWTEST_F(ExtensionRecordManagerTest, IsHostSpecifiedProcessValid_0100, TestSize. { auto extRecordMgr = std::make_shared(0); AAFwk::AbilityRequest abilityRequest; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); std::shared_ptr extRecord = std::make_shared(abilityRecord); std::string process = "testProcess"; @@ -387,7 +388,7 @@ HWTEST_F(ExtensionRecordManagerTest, IsHostSpecifiedProcessValid_0200, TestSize. AAFwk::AbilityRequest abilityRequest; abilityRequest.abilityInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); std::shared_ptr extRecord = std::make_shared(abilityRecord); std::string process = "testProcess"; @@ -420,7 +421,7 @@ HWTEST_F(ExtensionRecordManagerTest, UpdateProcessName_0100, TestSize.Level1) AAFwk::AbilityRequest abilityRequest; abilityRequest.abilityInfo.bundleName = "testBundleName"; abilityRequest.abilityInfo.name = "testInfoName"; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); std::shared_ptr extRecord = std::make_shared(abilityRecord); int32_t result = extRecordMgr->UpdateProcessName(abilityRequest, extRecord); @@ -479,7 +480,7 @@ HWTEST_F(ExtensionRecordManagerTest, IsPreloadExtensionRecord_0100, TestSize.Lev { auto extRecordMgr = std::make_shared(0); AAFwk::AbilityRequest abilityRequest; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); std::shared_ptr extRecord = std::make_shared(abilityRecord); std::string hostBundleName = "testHostBundleName"; bool isLoaded = false; @@ -540,7 +541,7 @@ HWTEST_F(ExtensionRecordManagerTest, GetOrCreateExtensionRecord_0100, TestSize.L abilityRequest.sessionInfo->uiExtensionComponentId = 0; auto extRecordMgr = std::make_shared(0); - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); std::shared_ptr extRecord = std::make_shared(abilityRecord); extRecord->abilityRecord_ = abilityRecord; @@ -577,7 +578,7 @@ HWTEST_F(ExtensionRecordManagerTest, GetOrCreateExtensionRecord_0200, TestSize.L abilityRequest.sessionInfo = sptr::MakeSptr(); abilityRequest.sessionInfo->uiExtensionComponentId = 0; std::string hostBundleName = "testHostBundleName"; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); bool isLoaded = false; auto extRecordMgr = std::make_shared(0); auto ret = extRecordMgr->GetOrCreateExtensionRecord(abilityRequest, @@ -632,7 +633,7 @@ HWTEST_F(ExtensionRecordManagerTest, GetUIExtensionSessionInfo_0300, TestSize.Le abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; abilityRequest.abilityInfo.extensionAbilityType = AppExecFwk::ExtensionAbilityType::UNSPECIFIED; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); auto extRecord = std::make_shared(abilityRecord); int32_t extensionRecordId = 1; @@ -662,7 +663,7 @@ HWTEST_F(ExtensionRecordManagerTest, GetUIExtensionSessionInfo_0400, TestSize.Le abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; abilityRequest.abilityInfo.extensionAbilityType = AppExecFwk::ExtensionAbilityType::SYSDIALOG_COMMON; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); auto extRecord = std::make_shared(abilityRecord); int32_t extensionRecordId = 1; @@ -697,7 +698,7 @@ HWTEST_F(ExtensionRecordManagerTest, GetUIExtensionSessionInfo_0500, TestSize.Le std::string abilityName = "testAbilityName"; std::string moduleName = "testModuleName"; abilityRequest.want.SetElementName(deviceId, bundleName, abilityName, moduleName); - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); auto extRecord = std::make_shared(abilityRecord); int32_t extensionRecordId = 1; @@ -739,7 +740,7 @@ HWTEST_F(ExtensionRecordManagerTest, GetUIExtensionSessionInfo_0600, TestSize.Le std::string abilityName = "testAbilityName"; std::string moduleName = "testModuleName"; abilityRequest.want.SetElementName(deviceId, bundleName, abilityName, moduleName); - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); ASSERT_NE(abilityRecord, nullptr); auto extRecord = std::make_shared(abilityRecord); int32_t extensionRecordId = 1; @@ -757,7 +758,7 @@ HWTEST_F(ExtensionRecordManagerTest, GetUIExtensionSessionInfo_0600, TestSize.Le std::string callerAbilityName = "testAbilityName"; std::string callerModuleName = "testModuleName"; callerAbilityRequest.want.SetElementName(callerDeviceId, callerBundleName, callerAbilityName, callerModuleName); - auto callerAbilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(callerAbilityRequest); + auto callerAbilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(callerAbilityRequest); ASSERT_NE(callerAbilityRecord, nullptr); auto callerExtRecord = std::make_shared(callerAbilityRecord); int32_t callerExtensionRecordId = 2; @@ -811,7 +812,7 @@ HWTEST_F(ExtensionRecordManagerTest, GetRemoteCallback_0200, TestSize.Level1) abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); auto extRecord = std::make_shared(abilityRecord); extRecord->hostPid_ = 0; @@ -837,7 +838,7 @@ HWTEST_F(ExtensionRecordManagerTest, GetRemoteCallback_0300, TestSize.Level1) abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); auto extRecord = std::make_shared(abilityRecord); extRecord->hostPid_ = 9999; @@ -864,7 +865,7 @@ HWTEST_F(ExtensionRecordManagerTest, GetRemoteCallback_0400, TestSize.Level1) abilityRequest.appInfo.bundleName = "com.example.unittest"; abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); auto extRecord = std::make_shared(abilityRecord); int32_t testPid = 1001; @@ -898,7 +899,7 @@ HWTEST_F(ExtensionRecordManagerTest, HandlePreloadUIExtensionLoadedById_0300, Te abilityRequest.appInfo.bundleName = "com.test"; abilityRequest.abilityInfo.name = "TestAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); auto extRecord = std::make_shared(abilityRecord); int32_t recordId = 200; @@ -933,7 +934,7 @@ HWTEST_F(ExtensionRecordManagerTest, HandlePreloadUIExtensionDestroyedById_0200, abilityRequest.appInfo.bundleName = "com.test.destroy"; abilityRequest.abilityInfo.name = "DestroyAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); auto extRecord = std::make_shared(abilityRecord); int32_t recordId = 300; @@ -1075,7 +1076,7 @@ HWTEST_F(ExtensionRecordManagerTest, HandlePreloadUIExtensionSuccess_0200, TestS abilityRequest.appInfo.bundleName = "com.test.success"; abilityRequest.abilityInfo.name = "SuccessAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); auto extRecord = std::make_shared(abilityRecord); int32_t recordId = 400; @@ -1117,7 +1118,7 @@ HWTEST_F(ExtensionRecordManagerTest, HandlePreloadUIExtensionSuccess_0300, TestS abilityRequest.appInfo.bundleName = "com.test.fail"; abilityRequest.abilityInfo.name = "FailAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); auto extRecord = std::make_shared(abilityRecord); int32_t recordId = 500; @@ -1197,7 +1198,7 @@ HWTEST_F(ExtensionRecordManagerTest, ClearPreloadedUIExtensionAbility_0300, Test AAFwk::AbilityRequest abilityRequest; abilityRequest.appInfo.bundleName = "com.test"; abilityRequest.abilityInfo.name = "TestAbility"; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); auto extRecord = std::make_shared(abilityRecord); int32_t currentPid = IPCSkeleton::GetCallingPid(); @@ -1213,7 +1214,7 @@ HWTEST_F(ExtensionRecordManagerTest, ClearPreloadedUIExtensionAbility_0300, Test /** * @tc.name: ClearPreloadedUIExtensionAbility_0400 - * @tc.desc: Test AbilityRecord is null inside ExtensionRecord. + * @tc.desc: Test BaseExtensionRecord is null inside ExtensionRecord. * Expected: ERR_INVALID_VALUE * @tc.type: FUNC */ @@ -1225,7 +1226,7 @@ HWTEST_F(ExtensionRecordManagerTest, ClearPreloadedUIExtensionAbility_0400, Test AAFwk::AbilityRequest abilityRequest; abilityRequest.appInfo.bundleName = "com.test"; abilityRequest.abilityInfo.name = "TestAbility"; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); auto extRecord = std::make_shared(abilityRecord); extRecord->abilityRecord_ = nullptr; @@ -1258,7 +1259,7 @@ HWTEST_F(ExtensionRecordManagerTest, ClearPreloadedUIExtensionAbility_0500, Test abilityRequest.appInfo.bundleName = "com.test.fail"; abilityRequest.abilityInfo.name = "FailAbility"; abilityRequest.abilityInfo.moduleName = "entry"; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); auto extRecord = std::make_shared(abilityRecord); extRecord->hostPid_ = IPCSkeleton::GetCallingPid(); @@ -1285,7 +1286,7 @@ HWTEST_F(ExtensionRecordManagerTest, ConvertToUnloadExtensionRecords0100, TestSi AAFwk::AbilityRequest request; request.abilityInfo.name = "CoverageTest"; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(request); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(request); auto validRecord = std::make_shared(abilityRecord); std::vector> sourceRecords; sourceRecords.push_back(validRecord); @@ -1311,7 +1312,7 @@ HWTEST_F(ExtensionRecordManagerTest, UpdateProcessName_0800, TestSize.Level1) AAFwk::AbilityRequest abilityRequest; abilityRequest.abilityInfo.bundleName = "testBundleName"; abilityRequest.abilityInfo.name = "testInfoName"; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); std::shared_ptr extRecord = std::make_shared(abilityRecord); extRecord->processMode_ = PROCESS_MODE_HOST_SPECIFIED; diff --git a/test/unittest/ui_extension_record_factory_test/ui_extension_record_factory_test.cpp b/test/unittest/ui_extension_record_factory_test/ui_extension_record_factory_test.cpp index 350261ed14..1e45968298 100644 --- a/test/unittest/ui_extension_record_factory_test/ui_extension_record_factory_test.cpp +++ b/test/unittest/ui_extension_record_factory_test/ui_extension_record_factory_test.cpp @@ -183,7 +183,7 @@ HWTEST_F(UIExtensionRecordFactoryTest, CreateRecord_0100, TestSize.Level1) auto sessionInfo = MockSessionInfo(1); abilityRequest.sessionInfo = sessionInfo; abilityRequest.sessionInfo->want.SetParam(UIEXTENSION_ABILITY_ID, 0); - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); auto extensionRecord = std::make_shared(abilityRecord); int32_t result = info.CreateRecord(abilityRequest, extensionRecord); EXPECT_EQ(result, ERR_OK); @@ -204,7 +204,7 @@ HWTEST_F(UIExtensionRecordFactoryTest, CreateRecord_0200, TestSize.Level1) auto sessionInfo = MockSessionInfo(1); abilityRequest.sessionInfo = sessionInfo; - std::shared_ptr abilityRecord = nullptr; + std::shared_ptr abilityRecord = nullptr; OHOS::sptr token = new OHOS::AAFwk::Token(abilityRecord); abilityRequest.sessionInfo->callerToken = token; auto result = info.CreateRecord(abilityRequest, extensionRecord); @@ -354,7 +354,7 @@ HWTEST_F(UIExtensionRecordFactoryTest, CreateDebugRecord_0200, TestSize.Level1) std::string bundleName = "com.ix.hiservcie"; std::string moduleName = "entry"; abilityRequest = GenerateAbilityRequest(deviceName, abilityName, appName, bundleName, moduleName); - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); OHOS::sptr token = new OHOS::AAFwk::Token(abilityRecord); abilityRequest.callerToken = token; EXPECT_NO_THROW(info.CreateDebugRecord(abilityRequest, abilityRecord)); @@ -375,7 +375,7 @@ HWTEST_F(UIExtensionRecordFactoryTest, CreateDebugRecord_0300, TestSize.Level1) std::string bundleName = "com.ix.hiservcie"; std::string moduleName = "entry"; abilityRequest = GenerateAbilityRequest(deviceName, abilityName, appName, bundleName, moduleName); - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); EXPECT_NO_THROW(info.CreateDebugRecord(abilityRequest, abilityRecord)); } } diff --git a/test/unittest/ui_extension_record_test/ui_extension_record_test.cpp b/test/unittest/ui_extension_record_test/ui_extension_record_test.cpp index 5638405338..091c697353 100644 --- a/test/unittest/ui_extension_record_test/ui_extension_record_test.cpp +++ b/test/unittest/ui_extension_record_test/ui_extension_record_test.cpp @@ -52,7 +52,7 @@ void UIExtensionRecordTest::TearDown() */ HWTEST_F(UIExtensionRecordTest, Update_0100, TestSize.Level0) { - std::shared_ptr abilityRecord = nullptr; + std::shared_ptr abilityRecord = nullptr; auto extRecord = std::make_shared(abilityRecord); AAFwk::AbilityRequest abilityRequest; extRecord->Update(abilityRequest); @@ -71,7 +71,7 @@ HWTEST_F(UIExtensionRecordTest, Update_0200, TestSize.Level0) abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - auto abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + auto abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); auto extRecord = std::make_shared(abilityRecord); extRecord->Update(abilityRequest); EXPECT_NE(abilityRecord, nullptr); @@ -84,7 +84,7 @@ HWTEST_F(UIExtensionRecordTest, Update_0200, TestSize.Level0) */ HWTEST_F(UIExtensionRecordTest, HandleNotifyUIExtensionTimeout_0300, TestSize.Level1) { - std::shared_ptr abilityRecord = nullptr; + std::shared_ptr abilityRecord = nullptr; auto extRecord = std::make_shared(abilityRecord); extRecord->HandleNotifyUIExtensionTimeout(AbilityRuntime::UIExtensionRecord::TERMINATE_TIMEOUT); EXPECT_EQ(abilityRecord, nullptr); @@ -94,7 +94,7 @@ HWTEST_F(UIExtensionRecordTest, HandleNotifyUIExtensionTimeout_0300, TestSize.Le abilityRequest.abilityInfo.name = "MainAbility"; abilityRequest.abilityInfo.type = AppExecFwk::AbilityType::EXTENSION; - abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); extRecord = std::make_shared(abilityRecord); extRecord->HandleNotifyUIExtensionTimeout(AbilityRuntime::UIExtensionRecord::TERMINATE_TIMEOUT); EXPECT_NE(extRecord->abilityRecord_, nullptr); @@ -103,7 +103,7 @@ HWTEST_F(UIExtensionRecordTest, HandleNotifyUIExtensionTimeout_0300, TestSize.Le sessionInfo->uiExtensionComponentId = 10; sessionInfo->sessionToken = nullptr; abilityRequest.sessionInfo = sessionInfo; - abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); extRecord = std::make_shared(abilityRecord); extRecord->HandleNotifyUIExtensionTimeout(AbilityRuntime::UIExtensionRecord::TERMINATE_TIMEOUT); EXPECT_NE(extRecord->abilityRecord_->GetSessionInfo(), nullptr); @@ -111,7 +111,7 @@ HWTEST_F(UIExtensionRecordTest, HandleNotifyUIExtensionTimeout_0300, TestSize.Le Rosen::SessionInfo info; sessionInfo->sessionToken = new Rosen::Session(info); abilityRequest.sessionInfo = sessionInfo; - abilityRecord = AAFwk::AbilityRecord::CreateAbilityRecord(abilityRequest); + abilityRecord = AAFwk::BaseExtensionRecord::CreateBaseExtensionRecord(abilityRequest); extRecord = std::make_shared(abilityRecord); extRecord->HandleNotifyUIExtensionTimeout(AbilityRuntime::UIExtensionRecord::TERMINATE_TIMEOUT); EXPECT_NE(sessionInfo->sessionToken, nullptr);