diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/ams_mgr_interface.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/ams_mgr_interface.h index 5de610a3b3db147f58aa232369ac394fe348e054..5572cac4e0227b1d5851bb4336f725433e6cdd31 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/ams_mgr_interface.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/ams_mgr_interface.h @@ -26,7 +26,6 @@ namespace OHOS { namespace AppExecFwk { - class IAmsMgr : public IRemoteBroker { public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.appexecfwk.IAmsMgr"); @@ -133,7 +132,6 @@ public: AMS_COMPEL_VERIFY_PERMISSION, }; }; - } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/ams_mgr_proxy.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/ams_mgr_proxy.h index 656fba6238f7ff2fc8c7c78400b204e53d1b31cd..086a8ad5c1d232cd68f919f111b3e81aac957e59 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/ams_mgr_proxy.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/ams_mgr_proxy.h @@ -22,7 +22,6 @@ namespace OHOS { namespace AppExecFwk { - class AmsMgrProxy : public IRemoteProxy { public: explicit AmsMgrProxy(const sptr &impl); @@ -123,7 +122,6 @@ private: private: static inline BrokerDelegator delegator_; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_AMS_MGR_CLIENT_H diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/ams_mgr_stub.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/ams_mgr_stub.h index 34450915bdcb0f18f4dd338b8d2b83033aae20db..a5e9874ad892a53b0f4a904fd16fe382be216f9e 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/ams_mgr_stub.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/ams_mgr_stub.h @@ -25,7 +25,6 @@ namespace OHOS { namespace AppExecFwk { - class AmsMgrStub : public IRemoteStub { public: AmsMgrStub(); @@ -51,7 +50,6 @@ private: DISALLOW_COPY_AND_MOVE(AmsMgrStub); }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_AMS_MGR_STUB_H diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_launch_data.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_launch_data.h index b65b80abd4279d43db932c5973c1c0e1dab33c3e..a94a8bbd4b06f671b875c12c9ca30309a06df122 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_launch_data.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_launch_data.h @@ -26,7 +26,6 @@ namespace OHOS { namespace AppExecFwk { - class AppLaunchData : public Parcelable { public: /** @@ -143,7 +142,6 @@ private: int32_t recordId_ = 0; int32_t uId_ = 0; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_APPMGR_INCLUDE_APP_LAUNCH_DATA_H diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_client.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_client.h index 323d60501e5e5be18024aee28722f2903cee5b9f..55bf0be769e6fac1defce4874f8fe6ffdb019b64 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_client.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_client.h @@ -27,7 +27,6 @@ namespace OHOS { namespace AppExecFwk { - class AppServiceManager; class AppMgrClient { @@ -173,7 +172,6 @@ private: std::unique_ptr serviceManager_; sptr remote_; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APP_MGR_CLIENT_H diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_constants.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_constants.h index 3ec06f155c15c43b98f2aed7793d1a5d14bb047f..eedab3f61957910c462a4a1e17b50ed2caad3aad 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_constants.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_constants.h @@ -19,9 +19,7 @@ namespace OHOS { namespace AppExecFwk { namespace Constants { - const std::string APP_MGR_SERVICE_NAME = "AppMgrService"; - } // namespace Constants enum class ApplicationState { @@ -50,7 +48,6 @@ enum AppMgrResultCode { ERROR_SERVICE_NOT_READY, ERROR_SERVICE_NOT_CONNECTED, }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_APP_MGR_CONSTANTS_H diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_interface.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_interface.h index 766e8d23f2b4e0fb3e55e65ecb9d40f2be98e896..d6a380253a8f2361adf357e8f5f780a348c9873b 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_interface.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_interface.h @@ -28,7 +28,6 @@ namespace OHOS { namespace AppExecFwk { - class IAppMgr : public IRemoteBroker { public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.appexecfwk.AppMgr"); @@ -153,7 +152,6 @@ public: AMS_APP_GET_APP_FREEZING_TIME, }; }; - } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_proxy.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_proxy.h index 8d48bb48b00ea86bd0daa15624813cb9585c25e1..e71ef18f250a8c2aa8e2638e59d15a7708985258 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_proxy.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_proxy.h @@ -22,7 +22,6 @@ namespace OHOS { namespace AppExecFwk { - class AppMgrProxy : public IRemoteProxy { public: explicit AppMgrProxy(const sptr &impl); @@ -136,11 +135,10 @@ public: private: bool SendTransactCmd(IAppMgr::Message code, MessageParcel &data, MessageParcel &reply); bool WriteInterfaceToken(MessageParcel &data); - template + template int GetParcelableInfos(MessageParcel &reply, std::vector &parcelableInfos); static inline BrokerDelegator delegator_; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_APP_MGR_CLIENT_H diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_stub.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_stub.h index b71636866b3443ce2655524df0a51f5983bc4c21..094e29ec3bd16c800cc7f4e42b6022efec401748 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_stub.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_mgr_stub.h @@ -25,7 +25,6 @@ namespace OHOS { namespace AppExecFwk { - class AppMgrStub : public IRemoteStub { public: AppMgrStub(); @@ -53,7 +52,6 @@ private: DISALLOW_COPY_AND_MOVE(AppMgrStub); }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_APP_MGR_STUB_H diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_process_data.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_process_data.h index aae4d474947e44df12d1f1f0045e8d9d9df2b109..48e3a991ad500f127deffc4b100643c8b530062c 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_process_data.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_process_data.h @@ -24,7 +24,6 @@ namespace OHOS { namespace AppExecFwk { - struct AppProcessData : public Parcelable { /** * @brief read this Sequenceable object from a Parcel. @@ -54,7 +53,6 @@ struct AppProcessData : public Parcelable { pid_t pid = 0; int32_t uid = 0; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_APP_PROCESS_DATA_H diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_record_id.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_record_id.h index fa9303e7eb0d65faa19190359b33dcc9ee60f62d..2a9bd3157421fdd273aa09805c151e8d35ec5567 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_record_id.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_record_id.h @@ -18,7 +18,6 @@ namespace OHOS { namespace AppExecFwk { - class AppRecordId { public: /** @@ -28,7 +27,6 @@ public: */ static int32_t Create(); }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_APP_RECORD_ID_H diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_scheduler_interface.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_scheduler_interface.h index 1f1799b74d4d790d490e4c903a65567b1b3f3718..1a03aeb9c26488983ac9c9080ce4647b886bda47 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_scheduler_interface.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_scheduler_interface.h @@ -138,7 +138,6 @@ public: SCHEDULE_PROCESS_SECURITY_EXIT_TRANSACTION, }; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_APP_SCHEDULER_INTERFACE_H diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_scheduler_proxy.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_scheduler_proxy.h index a9050822421d700c0f75aee94d9bd7dcd1234cb8..81647d7dd9f61bf4571b269eca004f76d5b1f770 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_scheduler_proxy.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_scheduler_proxy.h @@ -126,7 +126,6 @@ private: bool WriteInterfaceToken(MessageParcel &data); static inline BrokerDelegator delegator_; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_APP_SCHEDULER_CLIENT_H diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_service_manager.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_service_manager.h index 6cca44e0604267c891ba54dec740983768d0e14e..fae5e8ea79255ac52d02ebf69a30d2ac9e276472 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_service_manager.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_service_manager.h @@ -20,7 +20,6 @@ namespace OHOS { namespace AppExecFwk { - class AppServiceManager { public: AppServiceManager() = default; @@ -33,7 +32,6 @@ public: */ virtual sptr GetAppMgrService() const; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APP_SERVICE_MANAGER_H \ No newline at end of file diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_state_callback_host.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_state_callback_host.h index 0c4ce2bb6d72ec1a3ba3f16261df56fbfa0efae8..eec80b877474bf1edc0d1bf794a76daaf4f5c7db 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_state_callback_host.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_state_callback_host.h @@ -26,7 +26,6 @@ namespace OHOS { namespace AppExecFwk { - class AppStateCallbackHost : public IRemoteStub { public: AppStateCallbackHost(); @@ -59,7 +58,6 @@ private: DISALLOW_COPY_AND_MOVE(AppStateCallbackHost); }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_APP_STATE_CALLBACK_HOST_H diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_state_callback_proxy.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_state_callback_proxy.h index f563c110fb2168858b57bf85eaade11fcbf4171b..b91ed58a3445f533dd1ef3a1a10b259c39c1ab88 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_state_callback_proxy.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_state_callback_proxy.h @@ -23,7 +23,6 @@ namespace OHOS { namespace AppExecFwk { - class AppStateCallbackProxy : public IRemoteProxy { public: explicit AppStateCallbackProxy(const sptr &impl); @@ -48,7 +47,6 @@ private: bool WriteInterfaceToken(MessageParcel &data); static inline BrokerDelegator delegator_; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_APP_STATE_CALLBACK_PROXY_H diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_task_info.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_task_info.h index 653107c7c0c70e1269f2bdbb68a50f3da89a9e5b..6e5de4b24f0268e0c4c350ffce8cd541b1a91ca6 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/app_task_info.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/app_task_info.h @@ -23,7 +23,6 @@ namespace OHOS { namespace AppExecFwk { - class AppTaskInfo : public Parcelable { public: /** @@ -110,7 +109,6 @@ private: pid_t pid_ = 0; int32_t appRecordId_ = 0; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_APP_TASK_INFO_H diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/dummy_configuration.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/dummy_configuration.h index aafe7767beee29198808cf7f45fb4ea619904048..1c7db803e2d8448c28a30f75a8ccc3c54ff0ed49 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/dummy_configuration.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/dummy_configuration.h @@ -23,7 +23,6 @@ namespace OHOS { namespace AppExecFwk { - class Configuration : public Parcelable { public: Configuration() = default; @@ -65,7 +64,6 @@ public: private: std::string testInfostr_; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_OHOS_CONFIGURATION_H \ No newline at end of file diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/iapp_state_callback.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/iapp_state_callback.h index e9fdfe6d3d82717e88b931bc1c0750e8e14dd117..5abbef37c64120311e51285435d03a7da7f6f0e3 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/iapp_state_callback.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/iapp_state_callback.h @@ -24,7 +24,6 @@ namespace OHOS { namespace AppExecFwk { - class IAppStateCallback : public IRemoteBroker { public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.appexecfwk.AppStateCallback"); @@ -49,7 +48,6 @@ public: TRANSACT_ON_ABILITY_REQUEST_DONE, }; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_IAPP_STATE_CALLBACK_H diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/priority_object.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/priority_object.h index 64e71f35725f78dbe3ef216d842d55c5ebadcb3d..834e236801578bf4ee7e0c7303d3a50924340dc7 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/priority_object.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/priority_object.h @@ -23,9 +23,7 @@ #include "parcel.h" namespace OHOS { - namespace AppExecFwk { - class PriorityObject : public Parcelable { public: PriorityObject() = default; @@ -160,7 +158,6 @@ private: bool visibleStatus_ = false; bool perceptibleStatus_ = false; }; - } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/process_info.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/process_info.h index 969772a45f73cb2b7c54ef834fb96381f6c6c5d5..f9247e2be315e286cb0fe553eeef7742048fe707 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/process_info.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/process_info.h @@ -24,7 +24,6 @@ namespace OHOS { namespace AppExecFwk { - class ProcessInfo : public Parcelable { public: ProcessInfo() = default; @@ -77,7 +76,6 @@ private: std::string processName_; pid_t pid_ = 0; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_PROCESS_INFO_H diff --git a/interfaces/innerkits/appexecfwk_core/include/appmgr/profile.h b/interfaces/innerkits/appexecfwk_core/include/appmgr/profile.h index 6a0e8ca2e1a34e19391d97d01fb9ba95bd83e115..77589fcd9a8202e5e07b89e6691c3871156f1b0f 100644 --- a/interfaces/innerkits/appexecfwk_core/include/appmgr/profile.h +++ b/interfaces/innerkits/appexecfwk_core/include/appmgr/profile.h @@ -23,7 +23,6 @@ namespace OHOS { namespace AppExecFwk { - class Profile : public Parcelable { public: Profile() = default; @@ -65,7 +64,6 @@ public: private: std::string profileName_; // the name of the ability }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_APPEXECFWK_CORE_INCLUDE_APPMGR_PROFILE_H diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/ams_mgr_proxy.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/ams_mgr_proxy.cpp index b5b31a6412a877417e80819e69d5761375ccdbd8..5a309cb691b0a62f7d501b8c69c4ea55b5de99c4 100644 --- a/interfaces/innerkits/appexecfwk_core/src/appmgr/ams_mgr_proxy.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/ams_mgr_proxy.cpp @@ -23,7 +23,6 @@ namespace OHOS { namespace AppExecFwk { - AmsMgrProxy::AmsMgrProxy(const sptr &impl) : IRemoteProxy(impl) {} @@ -291,6 +290,5 @@ int AmsMgrProxy::CompelVerifyPermission(const std::string &permission, int pid, message = Str16ToStr8(reply.ReadString16()); return reply.ReadInt32(); } - } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/ams_mgr_stub.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/ams_mgr_stub.cpp index 921d6096d3552a602bd50228e2eb74bea25875b5..177edf1602d7d65f43f16b0409dcfe90a454ebbc 100644 --- a/interfaces/innerkits/appexecfwk_core/src/appmgr/ams_mgr_stub.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/ams_mgr_stub.cpp @@ -28,7 +28,6 @@ namespace OHOS { namespace AppExecFwk { - AmsMgrStub::AmsMgrStub() { memberFuncMap_[static_cast(IAmsMgr::Message::AMS_LOAD_ABILITY)] = &AmsMgrStub::HandleLoadAbility; diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_launch_data.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_launch_data.cpp index 3913757cdcf076dfc6b2d7e6cb0b596bc38f25a8..aee1ff488872a5c48cea047eb4359249ef745e35 100644 --- a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_launch_data.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_launch_data.cpp @@ -19,7 +19,6 @@ namespace OHOS { namespace AppExecFwk { - void AppLaunchData::SetApplicationInfo(const ApplicationInfo &info) { applicationInfo_ = info; @@ -89,6 +88,5 @@ AppLaunchData *AppLaunchData::Unmarshalling(Parcel &parcel) } return appLaunchData; } - } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_client.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_client.cpp index 061584e72882e4f8a85a81b59df14bd796c822b1..29d7f1800983a7b431ba8d49b8b619c8f18252dc 100644 --- a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_client.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_client.cpp @@ -27,7 +27,6 @@ namespace OHOS { namespace AppExecFwk { - AppMgrClient::AppMgrClient() { SetServiceManager(std::make_unique()); diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_proxy.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_proxy.cpp index 38b506602fd0b4243081544f83ce1ef18951f548..b8f25cfc04b91f9d69b5f9d98503fd8f3ecead87 100644 --- a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_proxy.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_proxy.cpp @@ -23,7 +23,6 @@ namespace OHOS { namespace AppExecFwk { - AppMgrProxy::AppMgrProxy(const sptr &impl) : IRemoteProxy(impl) {} @@ -317,7 +316,6 @@ void AppMgrProxy::SetAppFreezingTime(int time) return; } APP_LOGD("end"); - } void AppMgrProxy::GetAppFreezingTime(int &time) @@ -339,7 +337,7 @@ void AppMgrProxy::GetAppFreezingTime(int &time) APP_LOGE("get freeze time : %{public}d ", time); } -template +template int AppMgrProxy::GetParcelableInfos(MessageParcel &reply, std::vector &parcelableInfos) { int32_t infoSize = reply.ReadInt32(); @@ -354,6 +352,5 @@ int AppMgrProxy::GetParcelableInfos(MessageParcel &reply, std::vector &parcel APP_LOGD("get parcelable infos success"); return NO_ERROR; } - } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_stub.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_stub.cpp index 63aa66f90c5aefe7a995950b159e59a38b1f6f45..962993ebe541bcce6f3a30ee3ace35aa6719f8c2 100644 --- a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_stub.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_mgr_stub.cpp @@ -28,7 +28,6 @@ namespace OHOS { namespace AppExecFwk { - AppMgrStub::AppMgrStub() { memberFuncMap_[static_cast(IAppMgr::Message::AMS_APP_ATTACH_APPLICATION)] = @@ -184,6 +183,5 @@ int32_t AppMgrStub::HandleGetAppFreezingTime(MessageParcel &data, MessageParcel reply.WriteInt32(time); return NO_ERROR; } - } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_process_data.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_process_data.cpp index 4f3c27071da06749c1738bd0d263f55aaba95aae..137b244ce97e8d21e9f96b1d7eef94d2467dddb3 100644 --- a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_process_data.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_process_data.cpp @@ -19,7 +19,6 @@ namespace OHOS { namespace AppExecFwk { - bool AppProcessData::Marshalling(Parcel &parcel) const { return (parcel.WriteString(appName) && parcel.WriteString(processName) && @@ -51,6 +50,5 @@ AppProcessData *AppProcessData::Unmarshalling(Parcel &parcel) } return appProcessData; } - } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_record_id.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_record_id.cpp index ad465b779b09625bfdaad0e92a639dcbeaf95d73..c1b5ab57051d17d3361a77274f74fad7caa68f80 100644 --- a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_record_id.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_record_id.cpp @@ -18,13 +18,11 @@ #include "app_record_id.h" namespace OHOS { namespace AppExecFwk { - int32_t AppRecordId::Create() { // Make it atomic to avoid multi app creating concurrently. static std::atomic_int id(0); return ++id; } - } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_scheduler_host.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_scheduler_host.cpp index 06d8f2ee2b07c6af33047253a44abe40f103a146..79e206c185ece578d477b3ab79a658421fdbe610 100644 --- a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_scheduler_host.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_scheduler_host.cpp @@ -21,7 +21,6 @@ namespace OHOS { namespace AppExecFwk { - AppSchedulerHost::AppSchedulerHost() { memberFuncMap_[static_cast(IAppScheduler::Message::SCHEDULE_FOREGROUND_APPLICATION_TRANSACTION)] = @@ -164,6 +163,5 @@ int32_t AppSchedulerHost::HandleScheduleProcessSecurityExit(MessageParcel &data, ScheduleProcessSecurityExit(); return NO_ERROR; } - } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_scheduler_proxy.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_scheduler_proxy.cpp index d76de6f1428c360fd60e048c946903abe8f3a706..0fb7eb627566f353b9f315eb69b7a865760a01c7 100644 --- a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_scheduler_proxy.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_scheduler_proxy.cpp @@ -269,6 +269,5 @@ void AppSchedulerProxy::ScheduleProcessSecurityExit() APP_LOGW("SendRequest is failed, error code: %{public}d", ret); } } - } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_service_manager.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_service_manager.cpp index 093d421dab65ee62091dfc5b6a68cda3e428fd93..86e7bafb9e00b3156cf34068a3b0540c55a309ef 100644 --- a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_service_manager.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_service_manager.cpp @@ -24,7 +24,6 @@ namespace OHOS { namespace AppExecFwk { - sptr AppServiceManager::GetAppMgrService() const { sptr systemAbilityMgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); @@ -33,6 +32,5 @@ sptr AppServiceManager::GetAppMgrService() const } return systemAbilityMgr->GetSystemAbility(APP_MGR_SERVICE_ID); } - } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_state_callback_proxy.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_state_callback_proxy.cpp index e3eed8ebda07622a88d3ea08464916a90c407b27..9d2a8eeb1fa38b347918bec77f5b05ca98b7445d 100644 --- a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_state_callback_proxy.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_state_callback_proxy.cpp @@ -21,7 +21,6 @@ namespace OHOS { namespace AppExecFwk { - AppStateCallbackProxy::AppStateCallbackProxy(const sptr &impl) : IRemoteProxy(impl) {} @@ -81,6 +80,5 @@ void AppStateCallbackProxy::OnAppStateChanged(const AppProcessData &appProcessDa } APP_LOGD("end"); } - } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_task_info.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_task_info.cpp index 6af120bb401b83260f018dbd646f1bd0b5c9c835..6a81cd2c214cebd27a817659eccaffa4e00d5a44 100644 --- a/interfaces/innerkits/appexecfwk_core/src/appmgr/app_task_info.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/app_task_info.cpp @@ -19,7 +19,6 @@ namespace OHOS { namespace AppExecFwk { - const std::string &AppTaskInfo::GetName() const { return appName_; @@ -82,6 +81,5 @@ AppTaskInfo *AppTaskInfo::Unmarshalling(Parcel &parcel) } return appTaskInfo; } - } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/dummy_configuration.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/dummy_configuration.cpp index 8950ae62e8e8cfb93d47eb3909148d6679007ce2..6f53059e0e2da1e9763dace89da2512b6fb43fa0 100644 --- a/interfaces/innerkits/appexecfwk_core/src/appmgr/dummy_configuration.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/dummy_configuration.cpp @@ -21,7 +21,6 @@ namespace OHOS { namespace AppExecFwk { - Configuration::Configuration(const std::string &name) : testInfostr_(name) {} @@ -49,6 +48,5 @@ bool Configuration::Marshalling(Parcel &parcel) const } return true; } - } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/priority_object.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/priority_object.cpp index c5296ab36d431f018d44f809d6aee3f9958edaf6..23298807f98188427dae97f0b8309d17e71e7609 100644 --- a/interfaces/innerkits/appexecfwk_core/src/appmgr/priority_object.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/priority_object.cpp @@ -18,9 +18,7 @@ #include "app_log_wrapper.h" namespace OHOS { - namespace AppExecFwk { - pid_t PriorityObject::GetPid() const { return pid_; @@ -141,6 +139,5 @@ PriorityObject *PriorityObject::Unmarshalling(Parcel &parcel) } return priorityObject; } - } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/process_info.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/process_info.cpp index e68ee62a48c62fef3b1627e1906f47dc6563a607..e57d51f60f9f0af3754c25b052277185310a9c0e 100644 --- a/interfaces/innerkits/appexecfwk_core/src/appmgr/process_info.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/process_info.cpp @@ -19,7 +19,6 @@ namespace OHOS { namespace AppExecFwk { - ProcessInfo::ProcessInfo(const std::string &name, const pid_t &pid) : processName_(name), pid_(pid) {} @@ -61,6 +60,5 @@ bool ProcessInfo::Marshalling(Parcel &parcel) const { return (parcel.WriteString16(Str8ToStr16(processName_)) && parcel.WriteInt32(pid_)); } - } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/appexecfwk_core/src/appmgr/profile.cpp b/interfaces/innerkits/appexecfwk_core/src/appmgr/profile.cpp index 8d6ea3988ef68d9092c73685b2da35cd14b22b82..8025773b660f3fca3ee371847eed5886efa28dbf 100644 --- a/interfaces/innerkits/appexecfwk_core/src/appmgr/profile.cpp +++ b/interfaces/innerkits/appexecfwk_core/src/appmgr/profile.cpp @@ -21,7 +21,6 @@ namespace OHOS { namespace AppExecFwk { - Profile::Profile(const std::string &name) : profileName_(name) {} @@ -47,6 +46,5 @@ bool Profile::Marshalling(Parcel &parcel) const { return (parcel.WriteString16(Str8ToStr16(profileName_))); } - } // namespace AppExecFwk } // namespace OHOS diff --git a/interfaces/innerkits/task_dispatcher/include/threading/worker_pool.h b/interfaces/innerkits/task_dispatcher/include/threading/worker_pool.h index edf8a97adc088c81bcae6b0da232cf41d16ee3af..eee772130055a408da163b6e7be15d4d3cb2e53f 100644 --- a/interfaces/innerkits/task_dispatcher/include/threading/worker_pool.h +++ b/interfaces/innerkits/task_dispatcher/include/threading/worker_pool.h @@ -80,7 +80,7 @@ private: static bool IsRunning(int ctl); - static int GetStateFromControl(int ctl); + static int GetStateFromControl(unsigned int ctl); static int CombineToControl(unsigned int state, unsigned int count); diff --git a/interfaces/innerkits/task_dispatcher/src/threading/worker_pool.cpp b/interfaces/innerkits/task_dispatcher/src/threading/worker_pool.cpp index 137644970613b9da76e4abe79c47645dec7da7eb..c1ae3c5a56866ea2ee22a443f3772e558faed36e 100644 --- a/interfaces/innerkits/task_dispatcher/src/threading/worker_pool.cpp +++ b/interfaces/innerkits/task_dispatcher/src/threading/worker_pool.cpp @@ -319,7 +319,7 @@ bool WorkerPool::IsRunning(int ctl) return ctl < CLOSING; } -int WorkerPool::GetStateFromControl(int ctl) +int WorkerPool::GetStateFromControl(unsigned int ctl) { return ctl & ~CAPACITY; } @@ -345,7 +345,7 @@ int WorkerPool::CombineToControl(unsigned int state, unsigned int count) bool WorkerPool::CompareAndIncThreadNum(int expect) { - int ctl = control_.load(); + unsigned int ctl = control_.load(); int state = GetStateFromControl(ctl); return CompareAndSet(control_, ctl, CombineToControl(state, expect + 1)); } @@ -367,7 +367,7 @@ bool WorkerPool::CompareAndDecThreadNum(int expect) bool WorkerPool::CompareAndDecNum(int expectCount) { - int curr = control_.load(); + unsigned int curr = control_.load(); int state = GetStateFromControl(curr); int expectControl = CombineToControl(state, expectCount); return CompareAndDecThreadNum(expectControl); diff --git a/kits/appkit/napi/appMgr/app_mgr.cpp b/kits/appkit/napi/appMgr/app_mgr.cpp index c0a84af847fe690378445eed29eb5952abe745be..a67924e89704afcb04506d1feff36a5391308784 100755 --- a/kits/appkit/napi/appMgr/app_mgr.cpp +++ b/kits/appkit/napi/appMgr/app_mgr.cpp @@ -39,7 +39,7 @@ static napi_value ParseBundleName(napi_env env, std::string &bundleName, napi_va size_t len = 0; napi_get_value_string_utf8(env, args, buf, BUFFER_LENGTH_MAX, &len); HILOG_INFO("bundleName= [%{public}s].", buf); - bundleName = std::string{buf}; + bundleName = std::string{ buf }; // create result code napi_value result; status = napi_create_int32(env, 1, &result); @@ -67,14 +67,15 @@ napi_value NAPI_KillProcessesByBundleName(napi_env env, napi_callback_info info) NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, NULL, NULL)); HILOG_INFO("argc = [%{public}zu]", argc); - if (argc >= 2) { + size_t argcNum = 2; + if (argc >= argcNum) { napi_valuetype valuetype; NAPI_CALL(env, napi_typeof(env, argv[1], &valuetype)); NAPI_ASSERT(env, valuetype == napi_function, "Wrong argument type. Function expected."); } AsyncCallbackInfo *async_callback_info = - new AsyncCallbackInfo{.env = env, .asyncWork = nullptr, .deferred = nullptr}; + new AsyncCallbackInfo{ .env = env, .asyncWork = nullptr, .deferred = nullptr }; std::string bundleName; ParseBundleName(env, bundleName, argv[0]); diff --git a/kits/appkit/napi/bundlemgr/bundle_mgr.cpp b/kits/appkit/napi/bundlemgr/bundle_mgr.cpp index 1d01da1a0235cb0ca36da56066c531e1ab682846..50ea510051c019eaecf70e3cda1aa9ef3528f38a 100644 --- a/kits/appkit/napi/bundlemgr/bundle_mgr.cpp +++ b/kits/appkit/napi/bundlemgr/bundle_mgr.cpp @@ -961,7 +961,7 @@ static napi_value ParseInt(napi_env env, int ¶m, napi_value args) HILOG_INFO("param=%{public}d.", value); param = value; // create result code - napi_value result; + napi_value result = nullptr; napi_status status = napi_create_int32(env, NAPI_RETURN_ONE, &result); NAPI_ASSERT(env, status == napi_ok, "napi_create_int32 error!"); return result; @@ -3481,7 +3481,7 @@ napi_value RegisterAllPermissionsChanged(napi_env env, napi_callback_info info) std::vector uids; ParseInt32Array(env, uids, argv[ARGS_SIZE_ONE]); AsyncRegisterPermissions *asyncCallbackInfo = - new AsyncRegisterPermissions{.env = env, .asyncWork = nullptr, .uids = uids}; + new (std::nothrow) AsyncRegisterPermissions{.env = env, .asyncWork = nullptr, .uids = uids}; if (asyncCallbackInfo == nullptr) { return nullptr; } @@ -3525,7 +3525,7 @@ napi_value RegisterAllPermissionsChanged(napi_env env, napi_callback_info info) return result; } else if (permissionEvent == ANY_PERMISSION_CHANGE && argc == ARGS_SIZE_TWO) { AsyncRegisterAllPermissions *asyncCallbackInfo = - new AsyncRegisterAllPermissions{.env = env, .asyncWork = nullptr}; + new (std::nothrow) AsyncRegisterAllPermissions{.env = env, .asyncWork = nullptr}; if (asyncCallbackInfo == nullptr) { return nullptr; } diff --git a/services/appmgr/include/app_mgr_service_event_handler.h b/services/appmgr/include/app_mgr_service_event_handler.h index 1f30b3a1d84c1b7d025253a33128ef2071242431..4a7fe990b2f239d7d9d8efe861b98bb748041465 100644 --- a/services/appmgr/include/app_mgr_service_event_handler.h +++ b/services/appmgr/include/app_mgr_service_event_handler.h @@ -37,7 +37,6 @@ public: private: std::weak_ptr appMgr_; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_SERVICES_APPMGR_INCLUDE_APP_MGR_SERVICE_EVENT_HANDLER_H diff --git a/services/appmgr/include/cgroup_manager.h b/services/appmgr/include/cgroup_manager.h index 9811a37a945e66031e8c3b8e4b114b4b81d91b30..5cfbab241047697648a8c2e37b280e8af5813869 100644 --- a/services/appmgr/include/cgroup_manager.h +++ b/services/appmgr/include/cgroup_manager.h @@ -66,6 +66,7 @@ public: public: virtual bool Init(); + virtual bool InitCheck(); virtual bool IsInited() const; virtual bool SetThreadSchedPolicy(int tid, SchedPolicy schedPolicy); virtual bool SetProcessSchedPolicy(int pid, SchedPolicy schedPolicy); diff --git a/services/appmgr/include/process_optimizer.h b/services/appmgr/include/process_optimizer.h index 89a210d1f4bc7add3ceac415e9154ebb73425234..10b4028bcff4cc9ac3228b8d814f66f98fcc183d 100644 --- a/services/appmgr/include/process_optimizer.h +++ b/services/appmgr/include/process_optimizer.h @@ -76,6 +76,7 @@ protected: private: bool UpdateAppOomAdj(const AppPtr &app); + bool GetAppOomAdj(const AppPtr &app,ApplicationState state,int &oomAdj,int &oomAdjMax); bool UpdateAppSchedPolicy(const AppPtr &app); void StartAppSuspendTimer(const AppPtr &app); void StopAppSuspendTimer(const AppPtr &app); diff --git a/services/appmgr/include/process_optimizer_uba.h b/services/appmgr/include/process_optimizer_uba.h index 24d496374e01d14c4e71ab22a22d716ab4a73fee..a3f6d1eadbfd2ce20e0dc72e48a2ba71a34f8e78 100644 --- a/services/appmgr/include/process_optimizer_uba.h +++ b/services/appmgr/include/process_optimizer_uba.h @@ -157,6 +157,11 @@ private: } void CommitAbilityActions(); + void CommitStartAbilityAction(const StartAbilityAction& action, size_t index); + void CommitConnectAbilityAction(const ConnectAbilityAction& action, size_t index); + void CommitDisconnectAbilityAction(const DisconnectAbilityAction& action, size_t index); + void CommitChangedAbilityStateAction(const ChangeAbilityStateAction& action, size_t index); + void CommitRemoveAbilityAction(const RemoveAbilityAction& action, size_t index); UbaServicePtr GetUbaService(); private: diff --git a/services/appmgr/src/app_mgr_service.cpp b/services/appmgr/src/app_mgr_service.cpp index 1018518de84384b1682d41e7b887cf7a29e972f5..8567b510955aa5253b9cf535b53c2276716ac495 100644 --- a/services/appmgr/src/app_mgr_service.cpp +++ b/services/appmgr/src/app_mgr_service.cpp @@ -280,6 +280,5 @@ void AppMgrService::GetAppFreezingTime(int &time) appMgrServiceInner_->GetAppFreezingTime(time); APP_LOGE("get app freeze time %{public}d ", time); } - } // namespace AppExecFwk } // namespace OHOS diff --git a/services/appmgr/src/app_mgr_service_inner.cpp b/services/appmgr/src/app_mgr_service_inner.cpp index 4029ee5dbcc4a37d10f882d5bd72e9b8332d3860..caeb2756c707269aadf060bd6db9099854842396 100644 --- a/services/appmgr/src/app_mgr_service_inner.cpp +++ b/services/appmgr/src/app_mgr_service_inner.cpp @@ -386,7 +386,7 @@ bool AppMgrServiceInner::process_exist(pid_t &pid) bool AppMgrServiceInner::CheckALLProcessExist(std::list &pids) { - for (auto iter = pids.begin(); iter != pids.end();) { + for (auto iter = pids.begin(); iter != pids.end(); ) { if (!process_exist(*iter) && pids.size() != 0) { pids.erase(iter); if (pids.empty()) { diff --git a/services/appmgr/src/app_running_manager.cpp b/services/appmgr/src/app_running_manager.cpp index 90c17b01ea04eb69ce11edf923e797c3e756123b..74c987f3a667437df493e7cfbbed333cbb20b335 100644 --- a/services/appmgr/src/app_running_manager.cpp +++ b/services/appmgr/src/app_running_manager.cpp @@ -29,7 +29,6 @@ bool CheckUid(const int32_t uid) { return uid >= 0 && uid < std::numeric_limits::max(); } - } // namespace AppRunningManager::AppRunningManager() diff --git a/services/appmgr/src/cgroup_manager.cpp b/services/appmgr/src/cgroup_manager.cpp index 34708cd361fdd041a551de8a3dde0d09fb91e0a5..2fcea885bf928bd0250c85730aafc77118416424 100644 --- a/services/appmgr/src/cgroup_manager.cpp +++ b/services/appmgr/src/cgroup_manager.cpp @@ -142,38 +142,12 @@ bool CgroupManager::Init() return false; } - UniqueFd cpusetTasksFds[SCHED_POLICY_CPU_MAX]; - if (!InitCpusetTasksFds(cpusetTasksFds)) { - return false; - } - - UniqueFd cpuctlTasksFds[SCHED_POLICY_CPU_MAX]; - if (!InitCpuctlTasksFds(cpuctlTasksFds)) { - return false; - } - - UniqueFd freezerTasksFds[SCHED_POLICY_FREEZER_MAX]; - if (!InitFreezerTasksFds(freezerTasksFds)) { - return false; - } - - UniqueFd memoryEventControlFd; - if (!InitMemoryEventControlFd(memoryEventControlFd)) { - return false; - } - - UniqueFd memoryEventFds[LOW_MEMORY_LEVEL_MAX]; - if (!InitMemoryEventFds(memoryEventFds)) { - return false; - } - - UniqueFd memoryPressureFds[LOW_MEMORY_LEVEL_MAX]; - if (!InitMemoryPressureFds(memoryPressureFds)) { + if(!InitCheck()){ return false; } if (!RegisterLowMemoryMonitor( - memoryEventFds_, memoryPressureFds_, memoryEventControlFd_, LOW_MEMORY_LEVEL_LOW, eventHandler)) { + memoryEventFds_, memoryPressureFds_, memoryEventControlFd_, LOW_MEMORY_LEVEL_LOW, eventHandler)) { return false; } @@ -181,7 +155,7 @@ bool CgroupManager::Init() [&]() { eventHandler->RemoveFileDescriptorListener(memoryEventFds_[LOW_MEMORY_LEVEL_LOW]); }); if (!RegisterLowMemoryMonitor( - memoryEventFds_, memoryPressureFds_, memoryEventControlFd_, LOW_MEMORY_LEVEL_MEDIUM, eventHandler)) { + memoryEventFds_, memoryPressureFds_, memoryEventControlFd_, LOW_MEMORY_LEVEL_MEDIUM, eventHandler)) { return false; } @@ -189,7 +163,7 @@ bool CgroupManager::Init() [&]() { eventHandler->RemoveFileDescriptorListener(memoryEventFds_[LOW_MEMORY_LEVEL_MEDIUM]); }); if (!RegisterLowMemoryMonitor( - memoryEventFds_, memoryPressureFds_, memoryEventControlFd_, LOW_MEMORY_LEVEL_CRITICAL, eventHandler)) { + memoryEventFds_, memoryPressureFds_, memoryEventControlFd_, LOW_MEMORY_LEVEL_CRITICAL, eventHandler)) { return false; } @@ -197,7 +171,6 @@ bool CgroupManager::Init() [&]() { eventHandler->RemoveFileDescriptorListener(memoryEventFds_[LOW_MEMORY_LEVEL_CRITICAL]); }); eventHandler_ = eventHandler; - lowLevelListenerGuard.Dismiss(); mediumLevelListenerGuard.Dismiss(); criticalLevelListenerGuard.Dismiss(); @@ -205,6 +178,40 @@ bool CgroupManager::Init() return true; } +bool CgroupManager::InitCheck() +{ + UniqueFd cpusetTasksFds[SCHED_POLICY_CPU_MAX]; + if (!InitCpusetTasksFds(cpusetTasksFds)) { + return false; + } + + UniqueFd cpuctlTasksFds[SCHED_POLICY_CPU_MAX]; + if (!InitCpuctlTasksFds(cpuctlTasksFds)) { + return false; + } + + UniqueFd freezerTasksFds[SCHED_POLICY_FREEZER_MAX]; + if (!InitFreezerTasksFds(freezerTasksFds)) { + return false; + } + + UniqueFd memoryEventControlFd; + if (!InitMemoryEventControlFd(memoryEventControlFd)) { + return false; + } + + UniqueFd memoryEventFds[LOW_MEMORY_LEVEL_MAX]; + if (!InitMemoryEventFds(memoryEventFds)) { + return false; + } + + UniqueFd memoryPressureFds[LOW_MEMORY_LEVEL_MAX]; + if (!InitMemoryPressureFds(memoryPressureFds)) { + return false; + } + return true; +} + bool CgroupManager::IsInited() const { return bool(eventHandler_); @@ -531,6 +538,5 @@ bool CgroupManager::SetFreezerSubsystem(const int tid, const SchedPolicyFreezer return true; } - } // namespace AppExecFwk } // namespace OHOS diff --git a/services/appmgr/src/lmks/lmks_main.cpp b/services/appmgr/src/lmks/lmks_main.cpp index 1f0558030097931eb66363d2f29c0ee0d76bdb34..e90fead4a50319e18c46d784f08bc90bb40ec9f7 100644 --- a/services/appmgr/src/lmks/lmks_main.cpp +++ b/services/appmgr/src/lmks/lmks_main.cpp @@ -15,7 +15,7 @@ #include "lmks_server.h" -int main(int argc, char *const argv[]) +int main(int argc, char *argv[]) { (void)argc; (void)argv; diff --git a/services/appmgr/src/lmks/lmks_server.cpp b/services/appmgr/src/lmks/lmks_server.cpp index 0b89cd3d6b25825b1095fea685cbd6c4fa972148..dfed0e4605645498c88c7cc2f33fcdc089498296 100644 --- a/services/appmgr/src/lmks/lmks_server.cpp +++ b/services/appmgr/src/lmks/lmks_server.cpp @@ -283,6 +283,5 @@ void LmksServer::ProcessMessage(int connectFd, LMKS_PACKET cmds, int len) // close connect fd. close(connectFd); } - } // namespace LMKS } // namespace OHOS diff --git a/services/appmgr/src/lmks/lmks_utils.cpp b/services/appmgr/src/lmks/lmks_utils.cpp index 6c0ea2af75f395bc48d10392f801470c226951fb..ea37d7eb8eac645a1f89153fc943e31d8a3c8452 100644 --- a/services/appmgr/src/lmks/lmks_utils.cpp +++ b/services/appmgr/src/lmks/lmks_utils.cpp @@ -25,7 +25,6 @@ namespace OHOS { namespace LMKS { - namespace { constexpr int PROC_PATH_MAX = 256; constexpr int PROC_LINE_MAX = 128; @@ -108,7 +107,7 @@ std::string LmksUtils::GetProcName(pid_t pid) return name; } - if (strlen(line) + 1 <= PROC_LINE_MAX && strlen(line) != 0) { + if (strlen(line) + 1 <= PROC_LINE_MAX && strlen(line) != 0 && line[strlen(line)] == '\0') { name = line; } else { HiLog::Error(LABEL, "cmdline no data"); diff --git a/services/appmgr/src/lmks_client.cpp b/services/appmgr/src/lmks_client.cpp index bc5900ceaf0b63a3f0984c19bc068cfeedeca9db..f0c288b984af987503af16546eae26bc558bd8a9 100644 --- a/services/appmgr/src/lmks_client.cpp +++ b/services/appmgr/src/lmks_client.cpp @@ -31,7 +31,6 @@ namespace OHOS { namespace AppExecFwk { - namespace { constexpr int LMKS_SOCKET_TIMEOUT = 3; diff --git a/services/appmgr/src/process_optimizer.cpp b/services/appmgr/src/process_optimizer.cpp index bc5c3dca6d01747237606d7c77946e1967668e73..e3cf6bc23eb0f5e42d919980dbb6220d2731bb2f 100644 --- a/services/appmgr/src/process_optimizer.cpp +++ b/services/appmgr/src/process_optimizer.cpp @@ -479,14 +479,12 @@ bool ProcessOptimizer::UpdateAppOomAdj(const AppPtr &app) APP_LOGE("%{public}s(%{public}d) invalid priority object.", __func__, __LINE__); return false; } - // special set launcher and systemui adj if (app->IsLauncherApp() || app->GetBundleName() == SYSTEM_UI_BUNDLE_NAME) { return SetAppOomAdj(app, APP_OOM_ADJ_SYSTEM); } auto state = app->GetState(); - if (state == ApplicationState::APP_STATE_FOREGROUND || state == ApplicationState::APP_STATE_CREATE || state == ApplicationState::APP_STATE_READY) { return SetAppOomAdj(app, APP_OOM_ADJ_FOREGROUND); @@ -494,6 +492,34 @@ bool ProcessOptimizer::UpdateAppOomAdj(const AppPtr &app) int oomAdj; int oomAdjMax; + if(!GetAppOomAdj(app,state,oomAdj, oomAdjMax)){ + return false; + } + + for (auto curApp : appLru_) { + if (curApp->GetState() != state) { + continue; + } + // adj of launcher and systemui is always APP_OOM_ADJ_SYSTEM + if (curApp->IsLauncherApp() || curApp->GetBundleName() == SYSTEM_UI_BUNDLE_NAME) { + continue; + } + + SetAppOomAdj(curApp, oomAdj); + if (oomAdj < oomAdjMax) { + oomAdj += 1; + } + } + return true; +} + +bool ProcessOptimizer::GetAppOomAdj(const AppPtr &app,ApplicationState state,int &oomAdj,int &oomAdjMax) +{ + auto priorityObject = app->GetPriorityObject(); + if (!priorityObject) { + APP_LOGE("%{public}s(%{public}d) invalid priority object.", __func__, __LINE__); + return false; + } switch (state) { case ApplicationState::APP_STATE_BACKGROUND: @@ -521,23 +547,6 @@ bool ProcessOptimizer::UpdateAppOomAdj(const AppPtr &app) oomAdjMax = APP_OOM_ADJ_UNKNOWN; break; } - - for (auto curApp : appLru_) { - if (curApp->GetState() != state) { - continue; - } - - // adj of launcher and systemui is always APP_OOM_ADJ_SYSTEM - if (curApp->IsLauncherApp() || curApp->GetBundleName() == SYSTEM_UI_BUNDLE_NAME) { - continue; - } - - SetAppOomAdj(curApp, oomAdj); - if (oomAdj < oomAdjMax) { - oomAdj += 1; - } - } - return true; } @@ -568,7 +577,6 @@ bool ProcessOptimizer::UpdateAppSchedPolicy(const AppPtr &app) ret = true; break; } - return ret; } diff --git a/services/appmgr/src/process_optimizer_uba.cpp b/services/appmgr/src/process_optimizer_uba.cpp index 73122020aeea66407e2980278afdabb860f5b022..9e01e969e3fe8a80af9775e5bd6308c72fb9a50b 100644 --- a/services/appmgr/src/process_optimizer_uba.cpp +++ b/services/appmgr/src/process_optimizer_uba.cpp @@ -31,7 +31,7 @@ std::string ProcessOptimizerUBA::BaseAbilityAction::GetTimeString() const { std::time_t tmp = Clock::to_time_t(time_); char *pTime = std::ctime(&tmp); - return pTime == nullptr ? "" : std::string(pTime); + return (pTime == nullptr) ? "" : std::string(pTime); } const std::string &ProcessOptimizerUBA::BaseAbilityAction::GetName() const @@ -288,7 +288,6 @@ void ProcessOptimizerUBA::CommitAbilityActions() { auto n = abilityActionCount_; abilityActionCount_ = 0; - auto ubaService = GetUbaService(); if (!ubaService) { APP_LOGE("%{public}s(%{pubic}d) uba is not available.", __func__, __LINE__); @@ -302,61 +301,82 @@ void ProcessOptimizerUBA::CommitAbilityActions() auto startAbilityAction = std::get_if(&abilityAction); if (startAbilityAction) { - APP_LOGD(" [%{public}zu] %{public}s ability '%{public}s' starts '%{public}s'", - i, - startAbilityAction->GetTimeString().c_str(), - startAbilityAction->GetPreName().c_str(), - startAbilityAction->GetName().c_str()); - // commit action + CommitStartAbilityAction(*startAbilityAction, i); continue; } - auto connectAbilityAction = std::get_if(&abilityAction); if (connectAbilityAction) { - APP_LOGD(" [%{public}zu] %{public}s ability '%{public}s' connect to '%{public}s'", - i, - connectAbilityAction->GetTimeString().c_str(), - connectAbilityAction->GetName().c_str(), - connectAbilityAction->GetTargetName().c_str()); - // commit action + CommitConnectAbilityAction(*connectAbilityAction, i); continue; } - auto disconnectAbilityAction = std::get_if(&abilityAction); if (disconnectAbilityAction) { - APP_LOGD(" [%{public}zu] %{public}s '%{public}s' ability disconnect with '%{public}s'", - i, - disconnectAbilityAction->GetTimeString().c_str(), - disconnectAbilityAction->GetName().c_str(), - disconnectAbilityAction->GetTargetName().c_str()); - // commit action + CommitDisconnectAbilityAction(*disconnectAbilityAction, i); continue; } - auto changedAbilityStateAction = std::get_if(&abilityAction); if (changedAbilityStateAction) { - APP_LOGD(" [%{public}zu] %{public}s ability '%{public}s' state changed from %{public}d to %{public}d.", - i, - changedAbilityStateAction->GetTimeString().c_str(), - changedAbilityStateAction->GetName().c_str(), - changedAbilityStateAction->GetOldState(), - changedAbilityStateAction->GetNewState()); - // commit action + CommitChangedAbilityStateAction(*changedAbilityStateAction, i); continue; } - auto removeAbilityAction = std::get_if(&abilityAction); if (removeAbilityAction) { - APP_LOGD(" [%{public}zu] %{public}s '%{public}s' removed.", - i, - removeAbilityAction->GetTimeString().c_str(), - removeAbilityAction->GetName().c_str()); - // commit action + CommitRemoveAbilityAction(*removeAbilityAction, i); continue; } } } +void ProcessOptimizerUBA::CommitStartAbilityAction(const StartAbilityAction& action, size_t index) +{ + APP_LOGD(" [%{public}zu] %{public}s ability '%{public}s' starts '%{public}s'", + index, + action.GetTimeString().c_str(), + action.GetPreName().c_str(), + action.GetName().c_str()); + // commit action +} + +void ProcessOptimizerUBA::CommitConnectAbilityAction(const ConnectAbilityAction& action, size_t index) +{ + APP_LOGD(" [%{public}zu] %{public}s ability '%{public}s' connect to '%{public}s'", + index, + action.GetTimeString().c_str(), + action.GetName().c_str(), + action.GetTargetName().c_str()); + // commit action +} + +void ProcessOptimizerUBA::CommitDisconnectAbilityAction(const DisconnectAbilityAction& action, size_t index) +{ + APP_LOGD(" [%{public}zu] %{public}s '%{public}s' ability disconnect with '%{public}s'", + index, + action.GetTimeString().c_str(), + action.GetName().c_str(), + action.GetTargetName().c_str()); + // commit action +} + +void ProcessOptimizerUBA::CommitChangedAbilityStateAction(const ChangeAbilityStateAction& action, size_t index) +{ + APP_LOGD(" [%{public}zu] %{public}s ability '%{public}s' state changed from %{public}d to %{public}d.", + index, + action.GetTimeString().c_str(), + action.GetName().c_str(), + action.GetOldState(), + action.GetNewState()); + // commit action +} + +void ProcessOptimizerUBA::CommitRemoveAbilityAction(const RemoveAbilityAction& action, size_t index) +{ + APP_LOGD(" [%{public}zu] %{public}s '%{public}s' removed.", + index, + action.GetTimeString().c_str(), + action.GetName().c_str()); + // commit action +} + UbaServicePtr ProcessOptimizerUBA::GetUbaService() { if (ubaService_) { diff --git a/services/appmgr/test/mock/include/mock_ability_token.h b/services/appmgr/test/mock/include/mock_ability_token.h index ffee93df53ed1dd1cfb39d88f44c9bedc9dc9e49..2a43c7d652a418eec9212b9f478f89def85c7847 100644 --- a/services/appmgr/test/mock/include/mock_ability_token.h +++ b/services/appmgr/test/mock/include/mock_ability_token.h @@ -24,11 +24,11 @@ namespace OHOS { namespace AppExecFwk { - class IAbilityToken : public IRemoteBroker { public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.appexecfwk.AbilityToken"); }; +DECLARE_INTERFACE_DESCRIPTOR(u"IAbilityToken"); class MockAbilityToken : public IRemoteStub { public: @@ -54,9 +54,6 @@ public: private: DISALLOW_COPY_AND_MOVE(AbilityTokenProxy); }; - -DECLARE_INTERFACE_DESCRIPTOR(u"IAbilityToken"); - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_SERVICES_APPMGR_TEST_UT_MOCK_ABILITY_TOKEN_H diff --git a/services/appmgr/test/mock/include/mock_ams_mgr_scheduler.h b/services/appmgr/test/mock/include/mock_ams_mgr_scheduler.h index fd3d79275557492de992f418ab72334d7cbe7a74..2b5aaeeb4735ee73b78e4c79c342873ae0978923 100644 --- a/services/appmgr/test/mock/include/mock_ams_mgr_scheduler.h +++ b/services/appmgr/test/mock/include/mock_ams_mgr_scheduler.h @@ -21,18 +21,14 @@ namespace OHOS { namespace AppExecFwk { - class MockAmsMgrScheduler : public AmsMgrStub { - public: MOCK_METHOD4(LoadAbility, void(const sptr &token, const sptr &preToken, const std::shared_ptr &abilityInfo, const std::shared_ptr &appInfo)); - MOCK_METHOD5(AbilityBehaviorAnalysis, void(const sptr &token, const sptr &preToken, const int32_t visibility, const int32_t perceptibility, const int32_t connectionState)); - MOCK_METHOD1(TerminateAbility, void(const sptr &token)); MOCK_METHOD2(UpdateAbilityState, void(const sptr &token, const AbilityState state)); MOCK_METHOD0(Reset, void()); @@ -41,10 +37,8 @@ public: MOCK_METHOD0(IsReady, bool()); MOCK_METHOD1(AbilityAttachTimeOut, void(const sptr &token)); MOCK_METHOD4(CompelVerifyPermission, int(const std::string &permission, int pid, int uid, std::string &message)); - MockAmsMgrScheduler() : AmsMgrStub(){}; virtual ~MockAmsMgrScheduler(){}; - virtual void RegisterAppStateCallback(const sptr &callback) override { callback->OnAbilityRequestDone(nullptr, AbilityState::ABILITY_STATE_BACKGROUND); @@ -52,7 +46,6 @@ public: callback->OnAppStateChanged(appProcessData); } }; - } // namespace AppExecFwk } // namespace OHOS diff --git a/services/appmgr/test/mock/include/mock_app_mgr_service.h b/services/appmgr/test/mock/include/mock_app_mgr_service.h index e10cf628c2698d5a1dee727b9ce6d53cc95b2e57..3be54288ae3cff27d7501afcd6ff51debf979cb4 100644 --- a/services/appmgr/test/mock/include/mock_app_mgr_service.h +++ b/services/appmgr/test/mock/include/mock_app_mgr_service.h @@ -94,13 +94,11 @@ public: AbilityState st = AbilityState::ABILITY_STATE_BEGIN; callback_->OnAbilityRequestDone(token, st); } - private: Semaphore sem_; std::string data_; sptr callback_; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_SERVICES_COMMON_TEST_MOCK_MOCK_APP_MGR_SERVICE_H \ No newline at end of file diff --git a/services/appmgr/test/mock/include/mock_app_mgr_service_inner.h b/services/appmgr/test/mock/include/mock_app_mgr_service_inner.h index 21d2463c013731dfdbc67186635229b50830cc69..635e19f1fa70a28fa346813a27463a3d3852823b 100644 --- a/services/appmgr/test/mock/include/mock_app_mgr_service_inner.h +++ b/services/appmgr/test/mock/include/mock_app_mgr_service_inner.h @@ -18,13 +18,11 @@ #include "gmock/gmock.h" #include "app_log_wrapper.h" - #include "semaphore_ex.h" #include "app_mgr_service_inner.h" namespace OHOS { namespace AppExecFwk { - class MockAppMgrServiceInner : public AppMgrServiceInner { public: MockAppMgrServiceInner() : lock_(0) @@ -51,7 +49,6 @@ public: MOCK_CONST_METHOD0(QueryAppSpawnConnectionState, SpawnConnectionState()); MOCK_CONST_METHOD2(AddAppDeathRecipient, void(const pid_t pid, const sptr &appDeathRecipient)); MOCK_METHOD1(KillProcessByAbilityToken, void(const sptr &token)); - MOCK_METHOD5(AbilityBehaviorAnalysis, void(const sptr &token, const sptr &preToken, const int32_t visibility, const int32_t perceptibility, const int32_t connectionState)); @@ -67,7 +64,6 @@ public: currentCount_ = count_; } } - // for mock function return int32_t int32_t Post4Int() { @@ -101,7 +97,6 @@ private: int32_t count_ = 1; int32_t currentCount_ = 1; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_SERVICES_APPMGR_TEST_MOCK_APP_MGR_SERVICE_INNER_H diff --git a/services/appmgr/test/mock/include/mock_app_scheduler.h b/services/appmgr/test/mock/include/mock_app_scheduler.h index c1873d422d8688911f5939371414cd6c9147b268..e3e19822e164b99fcd3dc99c7bb958c5e1b53e40 100644 --- a/services/appmgr/test/mock/include/mock_app_scheduler.h +++ b/services/appmgr/test/mock/include/mock_app_scheduler.h @@ -24,12 +24,10 @@ namespace OHOS { namespace AppExecFwk { - class MockAppScheduler : public AppSchedulerHost { public: MockAppScheduler(){}; virtual ~MockAppScheduler(){}; - MOCK_METHOD0(ScheduleForegroundApplication, void()); MOCK_METHOD0(ScheduleBackgroundApplication, void()); MOCK_METHOD0(ScheduleTerminateApplication, void()); diff --git a/services/appmgr/test/mock/include/mock_app_service_mgr.h b/services/appmgr/test/mock/include/mock_app_service_mgr.h index 16a281468f940c4976fb059cc4aa79f4b42ab3c2..1f9980fb636d9a76178b6003b2b4429bd6b3bb89 100644 --- a/services/appmgr/test/mock/include/mock_app_service_mgr.h +++ b/services/appmgr/test/mock/include/mock_app_service_mgr.h @@ -17,14 +17,12 @@ #define FOUNDATION_APPEXECFWK_SERVICES_APPMGR_TEST_MOCK_APP_SERVICE_MGR_H #include "iremote_object.h" - #include "app_log_wrapper.h" #include "app_service_manager.h" #include "mock_app_mgr_service.h" namespace OHOS { namespace AppExecFwk { - class MockAppServiceMgr : public AppServiceManager { public: MockAppServiceMgr() = default; @@ -36,7 +34,6 @@ public: return new MockAppMgrService(); } }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_SERVICES_APPMGR_TEST_MOCK_APP_SERVICE_MGR_H \ No newline at end of file diff --git a/services/appmgr/test/mock/include/mock_app_spawn_client.h b/services/appmgr/test/mock/include/mock_app_spawn_client.h index 9ca5321263d23eb2be6080c5e25bfd56475af73b..62a5e60e43d5a4b11e393d65996f16fa2a88438d 100644 --- a/services/appmgr/test/mock/include/mock_app_spawn_client.h +++ b/services/appmgr/test/mock/include/mock_app_spawn_client.h @@ -20,7 +20,6 @@ namespace OHOS { namespace AppExecFwk { - class MockAppSpawnClient : public AppSpawnClient { public: MockAppSpawnClient() @@ -29,7 +28,6 @@ public: {} MOCK_METHOD2(StartProcess, ErrCode(const AppSpawnStartMsg &startMsg, pid_t &pid)); }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_SERVICES_APPMGR_TEST_UT_MOCK_APP_SPAWN_CLIENT_H diff --git a/services/appmgr/test/mock/include/mock_app_spawn_socket.h b/services/appmgr/test/mock/include/mock_app_spawn_socket.h index e2f66ae17bf99fca7e3cb212f7a03c0c0b488f98..4a14ec5ee108c0857ada0934989c1e03131a748a 100644 --- a/services/appmgr/test/mock/include/mock_app_spawn_socket.h +++ b/services/appmgr/test/mock/include/mock_app_spawn_socket.h @@ -24,7 +24,6 @@ namespace OHOS { namespace AppExecFwk { - class MockAppSpawnSocket : public AppSpawnSocket { public: MockAppSpawnSocket() = default; @@ -34,7 +33,6 @@ public: MOCK_METHOD0(CloseAppSpawnConnection, void()); MOCK_METHOD2(WriteMessage, ErrCode(const void *buf, const int32_t len)); MOCK_METHOD2(ReadMessage, ErrCode(void *buf, int32_t len)); - ErrCode ReadImpl(void *buf, [[maybe_unused]] int32_t len) { if (buf == nullptr) { @@ -56,7 +54,6 @@ public: private: int32_t expectPid_ = 0; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_SERVICES_APPMGR_TEST_UT_MOCK_APP_SPAWN_SOCKET_H diff --git a/services/appmgr/test/mock/include/mock_application.h b/services/appmgr/test/mock/include/mock_application.h index 52b560dbdb78bf6e8e17cc631a54c9bccc35e827..d293858dbefb49f63822cd7d2f4590fc31965a38 100644 --- a/services/appmgr/test/mock/include/mock_application.h +++ b/services/appmgr/test/mock/include/mock_application.h @@ -17,12 +17,10 @@ #include "gmock/gmock.h" #include "semaphore_ex.h" - #include "app_scheduler_host.h" namespace OHOS { namespace AppExecFwk { - class MockApplication : public AppSchedulerHost { public: MOCK_METHOD0(ScheduleForegroundApplication, void()); @@ -108,7 +106,6 @@ private: Profile profile_; // Configuration configuration_; }; - } // namespace AppExecFwk } // namespace OHOS #endif // FOUNDATION_APPEXECFWK_SERVICES_APPMGR_TEST_MOCK_APPLICATION_H diff --git a/services/appmgr/test/mock/include/mock_bundle_manager.h b/services/appmgr/test/mock/include/mock_bundle_manager.h index 4dfc90f9875ae1878049d89f74cd7c6fa85c58c2..abe52439eaef7cb825d93f3aa0903a682457d482 100644 --- a/services/appmgr/test/mock/include/mock_bundle_manager.h +++ b/services/appmgr/test/mock/include/mock_bundle_manager.h @@ -17,7 +17,6 @@ #define OHOS_AAFWK_ABILITY_MOCK_BUNDLE_MANAGER_H #include - #include "gmock/gmock.h" #include "ability_info.h" #include "application_info.h" @@ -28,7 +27,6 @@ namespace OHOS { namespace AppExecFwk { - class BundleMgrProxy : public IRemoteProxy { public: explicit BundleMgrProxy(const sptr &impl) : IRemoteProxy(impl) @@ -50,7 +48,6 @@ public: MOCK_METHOD1(UnregisterPermissionsChanged, bool(const sptr &callback)); bool QueryAbilityInfo(const AAFwk::Want &want, AbilityInfo &abilityInfo) override; bool QueryAbilityInfoByUri(const std::string &uri, AbilityInfo &abilityInfo) override; - std::string GetAppType(const std::string &bundleName) override; virtual bool GetApplicationInfo( @@ -100,19 +97,16 @@ public: { return ""; }; - virtual bool GetBundleArchiveInfo( const std::string &hapFilePath, const BundleFlag flag, BundleInfo &bundleInfo) override { return true; }; virtual bool GetHapModuleInfo(const AbilityInfo &abilityInfo, HapModuleInfo &hapModuleInfo) override; - virtual bool GetLaunchWantForBundle(const std::string &bundleName, Want &want) override { return true; }; - virtual int CheckPublicKeys(const std::string &firstBundleName, const std::string &secondBundleName) override { return 0; @@ -355,7 +349,8 @@ public: { return true; } - virtual bool GetModuleUsageRecords(const int32_t number, std::vector &moduleUsageRecords) override + virtual bool GetModuleUsageRecords(const int32_t number, + std::vector &moduleUsageRecords) override { return true; } @@ -365,7 +360,6 @@ public: return true; } }; - } // namespace AppExecFwk } // namespace OHOS diff --git a/services/appmgr/test/mock/include/sys_mgr_client.h b/services/appmgr/test/mock/include/sys_mgr_client.h index 45a85087ccf616ffaddf908099d851c781c873e9..5ec7b6906ecdbe3b80687a578e5571b0a8f238c2 100644 --- a/services/appmgr/test/mock/include/sys_mgr_client.h +++ b/services/appmgr/test/mock/include/sys_mgr_client.h @@ -20,14 +20,12 @@ #include #include #include - #include "if_system_ability_manager.h" #include "iremote_object.h" #include "singleton.h" namespace OHOS { namespace AppExecFwk { - class SysMrgClient { DECLARE_DELAYED_SINGLETON(SysMrgClient) public: diff --git a/services/appmgr/test/mock/include/system_ability.h b/services/appmgr/test/mock/include/system_ability.h index f850c8c9c8bb2d607897d92f9487d7bfe59ca1a2..000c49aa6e67de268503ca7ed65547f1a6809f23 100644 --- a/services/appmgr/test/mock/include/system_ability.h +++ b/services/appmgr/test/mock/include/system_ability.h @@ -20,11 +20,9 @@ #include "iremote_object.h" namespace OHOS { - #define REGISTER_SYSTEM_ABILITY_BY_ID(a, b, c) #define REGISTER_SYSTEM_ABILITY(abilityClassName, abilityId, runOnCreate) #define DECLEAR_SYSTEM_ABILITY(className) - static constexpr HiviewDFX::HiLogLabel LABEL = {LOG_CORE, 0xD001100, "MockSystemAbility"}; class SystemAbility { diff --git a/services/appmgr/test/mock/src/cgroup_manager.cpp b/services/appmgr/test/mock/src/cgroup_manager.cpp index 92093c088f6f42825ca47e6e600ddc1fa3e3d663..1c6659f6db420deb9601a48687298a8f05f2340f 100644 --- a/services/appmgr/test/mock/src/cgroup_manager.cpp +++ b/services/appmgr/test/mock/src/cgroup_manager.cpp @@ -27,9 +27,7 @@ namespace OHOS { namespace AppExecFwk { - namespace { - class ScopeGuard final { public: using Function = std::function; @@ -55,7 +53,6 @@ private: Function fn_; bool dismissed_ = false; }; - } // namespace CgroupManager::CgroupManager() : memoryEventControlFd_(-1) @@ -155,6 +152,5 @@ bool CgroupManager::SetFreezerSubsystem(const int tid, const SchedPolicyFreezer APP_LOGD("SetFreezerSubsystem start."); return true; } - } // namespace AppExecFwk } // namespace OHOS diff --git a/services/appmgr/test/mock/src/mock_bundle_manager.cpp b/services/appmgr/test/mock/src/mock_bundle_manager.cpp index e9d6280bf9d73b58770c010ce6cf1d08017c9124..45668e90e7d5682569532a1fc4e5790968c65442 100644 --- a/services/appmgr/test/mock/src/mock_bundle_manager.cpp +++ b/services/appmgr/test/mock/src/mock_bundle_manager.cpp @@ -21,7 +21,6 @@ namespace OHOS { namespace AppExecFwk { - bool BundleMgrProxy::QueryAbilityInfo(const AAFwk::Want &want, AbilityInfo &abilityInfo) { ElementName eleName = want.GetElement(); @@ -137,6 +136,5 @@ bool BundleMgrService::GetBundleGids(const std::string &bundleName, std::vector< gids.push_back(userGid3); return true; } - } // namespace AppExecFwk } // namespace OHOS diff --git a/services/appmgr/test/mock/src/sys_mgr_client_mock.cpp b/services/appmgr/test/mock/src/sys_mgr_client_mock.cpp index 2d342890cd87dcb3f719c1e5c86f9ab9c5062ae6..ebd54c033cde14ef0ec4eb3277e750978b372441 100644 --- a/services/appmgr/test/mock/src/sys_mgr_client_mock.cpp +++ b/services/appmgr/test/mock/src/sys_mgr_client_mock.cpp @@ -22,7 +22,6 @@ namespace OHOS { namespace AppExecFwk { - sptr SysMrgClient::GetSystemAbility(const int32_t systemAbilityId) { if (servicesMap_[systemAbilityId] == nullptr) { @@ -42,6 +41,5 @@ void SysMrgClient::RegisterSystemAbility(const int32_t systemAbilityId, sptr(appDeathRecipientObject_->appMgrServiceInner_.lock()->GetRecentAppList().size())); APP_LOGI("AppDeathRecipient_002 start"); } - } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/services/appmgr/test/unittest/ams_app_life_cycle_test/ams_app_life_cycle_test.cpp b/services/appmgr/test/unittest/ams_app_life_cycle_test/ams_app_life_cycle_test.cpp index 013644431605d2589218231cdb3fcf84379bbfd0..6b33aab85c7464adc25065dfb7428d24af31bd8e 100644 --- a/services/appmgr/test/unittest/ams_app_life_cycle_test/ams_app_life_cycle_test.cpp +++ b/services/appmgr/test/unittest/ams_app_life_cycle_test/ams_app_life_cycle_test.cpp @@ -198,7 +198,7 @@ std::shared_ptr AmsAppLifeCycleTest::CreateTestApplicationAndS auto appRecord = serviceInner_->GetOrCreateAppRunningRecord(token, appInfo, abilityInfo, "AmsAppLifeCycleTest", 0, result); EXPECT_NE(appRecord, nullptr); - appRecord->SetEventHandler(handler_); + appRecord->SetEventHandler(handler_); EXPECT_EQ(appRecord->GetRecordId(), result.appRecordId); appRecord->SetState(appState); return appRecord; @@ -2026,6 +2026,5 @@ HWTEST_F(AmsAppLifeCycleTest, GetAbilityRunningRecordByAbilityToken_001, TestSiz auto abilityRecord2 = serviceInner_->GetAbilityRunningRecordByAbilityToken(token2); EXPECT_FALSE(abilityRecord2); } - } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/services/appmgr/test/unittest/ams_app_running_record_test/ams_app_running_record_test.cpp b/services/appmgr/test/unittest/ams_app_running_record_test/ams_app_running_record_test.cpp index ec0b9b17ea8b65efa1e3298c802223aba75bc62b..1b05cbfcb4f817b40eeaad7131da553423f6044f 100644 --- a/services/appmgr/test/unittest/ams_app_running_record_test/ams_app_running_record_test.cpp +++ b/services/appmgr/test/unittest/ams_app_running_record_test/ams_app_running_record_test.cpp @@ -76,7 +76,6 @@ protected: { return mock_token_; } - protected: std::shared_ptr testAbilityRecord_; sptr client_; @@ -1226,6 +1225,5 @@ HWTEST_F(AmsAppRunningRecordTest, OnAbilityStateChanged_001, TestSize.Level0) appRecord->OnAbilityStateChanged(abilityRecord, AbilityState::ABILITY_STATE_BACKGROUND); EXPECT_EQ(AbilityState::ABILITY_STATE_BACKGROUND, abilityRecord->GetState()); } - } // namespace AppExecFwk } // namespace OHOS diff --git a/services/appmgr/test/unittest/ams_mgr_scheduler_test/ams_mgr_scheduler_test.cpp b/services/appmgr/test/unittest/ams_mgr_scheduler_test/ams_mgr_scheduler_test.cpp index d1568e48e04af9fac982eade0d4ef0fb3fcfc231..fda4e00117fa854dcb99cf60f68ef5eee2addcad 100644 --- a/services/appmgr/test/unittest/ams_mgr_scheduler_test/ams_mgr_scheduler_test.cpp +++ b/services/appmgr/test/unittest/ams_mgr_scheduler_test/ams_mgr_scheduler_test.cpp @@ -31,14 +31,12 @@ using testing::Return; namespace OHOS { namespace AppExecFwk { - class AmsMgrSchedulerTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); void SetUp(); void TearDown(); - public: protected: static const std::string GetTestAppName() @@ -404,6 +402,5 @@ HWTEST_F(AmsMgrSchedulerTest, AmsMgrScheduler_010, TestSize.Level0) APP_LOGD("AmsMgrScheduler_010 end."); } - } // namespace AppExecFwk } // namespace OHOS diff --git a/services/appmgr/test/unittest/ams_process_optimizer_test/ams_process_optimizer_test.cpp b/services/appmgr/test/unittest/ams_process_optimizer_test/ams_process_optimizer_test.cpp index bad957fbc5506d31b6ee9310fd0be8a2c63611c3..5165e060fe443f50c103a5abed5c71584703c6e0 100644 --- a/services/appmgr/test/unittest/ams_process_optimizer_test/ams_process_optimizer_test.cpp +++ b/services/appmgr/test/unittest/ams_process_optimizer_test/ams_process_optimizer_test.cpp @@ -25,17 +25,17 @@ #include #include "lmks_client.h" +namespace{ constexpr int APP_OOM_ADJ_BACKGROUND_MIN = 400; constexpr int APP_OOM_ADJ_SUSPEND_MIN = 600; const std::string APP_RECORD_NAME = "App_Name_Z"; static constexpr int APP_SUSPEND_TIMEOUT_DEFAULT = 100; static constexpr int APP_USLEEP = 200 * 1000; - using namespace testing::ext; +}; namespace OHOS { namespace AppExecFwk { - class AmsProcessOptimizerTest : public testing::Test { public: static void SetUpTestCase(); @@ -901,6 +901,5 @@ HWTEST_F(AmsProcessOptimizerTest, AmsProcessOptimizerTest_StopAppSuspendTimer_00 APP_LOGD("AmsProcessOptimizerTest_StopAppSuspendTimer_001 end."); } - } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/services/appmgr/test/unittest/ams_recent_app_list_test/ams_recent_app_list_test.cpp b/services/appmgr/test/unittest/ams_recent_app_list_test/ams_recent_app_list_test.cpp index 1364cffb53dd6d6ef2e9e84d81c896d002e599b5..2c9b6be487cd3bff2df35c8984fe3c051597f14c 100644 --- a/services/appmgr/test/unittest/ams_recent_app_list_test/ams_recent_app_list_test.cpp +++ b/services/appmgr/test/unittest/ams_recent_app_list_test/ams_recent_app_list_test.cpp @@ -409,6 +409,5 @@ HWTEST_F(AmsRecentAppListTest, PushAppFront_001, TestSize.Level1) serviceInner_->PushAppFront(appRecord->GetRecordId()); EXPECT_NE(nullptr, serviceInner_->GetAppTaskInfoById(appRecord->GetRecordId())); } - } // namespace AppExecFwk } // namespace OHOS diff --git a/services/appmgr/test/unittest/ams_service_load_ability_process_test/ams_service_load_ability_process_test.cpp b/services/appmgr/test/unittest/ams_service_load_ability_process_test/ams_service_load_ability_process_test.cpp index 65fd2f308ab0de9b1989520ee00f3e5138ad7bce..cb6a51447dd9b52dc3e8fdf0102c5af345afbcb9 100644 --- a/services/appmgr/test/unittest/ams_service_load_ability_process_test/ams_service_load_ability_process_test.cpp +++ b/services/appmgr/test/unittest/ams_service_load_ability_process_test/ams_service_load_ability_process_test.cpp @@ -37,6 +37,10 @@ using testing::Return; using testing::SetArgReferee; namespace OHOS { namespace AppExecFwk { +#define CHECK_POINTER_IS_NULLPTR(object) \ + if (object == nullptr) { \ + return; \ + } class AmsServiceLoadAbilityProcessTest : public testing::Test { public: static void SetUpTestCase(); @@ -129,12 +133,14 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, LoadAbility_001, TestSize.Level1) const auto &recordMap = service_->GetRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); auto record = service_->GetAppRunningRecordByAppName(GetTestAppName()); - ASSERT_NE(record, nullptr); + EXPECT_NE(record, nullptr); + CHECK_POINTER_IS_NULLPTR(record); EXPECT_EQ(record->GetState(), ApplicationState::APP_STATE_CREATE); const auto &abilityMap = record->GetAbilities(); EXPECT_EQ(abilityMap.size(), (uint32_t)1); auto abilityRecord = record->GetAbilityRunningRecordByToken(token); - ASSERT_NE(abilityRecord, nullptr); + EXPECT_NE(abilityRecord, nullptr); + CHECK_POINTER_IS_NULLPTR(abilityRecord); EXPECT_EQ(abilityRecord->GetState(), AbilityState::ABILITY_STATE_CREATE); APP_LOGI("AmsServiceLoadAbilityProcessTest LoadAbility_001 end"); } @@ -171,13 +177,15 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, LoadAbility_002, TestSize.Level1) const auto &recordMap = service_->GetRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); auto record = service_->GetAppRunningRecordByAppName(GetTestAppName()); - ASSERT_NE(record, nullptr); + EXPECT_NE(record, nullptr); + CHECK_POINTER_IS_NULLPTR(record); EXPECT_EQ(record->GetState(), ApplicationState::APP_STATE_CREATE); const auto &abilityMap = record->GetAbilities(); EXPECT_EQ(abilityMap.size(), (uint32_t)1); auto abilityRecord = record->GetAbilityRunningRecordByToken(token); - ASSERT_NE(abilityRecord, nullptr); + EXPECT_NE(abilityRecord, nullptr); + CHECK_POINTER_IS_NULLPTR(abilityRecord); EXPECT_EQ(abilityRecord->GetState(), AbilityState::ABILITY_STATE_CREATE); sptr token2 = GetMockToken(); @@ -195,10 +203,12 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, LoadAbility_002, TestSize.Level1) const uint32_t EXPECT_MAP_SIZE = 2; EXPECT_EQ(recordMap.size(), EXPECT_MAP_SIZE); auto record2 = service_->GetAppRunningRecordByAppName(GetTestAppName() + "_1"); - ASSERT_NE(record2, nullptr); + EXPECT_NE(record2, nullptr); + CHECK_POINTER_IS_NULLPTR(record2); EXPECT_EQ(record2->GetState(), ApplicationState::APP_STATE_CREATE); auto abilityRecord2 = record2->GetAbilityRunningRecordByToken(token2); - ASSERT_NE(abilityRecord2, nullptr); + EXPECT_NE(abilityRecord2, nullptr); + CHECK_POINTER_IS_NULLPTR(abilityRecord2); EXPECT_EQ(abilityRecord2->GetState(), AbilityState::ABILITY_STATE_CREATE); APP_LOGI("AmsServiceLoadAbilityProcessTest LoadAbility_002 end"); } @@ -348,12 +358,14 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, LoadAbility_007, TestSize.Level1) const auto &recordMap = service_->GetRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); auto record = service_->GetAppRunningRecordByAppName(GetTestAppName()); - ASSERT_NE(record, nullptr); + EXPECT_NE(record, nullptr); + CHECK_POINTER_IS_NULLPTR(record); EXPECT_EQ(record->GetState(), ApplicationState::APP_STATE_CREATE); const auto &abilityMap = record->GetAbilities(); EXPECT_EQ(abilityMap.size(), (uint32_t)1); auto abilityRecord = record->GetAbilityRunningRecordByToken(token); - ASSERT_NE(abilityRecord, nullptr); + EXPECT_NE(abilityRecord, nullptr); + CHECK_POINTER_IS_NULLPTR(abilityRecord); EXPECT_EQ(abilityRecord->GetState(), AbilityState::ABILITY_STATE_CREATE); std::shared_ptr mockClientPtr = std::make_shared(); EXPECT_CALL(*mockClientPtr, StartProcess(_, _)).Times(0); @@ -394,12 +406,14 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, LoadAbility_008, TestSize.Level1) const auto &recordMap = service_->GetRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); auto record = service_->GetAppRunningRecordByAppName(GetTestAppName()); - ASSERT_NE(record, nullptr); + EXPECT_NE(record, nullptr); + CHECK_POINTER_IS_NULLPTR(record); EXPECT_EQ(record->GetState(), ApplicationState::APP_STATE_CREATE); const auto &abilityMap = record->GetAbilities(); EXPECT_EQ(abilityMap.size(), (uint32_t)1); auto abilityRecord = record->GetAbilityRunningRecordByToken(token); - ASSERT_NE(abilityRecord, nullptr); + EXPECT_NE(abilityRecord, nullptr); + CHECK_POINTER_IS_NULLPTR(abilityRecord); EXPECT_EQ(abilityRecord->GetState(), AbilityState::ABILITY_STATE_CREATE); sptr token2 = new MockAbilityToken(); sptr preToken = token; @@ -418,7 +432,8 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, LoadAbility_008, TestSize.Level1) const auto &abilityMap2 = record2->GetAbilities(); EXPECT_EQ(abilityMap2.size(), EXPECT_MAP_SIZE); auto abilityRecord2 = record2->GetAbilityRunningRecordByToken(token2); - ASSERT_NE(abilityRecord2, nullptr); + EXPECT_NE(abilityRecord2, nullptr); + CHECK_POINTER_IS_NULLPTR(abilityRecord2); EXPECT_EQ(abilityRecord2->GetState(), AbilityState::ABILITY_STATE_CREATE); EXPECT_EQ(abilityRecord2->GetPreToken(), token); APP_LOGI("AmsServiceLoadAbilityProcessTest LoadAbility_008 end"); @@ -455,7 +470,8 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, RequestProcess_001, TestSize.Level1) const auto &recordMap = service_->GetRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); auto record = service_->GetAppRunningRecordByAppName(GetTestAppName()); - ASSERT_NE(record, nullptr); + EXPECT_NE(record, nullptr); + CHECK_POINTER_IS_NULLPTR(record); EXPECT_EQ(record->GetPriorityObject()->GetPid(), PID); EXPECT_EQ(record->GetState(), ApplicationState::APP_STATE_CREATE); APP_LOGI("AmsServiceLoadAbilityProcessTest RequestProcess_001 end"); @@ -582,12 +598,14 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, LaunchMode_001, TestSize.Level1) const auto &recordMap = service_->GetRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); auto record = service_->GetAppRunningRecordByAppName(GetTestAppName()); - ASSERT_NE(record, nullptr); + EXPECT_NE(record, nullptr); + CHECK_POINTER_IS_NULLPTR(record); EXPECT_EQ(record->GetState(), ApplicationState::APP_STATE_CREATE); const auto &abilityMap = record->GetAbilities(); EXPECT_EQ(abilityMap.size(), (uint32_t)1); auto abilityRecord = record->GetAbilityRunningRecordByToken(token); - ASSERT_NE(abilityRecord, nullptr); + EXPECT_NE(abilityRecord, nullptr); + CHECK_POINTER_IS_NULLPTR(abilityRecord); EXPECT_EQ(abilityRecord->GetState(), AbilityState::ABILITY_STATE_CREATE); APP_LOGI("AmsServiceLoadAbilityProcessTest LaunchMode_001 end"); } @@ -619,12 +637,14 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, LaunchMode_002, TestSize.Level1) const auto &recordMap = service_->GetRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); auto record = service_->GetAppRunningRecordByAppName(GetTestAppName()); - ASSERT_NE(record, nullptr); + EXPECT_NE(record, nullptr); + CHECK_POINTER_IS_NULLPTR(record); EXPECT_EQ(record->GetState(), ApplicationState::APP_STATE_CREATE); const auto &abilityMap = record->GetAbilities(); EXPECT_EQ(abilityMap.size(), (uint32_t)1); auto abilityRecord = record->GetAbilityRunningRecordByToken(token); - ASSERT_NE(abilityRecord, nullptr); + EXPECT_NE(abilityRecord, nullptr); + CHECK_POINTER_IS_NULLPTR(abilityRecord); EXPECT_EQ(abilityRecord->GetState(), AbilityState::ABILITY_STATE_CREATE); std::shared_ptr mockClientPtr = std::make_shared(); EXPECT_CALL(*mockClientPtr, StartProcess(_, _)).Times(0); @@ -666,12 +686,14 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartAbility_001, TestSize.Level1) const auto &recordMap = service_->GetRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); auto record = service_->GetAppRunningRecordByAppName(GetTestAppName()); - ASSERT_NE(record, nullptr); + EXPECT_NE(record, nullptr); + CHECK_POINTER_IS_NULLPTR(record); EXPECT_EQ(record->GetState(), ApplicationState::APP_STATE_CREATE); const auto &abilityMap = record->GetAbilities(); EXPECT_EQ(abilityMap.size(), (uint32_t)1); auto abilityRecord = record->GetAbilityRunningRecordByToken(token); - ASSERT_NE(abilityRecord, nullptr); + EXPECT_NE(abilityRecord, nullptr); + CHECK_POINTER_IS_NULLPTR(abilityRecord); EXPECT_EQ(abilityRecord->GetState(), AbilityState::ABILITY_STATE_CREATE); sptr token2 = new MockAbilityToken(); auto abilityInfo2 = std::make_shared(); @@ -690,7 +712,8 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartAbility_001, TestSize.Level1) const auto &abilityMap1 = record1->GetAbilities(); EXPECT_EQ(abilityMap1.size(), (uint32_t)2); auto abilityrecord1 = record1->GetAbilityRunningRecordByToken(token2); - ASSERT_NE(abilityrecord1, nullptr); + EXPECT_NE(abilityrecord1, nullptr); + CHECK_POINTER_IS_NULLPTR(abilityrecord1); EXPECT_EQ(abilityrecord1->GetState(), AbilityState::ABILITY_STATE_READY); APP_LOGI("AmsServiceLoadAbilityProcessTest StartAbility_001 end"); } @@ -720,12 +743,14 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartAbility_002, TestSize.Level1) const auto &recordMap = service_->GetRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); auto record = service_->GetAppRunningRecordByAppName(GetTestAppName()); - ASSERT_NE(record, nullptr); + EXPECT_NE(record, nullptr); + CHECK_POINTER_IS_NULLPTR(record); EXPECT_EQ(record->GetState(), ApplicationState::APP_STATE_CREATE); const auto &abilityMap = record->GetAbilities(); EXPECT_EQ(abilityMap.size(), (uint32_t)1); auto abilityRecord = record->GetAbilityRunningRecordByToken(token); - ASSERT_NE(abilityRecord, nullptr); + EXPECT_NE(abilityRecord, nullptr); + CHECK_POINTER_IS_NULLPTR(abilityRecord); EXPECT_EQ(abilityRecord->GetState(), AbilityState::ABILITY_STATE_CREATE); sptr token2 = new MockAbilityToken(); auto abilityInfo2 = std::make_shared(); @@ -773,12 +798,14 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartAbility_003, TestSize.Level1) const auto &recordMap = service_->GetRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); auto record = service_->GetAppRunningRecordByAppName(GetTestAppName()); - ASSERT_NE(record, nullptr); + EXPECT_NE(record, nullptr); + CHECK_POINTER_IS_NULLPTR(record); EXPECT_EQ(record->GetState(), ApplicationState::APP_STATE_CREATE); const auto &abilityMap = record->GetAbilities(); EXPECT_EQ(abilityMap.size(), (uint32_t)1); auto abilityRecord = record->GetAbilityRunningRecordByToken(token); - ASSERT_NE(abilityRecord, nullptr); + EXPECT_NE(abilityRecord, nullptr); + CHECK_POINTER_IS_NULLPTR(abilityRecord); EXPECT_EQ(abilityRecord->GetState(), AbilityState::ABILITY_STATE_CREATE); sptr token2 = new MockAbilityToken(); @@ -825,12 +852,14 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartAbility_004, TestSize.Level1) const auto &recordMap = service_->GetRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); auto record = service_->GetAppRunningRecordByAppName(GetTestAppName()); - ASSERT_NE(record, nullptr); + EXPECT_NE(record, nullptr); + CHECK_POINTER_IS_NULLPTR(record); EXPECT_EQ(record->GetState(), ApplicationState::APP_STATE_CREATE); const auto &abilityMap = record->GetAbilities(); EXPECT_EQ(abilityMap.size(), (uint32_t)1); auto abilityRecord = record->GetAbilityRunningRecordByToken(token); - ASSERT_NE(abilityRecord, nullptr); + EXPECT_NE(abilityRecord, nullptr); + CHECK_POINTER_IS_NULLPTR(abilityRecord); EXPECT_EQ(abilityRecord->GetState(), AbilityState::ABILITY_STATE_CREATE); auto abilityInfo2 = std::make_shared(); abilityInfo2->name = GetTestAbilityName() + "_1"; @@ -876,12 +905,14 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartAbility_005, TestSize.Level1) const auto &recordMap = service_->GetRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); auto record = service_->GetAppRunningRecordByAppName(GetTestAppName()); - ASSERT_NE(record, nullptr); + EXPECT_NE(record, nullptr); + CHECK_POINTER_IS_NULLPTR(record); EXPECT_EQ(record->GetState(), ApplicationState::APP_STATE_CREATE); const auto &abilityMap = record->GetAbilities(); EXPECT_EQ(abilityMap.size(), (uint32_t)1); auto abilityRecord = record->GetAbilityRunningRecordByToken(token); - ASSERT_NE(abilityRecord, nullptr); + EXPECT_NE(abilityRecord, nullptr); + CHECK_POINTER_IS_NULLPTR(abilityRecord); EXPECT_EQ(abilityRecord->GetState(), AbilityState::ABILITY_STATE_CREATE); sptr token2 = new MockAbilityToken(); auto abilityInfo2 = std::make_shared(); @@ -898,7 +929,8 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartAbility_005, TestSize.Level1) const auto &abilityMap1 = record1->GetAbilities(); EXPECT_EQ(abilityMap1.size(), (uint32_t)2); auto abilityrecord1 = record1->GetAbilityRunningRecordByToken(token2); - ASSERT_NE(abilityrecord1, nullptr); + EXPECT_NE(abilityrecord1, nullptr); + CHECK_POINTER_IS_NULLPTR(abilityrecord1); EXPECT_EQ(abilityrecord1->GetState(), AbilityState::ABILITY_STATE_READY); APP_LOGI("AmsServiceLoadAbilityProcessTest StartAbility_005 end"); } @@ -928,12 +960,14 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartAbility_006, TestSize.Level1) const auto &recordMap = service_->GetRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); auto record = service_->GetAppRunningRecordByAppName(GetTestAppName()); - ASSERT_NE(record, nullptr); + EXPECT_NE(record, nullptr); + CHECK_POINTER_IS_NULLPTR(record); EXPECT_EQ(record->GetState(), ApplicationState::APP_STATE_CREATE); const auto &abilityMap = record->GetAbilities(); EXPECT_EQ(abilityMap.size(), (uint32_t)1); auto abilityRecord = record->GetAbilityRunningRecordByToken(token); - ASSERT_NE(abilityRecord, nullptr); + EXPECT_NE(abilityRecord, nullptr); + CHECK_POINTER_IS_NULLPTR(abilityRecord); EXPECT_EQ(abilityRecord->GetState(), AbilityState::ABILITY_STATE_CREATE); auto abilityInfo2 = std::make_shared(); abilityInfo2->name = GetTestAbilityName() + "_1"; @@ -983,12 +1017,14 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartProcess001, TestSize.Level1) EXPECT_EQ(recordMap.size(), (uint32_t)1); auto record1 = service_->GetAppRunningRecordByAppName(GetTestAppName()); EXPECT_EQ(record1->GetPriorityObject()->GetPid(), PID); - ASSERT_NE(record1, nullptr); + EXPECT_NE(record1, nullptr); + CHECK_POINTER_IS_NULLPTR(record1); EXPECT_EQ(record1->GetState(), ApplicationState::APP_STATE_CREATE); const auto &abilityMap = record1->GetAbilities(); EXPECT_EQ(abilityMap.size(), (uint32_t)1); auto abilityRecord = record1->GetAbilityRunningRecordByToken(token); - ASSERT_NE(abilityRecord, nullptr); + EXPECT_NE(abilityRecord, nullptr); + CHECK_POINTER_IS_NULLPTR(abilityRecord); EXPECT_EQ(abilityRecord->GetState(), AbilityState::ABILITY_STATE_CREATE); APP_LOGI("AmsServiceLoadAbilityProcessTest StartProcess001 end"); } @@ -1019,7 +1055,8 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartProcess002, TestSize.Level1) const auto &recordMap = service_->GetRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); auto record1 = service_->GetAppRunningRecordByAppName(GetTestAppName()); - ASSERT_NE(record1, nullptr); + EXPECT_NE(record1, nullptr); + CHECK_POINTER_IS_NULLPTR(record1); APP_LOGI("AmsServiceLoadAbilityProcessTest StartProcess002 end"); } @@ -1050,7 +1087,8 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartProcess003, TestSize.Level1) const auto &recordMap = service_->GetRecordMap(); EXPECT_EQ(recordMap.size(), (uint32_t)1); auto record1 = service_->GetAppRunningRecordByAppName(GetTestAppName()); - ASSERT_NE(record1, nullptr); + EXPECT_NE(record1, nullptr); + CHECK_POINTER_IS_NULLPTR(record1); APP_LOGI("AmsServiceLoadAbilityProcessTest StartProcess003 end"); } @@ -1083,7 +1121,8 @@ HWTEST_F(AmsServiceLoadAbilityProcessTest, StartProcess004, TestSize.Level1) .WillOnce(DoAll(SetArgReferee<1>(PID), Return(ERR_TIMED_OUT))); std::shared_ptr record = service_->GetOrCreateAppRunningRecord(token, appInfo, abilityInfo, GetTestAppName(), 0, result); - ASSERT_NE(record, nullptr); + EXPECT_NE(record, nullptr); + CHECK_POINTER_IS_NULLPTR(record); service_->StartProcess(abilityInfo->applicationName, GetTestAppName(), record); auto record1 = service_->GetAppRunningRecordByAppRecordId(record->GetRecordId()); EXPECT_EQ(record1, nullptr); diff --git a/services/appmgr/test/unittest/app_mgr_service_event_handler_test/app_mgr_service_event_handler_test.cpp b/services/appmgr/test/unittest/app_mgr_service_event_handler_test/app_mgr_service_event_handler_test.cpp index 5de5eecffcd63f80adef14bcf38a6918746b6f85..bc565bfb5630ad594f78e540c02a470289059587 100644 --- a/services/appmgr/test/unittest/app_mgr_service_event_handler_test/app_mgr_service_event_handler_test.cpp +++ b/services/appmgr/test/unittest/app_mgr_service_event_handler_test/app_mgr_service_event_handler_test.cpp @@ -23,17 +23,13 @@ #include #include "mock_app_scheduler.h" #include "inner_event.h" - #include using namespace testing::ext; - namespace OHOS { namespace AppExecFwk { - static bool eventHandlerFlag_ = false; class MockAMSEventHandler : public AMSEventHandler { - public: MockAMSEventHandler(const std::shared_ptr &runner, const std::shared_ptr &ams); virtual ~MockAMSEventHandler(); @@ -126,15 +122,10 @@ HWTEST_F(AMSEventHandlerTest, app_mgr_service_event_handler_test_001, TestSize.L if (!testAms) { APP_LOGI("app_mgr_service_event_handler_test : testAms is null"); } - EXPECT_FALSE(eventHandler_); - // init eventHandler_ = std::make_shared(runner_, testAms); - EXPECT_TRUE(eventHandler_); - // EXPECT_TRUE(eventHandler_->testAms_); - APP_LOGI("app_mgr_service_event_handler_test end"); } @@ -171,6 +162,8 @@ HWTEST_F(AMSEventHandlerTest, app_mgr_service_event_handler_test_002, TestSize.L APP_LOGI("app_mgr_service_event_handler_test end"); } - } // namespace AppExecFwk + + + } // namespace OHOS diff --git a/services/bundlemgr/src/bundle_data_mgr.cpp b/services/bundlemgr/src/bundle_data_mgr.cpp index 1c61ef23952b1c590e001b34c1031709b134bf85..5bccc3f5c2886ff7593d3da34fcf75e8334a2534 100755 --- a/services/bundlemgr/src/bundle_data_mgr.cpp +++ b/services/bundlemgr/src/bundle_data_mgr.cpp @@ -1085,8 +1085,9 @@ bool BundleDataMgr::GenerateUidAndGid(InnerBundleInfo &info) APP_LOGI("the %{public}d app install", i); innerMap.emplace(i, info.GetBundleName()); uid = i + baseUid; - info.SetUid(baseUid); - info.SetGid(baseUid); + APP_LOGI("the uid is %{public}d", uid); + info.SetUid(uid); + info.SetGid(uid); return true; } } @@ -1121,8 +1122,10 @@ bool BundleDataMgr::RecycleUidAndGid(const InnerBundleInfo &info) return (appUidMap_); } }(); + std::lock_guard lock(uidMapMutex_); for (auto &kv : innerMap) { if (kv.second == info.GetBundleName()) { + APP_LOGI("the recycle uid is %{public}d", kv.first); innerMap.erase(kv.first); return true; } @@ -1198,10 +1201,13 @@ bool BundleDataMgr::RestoreUidAndGid() for (const auto &info : item.second) { uint32_t uid = info.second.GetUid(); if ((uid < Constants::BASE_SYS_VEN_UID) && (uid >= Constants::BASE_SYS_UID)) { + std::lock_guard lock(uidMapMutex_); sysUidMap_[uid - Constants::BASE_SYS_UID] = info.second.GetBundleName(); } else if ((uid >= Constants::BASE_SYS_VEN_UID) && (uid <= Constants::MAX_SYS_VEN_UID)) { + std::lock_guard lock(uidMapMutex_); sysVendorUidMap_[uid - Constants::BASE_SYS_VEN_UID] = info.second.GetBundleName(); } else if (uid > Constants::MAX_SYS_VEN_UID) { + std::lock_guard lock(uidMapMutex_); appUidMap_[uid - Constants::BASE_APP_UID] = info.second.GetBundleName(); } } @@ -1620,7 +1626,8 @@ bool BundleDataMgr::UnregisterPermissionsChanged(const sptr lock(allPermissionsChangedLock_); - for (auto allPermissionsItem = allPermissionsCallbacks_.begin(); allPermissionsItem != allPermissionsCallbacks_.end();) { + for (auto allPermissionsItem = allPermissionsCallbacks_.begin(); + allPermissionsItem != allPermissionsCallbacks_.end();) { if ((*allPermissionsItem)->AsObject() == callback->AsObject()) { allPermissionsItem = allPermissionsCallbacks_.erase(allPermissionsItem); APP_LOGI("unregister from all permissions callbacks success!"); diff --git a/services/bundlemgr/src/bundle_permission_mgr.cpp b/services/bundlemgr/src/bundle_permission_mgr.cpp index 91a84da1179df22393513352609afd6987dfe6ab..be095ae15f2094fbed9f6ba15f1c7d25f6ea2c86 100644 --- a/services/bundlemgr/src/bundle_permission_mgr.cpp +++ b/services/bundlemgr/src/bundle_permission_mgr.cpp @@ -26,8 +26,8 @@ namespace AppExecFwk { using namespace OHOS::Security; namespace { -const std::string HOS_NORMAL_APP = "ohos_normal_app"; -const std::string HOS_SYSTEM_APP = "ohos_system_app"; +const std::string HOS_NORMAL_APP = "hos_normal_app"; +const std::string HOS_SYSTEM_APP = "hos_system_app"; // convert the Permission::PermissionDef struct to // AppExecFwk::PermissionDef struct that can be used in IPC process bool ConvertPermissionDef(const Permission::PermissionDef &permDef, PermissionDef &permissionDef) diff --git a/services/bundlemgr/src/bundle_profile.cpp b/services/bundlemgr/src/bundle_profile.cpp index 4ef30a7e14a61265df5e4633a0b0ce5cbc4c57a4..5e6df71eeb635c8b323879c8ef907379042b833a 100644 --- a/services/bundlemgr/src/bundle_profile.cpp +++ b/services/bundlemgr/src/bundle_profile.cpp @@ -1916,6 +1916,10 @@ bool TransformToInfo( abilityInfo.kind = ability.type; abilityInfo.srcPath = ability.srcPath; abilityInfo.srcLanguage = ability.srcLanguage; + std::transform(abilityInfo.srcLanguage.begin(), abilityInfo.srcLanguage.end(), abilityInfo.srcLanguage.begin(), ::tolower); + if (abilityInfo.srcLanguage != ProfileReader::BUNDLE_MODULE_PROFILE_KEY_JS) { + abilityInfo.isNativeAbility = true; + } auto iterType = std::find_if(std::begin(ProfileReader::ABILITY_TYPE_MAP), std::end(ProfileReader::ABILITY_TYPE_MAP), [&ability](const auto &item) { return item.first == ability.type; }); @@ -1967,6 +1971,7 @@ bool TransformToInfo( abilityInfo.minFormWidth = ability.form.minWidth; abilityInfo.defaultFormWidth = ability.form.defaultWidth; GetMetaData(abilityInfo.metaData, ability.metaData); + abilityInfo.formEnabled = ability.formEnabled; return true; } @@ -2065,7 +2070,6 @@ bool TransformToInfo(ProfileReader::ConfigJson &configJson, InnerBundleInfo &inn } if (configJson.module.jses.empty()) { bundleInfo.isNativeApp = true; - abilityInfo.isNativeAbility = true; } innerBundleInfo.InsertAbilitiesInfo(keyName, abilityInfo); } diff --git a/services/test/moduletest/common/ams/ability_running_record_test/ams_ability_running_record_module_test.cpp b/services/test/moduletest/common/ams/ability_running_record_test/ams_ability_running_record_module_test.cpp index 21555dd04739c79ae960b4230a37fa928cab6e30..0de9b540d54eb9dcb6f755c8151a651594e3f418 100644 --- a/services/test/moduletest/common/ams/ability_running_record_test/ams_ability_running_record_module_test.cpp +++ b/services/test/moduletest/common/ams/ability_running_record_test/ams_ability_running_record_module_test.cpp @@ -27,10 +27,8 @@ using namespace testing::ext; namespace OHOS { namespace AppExecFwk { namespace { - const std::string APP_RECORD_NAME = "App_Name_Z"; const std::string ABILITY_RECORD_NAME = "Ability_Name_Z"; - // schedule phase const int NONE_SCHEDULED = 0; const int FOREGROUND_SCHEDULED = 1 << 0; @@ -44,9 +42,7 @@ const int CLEAN_ABILITY_SCHEDULED = 1 << 7; const int PROFILE_CHANGED_SCHEDULED = 1 << 8; const int SCHEDULE_CONFIGURATION_UPDATED = 1 << 9; const int ABILITY_RUNNING_RECORD_NUM = 1000; - } // namespace - class MockedSchedulerBase { public: MockedSchedulerBase() @@ -427,6 +423,5 @@ HWTEST_F(AmsAbilityRunningRecordModuleTest, OperateAbilityRunningRecord_001, Tes } APP_LOGI("OperateAbilityRunningRecord_001 end"); } - } // namespace AppExecFwk } // namespace OHOS diff --git a/services/test/moduletest/common/ams/app_life_cycle_test/ams_app_life_cycle_module_test.cpp b/services/test/moduletest/common/ams/app_life_cycle_test/ams_app_life_cycle_module_test.cpp index 20e10a2cb4575781565d8d08b6368436d0ff6b70..c268af9bdff29ae27c8398db0b4a13c40ea75a57 100755 --- a/services/test/moduletest/common/ams/app_life_cycle_test/ams_app_life_cycle_module_test.cpp +++ b/services/test/moduletest/common/ams/app_life_cycle_test/ams_app_life_cycle_module_test.cpp @@ -38,24 +38,24 @@ using testing::Return; using testing::SetArgReferee; namespace { - const int32_t ABILITY_NUM = 100; const int32_t APPLICATION_NUM = 100; const int32_t INDEX_NUM_100 = 100; const int32_t INDEX_NUM_MAX = 100; const std::string TEST_APP_NAME = "test_app_"; const std::string TEST_ABILITY_NAME = "test_ability_"; - +#define CHECK_POINTER_IS_NULLPTR(object) \ + if (object == nullptr) { \ + return; \ + } } // namespace namespace OHOS { namespace AppExecFwk { - struct TestProcessInfo { pid_t pid = 0; bool isStart = false; }; - // specify process condition class AmsAppLifeCycleModuleTest : public testing::Test { public: @@ -216,7 +216,8 @@ void AmsAppLifeCycleModuleTest::ChangeAbilityStateToForegroud(const sptrUpdateAbilityState(token, AbilityState::ABILITY_STATE_FOREGROUND); if (!isChange) { - ASSERT_NE(appRunningRecord, nullptr); + EXPECT_NE(appRunningRecord, nullptr); + CHECK_POINTER_IS_NULLPTR(appRunningRecord); int32_t recordId = appRunningRecord->GetRecordId(); serviceInner_->ApplicationForegrounded(recordId); } @@ -235,7 +236,8 @@ void AmsAppLifeCycleModuleTest::ChangeAbilityStateToBackGroud(const sptrUpdateAbilityState(token, AbilityState::ABILITY_STATE_BACKGROUND); if (!isChange) { - ASSERT_NE(appRunningRecord, nullptr); + EXPECT_NE(appRunningRecord, nullptr); + CHECK_POINTER_IS_NULLPTR(appRunningRecord); int32_t recordId = appRunningRecord->GetRecordId(); serviceInner_->ApplicationBackgrounded(recordId); } @@ -251,7 +253,8 @@ void AmsAppLifeCycleModuleTest::ChangeAppToTerminate(const sptrAbilityTerminated(token); - ASSERT_NE(appRunningRecord, nullptr); + EXPECT_NE(appRunningRecord, nullptr); + CHECK_POINTER_IS_NULLPTR(appRunningRecord); int32_t recordId = appRunningRecord->GetRecordId(); serviceInner_->ApplicationTerminated(recordId); } else { @@ -269,11 +272,13 @@ void AmsAppLifeCycleModuleTest::ChangeAbilityStateToTerminate( void AmsAppLifeCycleModuleTest::CheckState(const std::shared_ptr &appRunningRecord, const sptr &token, const AbilityState abilityState, const ApplicationState appState) const { - ASSERT_NE(appRunningRecord, nullptr); + EXPECT_NE(appRunningRecord, nullptr); + CHECK_POINTER_IS_NULLPTR(appRunningRecord); auto abilityRunningRecord = appRunningRecord->GetAbilityRunningRecordByToken(token); ApplicationState getAppState = appRunningRecord->GetState(); EXPECT_EQ(appState, getAppState); - ASSERT_NE(abilityRunningRecord, nullptr); + EXPECT_NE(abilityRunningRecord, nullptr); + CHECK_POINTER_IS_NULLPTR(abilityRunningRecord); AbilityState getAbilityState = abilityRunningRecord->GetState(); EXPECT_EQ(abilityState, getAbilityState); } @@ -350,11 +355,6 @@ sptr AmsAppLifeCycleModuleTest::GetAbilityToken() return mockToken_; } -// void InvokeOnAbilityRequestDone(const sptr &obj, const AbilityState state) -// { -// EXPECT_EQ(state, AbilityState::ABILITY_STATE_BACKGROUND); -// } - /* * Feature: Ams * Function: AppLifeCycle @@ -371,7 +371,8 @@ sptr AmsAppLifeCycleModuleTest::GetAbilityToken() */ HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_001, TestSize.Level2) { - ASSERT_NE(serviceInner_, nullptr); + EXPECT_NE(serviceInner_, nullptr); + CHECK_POINTER_IS_NULLPTR(serviceInner_); pid_t pid = 1024; sptr token = GetAbilityToken(); auto abilityInfo = GetAbilityInfo("0", "MainAbility", "p1", "com.ohos.test.helloworld"); @@ -416,7 +417,8 @@ HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_001, TestSize.Level2) HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_002, TestSize.Level3) { pid_t pid = 1023; - ASSERT_NE(serviceInner_, nullptr); + EXPECT_NE(serviceInner_, nullptr); + CHECK_POINTER_IS_NULLPTR(serviceInner_); std::shared_ptr appRunningRecord = nullptr; std::vector> tokens; auto abilityInfo = std::make_shared(); @@ -525,7 +527,8 @@ HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_003, TestSize.Level3) */ HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_004, TestSize.Level3) { - ASSERT_NE(serviceInner_, nullptr); + EXPECT_NE(serviceInner_, nullptr); + CHECK_POINTER_IS_NULLPTR(serviceInner_); pid_t pid = 1024; sptr token = GetAbilityToken(); auto abilityInfo = GetAbilityInfo("0", "MainAbility", "p3", "com.ohos.test.helloworld"); @@ -572,7 +575,8 @@ HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_004, TestSize.Level3) */ HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_005, TestSize.Level2) { - ASSERT_NE(serviceInner_, nullptr); + EXPECT_NE(serviceInner_, nullptr); + CHECK_POINTER_IS_NULLPTR(serviceInner_); pid_t pid = 1024; sptr token0 = new (std::nothrow) MockAbilityToken(); @@ -635,7 +639,8 @@ HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_005, TestSize.Level2) */ HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_006, TestSize.Level2) { - ASSERT_NE(serviceInner_, nullptr); + EXPECT_NE(serviceInner_, nullptr); + CHECK_POINTER_IS_NULLPTR(serviceInner_); pid_t pid = fork(); if (pid == 0) { @@ -692,7 +697,8 @@ HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_006, TestSize.Level2) */ HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_007, TestSize.Level2) { - ASSERT_NE(serviceInner_, nullptr); + EXPECT_NE(serviceInner_, nullptr); + CHECK_POINTER_IS_NULLPTR(serviceInner_); pid_t pid = 1024; sptr token = GetAbilityToken(); auto abilityInfo = GetAbilityInfo("0", "MainAbility", "p1", "com.ohos.test.helloworld"); @@ -741,7 +747,8 @@ HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_007, TestSize.Level2) */ HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_008, TestSize.Level2) { - ASSERT_NE(serviceInner_, nullptr); + EXPECT_NE(serviceInner_, nullptr); + CHECK_POINTER_IS_NULLPTR(serviceInner_); pid_t pid_0 = 1024; pid_t pid_1 = 2048; sptr token_0 = new (std::nothrow) MockAbilityToken(); @@ -811,7 +818,8 @@ HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_008, TestSize.Level2) HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_009, TestSize.Level3) { pid_t pid = 1025; - ASSERT_NE(serviceInner_, nullptr); + EXPECT_NE(serviceInner_, nullptr); + CHECK_POINTER_IS_NULLPTR(serviceInner_); std::shared_ptr appRunningRecord = nullptr; auto abilityInfo = std::make_shared(); auto appInfo = std::make_shared(); @@ -857,7 +865,8 @@ HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_009, TestSize.Level3) HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_010, TestSize.Level3) { pid_t pid = 1025; - ASSERT_NE(serviceInner_, nullptr); + EXPECT_NE(serviceInner_, nullptr); + CHECK_POINTER_IS_NULLPTR(serviceInner_); std::shared_ptr appRunningRecord = nullptr; int32_t recordId[APPLICATION_NUM]; sptr mockAppScheduler[APPLICATION_NUM]; @@ -979,7 +988,7 @@ HWTEST_F(AmsAppLifeCycleModuleTest, StateChange_013, TestSize.Level3) EXPECT_CALL(*mockAppSpawnSocket, OpenAppSpawnConnection()).Times(1).WillOnce(Return(0)); int ret = serviceInner_->OpenAppSpawnConnection(); - ASSERT_EQ(ret, 0); + EXPECT_EQ(ret, 0); EXPECT_EQ(serviceInner_->QueryAppSpawnConnectionState(), SpawnConnectionState::STATE_CONNECTED); EXPECT_CALL(*mockAppSpawnSocket, CloseAppSpawnConnection()).Times(1); @@ -1370,6 +1379,5 @@ HWTEST_F(AmsAppLifeCycleModuleTest, AbilityBehaviorAnalysis_06, TestSize.Level0) EXPECT_EQ(abilityRecord_1->GetPerceptibility(), perceptibility); EXPECT_EQ(abilityRecord_1->GetConnectionState(), connectionState); } - } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/services/test/moduletest/common/ams/app_mgr_service_test/ams_app_mgr_service_module_test.cpp b/services/test/moduletest/common/ams/app_mgr_service_test/ams_app_mgr_service_module_test.cpp index 12eadc519bf9b19e83c6f7288ef87a30a3eb091c..1b0b8039558e3c658eff7c4bc6f2a479ff1be317 100644 --- a/services/test/moduletest/common/ams/app_mgr_service_test/ams_app_mgr_service_module_test.cpp +++ b/services/test/moduletest/common/ams/app_mgr_service_test/ams_app_mgr_service_module_test.cpp @@ -34,13 +34,11 @@ using testing::InvokeWithoutArgs; using testing::Return; namespace { - constexpr int COUNT = 1; } namespace OHOS { namespace AppExecFwk { - class TestAppSchedulerImpl : public AppSchedulerHost { public: void ScheduleForegroundApplication() override @@ -66,7 +64,6 @@ public: void ScheduleProcessSecurityExit() override {} }; - class AppMgrServiceModuleTest : public testing::Test { public: static void SetUpTestCase(); @@ -75,9 +72,9 @@ public: void TearDown(); protected: - inline static std::shared_ptr mockAppMgrServiceInner_; - inline static std::shared_ptr appMgrService_; - inline static sptr testRemoteObject_; + inline static std::shared_ptr mockAppMgrServiceInner_{nullptr}; + inline static std::shared_ptr appMgrService_{nullptr}; + inline static sptr testRemoteObject_{nullptr}; }; void AppMgrServiceModuleTest::SetUpTestCase() @@ -483,6 +480,5 @@ HWTEST_F(AppMgrServiceModuleTest, GetAmsMgr_001, TestSize.Level1) EXPECT_TRUE(amsMgr); } - } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/services/test/moduletest/common/ams/app_recent_list_test/ams_app_recent_list_module_test.cpp b/services/test/moduletest/common/ams/app_recent_list_test/ams_app_recent_list_module_test.cpp index a9640bc1684bb4b3f65c33cbc5a8b7ea5f6ec5ea..18f6aee531c9219391723362203d07ea1468b2a4 100644 --- a/services/test/moduletest/common/ams/app_recent_list_test/ams_app_recent_list_module_test.cpp +++ b/services/test/moduletest/common/ams/app_recent_list_test/ams_app_recent_list_module_test.cpp @@ -36,14 +36,12 @@ using testing::SetArgReferee; namespace OHOS { namespace AppExecFwk { namespace { - const int32_t INDEX_NUM_1 = 1; const int32_t INDEX_NUM_2 = 2; const int32_t INDEX_NUM_3 = 3; const int32_t INDEX_NUM_10 = 10; const std::string TEST_APP_NAME = "test_app_"; const std::string TEST_ABILITY_NAME = "test_ability_"; - } // namespace class AmsAppRecentListModuleTest : public testing::Test { @@ -58,9 +56,9 @@ protected: const std::shared_ptr CreateAppRunningRecordByIndex(const int32_t index) const; void CreateAppRecentList(const int32_t appNum); - std::unique_ptr serviceInner_; - sptr mockToken_; - sptr mockBundleMgr; + std::unique_ptr serviceInner_{nullptr}; + sptr mockToken_{nullptr}; + sptr mockBundleMgr{nullptr}; }; void AmsAppRecentListModuleTest::SetUpTestCase() @@ -331,6 +329,5 @@ HWTEST_F(AmsAppRecentListModuleTest, Clear_Recent_List_001, TestSize.Level0) EXPECT_TRUE(serviceInner_->GetRecentAppList().empty()); APP_LOGI("Clear_Recent_List_002 end"); } - } // namespace AppExecFwk } // namespace OHOS diff --git a/services/test/moduletest/common/ams/app_running_record_test/ams_app_running_record_module_test.cpp b/services/test/moduletest/common/ams/app_running_record_test/ams_app_running_record_module_test.cpp index f565d0ef49b9bb0e33115fc4c098be6f5d7ee4d2..3f79fc7602094d518596da9d876cc6ae19c3cb45 100644 --- a/services/test/moduletest/common/ams/app_running_record_test/ams_app_running_record_module_test.cpp +++ b/services/test/moduletest/common/ams/app_running_record_test/ams_app_running_record_module_test.cpp @@ -35,7 +35,6 @@ using testing::InvokeWithoutArgs; namespace OHOS { namespace AppExecFwk { - class AmsAppRunningRecordModuleTest : public testing::Test { public: static void SetUpTestCase(); @@ -118,7 +117,7 @@ protected: EXPECT_EQ(abilityName, abilityNameFromServ) << "fail, app record name is not equal!"; } - std::unique_ptr service_; + std::unique_ptr service_{nullptr}; sptr GetMockToken() const { @@ -127,10 +126,20 @@ protected: private: std::vector appName_ = { - "test_app_name1", "test_app_name2", "test_app_name3", "test_app_name4", "test_app_name5"}; + "test_app_name1", + "test_app_name2", + "test_app_name3", + "test_app_name4", + "test_app_name5", + }; std::vector abilityName_ = { - "test_ability_name1", "test_ability_name2", "test_ability_name3", "test_ability_name4", "test_ability_name5"}; - sptr mockToken_; + "test_ability_name1", + "test_ability_name2", + "test_ability_name3", + "test_ability_name4", + "test_ability_name5", + }; + sptr mockToken_{nullptr}; }; void AmsAppRunningRecordModuleTest::SetUpTestCase() @@ -171,7 +180,7 @@ HWTEST_F(AmsAppRunningRecordModuleTest, ApplicationStart_001, TestSize.Level0) RecordQueryResult result; auto record = service_->GetOrCreateAppRunningRecord(GetMockToken(), appInfo, abilityInfo, processName, 0, result); EXPECT_TRUE(record != nullptr) << ",create apprunningrecord fail!"; - ASSERT_FALSE(result.appExists) << ",result is wrong!"; + EXPECT_FALSE(result.appExists) << ",result is wrong!"; // check apprunningrecord int32_t id = record->GetRecordId(); @@ -231,7 +240,7 @@ HWTEST_F(AmsAppRunningRecordModuleTest, MultiApplicationStart_002, TestSize.Leve auto record = service_->GetOrCreateAppRunningRecord(GetMockToken(), appInfo, abilityInfo, processName, 0, result); EXPECT_TRUE(record != nullptr) << "create apprunningrecord fail!"; - ASSERT_FALSE(result.appExists) << "result is wrong!"; + EXPECT_FALSE(result.appExists) << "result is wrong!"; // check abilityrunningrecord & apprunningrecord int32_t id = record->GetRecordId(); @@ -274,7 +283,7 @@ HWTEST_F(AmsAppRunningRecordModuleTest, ScheduleTrimMemory_003, TestSize.Level1) RecordQueryResult result; auto record = service_->GetOrCreateAppRunningRecord(GetMockToken(), appInfo, abilityInfo, processName, 0, result); EXPECT_TRUE(record != nullptr) << "create apprunningrecord fail!"; - ASSERT_FALSE(result.appExists) << "result is wrong!"; + EXPECT_FALSE(result.appExists) << "result is wrong!"; // LaunchApplication sptr mockApplication(new MockApplication()); @@ -322,7 +331,7 @@ HWTEST_F(AmsAppRunningRecordModuleTest, LowMemoryWarning_004, TestSize.Level1) RecordQueryResult result; auto record = service_->GetOrCreateAppRunningRecord(GetMockToken(), appInfo, abilityInfo, processName, 0, result); EXPECT_TRUE(record != nullptr) << "create apprunningrecord fail!"; - ASSERT_FALSE(result.appExists) << "result is wrong!"; + EXPECT_FALSE(result.appExists) << "result is wrong!"; // LaunchApplication sptr mockApplication(new MockApplication()); @@ -472,6 +481,5 @@ HWTEST_F(AmsAppRunningRecordModuleTest, ApplicationStatusChange_006, TestSize.Le auto stateFromRec = record->GetState(); EXPECT_EQ(stateFromRec, ApplicationState::APP_STATE_TERMINATED); } - } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/services/test/moduletest/common/ams/app_service_flow_test/ams_app_service_flow_module_test.cpp b/services/test/moduletest/common/ams/app_service_flow_test/ams_app_service_flow_module_test.cpp index 46881ed2c4b7c4f7f0c8def6657a1f810ef3fdb5..72d43e9e373915965733980e0305222f13d8f944 100644 --- a/services/test/moduletest/common/ams/app_service_flow_test/ams_app_service_flow_module_test.cpp +++ b/services/test/moduletest/common/ams/app_service_flow_test/ams_app_service_flow_module_test.cpp @@ -34,11 +34,8 @@ using testing::SetArgReferee; namespace OHOS { namespace AppExecFwk { namespace { - const uint32_t CYCLE_NUMBER = 10; - } // namespace - struct TestApplicationPreRunningRecord { TestApplicationPreRunningRecord( const std::shared_ptr &appRecord, const sptr &mockAppScheduler) @@ -64,7 +61,6 @@ struct TestApplicationPreRunningRecord { }; pid_t TestApplicationPreRunningRecord::g_pid = 0; - class AmsAppServiceFlowModuleTest : public testing::Test { public: static void SetUpTestCase(); @@ -78,7 +74,7 @@ protected: const std::string &appName, const AbilityState abilityState, const ApplicationState appState) const; protected: - std::shared_ptr serviceInner_; + std::shared_ptr serviceInner_ = nullptr; std::shared_ptr handler_ = nullptr; }; @@ -714,6 +710,5 @@ HWTEST_F(AmsAppServiceFlowModuleTest, ServiceFlow_ScreenOnAndOff_001, TestSize.L EXPECT_EQ(ApplicationState::APP_STATE_FOREGROUND, testAppA.appRecord_->GetState()); APP_LOGI("AmsAppServiceFlowModuleTest ServiceFlow_ScreenOnAndOff_001 end"); } - } // namespace AppExecFwk } // namespace OHOS diff --git a/services/test/moduletest/common/ams/ipc_ams_mgr_test/ams_ipc_ams_mgr_module_test.cpp b/services/test/moduletest/common/ams/ipc_ams_mgr_test/ams_ipc_ams_mgr_module_test.cpp index 9fc352a18152bd2cc48c00370ea793b47740e1a9..fb70baede03e7fa4217ed38113e6394e9754d536 100644 --- a/services/test/moduletest/common/ams/ipc_ams_mgr_test/ams_ipc_ams_mgr_module_test.cpp +++ b/services/test/moduletest/common/ams/ipc_ams_mgr_test/ams_ipc_ams_mgr_module_test.cpp @@ -41,13 +41,9 @@ using testing::InvokeWithoutArgs; namespace OHOS { namespace AppExecFwk { - namespace { - const int32_t COUNT = 1000; - } // namespace - class AmsIpcAmsmgrModuleTest : public testing::Test { public: static void SetUpTestCase(); @@ -69,11 +65,11 @@ public: protected: sptr mockToken_ = nullptr; - sptr token_; - std::unique_ptr client_; + sptr token_{nullptr}; + std::unique_ptr client_{nullptr}; - std::shared_ptr mockAppMgrServiceInner_; - std::shared_ptr amsEventHandler_; + std::shared_ptr mockAppMgrServiceInner_{nullptr}; + std::shared_ptr amsEventHandler_{nullptr}; }; class MockMockAppMgrService : public MockAppMgrService { @@ -422,6 +418,5 @@ HWTEST_F(AmsIpcAmsmgrModuleTest, ExcuteAmsmgrIPCInterface_007, TestSize.Level3) mockAppMgrServiceInner.reset(); amsMgrScheduler.release(); } - } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/services/test/moduletest/common/ams/ipc_app_mgr_test/ams_ipc_app_mgr_module_test.cpp b/services/test/moduletest/common/ams/ipc_app_mgr_test/ams_ipc_app_mgr_module_test.cpp index 58a7556eda78fbeb48dbae368981d926683f81d4..caf863ae46c4cccec695e057ebdae030fd3392e9 100644 --- a/services/test/moduletest/common/ams/ipc_app_mgr_test/ams_ipc_app_mgr_module_test.cpp +++ b/services/test/moduletest/common/ams/ipc_app_mgr_test/ams_ipc_app_mgr_module_test.cpp @@ -32,13 +32,9 @@ using OHOS::sptr; using testing::_; using testing::Invoke; using testing::InvokeWithoutArgs; - namespace { - const int32_t COUNT = 10000; - } // namespace - class AmsIpcAppmgrModuleTest : public testing::Test { public: static void SetUpTestCase(); diff --git a/services/test/moduletest/common/ams/ipc_app_scheduler_test/ams_ipc_app_scheduler_module_test.cpp b/services/test/moduletest/common/ams/ipc_app_scheduler_test/ams_ipc_app_scheduler_module_test.cpp index 356d2ba86ee67b79c248a662f2c1dcfe69898e2c..bba642f874d729bb198625cdd1a59117cd044b48 100644 --- a/services/test/moduletest/common/ams/ipc_app_scheduler_test/ams_ipc_app_scheduler_module_test.cpp +++ b/services/test/moduletest/common/ams/ipc_app_scheduler_test/ams_ipc_app_scheduler_module_test.cpp @@ -31,11 +31,8 @@ using testing::Invoke; using testing::InvokeWithoutArgs; namespace { - const int32_t COUNT = 10000; - } // namespace - class AmsIpcAppSchedulerModuleTest : public testing::Test { public: static void SetUpTestCase(); @@ -265,7 +262,7 @@ HWTEST_F(AmsIpcAppSchedulerModuleTest, ExcuteApplicationIPCInterface_008, TestSi mockApplication->Wait(); bool isEqual = mockApplication->CompareAppLaunchData(launchData); - ASSERT_EQ(true, isEqual) << "excute fail, index is " << i; + EXPECT_EQ(true, isEqual) << "excute fail, index is " << i; } } diff --git a/services/test/moduletest/common/ams/process_optimizer_uba_test/ams_process_optimizer_uba_module_test.cpp b/services/test/moduletest/common/ams/process_optimizer_uba_test/ams_process_optimizer_uba_module_test.cpp index 699685fde8cf88f26e933dadd2c369e8780e4907..cfb2dd1891f157788fec7582de88b4e25b2b6095 100644 --- a/services/test/moduletest/common/ams/process_optimizer_uba_test/ams_process_optimizer_uba_module_test.cpp +++ b/services/test/moduletest/common/ams/process_optimizer_uba_test/ams_process_optimizer_uba_module_test.cpp @@ -21,6 +21,10 @@ #include #include "app_log_wrapper.h" +using namespace testing::ext; +namespace OHOS { +namespace AppExecFwk { +namespace { const std::string APP_RECORD_NAME = "App_Name_Z"; // foreground process oom_adj constexpr int APP_OOM_ADJ_FOREGROUND = 0; @@ -31,13 +35,8 @@ constexpr int APP_OOM_ADJ_SUSPEND_MIN = 600; static constexpr int APP_SUSPEND_TIMEOUT_DEFAULT = 100; static constexpr int APP_USLEEP = 200 * 1000; - -using namespace testing::ext; - -namespace OHOS { -namespace AppExecFwk { - -class ProcessOptimizerModuleTest : public testing::Test { +} // namespace +class AmsProcessOptimizerUbaModuleTest : public testing::Test { public: static void SetUpTestCase(); static void TearDownTestCase(); @@ -50,7 +49,7 @@ public: std::make_unique(nullptr, nullptr, APP_SUSPEND_TIMEOUT_DEFAULT); }; -void ProcessOptimizerModuleTest::SuspendApplication(const std::shared_ptr &appRecord) +void AmsProcessOptimizerUbaModuleTest::SuspendApplication(const std::shared_ptr &appRecord) { if (!appRecord) { APP_LOGE("app record is null"); @@ -65,7 +64,7 @@ void ProcessOptimizerModuleTest::SuspendApplication(const std::shared_ptrOnAppStateChanged(appRecord, ApplicationState::APP_STATE_BACKGROUND); } -void ProcessOptimizerModuleTest::ResumeApplication(const std::shared_ptr &appRecord) +void AmsProcessOptimizerUbaModuleTest::ResumeApplication(const std::shared_ptr &appRecord) { if (!appRecord) { APP_LOGE("app record is null"); @@ -77,16 +76,16 @@ void ProcessOptimizerModuleTest::ResumeApplication(const std::shared_ptrGetUid()); } -void ProcessOptimizerModuleTest::SetUpTestCase() +void AmsProcessOptimizerUbaModuleTest::SetUpTestCase() {} -void ProcessOptimizerModuleTest::TearDownTestCase() +void AmsProcessOptimizerUbaModuleTest::TearDownTestCase() {} -void ProcessOptimizerModuleTest::SetUp() +void AmsProcessOptimizerUbaModuleTest::SetUp() {} -void ProcessOptimizerModuleTest::TearDown() +void AmsProcessOptimizerUbaModuleTest::TearDown() {} /* @@ -96,9 +95,9 @@ void ProcessOptimizerModuleTest::TearDown() * FunctionPoints: add application * CaseDescription: Call the OnAppAdded function to add multiple application */ -HWTEST_F(ProcessOptimizerModuleTest, OnAppAdded_001, TestSize.Level1) +HWTEST_F(AmsProcessOptimizerUbaModuleTest, OnAppAdded_001, TestSize.Level1) { - APP_LOGI("ProcessOptimizerModuleTest OnAppAdded_001 start"); + APP_LOGI("AmsProcessOptimizerUbaModuleTest OnAppAdded_001 start"); bool isSuccess = processOptimizerUBA->Init(); EXPECT_TRUE(true == isSuccess); @@ -125,7 +124,7 @@ HWTEST_F(ProcessOptimizerModuleTest, OnAppAdded_001, TestSize.Level1) oomAdj1 = priorityObject1->GetCurAdj(); - APP_LOGI("ProcessOptimizerModuleTest OnAppAdded_001 end"); + APP_LOGI("AmsProcessOptimizerUbaModuleTest OnAppAdded_001 end"); } /* @@ -135,9 +134,9 @@ HWTEST_F(ProcessOptimizerModuleTest, OnAppAdded_001, TestSize.Level1) * FunctionPoints: change application status * CaseDescription: Set a different state, check the value of adj */ -HWTEST_F(ProcessOptimizerModuleTest, OnAppStateChanged_001, TestSize.Level1) +HWTEST_F(AmsProcessOptimizerUbaModuleTest, OnAppStateChanged_001, TestSize.Level1) { - APP_LOGI("ProcessOptimizerModuleTest OnAppStateChanged_001 start"); + APP_LOGI("AmsProcessOptimizerUbaModuleTest OnAppStateChanged_001 start"); bool isSuccess = processOptimizerUBA->Init(); EXPECT_TRUE(true == isSuccess); @@ -155,7 +154,7 @@ HWTEST_F(ProcessOptimizerModuleTest, OnAppStateChanged_001, TestSize.Level1) auto oomAdj = priorityObject->GetCurAdj(); EXPECT_TRUE(oomAdj == APP_OOM_ADJ_FOREGROUND); - APP_LOGI("ProcessOptimizerModuleTest OnAppStateChanged_001 end"); + APP_LOGI("AmsProcessOptimizerUbaModuleTest OnAppStateChanged_001 end"); } /* @@ -165,9 +164,9 @@ HWTEST_F(ProcessOptimizerModuleTest, OnAppStateChanged_001, TestSize.Level1) * FunctionPoints: change application status * CaseDescription: Set a different state, check the value of adj */ -HWTEST_F(ProcessOptimizerModuleTest, OnAppStateChanged_002, TestSize.Level1) +HWTEST_F(AmsProcessOptimizerUbaModuleTest, OnAppStateChanged_002, TestSize.Level1) { - APP_LOGI("ProcessOptimizerModuleTest OnAppStateChanged_002 start"); + APP_LOGI("AmsProcessOptimizerUbaModuleTest OnAppStateChanged_002 start"); bool isSuccess = processOptimizerUBA->Init(); EXPECT_TRUE(true == isSuccess); @@ -186,7 +185,7 @@ HWTEST_F(ProcessOptimizerModuleTest, OnAppStateChanged_002, TestSize.Level1) auto oomAdj = priorityObject->GetCurAdj(); EXPECT_TRUE(oomAdj == APP_OOM_ADJ_BACKGROUND_MIN); - APP_LOGI("ProcessOptimizerModuleTest OnAppStateChanged_002 end"); + APP_LOGI("AmsProcessOptimizerUbaModuleTest OnAppStateChanged_002 end"); } /* @@ -198,14 +197,14 @@ HWTEST_F(ProcessOptimizerModuleTest, OnAppStateChanged_002, TestSize.Level1) function, make the app state suspended 2. Call the OnAppStateChanged function to remove the suspended state */ -HWTEST_F(ProcessOptimizerModuleTest, OnAppStateChanged_003, TestSize.Level1) +HWTEST_F(AmsProcessOptimizerUbaModuleTest, OnAppStateChanged_003, TestSize.Level1) { - APP_LOGI("ProcessOptimizerModuleTest OnAppStateChanged_003 start"); + APP_LOGI("AmsProcessOptimizerUbaModuleTest OnAppStateChanged_003 start"); processOptimizerUBA->AppSuspended = - std::bind(&ProcessOptimizerModuleTest::SuspendApplication, this, std::placeholders::_1); + std::bind(&AmsProcessOptimizerUbaModuleTest::SuspendApplication, this, std::placeholders::_1); processOptimizerUBA->AppResumed = - std::bind(&ProcessOptimizerModuleTest::ResumeApplication, this, std::placeholders::_1); + std::bind(&AmsProcessOptimizerUbaModuleTest::ResumeApplication, this, std::placeholders::_1); bool isSuccess = processOptimizerUBA->Init(); EXPECT_TRUE(true == isSuccess); @@ -226,7 +225,7 @@ HWTEST_F(ProcessOptimizerModuleTest, OnAppStateChanged_003, TestSize.Level1) auto oomAdj = priorityObject->GetCurAdj(); EXPECT_TRUE(oomAdj == APP_OOM_ADJ_SUSPEND_MIN); - GTEST_LOG_(INFO) << "ProcessOptimizerModuleTest OnAppStateChanged_003 oomAdj: " << oomAdj; + GTEST_LOG_(INFO) << "AmsProcessOptimizerUbaModuleTest OnAppStateChanged_003 oomAdj: " << oomAdj; auto appState = app->GetState(); if (appState == ApplicationState::APP_STATE_SUSPENDED) { @@ -236,7 +235,7 @@ HWTEST_F(ProcessOptimizerModuleTest, OnAppStateChanged_003, TestSize.Level1) EXPECT_TRUE(oomAdj == APP_OOM_ADJ_BACKGROUND_MIN); } - APP_LOGI("ProcessOptimizerModuleTest OnAppStateChanged_003 end"); + APP_LOGI("AmsProcessOptimizerUbaModuleTest OnAppStateChanged_003 end"); } /* @@ -248,9 +247,9 @@ HWTEST_F(ProcessOptimizerModuleTest, OnAppStateChanged_003, TestSize.Level1) function 2. Calling the OnAppRemoved function will call the StopAppSuspendTimer function */ -HWTEST_F(ProcessOptimizerModuleTest, OnAppRemoved_001, TestSize.Level1) +HWTEST_F(AmsProcessOptimizerUbaModuleTest, OnAppRemoved_001, TestSize.Level1) { - APP_LOGI("ProcessOptimizerModuleTest OnAppRemoved_001 start"); + APP_LOGI("AmsProcessOptimizerUbaModuleTest OnAppRemoved_001 start"); bool isSuccess = processOptimizerUBA->Init(); EXPECT_TRUE(true == isSuccess); @@ -274,7 +273,7 @@ HWTEST_F(ProcessOptimizerModuleTest, OnAppRemoved_001, TestSize.Level1) EXPECT_TRUE(oomAdj == APP_OOM_ADJ_BACKGROUND_MIN); - APP_LOGI("ProcessOptimizerModuleTest OnAppRemoved_001 end"); + APP_LOGI("AmsProcessOptimizerUbaModuleTest OnAppRemoved_001 end"); } } // namespace AppExecFwk diff --git a/services/test/moduletest/common/ams/service_app_spawn_client_test/ams_service_app_spawn_client_module_test.cpp b/services/test/moduletest/common/ams/service_app_spawn_client_test/ams_service_app_spawn_client_module_test.cpp index d50d759ce6af828b33b0fb0ccc08996f93330180..22657286d361b9ffa5dc435f8cf46398f2417b07 100644 --- a/services/test/moduletest/common/ams/service_app_spawn_client_test/ams_service_app_spawn_client_module_test.cpp +++ b/services/test/moduletest/common/ams/service_app_spawn_client_test/ams_service_app_spawn_client_module_test.cpp @@ -40,11 +40,9 @@ using testing::Invoke; using testing::Return; namespace { - const uint32_t CYCLE_NUMBER = 10; const int32_t PID_VALUE = 13579; const int32_t CONNECT_RETRY_MAX_TIMES = 15; - } // namespace // this function is only used to mock sleep method so mst can run without delay. @@ -208,8 +206,8 @@ HWTEST_F(AmsServiceAppSpawnClientModuleTest, ConnectAppSpawnDaemon_001, TestSize for (uint32_t i = 0; i < CYCLE_NUMBER; i++) { std::this_thread::sleep_for(std::chrono::milliseconds(1)); appMgrService->OnStart(); - ASSERT_EQ(SpawnConnectionState::STATE_CONNECTED, appMgrService->QueryServiceState().connectionState); - ASSERT_EQ(SpawnConnectionState::STATE_CONNECTED, amsInner->QueryAppSpawnConnectionState()); + EXPECT_EQ(SpawnConnectionState::STATE_CONNECTED, appMgrService->QueryServiceState().connectionState); + EXPECT_EQ(SpawnConnectionState::STATE_CONNECTED, amsInner->QueryAppSpawnConnectionState()); appMgrService->OnStop(); EXPECT_EQ(SpawnConnectionState::STATE_NOT_CONNECT, appMgrService->QueryServiceState().connectionState); EXPECT_EQ(SpawnConnectionState::STATE_NOT_CONNECT, amsInner->QueryAppSpawnConnectionState()); @@ -243,8 +241,8 @@ HWTEST_F(AmsServiceAppSpawnClientModuleTest, ConnectAppSpawnDaemon_002, TestSize EXPECT_EQ(SpawnConnectionState::STATE_NOT_CONNECT, amsInner->QueryAppSpawnConnectionState()); MockedAppSpawnSocket::gConnectSuccess_ = true; appMgrService->OnStart(); - ASSERT_EQ(SpawnConnectionState::STATE_CONNECTED, appMgrService->QueryServiceState().connectionState); - ASSERT_EQ(SpawnConnectionState::STATE_CONNECTED, amsInner->QueryAppSpawnConnectionState()); + EXPECT_EQ(SpawnConnectionState::STATE_CONNECTED, appMgrService->QueryServiceState().connectionState); + EXPECT_EQ(SpawnConnectionState::STATE_CONNECTED, amsInner->QueryAppSpawnConnectionState()); appMgrService->OnStop(); EXPECT_EQ(SpawnConnectionState::STATE_NOT_CONNECT, appMgrService->QueryServiceState().connectionState); EXPECT_EQ(SpawnConnectionState::STATE_NOT_CONNECT, amsInner->QueryAppSpawnConnectionState()); @@ -270,8 +268,8 @@ HWTEST_F(AmsServiceAppSpawnClientModuleTest, ConnectAppSpawnDaemon_003, TestSize for (uint32_t i = 0; i < CYCLE_NUMBER; i++) { std::this_thread::sleep_for(std::chrono::milliseconds(1)); appMgrService->OnStart(); - ASSERT_EQ(SpawnConnectionState::STATE_CONNECTED, appMgrService->QueryServiceState().connectionState); - ASSERT_EQ(SpawnConnectionState::STATE_CONNECTED, amsInner->QueryAppSpawnConnectionState()); + EXPECT_EQ(SpawnConnectionState::STATE_CONNECTED, appMgrService->QueryServiceState().connectionState); + EXPECT_EQ(SpawnConnectionState::STATE_CONNECTED, amsInner->QueryAppSpawnConnectionState()); appMgrService->OnStart(); EXPECT_EQ(SpawnConnectionState::STATE_CONNECTED, appMgrService->QueryServiceState().connectionState); EXPECT_EQ(SpawnConnectionState::STATE_CONNECTED, amsInner->QueryAppSpawnConnectionState()); diff --git a/services/test/moduletest/common/ams/service_event_drive_test/ams_service_event_drive_module_test.cpp b/services/test/moduletest/common/ams/service_event_drive_test/ams_service_event_drive_module_test.cpp index ae18a39701f746fb3b71798c20dfa957c46a0ce8..2f0de0cbccfb4036cc73b8c4ea8110e37541c282 100644 --- a/services/test/moduletest/common/ams/service_event_drive_test/ams_service_event_drive_module_test.cpp +++ b/services/test/moduletest/common/ams/service_event_drive_test/ams_service_event_drive_module_test.cpp @@ -28,11 +28,8 @@ using namespace OHOS::AppExecFwk; using OHOS::Semaphore; namespace { - const uint32_t CYCLE_NUMBER = 10000; - } - enum class AmsInnerState { STATE_NO_OPERATION, STATE_ABILITY_LOADED, diff --git a/services/test/moduletest/common/ams/service_start_process_test/ams_service_start_process_module_test.cpp b/services/test/moduletest/common/ams/service_start_process_test/ams_service_start_process_module_test.cpp index 27ebd33e6f1db723cd07b91ba7f3aa68e46bf131..53e88c5284af87fd6eba22b2a82c70a980eeab17 100644 --- a/services/test/moduletest/common/ams/service_start_process_test/ams_service_start_process_module_test.cpp +++ b/services/test/moduletest/common/ams/service_start_process_test/ams_service_start_process_module_test.cpp @@ -26,9 +26,7 @@ using namespace testing::ext; using namespace OHOS::AppExecFwk; namespace { - const int CYCLE_NUMBER = 10000; - } // namespace class AppMgrServiceInnerMock : public AppMgrServiceInner { diff --git a/services/test/moduletest/utils/src/common_tool.cpp b/services/test/moduletest/utils/src/common_tool.cpp index 08edfb2aee15969ffabb130313504da8066318b0..f3e851a738ca0b9609b02f810d46237da37931de 100644 --- a/services/test/moduletest/utils/src/common_tool.cpp +++ b/services/test/moduletest/utils/src/common_tool.cpp @@ -99,6 +99,11 @@ bool CommonTool::CopyTmpFileToSystemPath(const std::string &srcPath, const std:: long CommonTool::GetFileBuildTime(const std::string &path) { long buildTime = 0; + + if (!CheckFilePathISExist(path)) { + return buildTime; + } + struct stat buf; FILE *file = fopen(path.c_str(), "r"); if (file == nullptr) { diff --git a/test/resource/ams/ams_page_ability_bundle/amsKitSTAbilityManager.hap b/test/resource/ams/ams_page_ability_bundle/amsKitSTAbilityManager.hap index 2b3c756af72cf0fa4f6ec949a4a0a7b0f2c3d46d..75bc00b79157494efbc99860fb222a55f01c70eb 100644 Binary files a/test/resource/ams/ams_page_ability_bundle/amsKitSTAbilityManager.hap and b/test/resource/ams/ams_page_ability_bundle/amsKitSTAbilityManager.hap differ diff --git a/test/resource/ams/ams_page_ability_bundle/amsKitSTAbilityManagerFirst.hap b/test/resource/ams/ams_page_ability_bundle/amsKitSTAbilityManagerFirst.hap new file mode 100644 index 0000000000000000000000000000000000000000..8ca69be85181b37fdfd829453ba6f7d523db134f Binary files /dev/null and b/test/resource/ams/ams_page_ability_bundle/amsKitSTAbilityManagerFirst.hap differ diff --git a/test/resource/amssystemtestability/abilitySrc/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/BUILD.gn index f583aff6456955f30da23a691294f598e85819f6..b541b54ea04a535d4f41f950283a08821faed033 100644 --- a/test/resource/amssystemtestability/abilitySrc/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/BUILD.gn @@ -13,52 +13,54 @@ group("ams_system_test_app") { deps = [ - #"amsAbilityAppendTestA:amsAbilityAppendTestA", - #"amsAbilityAppendTestB:amsAbilityAppendTestB", - #"amsAbilityVisibleTestPageA:amsAbilityVisibleTestPageA", - #"amsAbilityVisibleTestServiceB:amsAbilityVisibleTestServiceB", - #"amsConfigurationUpdatedTest:amsConfigurationUpdatedTest", - #"amsDataSystemTestA:amsDataSystemTestA", - #"amsDataSystemTestB:amsDataSystemTestB", - #"amsDataSystemTestC:amsDataSystemTestC", - #"amsKitSTAbilityManager:amsKitSTAbilityManager", - #"amsKitSystemTest:amsKitSystemTest", - #"amsKitSystemTestA:amsKitSystemTestA", - #"amsKitSystemTestB:amsKitSystemTestB", - #"amsKitSystemTestDataA:amsKitSystemTestDataA", - #"amsKitSystemTestDataB:amsKitSystemTestDataB", - #"amsKitSystemTestPageA:amsKitSystemTestPageA", - #"amsKitSystemTestService:amsKitSystemTestService", - #"amsMissionStackTest:amsMissionStackTest", - #"amsMissionStackTestSubsidiary:amsMissionStackTestSubsidiary", - #"amsSystemTestA:amsSystemTestA", - #"amsSystemTestB:amsSystemTestB", - #"amsSystemTestC:amsSystemTestC", - #"amsSystemTestD:amsSystemTestD", - #"amsSystemTestDFX:amsSystemTestDFX", - #"amsSystemTestE:amsSystemTestE", - #"amsSystemTestErrorK:amsSystemTestErrorK", - #"amsSystemTestErrorL:amsSystemTestErrorL", - #"amsSystemTestF:amsSystemTestF", - #"amsSystemTestG:amsSystemTestG", - #"amsSystemTestH:amsSystemTestH", - #"amsSystemTestI:amsSystemTestI", - #"amsSystemTestM:amsSystemTestM", - #"amsSystemTestN:amsSystemTestN", - #"amsSystemTestO:amsSystemTestO", - #"amsSystemTestP:amsSystemTestP", - #"amsSystemTestQ:amsSystemTestQ", - #"amsSystemTestR:amsSystemTestR", - #"amsSystemTestServiceA:amsSystemTestServiceA", - #"amsSystemTestServiceB:amsSystemTestServiceB", - #"amsSystemTestServiceC:amsSystemTestServiceC", - ## "amsSystemTestServiceD:amsSystemTestServiceD", - #"amsSystemTestServiceE:amsSystemTestServiceE", - #"amsSystemTestServiceF:amsSystemTestServiceF", - #"amsSystemTestServiceG:amsSystemTestServiceG", - #"amsSystemTestServiceH:amsSystemTestServiceH", - #"serviceAbilityA:serviceAbilityA", - #"taskDispatcherTestA:taskDispatcherTestA", - #"taskDispatcherTestB:taskDispatcherTestB", + "amsAbilityAppendTestA:amsAbilityAppendTestA", + "amsAbilityAppendTestB:amsAbilityAppendTestB", + "amsAbilityVisibleTestPageA:amsAbilityVisibleTestPageA", + "amsAbilityVisibleTestServiceB:amsAbilityVisibleTestServiceB", + "amsConfigurationUpdatedTest:amsConfigurationUpdatedTest", + "amsDataSystemTestA:amsDataSystemTestA", + "amsDataSystemTestB:amsDataSystemTestB", + "amsDataSystemTestC:amsDataSystemTestC", + "amsKitSTAbilityManager:amsKitSTAbilityManager", + "amsKitSTAbilityManagerFirst:amsKitSTAbilityManagerFirst", + "amsKitSystemTest:amsKitSystemTest", + "amsKitSystemTestA:amsKitSystemTestA", + "amsKitSystemTestB:amsKitSystemTestB", + "amsKitSystemTestDataA:amsKitSystemTestDataA", + "amsKitSystemTestDataB:amsKitSystemTestDataB", + "amsKitSystemTestPageA:amsKitSystemTestPageA", + "amsKitSystemTestService:amsKitSystemTestService", + "amsMissionStackTest:amsMissionStackTest", + "amsMissionStackTestSubsidiary:amsMissionStackTestSubsidiary", + "amsSystemTestA:amsSystemTestA", + "amsSystemTestB:amsSystemTestB", + "amsSystemTestC:amsSystemTestC", + "amsSystemTestD:amsSystemTestD", + "amsSystemTestDFX:amsSystemTestDFX", + "amsSystemTestE:amsSystemTestE", + "amsSystemTestErrorK:amsSystemTestErrorK", + "amsSystemTestErrorL:amsSystemTestErrorL", + "amsSystemTestF:amsSystemTestF", + "amsSystemTestG:amsSystemTestG", + "amsSystemTestH:amsSystemTestH", + "amsSystemTestI:amsSystemTestI", + "amsSystemTestM:amsSystemTestM", + "amsSystemTestN:amsSystemTestN", + "amsSystemTestO:amsSystemTestO", + "amsSystemTestP:amsSystemTestP", + "amsSystemTestQ:amsSystemTestQ", + "amsSystemTestR:amsSystemTestR", + "amsSystemTestServiceA:amsSystemTestServiceA", + "amsSystemTestServiceB:amsSystemTestServiceB", + "amsSystemTestServiceC:amsSystemTestServiceC", + + # "amsSystemTestServiceD:amsSystemTestServiceD", + "amsSystemTestServiceE:amsSystemTestServiceE", + "amsSystemTestServiceF:amsSystemTestServiceF", + "amsSystemTestServiceG:amsSystemTestServiceG", + "amsSystemTestServiceH:amsSystemTestServiceH", + "serviceAbilityA:serviceAbilityA", + "taskDispatcherTestA:taskDispatcherTestA", + "taskDispatcherTestB:taskDispatcherTestB", ] } diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/main_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/main_ability.cpp index 0ee77556032cf9665bdb9fdb11d577b6b4a88e10..ddf4f31b1c5d4c17320e23d0015f1a48c671fd94 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/main_ability.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/main_ability.cpp @@ -20,6 +20,12 @@ namespace OHOS { namespace AppExecFwk { using namespace OHOS::EventFwk; +namespace { +constexpr int numZero = 0; +constexpr int numOne = 0; +constexpr int numTwo = 0; +constexpr int numThree = 0; +} void MainAbility::Init(const std::shared_ptr &abilityInfo, const std::shared_ptr &application, std::shared_ptr &handler, @@ -110,11 +116,11 @@ void FirstEventSubscriber::OnReceiveEvent(const CommonEventData &data) if (std::strcmp(eventName.c_str(), g_EVENT_REQU_FIRST.c_str()) == 0) { auto target = data.GetData(); auto caseInfo = TestUtils::split(target, "_"); - if (caseInfo.size() < 3) { + if (caseInfo.size() < numThree) { return; } - if (mapTestFunc_.find(caseInfo[0]) != mapTestFunc_.end()) { - mapTestFunc_[caseInfo[0]](std::stoi(caseInfo[1]), std::stoi(caseInfo[2]), data.GetCode()); + if (mapTestFunc_.find(caseInfo[numZero]) != mapTestFunc_.end()) { + mapTestFunc_[caseInfo[numZero]](std::stoi(caseInfo[numOne]), std::stoi(caseInfo[numTwo]), data.GetCode()); } else { APP_LOGI("OnReceiveEvent: CommonEventData error(%{public}s)", target.c_str()); } diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/second_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/second_ability.cpp index 74d9768f8a42a4b3cc9f4e70f2cbcb85330f1a98..5f2c2f219d1a598edb0d12bce40b80eeb1d6e6ba 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/second_ability.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/second_ability.cpp @@ -20,6 +20,12 @@ namespace OHOS { namespace AppExecFwk { using namespace OHOS::EventFwk; +namespace { +constexpr int numZero = 0; +constexpr int numOne = 0; +constexpr int numTwo = 0; +constexpr int numThree = 0; +} void SecondAbility::Init(const std::shared_ptr &abilityInfo, const std::shared_ptr &application, std::shared_ptr &handler, @@ -127,11 +133,11 @@ void SecondEventSubscriber::OnReceiveEvent(const CommonEventData &data) if (std::strcmp(eventName.c_str(), g_EVENT_REQU_SECOND.c_str()) == 0) { auto target = data.GetData(); auto caseInfo = TestUtils::split(target, "_"); - if (caseInfo.size() < 3) { + if (caseInfo.size() < numThree) { return; } - if (mapTestFunc_.find(caseInfo[0]) != mapTestFunc_.end()) { - mapTestFunc_[caseInfo[0]](std::stoi(caseInfo[1]), std::stoi(caseInfo[2]), data.GetCode()); + if (mapTestFunc_.find(caseInfo[numZero]) != mapTestFunc_.end()) { + mapTestFunc_[caseInfo[numZero]](std::stoi(caseInfo[numOne]), std::stoi(caseInfo[numTwo]), data.GetCode()); } else { APP_LOGI("OnReceiveEvent: CommonEventData error(%{public}s)", target.c_str()); } diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/test_utils.cpp index 07ebf00c47128276f0e83d0aa5783fec0a417147..3e75bdf815379f71af430ad9d5c979da62400675 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/test_utils.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestA/src/test_utils.cpp @@ -47,9 +47,10 @@ Want TestUtils::MakeWant( std::vector TestUtils::split(const std::string &in, const std::string &delim) { - std::regex reg{delim}; - return std::vector{ - std::sregex_token_iterator(in.begin(), in.end(), reg, -1), std::sregex_token_iterator()}; + std::regex reg {delim}; + return std::vector { + std::sregex_token_iterator(in.begin(), in.end(), reg, -1), std::sregex_token_iterator() + }; } } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/main_ability.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/main_ability.cpp index db038f3117a282e90f5ef9b2e9c5681325531547..beacde5933001025b9204907d18c062ec74bb9ec 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/main_ability.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/main_ability.cpp @@ -20,6 +20,12 @@ namespace OHOS { namespace AppExecFwk { using namespace OHOS::EventFwk; +namespace { +constexpr int numZero = 0; +constexpr int numOne = 0; +constexpr int numTwo = 0; +constexpr int numThree = 0; +} void MainAbility::Init(const std::shared_ptr &abilityInfo, const std::shared_ptr &application, std::shared_ptr &handler, @@ -103,11 +109,11 @@ void FirstEventSubscriber::OnReceiveEvent(const CommonEventData &data) if (std::strcmp(eventName.c_str(), g_EVENT_REQU_FIRSTB.c_str()) == 0) { auto target = data.GetData(); auto caseInfo = TestUtils::split(target, "_"); - if (caseInfo.size() < 3) { + if (caseInfo.size() < numThree) { return; } - if (mapTestFunc_.find(caseInfo[0]) != mapTestFunc_.end()) { - mapTestFunc_[caseInfo[0]](std::stoi(caseInfo[1]), std::stoi(caseInfo[2]), data.GetCode()); + if (mapTestFunc_.find(caseInfo[numZero]) != mapTestFunc_.end()) { + mapTestFunc_[caseInfo[numZero]](std::stoi(caseInfo[numOne]), std::stoi(caseInfo[numTwo]), data.GetCode()); } else { APP_LOGI("OnReceiveEvent: CommonEventData error(%{public}s)", target.c_str()); } diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/test_utils.cpp index 07ebf00c47128276f0e83d0aa5783fec0a417147..3e75bdf815379f71af430ad9d5c979da62400675 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/test_utils.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityAppendTestB/src/test_utils.cpp @@ -47,9 +47,10 @@ Want TestUtils::MakeWant( std::vector TestUtils::split(const std::string &in, const std::string &delim) { - std::regex reg{delim}; - return std::vector{ - std::sregex_token_iterator(in.begin(), in.end(), reg, -1), std::sregex_token_iterator()}; + std::regex reg {delim}; + return std::vector { + std::sregex_token_iterator(in.begin(), in.end(), reg, -1), std::sregex_token_iterator() + }; } } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn index edea9e7b8463bf365cd7d920a2d6dc691877375d..770dabb0871571189d1d36d7b69ce040d5c7d773 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/BUILD.gn @@ -62,6 +62,9 @@ ohos_shared_library("amsAbilityVisibleTestPageA") { "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "native_appdatamgr:native_appdatafwk", + "native_appdatamgr:native_dataability", + "native_appdatamgr:native_rdb", ] subsystem_name = "amssystemtestability" } diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/include/amsabilityvisibletestpagea1.h b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/include/amsabilityvisibletestpagea1.h index 67a70f3ed4ecdeb3c0a65421671782c5a2d0eef0..b3015819c5ad703b5f52f1f0be433954186f2475 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/include/amsabilityvisibletestpagea1.h +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/include/amsabilityvisibletestpagea1.h @@ -20,8 +20,11 @@ #include #include "ability_connect_callback_stub.h" #include "ability_connect_callback_proxy.h" +#include "abs_shared_result_set.h" #include "ability_loader.h" #include "app_log_wrapper.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" namespace OHOS { namespace AppExecFwk { diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/include/amsabilityvisibletestpagea2.h b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/include/amsabilityvisibletestpagea2.h index 5dd3f74cbd9fad4ffed48eb6a850c6a1837ef64f..739a073841d08777398d4f7cdec8ab7c8e3141e0 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/include/amsabilityvisibletestpagea2.h +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/include/amsabilityvisibletestpagea2.h @@ -20,8 +20,11 @@ #include #include "ability_connect_callback_stub.h" #include "ability_connect_callback_proxy.h" +#include "abs_shared_result_set.h" #include "ability_loader.h" #include "app_log_wrapper.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" #include "want_agent_helper.h" namespace OHOS { diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/include/amsabilityvisibletestpagea3.h b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/include/amsabilityvisibletestpagea3.h index e296afccbda7f3c76136819d3f4e370149e82fea..57876df1e56b2a190750502328a41ef9a34e03c8 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/include/amsabilityvisibletestpagea3.h +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/include/amsabilityvisibletestpagea3.h @@ -20,8 +20,11 @@ #include #include "ability_connect_callback_stub.h" #include "ability_connect_callback_proxy.h" +#include "abs_shared_result_set.h" #include "ability_loader.h" #include "app_log_wrapper.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" namespace OHOS { namespace AppExecFwk { diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/include/amsabilityvisibletestpagea4.h b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/include/amsabilityvisibletestpagea4.h index d6618b46fb9ac9f652db7d4f5ef2f7ca2e2e9670..96558792a672ad7351f6f1bbb6fabb213ffc6ca5 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/include/amsabilityvisibletestpagea4.h +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/include/amsabilityvisibletestpagea4.h @@ -20,8 +20,11 @@ #include #include "ability_connect_callback_stub.h" #include "ability_connect_callback_proxy.h" +#include "abs_shared_result_set.h" #include "ability_loader.h" #include "app_log_wrapper.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" namespace OHOS { namespace AppExecFwk { diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/src/amsabilityvisibletestpagea2.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/src/amsabilityvisibletestpagea2.cpp index 169897284c4c5885d78b51e19f615971a1d680fb..4382a866873f2b62b1a791641a5f8f3cfa0b6e96 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/src/amsabilityvisibletestpagea2.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/src/amsabilityvisibletestpagea2.cpp @@ -90,7 +90,7 @@ void AmsAbilityVisibleTestPageA2::OnActive() if (startAbilityType == "Data") { Uri dataAbilityUri("dataability:///" + startBundleName + "." + startAbilityName); std::shared_ptr helper = DataAbilityHelper::Creator(GetContext()); - ValuesBucket bucket; + NativeRdb::ValuesBucket bucket; helper->Insert(dataAbilityUri, bucket); } if (startAbilityType == "TriggerWantAgentPageAbility") { diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/src/amsabilityvisibletestpagea3.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/src/amsabilityvisibletestpagea3.cpp index 3a10f80656d8a96d4885999ec4696d179971f613..80eedc686d0d9f923963bf1ea6b9ec008e78f3bf 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/src/amsabilityvisibletestpagea3.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/src/amsabilityvisibletestpagea3.cpp @@ -80,7 +80,7 @@ void AmsAbilityVisibleTestPageA3::OnActive() if (startAbilityType == "Data") { Uri dataAbilityUri("dataability:///" + startBundleName + "." + startAbilityName); std::shared_ptr helper = DataAbilityHelper::Creator(GetContext()); - ValuesBucket bucket; + NativeRdb::ValuesBucket bucket; helper->Insert(dataAbilityUri, bucket); } } diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/src/amsabilityvisibletestpagea4.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/src/amsabilityvisibletestpagea4.cpp index c122ba32b9be2aad813ad493c9ae23aa697a7d6d..fad9868758e94937d543a1256f19139493f48b1a 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/src/amsabilityvisibletestpagea4.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestPageA/src/amsabilityvisibletestpagea4.cpp @@ -17,7 +17,7 @@ namespace OHOS { namespace AppExecFwk { - + void AmsAbilityVisibleTestPageA4::OnStart(const Want &want) { GetWantInfo(want); @@ -81,7 +81,7 @@ void AmsAbilityVisibleTestPageA4::OnActive() if (startAbilityType == "Data") { Uri dataAbilityUri("dataability:///" + startBundleName + "." + startAbilityName); std::shared_ptr helper = DataAbilityHelper::Creator(GetContext()); - ValuesBucket bucket; + NativeRdb::ValuesBucket bucket; helper->Insert(dataAbilityUri, bucket); } } diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn index 0eafd1b592e649e793df8f50579dde01c57faf43..4fc83075c951c23b6fe435fdc1b8c93a3469fd3a 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/BUILD.gn @@ -63,6 +63,9 @@ ohos_shared_library("amsAbilityVisibleTestServiceB") { "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "native_appdatamgr:native_appdatafwk", + "native_appdatamgr:native_dataability", + "native_appdatamgr:native_rdb", ] subsystem_name = "amssystemtestability" } diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestdata.h b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestdata.h index 330c14eed9bd3b0137e57a32a26d53d59412f4cc..f8bc3ed10402095f5756483e63bc9627b7515cb6 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestdata.h +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestdata.h @@ -21,7 +21,10 @@ #include #include "ability_connect_callback_stub.h" #include "ability_connect_callback_proxy.h" +#include "abs_shared_result_set.h" #include "ability_loader.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" #include "common_event.h" #include "common_event_manager.h" @@ -34,11 +37,12 @@ public: protected: virtual void OnStart(const Want &want) override; - virtual int Insert(const Uri &uri, const ValuesBucket &value) override; - virtual int Delete(const Uri &uri, const DataAbilityPredicates &predicates) override; - virtual int Update(const Uri &uri, const ValuesBucket &value, const DataAbilityPredicates &predicates) override; - virtual std::shared_ptr Query( - const Uri &uri, const std::vector &columns, const DataAbilityPredicates &predicates) override; + virtual int Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) override; + virtual int Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) override; + virtual int Update(const Uri &uri, const NativeRdb::ValuesBucket &value, + const NativeRdb::DataAbilityPredicates &predicates) override; + virtual std::shared_ptr Query(const Uri &uri, + const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) override; virtual std::vector GetFileTypes(const Uri &uri, const std::string &mimeTypeFilter) override; virtual int OpenFile(const Uri &uri, const std::string &mode) override; diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestpageb1.h b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestpageb1.h index 5d6d3c474b06aed5e750d90a100ee0523047e953..8fd85885c4bc03f32cd5b955cf79376c2afd8759 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestpageb1.h +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestpageb1.h @@ -20,8 +20,11 @@ #include #include "ability_connect_callback_stub.h" #include "ability_connect_callback_proxy.h" +#include "abs_shared_result_set.h" #include "ability_loader.h" #include "app_log_wrapper.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" namespace OHOS { namespace AppExecFwk { diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestpageb2.h b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestpageb2.h index 0d7daf8014f2e5d3abcdbd082855d5a38ab19924..fe4b3d205b7b21b90455305c9dea3e399927a401 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestpageb2.h +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestpageb2.h @@ -20,8 +20,12 @@ #include #include "ability_connect_callback_stub.h" #include "ability_connect_callback_proxy.h" +#include "abs_shared_result_set.h" #include "ability_loader.h" #include "app_log_wrapper.h" +#include "completed_callback.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" #include "want_agent_helper.h" namespace OHOS { @@ -29,6 +33,7 @@ namespace AppExecFwk { using AbilityConnectionStub = OHOS::AAFwk::AbilityConnectionStub; using Uri = OHOS::Uri; +using CompletedCallback = OHOS::Notification::WantAgent::CompletedCallback; using namespace OHOS::Notification::WantAgent; class AbilityConnectCallback : public AbilityConnectionStub { diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestservice.h b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestservice.h index b22ee92c3c3331a0b31997112bfc5aa2c2604e75..62393926817ce7a01fd69a8e39459ec06da62f73 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestservice.h +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestservice.h @@ -21,9 +21,13 @@ #include #include "ability_connect_callback_stub.h" #include "ability_connect_callback_proxy.h" +#include "abs_shared_result_set.h" #include "ability_loader.h" +#include "app_log_wrapper.h" #include "common_event.h" #include "common_event_manager.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" namespace OHOS { namespace AppExecFwk { diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestservicea1.h b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestservicea1.h index 5f1b5dd050b468c133737cd92c89191c62c5273b..32af37edd896e1f704662d11cb37c9873bae9f16 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestservicea1.h +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/include/amsabilityvisibletestservicea1.h @@ -21,9 +21,13 @@ #include #include "ability_connect_callback_stub.h" #include "ability_connect_callback_proxy.h" +#include "abs_shared_result_set.h" #include "ability_loader.h" +#include "app_log_wrapper.h" #include "common_event.h" #include "common_event_manager.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" namespace OHOS { namespace AppExecFwk { diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestdata.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestdata.cpp index 624298a0ee79f40447199239e3b400396dc7eee0..fae0811bf061b59f4d32c69992c1bf2c55b88934 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestdata.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestdata.cpp @@ -36,7 +36,7 @@ void AmsAbilityVisibleTestData::OnStart(const Want &want) pageAbilityEvent.PublishEvent(STEventName::g_eventName, pageAbilityEvent.GetOnStartCount(), eventData); } -int AmsAbilityVisibleTestData::Insert(const Uri &uri, const ValuesBucket &value) +int AmsAbilityVisibleTestData::Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) { APP_LOGI("AmsAbilityVisibleTestData::Insert"); int result = Ability::Insert(uri, value); @@ -45,7 +45,7 @@ int AmsAbilityVisibleTestData::Insert(const Uri &uri, const ValuesBucket &value) return result; } -int AmsAbilityVisibleTestData::Delete(const Uri &uri, const DataAbilityPredicates &predicates) +int AmsAbilityVisibleTestData::Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("AmsAbilityVisibleTestData::Delete"); int result = Ability::Delete(uri, predicates); @@ -55,7 +55,7 @@ int AmsAbilityVisibleTestData::Delete(const Uri &uri, const DataAbilityPredicate } int AmsAbilityVisibleTestData::Update( - const Uri &uri, const ValuesBucket &value, const DataAbilityPredicates &predicates) + const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("AmsAbilityVisibleTestData::Update"); int result = Ability::Update(uri, value, predicates); @@ -64,11 +64,11 @@ int AmsAbilityVisibleTestData::Update( return result; } -std::shared_ptr AmsAbilityVisibleTestData::Query( - const Uri &uri, const std::vector &columns, const DataAbilityPredicates &predicates) +std::shared_ptr AmsAbilityVisibleTestData::Query( + const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("AmsAbilityVisibleTestData::Query"); - std::shared_ptr result = Ability::Query(uri, columns, predicates); + std::shared_ptr result = Ability::Query(uri, columns, predicates); std::string eventData = GetAbilityName() + STEventName::g_abilityStateQuery; pageAbilityEvent.PublishEvent(STEventName::g_eventName, defenvntCode, eventData); return result; diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestpageb1.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestpageb1.cpp index 29a044e5b841a98b81f856b72908d27a1272fe0d..9628f96aa38ccd0972c31bb1e55e813fbadae17d 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestpageb1.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestpageb1.cpp @@ -17,7 +17,7 @@ namespace OHOS { namespace AppExecFwk { - + void AmsAbilityVisibleTestPageB1::Init(const std::shared_ptr &abilityInfo, const std::shared_ptr &application, std::shared_ptr &handler, const sptr &token) @@ -90,7 +90,7 @@ void AmsAbilityVisibleTestPageB1::OnActive() if (startAbilityType == "Data") { Uri dataAbilityUri("dataability:///" + startBundleName + "." + startAbilityName); std::shared_ptr helper = DataAbilityHelper::Creator(GetContext()); - ValuesBucket bucket; + NativeRdb::ValuesBucket bucket; helper->Insert(dataAbilityUri, bucket); } } diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestpageb2.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestpageb2.cpp index 36516ae9a5df48605e3201efe6b5bb7daabc9d94..29980123edf60bf455a1704a4e7ec2215bbc7c1f 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestpageb2.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestpageb2.cpp @@ -91,7 +91,7 @@ void AmsAbilityVisibleTestPageB2::OnActive() if (startAbilityType == "Data" || startAbilityType == "DataRelease") { Uri dataAbilityUri("dataability:///" + startBundleName + "." + startAbilityName); std::shared_ptr helper = DataAbilityHelper::Creator(GetContext()); - ValuesBucket bucket; + NativeRdb::ValuesBucket bucket; helper->Insert(dataAbilityUri, bucket); if (startAbilityType == "DataRelease") { helper->Release(); diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestservice.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestservice.cpp index d6c3935407a9967842649eb5dede4332b1a5fd65..7ada477f7757b295ca6bbd285def5e1f7ba30fc3 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestservice.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestservice.cpp @@ -116,7 +116,7 @@ sptr AmsAbilityVisibleTestService::OnConnect(const Want &want) if (startAbilityType == "Data") { Uri dataAbilityUri("dataability:///" + startBundleName + "." + startAbilityName); std::shared_ptr helper = DataAbilityHelper::Creator(GetContext()); - ValuesBucket bucket; + NativeRdb::ValuesBucket bucket; helper->Insert(dataAbilityUri, bucket); } } diff --git a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestservicea1.cpp b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestservicea1.cpp index a7bb23c23067f378f13c300df8e679abf6a3df1e..fdcd9bbad3f8e5f3a524a903d3a20a4d9acce4c4 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestservicea1.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsAbilityVisibleTestServiceB/src/amsabilityvisibletestservicea1.cpp @@ -116,7 +116,7 @@ sptr AmsAbilityVisibleTestServiceA1::OnConnect(const Want &want) if (startAbilityType == "Data") { Uri dataAbilityUri("dataability:///" + startBundleName + "." + startAbilityName); std::shared_ptr helper = DataAbilityHelper::Creator(GetContext()); - ValuesBucket bucket; + NativeRdb::ValuesBucket bucket; helper->Insert(dataAbilityUri, bucket); } } diff --git a/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/src/test_utils.cpp index 07ebf00c47128276f0e83d0aa5783fec0a417147..3e75bdf815379f71af430ad9d5c979da62400675 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/src/test_utils.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsConfigurationUpdatedTest/src/test_utils.cpp @@ -47,9 +47,10 @@ Want TestUtils::MakeWant( std::vector TestUtils::split(const std::string &in, const std::string &delim) { - std::regex reg{delim}; - return std::vector{ - std::sregex_token_iterator(in.begin(), in.end(), reg, -1), std::sregex_token_iterator()}; + std::regex reg {delim}; + return std::vector { + std::sregex_token_iterator(in.begin(), in.end(), reg, -1), std::sregex_token_iterator() + }; } } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn index ed06c53138da221155adb084fc48d6026938d5ab..e8c4d9a4b524a5161c47551d7ecbb26c2dfd430c 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/BUILD.gn @@ -67,6 +67,9 @@ ohos_shared_library("amsDataSystemTestA") { "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "native_appdatamgr:native_appdatafwk", + "native_appdatamgr:native_dataability", + "native_appdatamgr:native_rdb", ] subsystem_name = "amssystemtestability" } diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/include/ams_st_data_ability_data_a.h b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/include/ams_st_data_ability_data_a.h index 46d8d51c78e3edc2ab0fbd06f94471464d4c8f27..48f930a9e3d2472c463a19215eb59b0afd6a5aa1 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/include/ams_st_data_ability_data_a.h +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/include/ams_st_data_ability_data_a.h @@ -22,6 +22,9 @@ #include "event.h" #include "skills.h" #include "stoperator.h" +#include "abs_shared_result_set.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" namespace OHOS { namespace AppExecFwk { @@ -40,11 +43,11 @@ public: protected: virtual void OnStart(const Want &want) override; - virtual int Insert(const Uri &uri, const ValuesBucket &value) override; - virtual int Delete(const Uri &uri, const DataAbilityPredicates &predicates) override; - virtual int Update(const Uri &uri, const ValuesBucket &value, const DataAbilityPredicates &predicates) override; - virtual std::shared_ptr Query( - const Uri &uri, const std::vector &columns, const DataAbilityPredicates &predicates) override; + virtual int Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) override; + virtual int Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) override; + virtual int Update(const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates) override; + virtual std::shared_ptr Query( + const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) override; virtual std::vector GetFileTypes(const Uri &uri, const std::string &mimeTypeFilter) override; virtual int OpenFile(const Uri &uri, const std::string &mode) override; diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp index e930e4b026e83d51e2237a4366e272891719cfe0..c533fdb5adf76222cc862154cf9a9c2534e3ee56 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_data_a.cpp @@ -25,6 +25,7 @@ namespace OHOS { namespace AppExecFwk { +namespace { static const int ABILITY_DATA_A_CODE = 210; static const std::string OPERATOR_INSERT = "Insert"; static const std::string OPERATOR_DELETE = "Delete"; @@ -38,6 +39,8 @@ static const int DEFAULT_UPDATE_RESULT = 3333; static const std::string ABILITY_TYPE_PAGE = "0"; static const std::string ABILITY_TYPE_SERVICE = "1"; static const std::string ABILITY_TYPE_DATA = "2"; +constexpr int charCnt = 5; +} bool AmsStDataAbilityDataA::PublishEvent(const std::string &eventName, const int &code, const std::string &data) { @@ -92,7 +95,7 @@ void AmsStDataAbilityDataA::OnStart(const Want &want) PublishEvent(abilityEventName, ABILITY_DATA_A_CODE, "OnStart"); } -int AmsStDataAbilityDataA::Insert(const Uri &uri, const ValuesBucket &value) +int AmsStDataAbilityDataA::Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) { APP_LOGI("AmsStDataAbilityDataA <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_A_CODE, "Insert"); @@ -105,22 +108,22 @@ int AmsStDataAbilityDataA::Insert(const Uri &uri, const ValuesBucket &value) return DEFAULT_INSERT_RESULT; } -int AmsStDataAbilityDataA::Delete(const Uri &uri, const DataAbilityPredicates &predicates) +int AmsStDataAbilityDataA::Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("AmsStDataAbilityDataA <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_A_CODE, "Delete"); return DEFAULT_DELETE_RESULT; } -int AmsStDataAbilityDataA::Update(const Uri &uri, const ValuesBucket &value, const DataAbilityPredicates &predicates) +int AmsStDataAbilityDataA::Update(const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("AmsStDataAbilityDataA <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_A_CODE, "Update"); return DEFAULT_UPDATE_RESULT; } -std::shared_ptr AmsStDataAbilityDataA::Query( - const Uri &uri, const std::vector &columns, const DataAbilityPredicates &predicates) +std::shared_ptr AmsStDataAbilityDataA::Query( + const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) { subscriber_->vectorOperator_ = columns; APP_LOGI("AmsStDataAbilityDataA <<<>>>"); @@ -129,7 +132,9 @@ std::shared_ptr AmsStDataAbilityDataA::Query( STtools::WaitCompleted(event, OPERATOR_QUERY, ABILITY_DATA_A_CODE); subscriber_->TestPost(); - std::shared_ptr resultValue = std::make_shared(OPERATOR_QUERY); + std::shared_ptr resultValue = std::make_shared(OPERATOR_QUERY); + AppDataFwk::SharedBlock *pSharedBlock = resultValue->GetBlock(); + pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1); return resultValue; } @@ -137,7 +142,7 @@ std::vector AmsStDataAbilityDataA::GetFileTypes(const Uri &uri, con { APP_LOGI("AmsStDataAbilityDataA <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_A_CODE, "GetFileTypes"); - std::vector fileType{ + std::vector fileType { "filetypes", }; return fileType; @@ -161,8 +166,8 @@ int AmsStDataAbilityDataA::OpenFile(const Uri &uri, const std::string &mode) static void GetResult(std::shared_ptr child, std::shared_ptr helper, Uri dataAbilityUri, string &result) { - AppExecFwk::DataAbilityPredicates predicates; - ValuesBucket bucket; + NativeRdb::DataAbilityPredicates predicates; + NativeRdb::ValuesBucket bucket; result = "failed"; if (child->GetOperatorName() == OPERATOR_INSERT) { result = std::to_string(helper->Insert(dataAbilityUri, bucket)); @@ -172,8 +177,12 @@ static void GetResult(std::shared_ptr child, std::shared_pt result = std::to_string(helper->Update(dataAbilityUri, bucket, predicates)); } else if (child->GetOperatorName() == OPERATOR_QUERY) { std::vector columns = STtools::SerializationStOperatorToVector(*child); - std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); - result = (resultValue != nullptr) ? (resultValue->testInf_) : "failed"; + std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); + result = "failed"; + if (resultValue != nullptr) { + resultValue->GoToRow(0); + resultValue->GetString(0, result); + } } else if (child->GetOperatorName() == OPERATOR_GETFILETYPES) { std::vector types = helper->GetFileTypes(dataAbilityUri, child->GetMessage()); result = (types.size() > 0) ? types[0] : "failed"; @@ -187,9 +196,10 @@ static void GetResult(std::shared_ptr child, std::shared_pt return; } result = std::to_string(fd); - char str[5]; - if (!feof(file)) - fgets(str, 5, file); + char str[charCnt]; + if (!feof(file)) { + fgets(str, charCnt, file); + } result = str; fclose(file); } @@ -198,7 +208,7 @@ static void GetResult(std::shared_ptr child, std::shared_pt void DataTestDataAEventSubscriber::TestPost(const std::string funName) { APP_LOGI("DataTestDataAEventSubscriber::TestPost %{public}s", funName.c_str()); - STtools::StOperator allOperator{}; + STtools::StOperator allOperator {}; STtools::DeserializationStOperatorFromVector(allOperator, vectorOperator_); for (auto child : allOperator.GetChildOperator()) { APP_LOGI("---------data--------targetBundle:%{public}s", child->GetBundleName().c_str()); diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_page_a.cpp b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_page_a.cpp index 83c3d4752a94e4189720e4e0e078f67cc06411d2..0955f8948aa4db6c20b2926596b4732e2095c0ca 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_page_a.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestA/src/ams_st_data_ability_page_a.cpp @@ -20,12 +20,13 @@ #include "app_log_wrapper.h" #include "data_ability_helper.h" -#include "dummy_data_ability_predicates.h" -#include "dummy_result_set.h" -#include "dummy_values_bucket.h" +#include "abs_shared_result_set.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" namespace OHOS { namespace AppExecFwk { +namespace { static const int ABILITY_PAGE_A_CODE = 110; static const std::string OPERATOR_INSERT = "Insert"; static const std::string OPERATOR_DELETE = "Delete"; @@ -33,6 +34,8 @@ static const std::string OPERATOR_UPDATE = "Update"; static const std::string OPERATOR_QUERY = "Query"; static const std::string OPERATOR_GETFILETYPES = "GetFileTypes"; static const std::string OPERATOR_OPENFILE = "OpenFile"; +constexpr int charCnt = 5; +} bool AmsStDataAbilityPageA::PublishEvent(const std::string &eventName, const int &code, const std::string &data) { @@ -69,7 +72,7 @@ AmsStDataAbilityPageA::~AmsStDataAbilityPageA() void AmsStDataAbilityPageA::SubscribeEvent(const Want &want) { - Want mwant{want}; + Want mwant {want}; std::vector eventList = { "event_data_test_action", }; @@ -132,7 +135,7 @@ void AmsStDataAbilityPageA::OnBackground() void AmsStDataAbilityPageA::GetWantInfo(const Want &want) { Want mWant(want); - STtools::StOperator allOperator{}; + STtools::StOperator allOperator {}; std::vector vectorOperator = mWant.GetStringArrayParam("operator"); STtools::DeserializationStOperatorFromVector(allOperator, vectorOperator); @@ -148,8 +151,8 @@ void AmsStDataAbilityPageA::GetWantInfo(const Want &want) static void GetResult(std::shared_ptr child, std::shared_ptr helper, Uri dataAbilityUri, string &result) { - AppExecFwk::DataAbilityPredicates predicates; - ValuesBucket bucket; + NativeRdb::DataAbilityPredicates predicates; + NativeRdb::ValuesBucket bucket; result = "failed"; if (child->GetOperatorName() == OPERATOR_INSERT) { result = std::to_string(helper->Insert(dataAbilityUri, bucket)); @@ -159,8 +162,12 @@ static void GetResult(std::shared_ptr child, std::shared_pt result = std::to_string(helper->Update(dataAbilityUri, bucket, predicates)); } else if (child->GetOperatorName() == OPERATOR_QUERY) { std::vector columns = STtools::SerializationStOperatorToVector(*child); - std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); - result = (resultValue != nullptr) ? (resultValue->testInf_) : "failed"; + std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); + result = "failed"; + if (resultValue != nullptr) { + resultValue->GoToRow(0); + resultValue->GetString(0, result); + } } else if (child->GetOperatorName() == OPERATOR_GETFILETYPES) { std::vector types = helper->GetFileTypes(dataAbilityUri, child->GetMessage()); result = (types.size() > 0) ? types[0] : "failed"; @@ -176,9 +183,10 @@ static void GetResult(std::shared_ptr child, std::shared_pt return; } result = std::to_string(fd); - char str[5]; - if (!feof(file)) - fgets(str, 5, file); + char str[charCnt]; + if (!feof(file)) { + fgets(str, charCnt, file); + } result = str; fclose(file); } @@ -187,7 +195,7 @@ static void GetResult(std::shared_ptr child, std::shared_pt void DataTestPageAEventSubscriber::TestPost(const std::string funName) { APP_LOGI("DataTestPageAEventSubscriber::TestPost %{public}s", funName.c_str()); - STtools::StOperator allOperator{}; + STtools::StOperator allOperator {}; STtools::DeserializationStOperatorFromVector(allOperator, vectorOperator_); for (auto child : allOperator.GetChildOperator()) { APP_LOGI("-----------------targetBundle:%{public}s", child->GetBundleName().c_str()); diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn index 99440ff945f619d3edcbd7eaed9e8251069aa5c0..2bf6c1e9c927f49900ed57727bf110ff2058948e 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/BUILD.gn @@ -66,6 +66,9 @@ ohos_shared_library("amsDataSystemTestB") { "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "native_appdatamgr:native_appdatafwk", + "native_appdatamgr:native_dataability", + "native_appdatamgr:native_rdb", ] subsystem_name = "amssystemtestability" } diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/include/ams_st_data_ability_data_b.h b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/include/ams_st_data_ability_data_b.h index 0addc8c3765fcdfd8015ba88ce73e98f59bed919..a3ef18cfd43af7177bd2d9ba6dd9ad7fd9e83df8 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/include/ams_st_data_ability_data_b.h +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/include/ams_st_data_ability_data_b.h @@ -22,6 +22,9 @@ #include "event.h" #include "skills.h" #include "stoperator.h" +#include "abs_shared_result_set.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" namespace OHOS { namespace AppExecFwk { @@ -38,11 +41,11 @@ public: protected: virtual void OnStart(const Want &want) override; - virtual int Insert(const Uri &uri, const ValuesBucket &value) override; - virtual int Delete(const Uri &uri, const DataAbilityPredicates &predicates) override; - virtual int Update(const Uri &uri, const ValuesBucket &value, const DataAbilityPredicates &predicates) override; - virtual std::shared_ptr Query( - const Uri &uri, const std::vector &columns, const DataAbilityPredicates &predicates) override; + virtual int Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) override; + virtual int Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) override; + virtual int Update(const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates) override; + virtual std::shared_ptr Query( + const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) override; virtual std::vector GetFileTypes(const Uri &uri, const std::string &mimeTypeFilter) override; virtual int OpenFile(const Uri &uri, const std::string &mode) override; diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/src/ams_st_data_ability_data_b.cpp b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/src/ams_st_data_ability_data_b.cpp index 8b0a9509b04186fe70e0d6546f5969b057f1540a..665663d6a91f4d03aad9b9d3dbf9de3e03d0118c 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/src/ams_st_data_ability_data_b.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/src/ams_st_data_ability_data_b.cpp @@ -23,6 +23,7 @@ namespace OHOS { namespace AppExecFwk { +namespace { static const int ABILITY_DATA_B_CODE = 220; static const std::string OPERATOR_INSERT = "Insert"; static const std::string OPERATOR_DELETE = "Delete"; @@ -36,6 +37,8 @@ static const int DEFAULT_UPDATE_RESULT = 3333; static const std::string ABILITY_TYPE_PAGE = "0"; static const std::string ABILITY_TYPE_SERVICE = "1"; static const std::string ABILITY_TYPE_DATA = "2"; +constexpr int charCnt = 5; +} bool AmsStDataAbilityDataB::PublishEvent(const std::string &eventName, const int &code, const std::string &data) { @@ -90,29 +93,29 @@ void AmsStDataAbilityDataB::OnStart(const Want &want) PublishEvent(abilityEventName, ABILITY_DATA_B_CODE, "OnStart"); } -int AmsStDataAbilityDataB::Insert(const Uri &uri, const ValuesBucket &value) +int AmsStDataAbilityDataB::Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) { APP_LOGI("AmsStDataAbilityDataB <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_B_CODE, "Insert"); return DEFAULT_INSERT_RESULT; } -int AmsStDataAbilityDataB::Delete(const Uri &uri, const DataAbilityPredicates &predicates) +int AmsStDataAbilityDataB::Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("AmsStDataAbilityDataB <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_B_CODE, "Delete"); return DEFAULT_DELETE_RESULT; } -int AmsStDataAbilityDataB::Update(const Uri &uri, const ValuesBucket &value, const DataAbilityPredicates &predicates) +int AmsStDataAbilityDataB::Update(const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("AmsStDataAbilityDataB <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_B_CODE, "Update"); return DEFAULT_UPDATE_RESULT; } -std::shared_ptr AmsStDataAbilityDataB::Query( - const Uri &uri, const std::vector &columns, const DataAbilityPredicates &predicates) +std::shared_ptr AmsStDataAbilityDataB::Query( + const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) { subscriber_->vectorOperator_ = columns; APP_LOGI("AmsStDataAbilityDataB <<<>>>"); @@ -121,7 +124,9 @@ std::shared_ptr AmsStDataAbilityDataB::Query( STtools::WaitCompleted(event, OPERATOR_QUERY, ABILITY_DATA_B_CODE); subscriber_->TestPost(); - std::shared_ptr resultValue = std::make_shared(OPERATOR_QUERY); + std::shared_ptr resultValue = std::make_shared(OPERATOR_QUERY); + AppDataFwk::SharedBlock *pSharedBlock = resultValue->GetBlock(); + pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1); return resultValue; } @@ -129,7 +134,7 @@ std::vector AmsStDataAbilityDataB::GetFileTypes(const Uri &uri, con { APP_LOGI("AmsStDataAbilityDataB <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_B_CODE, "GetFileTypes"); - std::vector fileType{"filetypes"}; + std::vector fileType {"filetypes"}; return fileType; } @@ -149,8 +154,8 @@ int AmsStDataAbilityDataB::OpenFile(const Uri &uri, const std::string &mode) static void GetResult(std::shared_ptr child, std::shared_ptr helper, Uri dataAbilityUri, string &result) { - AppExecFwk::DataAbilityPredicates predicates; - ValuesBucket bucket; + NativeRdb::DataAbilityPredicates predicates; + NativeRdb::ValuesBucket bucket; result = "failed"; if (child->GetOperatorName() == OPERATOR_INSERT) { result = std::to_string(helper->Insert(dataAbilityUri, bucket)); @@ -160,8 +165,12 @@ static void GetResult(std::shared_ptr child, std::shared_pt result = std::to_string(helper->Update(dataAbilityUri, bucket, predicates)); } else if (child->GetOperatorName() == OPERATOR_QUERY) { std::vector columns = STtools::SerializationStOperatorToVector(*child); - std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); - result = (resultValue != nullptr) ? (resultValue->testInf_) : "failed"; + std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); + result = "failed"; + if (resultValue != nullptr) { + resultValue->GoToRow(0); + resultValue->GetString(0, result); + } } else if (child->GetOperatorName() == OPERATOR_GETFILETYPES) { std::vector types = helper->GetFileTypes(dataAbilityUri, child->GetMessage()); result = (types.size() > 0) ? types[0] : "failed"; @@ -175,9 +184,10 @@ static void GetResult(std::shared_ptr child, std::shared_pt return; } result = std::to_string(fd); - char str[5]; - if (!feof(file)) - fgets(str, 5, file); + char str[charCnt]; + if (!feof(file)) { + fgets(str, charCnt, file); + } result = str; fclose(file); } @@ -186,7 +196,7 @@ static void GetResult(std::shared_ptr child, std::shared_pt void DataTestDataBEventSubscriber::TestPost(const std::string funName) { APP_LOGI("DataTestDataBEventSubscriber::TestPost %{public}s", funName.c_str()); - STtools::StOperator allOperator{}; + STtools::StOperator allOperator {}; STtools::DeserializationStOperatorFromVector(allOperator, vectorOperator_); std::shared_ptr helper = DataAbilityHelper::Creator(mainAbility_->GetContext()); for (auto child : allOperator.GetChildOperator()) { diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/src/ams_st_data_ability_page_b.cpp b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/src/ams_st_data_ability_page_b.cpp index 5d03834da1ad231a14729e526652568b8093fbaf..c4be0f52427ae2f50f0989bbb960283051ec4cc2 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/src/ams_st_data_ability_page_b.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestB/src/ams_st_data_ability_page_b.cpp @@ -20,12 +20,14 @@ #include "app_log_wrapper.h" #include "data_ability_helper.h" -#include "dummy_data_ability_predicates.h" -#include "dummy_result_set.h" -#include "dummy_values_bucket.h" +#include "abs_shared_result_set.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" + namespace OHOS { namespace AppExecFwk { +namespace { static const int ABILITY_PAGE_B_CODE = 120; static const std::string OPERATOR_INSERT = "Insert"; static const std::string OPERATOR_DELETE = "Delete"; @@ -33,6 +35,8 @@ static const std::string OPERATOR_UPDATE = "Update"; static const std::string OPERATOR_QUERY = "Query"; static const std::string OPERATOR_GETFILETYPES = "GetFileTypes"; static const std::string OPERATOR_OPENFILE = "OpenFile"; +constexpr int charCnt = 5; +} bool AmsStDataAbilityPageB::PublishEvent(const std::string &eventName, const int &code, const std::string &data) { @@ -69,7 +73,7 @@ AmsStDataAbilityPageB::~AmsStDataAbilityPageB() void AmsStDataAbilityPageB::SubscribeEvent(const Want &want) { - Want mwant{want}; + Want mwant {want}; std::vector eventList = { "event_data_test_action", }; @@ -134,7 +138,7 @@ void AmsStDataAbilityPageB::OnBackground() void AmsStDataAbilityPageB::GetWantInfo(const Want &want) { Want mWant(want); - STtools::StOperator allOperator{}; + STtools::StOperator allOperator {}; std::vector vectorOperator = mWant.GetStringArrayParam("operator"); STtools::DeserializationStOperatorFromVector(allOperator, vectorOperator); @@ -150,8 +154,8 @@ void AmsStDataAbilityPageB::GetWantInfo(const Want &want) static void GetResult(std::shared_ptr child, std::shared_ptr helper, Uri dataAbilityUri, string &result) { - AppExecFwk::DataAbilityPredicates predicates; - ValuesBucket bucket; + NativeRdb::DataAbilityPredicates predicates; + NativeRdb::ValuesBucket bucket; result = "failed"; if (child->GetOperatorName() == OPERATOR_INSERT) { result = std::to_string(helper->Insert(dataAbilityUri, bucket)); @@ -161,8 +165,12 @@ static void GetResult(std::shared_ptr child, std::shared_pt result = std::to_string(helper->Update(dataAbilityUri, bucket, predicates)); } else if (child->GetOperatorName() == OPERATOR_QUERY) { std::vector columns = STtools::SerializationStOperatorToVector(*child); - std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); - result = (resultValue != nullptr) ? (resultValue->testInf_) : "failed"; + std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); + result = "failed"; + if (resultValue != nullptr) { + resultValue->GoToRow(0); + resultValue->GetString(0, result); + } } else if (child->GetOperatorName() == OPERATOR_GETFILETYPES) { std::vector types = helper->GetFileTypes(dataAbilityUri, child->GetMessage()); result = (types.size() > 0) ? types[0] : "failed"; @@ -176,9 +184,10 @@ static void GetResult(std::shared_ptr child, std::shared_pt return; } result = std::to_string(fd); - char str[5]; - if (!feof(file)) - fgets(str, 5, file); + char str[charCnt]; + if (!feof(file)) { + fgets(str, charCnt, file); + } result = str; fclose(file); } @@ -187,7 +196,7 @@ static void GetResult(std::shared_ptr child, std::shared_pt void DataTestPageBEventSubscriber::TestPost(const std::string funName) { APP_LOGI("DataTestPageBEventSubscriber::TestPost %{public}s", funName.c_str()); - STtools::StOperator allOperator{}; + STtools::StOperator allOperator {}; STtools::DeserializationStOperatorFromVector(allOperator, vectorOperator_); std::shared_ptr helper = DataAbilityHelper::Creator(mainAbility_->GetContext()); for (auto child : allOperator.GetChildOperator()) { diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn index 84116a2f76d062578358d0c8bb062d639237cdfc..f81cf8d1b86a950dad16b417f15467d705ae9949 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/BUILD.gn @@ -66,6 +66,9 @@ ohos_shared_library("amsDataSystemTestC") { "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "native_appdatamgr:native_appdatafwk", + "native_appdatamgr:native_dataability", + "native_appdatamgr:native_rdb", ] subsystem_name = "amssystemtestability" } diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/include/ams_st_data_ability_data_c1.h b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/include/ams_st_data_ability_data_c1.h index 7935243c612949e6a82d654695e4558427daffdd..243c40b2e505c9f979bbbecd7103a99a969bd992 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/include/ams_st_data_ability_data_c1.h +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/include/ams_st_data_ability_data_c1.h @@ -22,6 +22,9 @@ #include "event.h" #include "skills.h" #include "stoperator.h" +#include "abs_shared_result_set.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" namespace OHOS { namespace AppExecFwk { @@ -40,11 +43,11 @@ public: protected: virtual void OnStart(const Want &want) override; - virtual int Insert(const Uri &uri, const ValuesBucket &value) override; - virtual int Delete(const Uri &uri, const DataAbilityPredicates &predicates) override; - virtual int Update(const Uri &uri, const ValuesBucket &value, const DataAbilityPredicates &predicates) override; - virtual std::shared_ptr Query( - const Uri &uri, const std::vector &columns, const DataAbilityPredicates &predicates) override; + virtual int Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) override; + virtual int Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) override; + virtual int Update(const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates) override; + virtual std::shared_ptr Query( + const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) override; virtual std::vector GetFileTypes(const Uri &uri, const std::string &mimeTypeFilter) override; virtual int OpenFile(const Uri &uri, const std::string &mode) override; friend class DataTestDataC1EventSubscriber; diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/include/ams_st_data_ability_data_c2.h b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/include/ams_st_data_ability_data_c2.h index 3fea6b358aeb068a3a860f16fab6a7f80e9c4d6a..186130a4993873b97427fb47e816c5a3a48dc1a1 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/include/ams_st_data_ability_data_c2.h +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/include/ams_st_data_ability_data_c2.h @@ -22,6 +22,9 @@ #include "event.h" #include "skills.h" #include "stoperator.h" +#include "abs_shared_result_set.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" namespace OHOS { namespace AppExecFwk { @@ -39,11 +42,11 @@ public: protected: virtual void OnStart(const Want &want) override; - virtual int Insert(const Uri &uri, const ValuesBucket &value) override; - virtual int Delete(const Uri &uri, const DataAbilityPredicates &predicates) override; - virtual int Update(const Uri &uri, const ValuesBucket &value, const DataAbilityPredicates &predicates) override; - virtual std::shared_ptr Query( - const Uri &uri, const std::vector &columns, const DataAbilityPredicates &predicates) override; + virtual int Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) override; + virtual int Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) override; + virtual int Update(const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates) override; + virtual std::shared_ptr Query( + const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) override; virtual std::vector GetFileTypes(const Uri &uri, const std::string &mimeTypeFilter) override; virtual int OpenFile(const Uri &uri, const std::string &mode) override; diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c1.cpp b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c1.cpp index 6a71906f6645ab7534036933f4e8460efced6e22..ddf47aa879ba9cbfd5ea6e8eb4e0b71f629a22ff 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c1.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c1.cpp @@ -23,6 +23,7 @@ namespace OHOS { namespace AppExecFwk { +namespace { static const int ABILITY_DATA_C1_CODE = 230; static const std::string OPERATOR_INSERT = "Insert"; static const std::string OPERATOR_DELETE = "Delete"; @@ -37,6 +38,7 @@ static const std::string ABILITY_TYPE_PAGE = "0"; static const std::string ABILITY_TYPE_SERVICE = "1"; static const std::string ABILITY_TYPE_DATA = "2"; constexpr int charCnt = 5; +} bool AmsStDataAbilityDataC1::PublishEvent(const std::string &eventName, const int &code, const std::string &data) { @@ -91,7 +93,7 @@ void AmsStDataAbilityDataC1::OnStart(const Want &want) PublishEvent(abilityEventName, ABILITY_DATA_C1_CODE, "OnStart"); } -int AmsStDataAbilityDataC1::Insert(const Uri &uri, const ValuesBucket &value) +int AmsStDataAbilityDataC1::Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) { APP_LOGI("AmsStDataAbilityDataC1 <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_C1_CODE, "Insert"); @@ -104,22 +106,22 @@ int AmsStDataAbilityDataC1::Insert(const Uri &uri, const ValuesBucket &value) return DEFAULT_INSERT_RESULT; } -int AmsStDataAbilityDataC1::Delete(const Uri &uri, const DataAbilityPredicates &predicates) +int AmsStDataAbilityDataC1::Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("AmsStDataAbilityDataC1 <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_C1_CODE, "Delete"); return DEFAULT_DELETE_RESULT; } -int AmsStDataAbilityDataC1::Update(const Uri &uri, const ValuesBucket &value, const DataAbilityPredicates &predicates) +int AmsStDataAbilityDataC1::Update(const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("AmsStDataAbilityDataC1 <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_C1_CODE, "Update"); return DEFAULT_UPDATE_RESULT; } -std::shared_ptr AmsStDataAbilityDataC1::Query( - const Uri &uri, const std::vector &columns, const DataAbilityPredicates &predicates) +std::shared_ptr AmsStDataAbilityDataC1::Query( + const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) { subscriber_->vectorOperator_ = columns; APP_LOGI("AmsStDataAbilityDataC1 <<<>>>"); @@ -128,7 +130,9 @@ std::shared_ptr AmsStDataAbilityDataC1::Query( STtools::WaitCompleted(event, OPERATOR_QUERY, ABILITY_DATA_C1_CODE); subscriber_->TestPost(); - std::shared_ptr resultValue = std::make_shared(OPERATOR_QUERY); + std::shared_ptr resultValue = std::make_shared(OPERATOR_QUERY); + AppDataFwk::SharedBlock *pSharedBlock = resultValue->GetBlock(); + pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1); return resultValue; } @@ -136,7 +140,7 @@ std::vector AmsStDataAbilityDataC1::GetFileTypes(const Uri &uri, co { APP_LOGI("AmsStDataAbilityDataC1 <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_C1_CODE, "GetFileTypes"); - std::vector fileType{"filetypes"}; + std::vector fileType {"filetypes"}; return fileType; } @@ -148,8 +152,8 @@ int AmsStDataAbilityDataC1::OpenFile(const Uri &uri, const std::string &mode) static void GetResult(std::shared_ptr child, std::shared_ptr helper, Uri dataAbilityUri, string &result) { - AppExecFwk::DataAbilityPredicates predicates; - ValuesBucket bucket; + NativeRdb::DataAbilityPredicates predicates; + NativeRdb::ValuesBucket bucket; result = "failed"; if (child->GetOperatorName() == OPERATOR_INSERT) { result = std::to_string(helper->Insert(dataAbilityUri, bucket)); @@ -159,8 +163,12 @@ static void GetResult(std::shared_ptr child, std::shared_pt result = std::to_string(helper->Update(dataAbilityUri, bucket, predicates)); } else if (child->GetOperatorName() == OPERATOR_QUERY) { std::vector columns = STtools::SerializationStOperatorToVector(*child); - std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); - result = (resultValue != nullptr) ? (resultValue->testInf_) : "failed"; + std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); + result = "failed"; + if (resultValue != nullptr) { + resultValue->GoToRow(0); + resultValue->GetString(0, result); + } } else if (child->GetOperatorName() == OPERATOR_GETFILETYPES) { std::vector types = helper->GetFileTypes(dataAbilityUri, child->GetMessage()); result = (types.size() > 0) ? types[0] : "failed"; @@ -187,26 +195,26 @@ void DataTestDataC1EventSubscriber::GetResultBySelf( { if (child->GetOperatorName() == OPERATOR_INSERT) { APP_LOGI("---------------------Insert--------------------"); - ValuesBucket bucket; + NativeRdb::ValuesBucket bucket; result = std::to_string(mainAbility->Insert(dataAbilityUri, bucket)); } else if (child->GetOperatorName() == OPERATOR_DELETE) { APP_LOGI("---------------------Delete--------------------"); - AppExecFwk::DataAbilityPredicates predicates; + NativeRdb::DataAbilityPredicates predicates; result = std::to_string(mainAbility->Delete(dataAbilityUri, predicates)); } else if (child->GetOperatorName() == OPERATOR_UPDATE) { APP_LOGI("---------------------Update--------------------"); - ValuesBucket bucket; - AppExecFwk::DataAbilityPredicates predicates; + NativeRdb::ValuesBucket bucket; + NativeRdb::DataAbilityPredicates predicates; result = std::to_string(mainAbility->Update(dataAbilityUri, bucket, predicates)); } else if (child->GetOperatorName() == OPERATOR_QUERY) { APP_LOGI("---------------------Query--------------------"); std::vector columns = STtools::SerializationStOperatorToVector(*child); - AppExecFwk::DataAbilityPredicates predicates; - std::shared_ptr resultValue = mainAbility->Query(dataAbilityUri, columns, predicates); + NativeRdb::DataAbilityPredicates predicates; + std::shared_ptr resultValue = mainAbility->Query(dataAbilityUri, columns, predicates); + result = "failed"; if (resultValue != nullptr) { - result = resultValue->testInf_; - } else { - result = "failed"; + resultValue->GoToRow(0); + resultValue->GetString(0, result); } } else if (child->GetOperatorName() == OPERATOR_GETFILETYPES) { APP_LOGI("---------------------GetFileTypes--------------------"); @@ -225,8 +233,9 @@ void DataTestDataC1EventSubscriber::GetResultBySelf( mainAbility_->PublishEvent(abilityEventName, ABILITY_DATA_C1_CODE, "OpenFile"); char str[charCnt]; - if (!feof(file)) + if (!feof(file)) { fgets(str, charCnt, file); + } result = str; fclose(file); } @@ -235,7 +244,7 @@ void DataTestDataC1EventSubscriber::GetResultBySelf( void DataTestDataC1EventSubscriber::TestPost(const std::string funName) { APP_LOGI("DataTestDataC1EventSubscriber::TestPost %{public}s", funName.c_str()); - STtools::StOperator allOperator{}; + STtools::StOperator allOperator {}; STtools::DeserializationStOperatorFromVector(allOperator, vectorOperator_); std::shared_ptr helper = DataAbilityHelper::Creator(mainAbility_->GetContext()); for (auto child : allOperator.GetChildOperator()) { diff --git a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c2.cpp b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c2.cpp index c8bd58b4382aa152b51ba980fdb7ad4287fa9f11..a9ba2761636922262ee306aa89ecb54eaba10ec2 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c2.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsDataSystemTestC/src/ams_st_data_ability_data_c2.cpp @@ -23,6 +23,7 @@ namespace OHOS { namespace AppExecFwk { +namespace { static const int ABILITY_DATA_C2_CODE = 240; static const std::string OPERATOR_INSERT = "Insert"; static const std::string OPERATOR_DELETE = "Delete"; @@ -36,6 +37,8 @@ static const int DEFAULT_UPDATE_RESULT = 3333; static const std::string ABILITY_TYPE_PAGE = "0"; static const std::string ABILITY_TYPE_SERVICE = "1"; static const std::string ABILITY_TYPE_DATA = "2"; +constexpr int charCnt = 5; +} bool AmsStDataAbilityDataC2::PublishEvent(const std::string &eventName, const int &code, const std::string &data) { @@ -90,29 +93,29 @@ void AmsStDataAbilityDataC2::OnStart(const Want &want) PublishEvent(abilityEventName, ABILITY_DATA_C2_CODE, "OnStart"); } -int AmsStDataAbilityDataC2::Insert(const Uri &uri, const ValuesBucket &value) +int AmsStDataAbilityDataC2::Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) { APP_LOGI("AmsStDataAbilityDataC2 <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_C2_CODE, "Insert"); return DEFAULT_INSERT_RESULT; } -int AmsStDataAbilityDataC2::Delete(const Uri &uri, const DataAbilityPredicates &predicates) +int AmsStDataAbilityDataC2::Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("AmsStDataAbilityDataC2 <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_C2_CODE, "Delete"); return DEFAULT_DELETE_RESULT; } -int AmsStDataAbilityDataC2::Update(const Uri &uri, const ValuesBucket &value, const DataAbilityPredicates &predicates) +int AmsStDataAbilityDataC2::Update(const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("AmsStDataAbilityDataC2 <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_C2_CODE, "Update"); return DEFAULT_UPDATE_RESULT; } -std::shared_ptr AmsStDataAbilityDataC2::Query( - const Uri &uri, const std::vector &columns, const DataAbilityPredicates &predicates) +std::shared_ptr AmsStDataAbilityDataC2::Query( + const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) { subscriber_->vectorOperator_ = columns; APP_LOGI("AmsStDataAbilityDataC2 <<<>>>"); @@ -121,7 +124,9 @@ std::shared_ptr AmsStDataAbilityDataC2::Query( STtools::WaitCompleted(event, OPERATOR_QUERY, ABILITY_DATA_C2_CODE); subscriber_->TestPost(); - std::shared_ptr resultValue = std::make_shared(OPERATOR_QUERY); + std::shared_ptr resultValue = std::make_shared(OPERATOR_QUERY); + AppDataFwk::SharedBlock *pSharedBlock = resultValue->GetBlock(); + pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1); return resultValue; } @@ -129,7 +134,7 @@ std::vector AmsStDataAbilityDataC2::GetFileTypes(const Uri &uri, co { APP_LOGI("AmsStDataAbilityDataC2 <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_C2_CODE, "GetFileTypes"); - std::vector fileType{"filetypes"}; + std::vector fileType {"filetypes"}; return fileType; } @@ -149,8 +154,8 @@ int AmsStDataAbilityDataC2::OpenFile(const Uri &uri, const std::string &mode) static void GetResult(std::shared_ptr child, std::shared_ptr helper, Uri dataAbilityUri, string &result) { - AppExecFwk::DataAbilityPredicates predicates; - ValuesBucket bucket; + NativeRdb::DataAbilityPredicates predicates; + NativeRdb::ValuesBucket bucket; result = "failed"; if (child->GetOperatorName() == OPERATOR_INSERT) { result = std::to_string(helper->Insert(dataAbilityUri, bucket)); @@ -160,8 +165,12 @@ static void GetResult(std::shared_ptr child, std::shared_pt result = std::to_string(helper->Update(dataAbilityUri, bucket, predicates)); } else if (child->GetOperatorName() == OPERATOR_QUERY) { std::vector columns = STtools::SerializationStOperatorToVector(*child); - std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); - result = (resultValue != nullptr) ? (resultValue->testInf_) : "failed"; + std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); + result = "failed"; + if (resultValue != nullptr) { + resultValue->GoToRow(0); + resultValue->GetString(0, result); + } } else if (child->GetOperatorName() == OPERATOR_GETFILETYPES) { std::vector types = helper->GetFileTypes(dataAbilityUri, child->GetMessage()); result = (types.size() > 0) ? types[0] : "failed"; @@ -175,9 +184,10 @@ static void GetResult(std::shared_ptr child, std::shared_pt return; } result = std::to_string(fd); - char str[5]; - if (!feof(file)) - fgets(str, 5, file); + char str[charCnt]; + if (!feof(file)) { + fgets(str, charCnt, file); + } result = str; fclose(file); } @@ -186,7 +196,7 @@ static void GetResult(std::shared_ptr child, std::shared_pt void DataTestDataC2EventSubscriber::TestPost(const std::string funName) { APP_LOGI("DataTestDataC2EventSubscriber::TestPost %{public}s", funName.c_str()); - STtools::StOperator allOperator{}; + STtools::StOperator allOperator {}; STtools::DeserializationStOperatorFromVector(allOperator, vectorOperator_); std::shared_ptr helper = DataAbilityHelper::Creator(mainAbility_->GetContext()); for (auto child : allOperator.GetChildOperator()) { diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/src/kit_test_ability_manager_second.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/src/kit_test_ability_manager_second.cpp index d056f2a265c1fee4c1a7c030ee48cdc28fce9f75..15edde043ef3b74f5245f748ab69bd8ee82c293b 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/src/kit_test_ability_manager_second.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManager/src/kit_test_ability_manager_second.cpp @@ -28,16 +28,16 @@ namespace { const std::string currentAbilityName = "KitTestAbilityManagerSecond"; const std::string topAbilityName = "KitTestAbilityManager"; const std::string launchAbilityName = "LauncherAbility"; -const std::string bundleName = "com.ohos.amsst.AppKit"; -const std::string topProcessInfo = "com.ohos.amsst.AppKit"; +const std::string bundleName = "com.ohos.amsst.AppKitAbilityManagerFirst"; +const std::string topProcessInfo = "com.ohos.amsst.AppKitAbilityManagerFirst"; const std::string currentProcessInfo = "com.ohos.amsst.AppKitAbilityManager"; const std::string launchProcessInfo = "com.ix.launcher"; bool isMoveMissionToTop = false; int moveMissionToTopCode = -1; bool isClearUpApplicationData = false; int clearUpApplicationDataCode = -1; -int numTwo = 2; -int numThree = 3; +constexpr int numTwo = 2; +constexpr int numThree = 3; } // namespace bool KitTestAbilityManagerSecond::PublishEvent(const std::string &eventName, const int &code, const std::string &data) @@ -112,8 +112,7 @@ void KitTestAbilityManagerSecond::ProcessStateNotEqual( void KitTestAbilityManagerSecond::GetAllStackInfo(MissionStackInfo &missionStackInfo, int stackID) { - StackInfo stackInfo; - stackInfo = AbilityManager::GetInstance().GetAllStackInfo(); + StackInfo stackInfo = AbilityManager::GetInstance().GetAllStackInfo(); for (const auto &stackInfo : stackInfo.missionStackInfos) { if (stackInfo.id == stackID) { missionStackInfo = stackInfo; @@ -208,7 +207,7 @@ void KitTestAbilityManagerSecond::AbilityManagerGetAllStackInfoCase4(int code) GetAllStackInfo(missionStackInfo, 1); bool result = false; if (missionStackInfo.missionRecords.size() == 1) { - result = (missionStackInfo.missionRecords[0].abilityRecordInfos.size() == 2); + result = (missionStackInfo.missionRecords[0].abilityRecordInfos.size() == numTwo); } PublishEvent(g_respPageManagerAbilityST, code, std::to_string(result)); } @@ -230,9 +229,9 @@ void KitTestAbilityManagerSecond::AbilityManagerQueryRecentAbilityMissionInfoCas { APP_LOGI("KitTestAbilityManagerSecond::AbilityManagerQueryRecentAbilityMissionInfoCase1"); std::vector info; - info = AbilityManager::GetInstance().QueryRecentAbilityMissionInfo(3, RECENT_WITH_EXCLUDED); + info = AbilityManager::GetInstance().QueryRecentAbilityMissionInfo(numThree, RECENT_WITH_EXCLUDED); bool result = false; - if (1 == info.size() && 2 == info[0].size) { + if (info.size() == 1 && info[0].size == numTwo) { if (info[0].baseAbility.GetBundleName() == bundleName) { result = true; } @@ -244,9 +243,9 @@ void KitTestAbilityManagerSecond::AbilityManagerQueryRecentAbilityMissionInfoCas { APP_LOGI("KitTestAbilityManagerSecond::AbilityManagerQueryRecentAbilityMissionInfoCase2"); std::vector info; - info = AbilityManager::GetInstance().QueryRecentAbilityMissionInfo(3, RECENT_WITH_EXCLUDED); + info = AbilityManager::GetInstance().QueryRecentAbilityMissionInfo(numThree, RECENT_WITH_EXCLUDED); bool result = false; - if (1 == info.size() && 2 == info[0].size) { + if (info.size() == 1 && info[0].size == numTwo) { result = true; } PublishEvent(g_respPageManagerAbilityST, code, std::to_string(result)); @@ -256,9 +255,9 @@ void KitTestAbilityManagerSecond::AbilityManagerQueryRecentAbilityMissionInfoCas { APP_LOGI("KitTestAbilityManagerSecond::AbilityManagerQueryRecentAbilityMissionInfoCase3"); std::vector info; - info = AbilityManager::GetInstance().QueryRecentAbilityMissionInfo(3, RECENT_WITH_EXCLUDED); + info = AbilityManager::GetInstance().QueryRecentAbilityMissionInfo(numThree, RECENT_WITH_EXCLUDED); bool result = false; - if (1 == info.size() && 2 == info[0].size) { + if (info.size() == 1 && info[0].size == numTwo) { if (info[0].baseAbility.GetBundleName() == bundleName && info[0].baseAbility.GetAbilityName() == topAbilityName) { result = true; @@ -272,9 +271,9 @@ void KitTestAbilityManagerSecond::AbilityManagerQueryRunningAbilityMissionInfoCa { APP_LOGI("KitTestAbilityManagerSecond::AbilityManagerQueryRunningAbilityMissionInfoCase1"); std::vector info; - info = AbilityManager::GetInstance().QueryRunningAbilityMissionInfo(3); + info = AbilityManager::GetInstance().QueryRunningAbilityMissionInfo(numThree); bool result = false; - if (1 == info.size() && 2 == info[0].size) { + if (info.size() == 1 && info[0].size == numTwo) { if (info[0].baseAbility.GetBundleName() == bundleName) { result = true; } @@ -286,9 +285,9 @@ void KitTestAbilityManagerSecond::AbilityManagerQueryRunningAbilityMissionInfoCa { APP_LOGI("KitTestAbilityManagerSecond::AbilityManagerQueryRunningAbilityMissionInfoCase2"); std::vector info; - info = AbilityManager::GetInstance().QueryRunningAbilityMissionInfo(3); + info = AbilityManager::GetInstance().QueryRunningAbilityMissionInfo(numThree); bool result = false; - if (1 == info.size() && 2 == info[0].size) { + if (info.size() == 1 && info[0].size == numTwo) { result = true; } PublishEvent(g_respPageManagerAbilityST, code, std::to_string(result)); @@ -298,9 +297,9 @@ void KitTestAbilityManagerSecond::AbilityManagerQueryRunningAbilityMissionInfoCa { APP_LOGI("KitTestAbilityManagerSecond::AbilityManagerQueryRunningAbilityMissionInfoCase3"); std::vector info; - info = AbilityManager::GetInstance().QueryRunningAbilityMissionInfo(3); + info = AbilityManager::GetInstance().QueryRunningAbilityMissionInfo(numThree); bool result = false; - if (1 == info.size() && 2 == info[0].size) { + if (info.size() == 1 && info[0].size == numTwo) { if (info[0].baseAbility.GetBundleName() == bundleName && info[0].baseAbility.GetAbilityName() == topAbilityName) { result = true; @@ -354,7 +353,7 @@ void KitTestAbilityManagerSecond::OnActive() { APP_LOGI("KitTestAbilityManagerSecond::OnActive"); Ability::OnActive(); - if (true == isMoveMissionToTop) { + if (isMoveMissionToTop == true) { PublishEvent(g_respPageManagerAbilityST, moveMissionToTopCode, "1"); isMoveMissionToTop = false; moveMissionToTopCode = -1; @@ -380,10 +379,10 @@ void KitTestAbilityManagerSecond::OnBackground() { APP_LOGI("KitTestAbilityManagerSecond::OnBackground"); Ability::OnBackground(); - if (true == isMoveMissionToTop) { + if (isMoveMissionToTop == true) { std::vector info; - info = AbilityManager::GetInstance().QueryRecentAbilityMissionInfo(3, RECENT_WITH_EXCLUDED); - if (1 == info.size() && 2 == info[0].size) { + info = AbilityManager::GetInstance().QueryRecentAbilityMissionInfo(numThree, RECENT_WITH_EXCLUDED); + if (info.size() == 1 && info[0].size == numTwo) { GetAbilityManager()->MoveMissionToTop(info[0].id); APP_LOGI("GetAbilityManager()->MoveMissionToTop(info[0].id);%{public}d", static_cast(info[0].id)); } diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..ee4f5b143f11998c982c570dd0fe1f3a1ef956d2 --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/BUILD.gn @@ -0,0 +1,69 @@ +# Copyright (c) 2021 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/appexecfwk/standard/appexecfwk.gni") + +config("amsKitSTAbilityManagerConfig") { + visibility = [ ":*" ] + include_dirs = [ + "include", + "${aafwk_path}/interfaces/innerkits/ability_manager/include", + "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk/content", + "${aafwk_path}/services/abilitymgr/include", + "${appexecfwk_path}/common/log/include", + "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include", + "${appexecfwk_path}/kits/appkit/native/app", + "${appexecfwk_path}/services/bundlemgr/include", + "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include", + "//utils/system/safwk/native/include", + "${appexecfwk_path}/test/resource/amssystemtestability/abilitySrc/common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core/include/appmgr", + "//third_party/jsoncpp/include", + ] + defines = [ + "APP_LOG_TAG = \"amsKitSTAbilityManagerFirst\"", + "LOG_DOMAIN = 0xD002200", + ] +} +ohos_shared_library("amsKitSTAbilityManagerFirst") { + sources = [ + "src/kit_test_ability_manager.cpp", + "src/test_utils.cpp", + ] + cflags = [] + if (target_cpu == "arm") { + cflags += [ "-DBINDER_IPC_32BIT" ] + } + configs = [ ":amsKitSTAbilityManagerConfig" ] + deps = [ + "${aafwk_path}/frameworks/kits/ability/native:abilitykit_native", + "${aafwk_path}/interfaces/innerkits/base:base", + "${aafwk_path}/interfaces/innerkits/want:want", + "${appexecfwk_path}/common:libappexecfwk_common", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base:appexecfwk_base", + "${appexecfwk_path}/interfaces/innerkits/appexecfwk_core:appexecfwk_core", + "${appexecfwk_path}/kits:appkit_native", + "${appexecfwk_path}/services/bundlemgr:libbms", + "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", + "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", + "//third_party/jsoncpp:jsoncpp", + "//utils/native/base:utilsbase", + ] + external_deps = [ + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", + "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", + ] + subsystem_name = "amssystemtestability" +} diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/config.json b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/config.json new file mode 100644 index 0000000000000000000000000000000000000000..1b39120f4c0247fa3d5fec31d920ca00fe7b99b6 --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/config.json @@ -0,0 +1,40 @@ +{ + "app":{ + "bundleName": "com.ohos.amsst.AppKitAbilityManagerFirst", + "vendor": "ix", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 3, + "target": 3 + } + }, + "deviceConfig": { + "default": { + } + }, + "module": { + "package":"com.ohos.KitAbilityManagerFirst.src", + "name":"MainAbility", + "deviceType": [ + "tv", + "car" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "testability", + "moduleType": "entry" + }, + "abilities": [{ + "name": "KitTestAbilityManager", + "icon": "$media:snowflakes", + "label": "Kittest Ability", + "launchType": "singletop", + "orientation": "unspecified", + "type": "page", + "visible": true + }] + } +} \ No newline at end of file diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/include/kit_test_ability_manager.h b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/include/kit_test_ability_manager.h new file mode 100644 index 0000000000000000000000000000000000000000..1bc3c529ed1d2eec1a368058024516d4802b4e4b --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/include/kit_test_ability_manager.h @@ -0,0 +1,195 @@ +/* + * Copyright (c) 2021 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 _KIT_TEST_ABILITY_MANAGER_H_ +#define _KIT_TEST_ABILITY_MANAGER_H_ +#include +#include "ability_loader.h" +#include "running_process_info.h" +#include "ability_manager.h" +#include "common_event.h" +#include "common_event_manager.h" +#include "kit_test_common_info.h" +#include "test_utils.h" + +namespace OHOS { +namespace AppExecFwk { +using vector_str = std::vector; +using vector_conststr = std::vector; +using vector_func = std::vector>; +using MAP_STR_STR = std::map; +class KitTestManagerEventSubscriber; +class KitTestAbilityManager : public Ability { +public: + void SubscribeEvent(const vector_conststr &eventList); + void AbilityManagerStByCode(int apiIndex, int caseIndex, int code); + void CompareProcessName(std::vector &info, const std::string &expectedName, int code); + void CompareProcessState( + std::vector &info, const std::string &processName, AppProcessState expectedState, int code); + void StartAbilitySelf( + const std::string &bundleName, const std::string &abilityNmae, AbilityManagerApi api, int codeIndex, int code); + void GetAllStackInfo(AAFwk::MissionStackInfo &missionStackInfo, int stackID); + + // GetAllRunningProcesses ST kit case + void AbilityManagerGetAllRunningProcessesCase1(int code); + void AbilityManagerGetAllRunningProcessesCase2(int code); + void AbilityManagerGetAllRunningProcessesCase3(int code); + void AbilityManagerGetAllRunningProcessesCase4(int code); + void AbilityManagerGetAllRunningProcessesCase5(int code); + void AbilityManagerGetAllRunningProcessesCase6(int code); + void AbilityManagerGetAllRunningProcessesCase7(int code); + void AbilityManagerGetAllRunningProcessesCase8(int code); + void AbilityManagerGetAllRunningProcessesCase9(int code); + void AbilityManagerGetAllRunningProcessesCase10(int code); + + // GetAllStackInfo ST kit case + void AbilityManagerGetAllStackInfoCase1(int code); + void AbilityManagerGetAllStackInfoCase2(int code); + void AbilityManagerGetAllStackInfoCase3(int code); + void AbilityManagerGetAllStackInfoCase4(int code); + void AbilityManagerGetAllStackInfoCase5(int code); + void AbilityManagerGetAllStackInfoCase6(int code); + void AbilityManagerGetAllStackInfoCase7(int code); + void AbilityManagerGetAllStackInfoCase8(int code); + void AbilityManagerGetAllStackInfoCase9(int code); + + // QueryRecentAbilityMissionInfo ST kit case + void QueryRecentAbilityMissionInfoParam(int numMax, int code, std::size_t size, int flags); + void AbilityManagerQueryRecentAbilityMissionInfoCase1(int code); + void AbilityManagerQueryRecentAbilityMissionInfoCase2(int code); + void AbilityManagerQueryRecentAbilityMissionInfoCase3(int code); + void AbilityManagerQueryRecentAbilityMissionInfoCase4(int code); + void AbilityManagerQueryRecentAbilityMissionInfoCase5(int code); + void AbilityManagerQueryRecentAbilityMissionInfoCase6(int code); + void AbilityManagerQueryRecentAbilityMissionInfoCase7(int code); + void AbilityManagerQueryRecentAbilityMissionInfoCase8(int code); + void AbilityManagerQueryRecentAbilityMissionInfoCase9(int code); + void AbilityManagerQueryRecentAbilityMissionInfoCase10(int code); + void AbilityManagerQueryRecentAbilityMissionInfoCase11(int code); + void AbilityManagerQueryRecentAbilityMissionInfoCase12(int code); + void AbilityManagerQueryRecentAbilityMissionInfoCase13(int code); + void AbilityManagerQueryRecentAbilityMissionInfoCase14(int code); + + // QueryRunningAbilityMissionInfo ST kit case + void QueryRunningAbilityMissionInfoParam(int numMax, int code, std::size_t size); + void AbilityManagerQueryRunningAbilityMissionInfoCase1(int code); + void AbilityManagerQueryRunningAbilityMissionInfoCase2(int code); + void AbilityManagerQueryRunningAbilityMissionInfoCase3(int code); + void AbilityManagerQueryRunningAbilityMissionInfoCase4(int code); + void AbilityManagerQueryRunningAbilityMissionInfoCase5(int code); + void AbilityManagerQueryRunningAbilityMissionInfoCase6(int code); + void AbilityManagerQueryRunningAbilityMissionInfoCase7(int code); + void AbilityManagerQueryRunningAbilityMissionInfoCase8(int code); + void AbilityManagerQueryRunningAbilityMissionInfoCase9(int code); + + // MoveMissionToTop ST kit case + void AbilityManagerMoveMissionToTopCase1(int code); + void AbilityManagerMoveMissionToTopCase2(int code); + + // ClearUpApplicationData ST kit case + void AbilityManagerClearUpApplicationDataCase1(int code); + std::shared_ptr subscriber; + +protected: + virtual void OnStart(const Want &want) override; + virtual void OnStop() override; + virtual void OnActive() override; + virtual void OnInactive() override; + virtual void OnBackground() override; + virtual void OnForeground(const Want &want) override; + virtual void OnNewWant(const Want &want) override; + +private: + std::unordered_map mapStKitFunc_{ + {static_cast(AbilityManagerApi::GetAllRunningProcesses), + {{[this](int code) { AbilityManagerGetAllRunningProcessesCase1(code); }}, + {[this](int code) { AbilityManagerGetAllRunningProcessesCase2(code); }}, + {[this](int code) { AbilityManagerGetAllRunningProcessesCase3(code); }}, + {[this](int code) { AbilityManagerGetAllRunningProcessesCase4(code); }}, + {[this](int code) { AbilityManagerGetAllRunningProcessesCase5(code); }}, + {[this](int code) { AbilityManagerGetAllRunningProcessesCase6(code); }}, + {[this](int code) { AbilityManagerGetAllRunningProcessesCase7(code); }}, + {[this](int code) { AbilityManagerGetAllRunningProcessesCase8(code); }}, + {[this](int code) { AbilityManagerGetAllRunningProcessesCase9(code); }}, + {[this](int code) { AbilityManagerGetAllRunningProcessesCase10(code); }}}}, + {static_cast(AbilityManagerApi::GetAllStackInfo), + {{[this](int code) { AbilityManagerGetAllStackInfoCase1(code); }}, + {[this](int code) { AbilityManagerGetAllStackInfoCase2(code); }}, + {[this](int code) { AbilityManagerGetAllStackInfoCase3(code); }}, + {[this](int code) { AbilityManagerGetAllStackInfoCase4(code); }}, + {[this](int code) { AbilityManagerGetAllStackInfoCase5(code); }}, + {[this](int code) { AbilityManagerGetAllStackInfoCase6(code); }}, + {[this](int code) { AbilityManagerGetAllStackInfoCase7(code); }}, + {[this](int code) { AbilityManagerGetAllStackInfoCase8(code); }}, + {[this](int code) { AbilityManagerGetAllStackInfoCase9(code); }}}}, + {static_cast(AbilityManagerApi::QueryRecentAbilityMissionInfo), + {{[this](int code) { AbilityManagerQueryRecentAbilityMissionInfoCase1(code); }}, + {[this](int code) { AbilityManagerQueryRecentAbilityMissionInfoCase2(code); }}, + {[this](int code) { AbilityManagerQueryRecentAbilityMissionInfoCase3(code); }}, + {[this](int code) { AbilityManagerQueryRecentAbilityMissionInfoCase4(code); }}, + {[this](int code) { AbilityManagerQueryRecentAbilityMissionInfoCase5(code); }}, + {[this](int code) { AbilityManagerQueryRecentAbilityMissionInfoCase6(code); }}, + {[this](int code) { AbilityManagerQueryRecentAbilityMissionInfoCase7(code); }}, + {[this](int code) { AbilityManagerQueryRecentAbilityMissionInfoCase8(code); }}, + {[this](int code) { AbilityManagerQueryRecentAbilityMissionInfoCase9(code); }}, + {[this](int code) { AbilityManagerQueryRecentAbilityMissionInfoCase10(code); }}, + {[this](int code) { AbilityManagerQueryRecentAbilityMissionInfoCase11(code); }}, + {[this](int code) { AbilityManagerQueryRecentAbilityMissionInfoCase12(code); }}, + {[this](int code) { AbilityManagerQueryRecentAbilityMissionInfoCase13(code); }}, + {[this](int code) { AbilityManagerQueryRecentAbilityMissionInfoCase14(code); }}}}, + {static_cast(AbilityManagerApi::QueryRunningAbilityMissionInfo), + {{[this](int code) { AbilityManagerQueryRunningAbilityMissionInfoCase1(code); }}, + {[this](int code) { AbilityManagerQueryRunningAbilityMissionInfoCase2(code); }}, + {[this](int code) { AbilityManagerQueryRunningAbilityMissionInfoCase3(code); }}, + {[this](int code) { AbilityManagerQueryRunningAbilityMissionInfoCase4(code); }}, + {[this](int code) { AbilityManagerQueryRunningAbilityMissionInfoCase5(code); }}, + {[this](int code) { AbilityManagerQueryRunningAbilityMissionInfoCase6(code); }}, + {[this](int code) { AbilityManagerQueryRunningAbilityMissionInfoCase7(code); }}, + {[this](int code) { AbilityManagerQueryRunningAbilityMissionInfoCase8(code); }}, + {[this](int code) { AbilityManagerQueryRunningAbilityMissionInfoCase9(code); }}}}, + {static_cast(AbilityManagerApi::MoveMissionToTop), + {{[this](int code) { AbilityManagerMoveMissionToTopCase1(code); }}, + {[this](int code) { AbilityManagerMoveMissionToTopCase2(code); }}}}, + {static_cast(AbilityManagerApi::ClearUpApplicationData), + {{[this](int code) { AbilityManagerClearUpApplicationDataCase1(code); }}}}}; +}; + +// KitTestManagerEventSubscriber Class +class KitTestManagerEventSubscriber : public EventFwk::CommonEventSubscriber { +public: + KitTestManagerEventSubscriber(const EventFwk::CommonEventSubscribeInfo &sp, KitTestAbilityManager *ability) + : CommonEventSubscriber(sp) + { + mapTestFunc_ = {{"AbilityManagerApi", + [this](int apiIndex, int caseIndex, int code) { AbilityManagerStByCode(apiIndex, caseIndex, code); }}}; + kitTestAbility_ = ability; + } + ~KitTestManagerEventSubscriber() + { + kitTestAbility_ = nullptr; + } + + virtual void OnReceiveEvent(const EventFwk::CommonEventData &data) override; + void AbilityManagerStByCode(int apiIndex, int caseIndex, int code); + void KitTerminateAbility(); + +private: + std::unordered_map> mapTestFunc_; + KitTestAbilityManager *kitTestAbility_; +}; + +} // namespace AppExecFwk +} // namespace OHOS +#endif //_KIT_TEST_ABILITY_MANAGER_H_ diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/include/test_utils.h b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/include/test_utils.h new file mode 100644 index 0000000000000000000000000000000000000000..0af55daf4ded4319a4da63849373fcf9ba3d4b03 --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/include/test_utils.h @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2021 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 _TEST_UTILS_H_ +#define _TEST_UTILS_H_ +#include "ability_info.h" +#include "ability_lifecycle.h" +#include "application_info.h" +#include "process_info.h" +#include "want.h" + +namespace OHOS { +namespace AppExecFwk { +const int OnStateChangedEventWant = LifeCycle::Event::UNDEFINED; +const int OnStateChangedEvent = (int)LifeCycle::Event::UNDEFINED + 1; +const int requestCodeForTerminate = 10; +const int requestCodeForResult = 20; + +class TestUtils { +public: + TestUtils() = default; + virtual ~TestUtils() = default; + static bool PublishEvent(const std::string &eventName, const int &code, const std::string &data); + static Want MakeWant(std::string deviceId, std::string abilityName, std::string bundleName, + std::map params); + static std::vector split(const std::string &in, const std::string &delim); +}; +} // namespace AppExecFwk +} // namespace OHOS +#endif // _TEST_UTILS_H_ \ No newline at end of file diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/kit_test_ability_manager.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/kit_test_ability_manager.cpp new file mode 100644 index 0000000000000000000000000000000000000000..acfa1dcac84ecf129752004481bb407ef6126d98 --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/kit_test_ability_manager.cpp @@ -0,0 +1,611 @@ +/* + * Copyright (c) 2021 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 "kit_test_ability_manager.h" +#include +#include +#include +#include "app_log_wrapper.h" + +namespace OHOS { +namespace AppExecFwk { +using namespace OHOS::EventFwk; +using namespace OHOS::AAFwk; +namespace { +const std::string bundleName = "com.ohos.amsst.AppKitAbilityManager"; +const std::string abilityName = "KitTestAbilityManagerSecond"; +const std::string currentAbilityName = "KitTestAbilityManager"; +const std::string currentProcessInfo = "com.ohos.amsst.AppKitAbilityManagerFirst"; +const std::string launchAbilityName = "LauncherAbility"; +const std::string launchProcessInfo = "com.ix.launcher"; +bool isMoveMissionToTop = false; +int moveMissionToTopCode = -1; +int isClearUpApplicationData = false; +int numThree = 3; +} // namespace + +void KitTestAbilityManager::SubscribeEvent(const vector_conststr &eventList) +{ + MatchingSkills matchingSkills; + for (const auto &e : eventList) { + matchingSkills.AddEvent(e); + } + CommonEventSubscribeInfo subscribeInfo(matchingSkills); + subscribeInfo.SetPriority(1); + subscriber = std::make_shared(subscribeInfo, this); + CommonEventManager::SubscribeCommonEvent(subscriber); +} + +void KitTestAbilityManager::AbilityManagerStByCode(int apiIndex, int caseIndex, int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerStByCode"); + if (mapStKitFunc_.find(apiIndex) != mapStKitFunc_.end() && + static_cast(mapStKitFunc_[apiIndex].size()) > caseIndex) { + mapStKitFunc_[apiIndex][caseIndex](code); + } else { + APP_LOGI("AbilityManagerStByCode error"); + } +} + +void KitTestAbilityManager::CompareProcessName( + std::vector &info, const std::string &expectedName, int code) +{ + bool result = false; + for (auto processInfo : info) { + if (processInfo.processName_ == expectedName) { + result = true; + } + } + TestUtils::PublishEvent(g_respPageManagerAbilityST, code, std::to_string(result)); +} + +void KitTestAbilityManager::CompareProcessState( + std::vector &info, const std::string &processName, AppProcessState expectedState, int code) +{ + bool result = false; + for (auto processInfo : info) { + if (processInfo.processName_ == processName && processInfo.state_ == expectedState) { + result = true; + } + } + TestUtils::PublishEvent(g_respPageManagerAbilityST, code, std::to_string(result)); +} + +void KitTestAbilityManager::StartAbilitySelf( + const std::string &bundleName, const std::string &abilityNmae, AbilityManagerApi api, int codeIndex, int code) +{ + MAP_STR_STR params; + params["apiIndex"] = std::to_string(static_cast(api)); + params["caseIndex"] = std::to_string(codeIndex); + params["code"] = std::to_string(code); + Want want = TestUtils::MakeWant("", abilityNmae, bundleName, params); + StartAbility(want); +} + +void KitTestAbilityManager::GetAllStackInfo(MissionStackInfo &missionStackInfo, int stackID) +{ + StackInfo stackInfo = AbilityManager::GetInstance().GetAllStackInfo(); + for (const auto &missionInfo : stackInfo.missionStackInfos) { + if (missionInfo.id == stackID) { + missionStackInfo = missionInfo; + break; + } + } +} + +// GetAllRunningProcesses ST kit case +void KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase1(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase1"); + std::vector info = AbilityManager::GetInstance().GetAllRunningProcesses(); + CompareProcessName(info, currentProcessInfo, code); +} + +void KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase2(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase2"); + std::vector info = AbilityManager::GetInstance().GetAllRunningProcesses(); + CompareProcessName(info, launchProcessInfo, code); +} + +void KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase3(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase3"); + std::vector info = AbilityManager::GetInstance().GetAllRunningProcesses(); + std::shared_ptr processInfo = AbilityContext::GetProcessInfo(); + bool result = false; + for (auto runProcessInfo : info) { + if (runProcessInfo.processName_ == currentProcessInfo && processInfo->GetPid() == runProcessInfo.pid_) { + result = true; + } + } + TestUtils::PublishEvent(g_respPageManagerAbilityST, code, std::to_string(result)); +} + +void KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase4(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase4"); + std::vector info = AbilityManager::GetInstance().GetAllRunningProcesses(); + CompareProcessState(info, currentProcessInfo, AppProcessState::APP_STATE_FOREGROUND, code); +} + +void KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase5(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase5"); + auto index = 0; + StartAbilitySelf(bundleName, abilityName, AbilityManagerApi::GetAllRunningProcesses, index, code); +} + +void KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase6(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase6"); + auto index = 1; + StartAbilitySelf(bundleName, abilityName, AbilityManagerApi::GetAllRunningProcesses, index, code); +} + +void KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase7(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase7"); + auto index = 2; + StartAbilitySelf(bundleName, abilityName, AbilityManagerApi::GetAllRunningProcesses, index, code); +} + +void KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase8(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase8"); + auto index = 3; + StartAbilitySelf(bundleName, abilityName, AbilityManagerApi::GetAllRunningProcesses, index, code); +} + +void KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase9(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase9"); + auto index = 4; + StartAbilitySelf(bundleName, abilityName, AbilityManagerApi::GetAllRunningProcesses, index, code); +} + +void KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase10(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerGetAllRunningProcessesCase10"); + auto index = 5; + StartAbilitySelf(bundleName, abilityName, AbilityManagerApi::GetAllRunningProcesses, index, code); +} + +// GetAllStackInfo ST kit case +void KitTestAbilityManager::AbilityManagerGetAllStackInfoCase1(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerGetAllStackInfoCase1"); + MissionStackInfo missionStackInfo; + GetAllStackInfo(missionStackInfo, 1); + bool result = (missionStackInfo.missionRecords.size() == 1); + TestUtils::PublishEvent(g_respPageManagerAbilityST, code, std::to_string(result)); +} + +void KitTestAbilityManager::AbilityManagerGetAllStackInfoCase2(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerGetAllStackInfoCase2"); + MissionStackInfo missionStackInfo; + GetAllStackInfo(missionStackInfo, 1); + auto abilityInfos = missionStackInfo.missionRecords[0].abilityRecordInfos; + bool result = (abilityInfos[0].mainName.compare(currentAbilityName) == 0); + TestUtils::PublishEvent(g_respPageManagerAbilityST, code, std::to_string(result)); +} + +void KitTestAbilityManager::AbilityManagerGetAllStackInfoCase3(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerGetAllStackInfoCase3"); + MissionStackInfo missionStackInfo; + GetAllStackInfo(missionStackInfo, 0); + bool result = (missionStackInfo.missionRecords.size() == 1); + TestUtils::PublishEvent(g_respPageManagerAbilityST, code, std::to_string(result)); +} + +void KitTestAbilityManager::AbilityManagerGetAllStackInfoCase4(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerGetAllStackInfoCase4"); + MissionStackInfo missionStackInfo; + GetAllStackInfo(missionStackInfo, 0); + auto abilityInfos = missionStackInfo.missionRecords[0].abilityRecordInfos; + bool result = (abilityInfos[0].mainName.compare(launchAbilityName) == 0); + TestUtils::PublishEvent(g_respPageManagerAbilityST, code, std::to_string(result)); +} + +void KitTestAbilityManager::AbilityManagerGetAllStackInfoCase5(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerGetAllStackInfoCase5"); + auto index = 0; + StartAbilitySelf(bundleName, abilityName, AbilityManagerApi::GetAllStackInfo, index, code); +} + +void KitTestAbilityManager::AbilityManagerGetAllStackInfoCase6(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerGetAllStackInfoCase6"); + auto index = 1; + StartAbilitySelf(bundleName, abilityName, AbilityManagerApi::GetAllStackInfo, index, code); +} + +void KitTestAbilityManager::AbilityManagerGetAllStackInfoCase7(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerGetAllStackInfoCase7"); + auto index = 2; + StartAbilitySelf(bundleName, abilityName, AbilityManagerApi::GetAllStackInfo, index, code); +} + +void KitTestAbilityManager::AbilityManagerGetAllStackInfoCase8(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerGetAllStackInfoCase8"); + auto index = 3; + StartAbilitySelf(bundleName, abilityName, AbilityManagerApi::GetAllStackInfo, index, code); +} + +void KitTestAbilityManager::AbilityManagerGetAllStackInfoCase9(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerGetAllStackInfoCase9"); + auto index = 4; + StartAbilitySelf(bundleName, abilityName, AbilityManagerApi::GetAllStackInfo, index, code); +} + +// QueryRecentAbilityMissionInfo ST kit case +void KitTestAbilityManager::QueryRecentAbilityMissionInfoParam(int numMax, int code, std::size_t size, int flags) +{ + std::vector info; + info = AbilityManager::GetInstance().QueryRecentAbilityMissionInfo(numMax, flags); + bool result = (info.size() == size); + TestUtils::PublishEvent(g_respPageManagerAbilityST, code, std::to_string(result)); +} + +void KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase1(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase1"); + auto num = -1; + auto size = 0; + QueryRecentAbilityMissionInfoParam(num, code, size, RECENT_IGNORE_UNAVAILABLE); +} + +void KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase2(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase2"); + auto num = 3; + auto size = 0; + auto flag = -1; + QueryRecentAbilityMissionInfoParam(num, code, size, flag); +} + +void KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase3(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase3"); + auto num = 3; + auto size = 0; + auto flag = 0; + QueryRecentAbilityMissionInfoParam(num, code, size, flag); +} + +void KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase4(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase4"); + auto num = 3; + auto size = 0; + auto flag = 3; + QueryRecentAbilityMissionInfoParam(num, code, size, flag); +} + +void KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase5(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase5"); + auto num = 3; + auto size = 1; + QueryRecentAbilityMissionInfoParam(num, code, size, RECENT_WITH_EXCLUDED); +} + +void KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase6(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase6"); + auto num = 3; + auto size = 1; + QueryRecentAbilityMissionInfoParam(num, code, size, RECENT_IGNORE_UNAVAILABLE); +} + +void KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase7(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase7"); + std::vector info; + auto num = 3; + info = AbilityManager::GetInstance().QueryRecentAbilityMissionInfo(num, RECENT_WITH_EXCLUDED); + bool result = false; + if (info.size() == 1 && info[0].size == 1) { + result = true; + } + TestUtils::PublishEvent(g_respPageManagerAbilityST, code, std::to_string(result)); +} + +void KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase8(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase8"); + auto index = 0; + StartAbilitySelf(bundleName, abilityName, AbilityManagerApi::QueryRecentAbilityMissionInfo, index, code); +} + +void KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase9(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase9"); + auto index = 1; + StartAbilitySelf(bundleName, abilityName, AbilityManagerApi::QueryRecentAbilityMissionInfo, index, code); +} + +void KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase10(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase10"); + auto index = 2; + StartAbilitySelf(bundleName, abilityName, AbilityManagerApi::QueryRecentAbilityMissionInfo, index, code); +} + +void KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase11(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase11"); + auto num = std::numeric_limits::min(); + auto size = 0; + QueryRecentAbilityMissionInfoParam(num, code, size, RECENT_WITH_EXCLUDED); +} + +void KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase12(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase12"); + auto num = std::numeric_limits::max(); + auto size = 1; + QueryRecentAbilityMissionInfoParam(num, code, size, RECENT_WITH_EXCLUDED); +} + +void KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase13(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase13"); + auto num = 3; + auto size = 0; + auto flag = std::numeric_limits::min(); + QueryRecentAbilityMissionInfoParam(num, code, size, flag); +} + +void KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase14(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRecentAbilityMissionInfoCase14"); + auto num = 3; + auto size = 0; + auto flag = std::numeric_limits::max(); + QueryRecentAbilityMissionInfoParam(num, code, size, flag); +} + +// QueryRunningAbilityMissionInfo ST kit case +void KitTestAbilityManager::QueryRunningAbilityMissionInfoParam(int numMax, int code, std::size_t size) +{ + std::vector info; + info = AbilityManager::GetInstance().QueryRunningAbilityMissionInfo(numMax); + bool result = (info.size() == size); + TestUtils::PublishEvent(g_respPageManagerAbilityST, code, std::to_string(result)); +} + +void KitTestAbilityManager::AbilityManagerQueryRunningAbilityMissionInfoCase1(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRunningAbilityMissionInfoCase1"); + auto num = -1; + auto flag = 0; + QueryRunningAbilityMissionInfoParam(num, code, flag); +} + +void KitTestAbilityManager::AbilityManagerQueryRunningAbilityMissionInfoCase2(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRunningAbilityMissionInfoCase2"); + auto num = 0; + auto flag = 0; + QueryRunningAbilityMissionInfoParam(num, code, flag); +} + +void KitTestAbilityManager::AbilityManagerQueryRunningAbilityMissionInfoCase3(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRunningAbilityMissionInfoCase3"); + auto num = 3; + auto flag = 1; + QueryRunningAbilityMissionInfoParam(num, code, flag); +} + +void KitTestAbilityManager::AbilityManagerQueryRunningAbilityMissionInfoCase4(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRunningAbilityMissionInfoCase4"); + std::vector info; + auto num = 3; + info = AbilityManager::GetInstance().QueryRunningAbilityMissionInfo(num); + bool result = false; + if (info.size() == 1 && info[0].size == 1) { + result = true; + } + TestUtils::PublishEvent(g_respPageManagerAbilityST, code, std::to_string(result)); +} + +void KitTestAbilityManager::AbilityManagerQueryRunningAbilityMissionInfoCase5(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRunningAbilityMissionInfoCase5"); + auto index = 0; + StartAbilitySelf(bundleName, abilityName, AbilityManagerApi::QueryRunningAbilityMissionInfo, index, code); +} + +void KitTestAbilityManager::AbilityManagerQueryRunningAbilityMissionInfoCase6(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRunningAbilityMissionInfoCase6"); + auto index = 1; + StartAbilitySelf(bundleName, abilityName, AbilityManagerApi::QueryRunningAbilityMissionInfo, index, code); +} + +void KitTestAbilityManager::AbilityManagerQueryRunningAbilityMissionInfoCase7(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRunningAbilityMissionInfoCase7"); + auto index = 2; + StartAbilitySelf(bundleName, abilityName, AbilityManagerApi::QueryRunningAbilityMissionInfo, index, code); +} + +void KitTestAbilityManager::AbilityManagerQueryRunningAbilityMissionInfoCase8(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRunningAbilityMissionInfoCase8"); + QueryRunningAbilityMissionInfoParam(std::numeric_limits::min(), code, 0); +} + +void KitTestAbilityManager::AbilityManagerQueryRunningAbilityMissionInfoCase9(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerQueryRunningAbilityMissionInfoCase9"); + QueryRunningAbilityMissionInfoParam(std::numeric_limits::max(), code, 1); +} + +// MoveMissionToTop ST kit case +void KitTestAbilityManager::AbilityManagerMoveMissionToTopCase1(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerMoveMissionToTopCase1"); + StartAbilitySelf(bundleName, abilityName, AbilityManagerApi::MoveMissionToTop, 0, code); +} + +void KitTestAbilityManager::AbilityManagerMoveMissionToTopCase2(int code) +{ + APP_LOGI("KitTestAbilityManager::AbilityManagerMoveMissionToTopCase2"); + moveMissionToTopCode = code; + isMoveMissionToTop = true; + Want wantEntity; + wantEntity.AddEntity(Want::FLAG_HOME_INTENT_FROM_SYSTEM); + StartAbility(wantEntity); +} + +// ClearUpApplicationData ST kit case +void KitTestAbilityManager::AbilityManagerClearUpApplicationDataCase1(int code) +{ + isClearUpApplicationData = true; + StartAbilitySelf(bundleName, abilityName, AbilityManagerApi::ClearUpApplicationData, 0, code); +} + +void KitTestAbilityManager::OnStart(const Want &want) +{ + APP_LOGI("KitTestAbilityManager::onStart"); + Ability::OnStart(want); + SubscribeEvent(g_requPageManagerAbilitySTVector); + std::string eventData = GetAbilityName() + g_abilityStateOnStart; + TestUtils::PublishEvent(g_respPageManagerAbilityST, 0, eventData); +} + +void KitTestAbilityManager::OnStop() +{ + APP_LOGI("KitTestAbilityManager::onStop"); + Ability::OnStop(); + CommonEventManager::UnSubscribeCommonEvent(subscriber); + std::string eventData = GetAbilityName() + g_abilityStateOnStop; + TestUtils::PublishEvent(g_respPageManagerAbilityST, 0, eventData); +} + +void KitTestAbilityManager::OnActive() +{ + APP_LOGI("KitTestAbilityManager::OnActive"); + Ability::OnActive(); + if (isMoveMissionToTop) { + TestUtils::PublishEvent(g_respPageManagerAbilityST, moveMissionToTopCode, "1"); + isMoveMissionToTop = false; + moveMissionToTopCode = -1; + } + std::string eventData = GetAbilityName() + g_abilityStateOnActive; + TestUtils::PublishEvent(g_respPageManagerAbilityST, 0, eventData); +} + +void KitTestAbilityManager::OnInactive() +{ + APP_LOGI("KitTestAbilityManager::OnInactive"); + Ability::OnInactive(); + std::string eventData = GetAbilityName() + g_abilityStateOnInactive; + TestUtils::PublishEvent(g_respPageManagerAbilityST, 0, eventData); +} + +void KitTestAbilityManager::OnBackground() +{ + APP_LOGI("KitTestAbilityManager::OnBackground"); + Ability::OnBackground(); + if (isMoveMissionToTop) { + std::vector info; + info = AbilityManager::GetInstance().QueryRecentAbilityMissionInfo(numThree, RECENT_WITH_EXCLUDED); + if (info.size() == 1 && info[0].size == 1) { + GetAbilityManager()->MoveMissionToTop(info[0].id); + } + } + if (isClearUpApplicationData != false) { + AbilityManager::GetInstance().ClearUpApplicationData(currentProcessInfo); + isClearUpApplicationData = false; + } + std::string eventData = GetAbilityName() + g_abilityStateOnBackground; + TestUtils::PublishEvent(g_respPageManagerAbilityST, 0, eventData); +} + +void KitTestAbilityManager::OnForeground(const Want &want) +{ + APP_LOGI("KitTestAbilityManager::OnForeground"); + Ability::OnForeground(want); + std::string eventData = GetAbilityName() + g_abilityStateOnForeground; + TestUtils::PublishEvent(g_respPageManagerAbilityST, 0, eventData); +} + +void KitTestAbilityManager::OnNewWant(const Want &want) +{ + APP_LOGI("KitTestAbilityManager::OnNewWant"); + Ability::OnNewWant(want); + std::string eventData = GetAbilityName() + g_abilityStateOnNewWant; + TestUtils::PublishEvent(g_respPageManagerAbilityST, 0, eventData); +} + +// KitTestManagerEventSubscriber Class +void KitTestManagerEventSubscriber::OnReceiveEvent(const CommonEventData &data) +{ + APP_LOGI("KitTestEventSubscriber::OnReceiveEvent:event=%{public}s", data.GetWant().GetAction().c_str()); + APP_LOGI("KitTestEventSubscriber::OnReceiveEvent:data=%{public}s", data.GetData().c_str()); + APP_LOGI("KitTestEventSubscriber::OnReceiveEvent:code=%{public}d", data.GetCode()); + auto eventName = data.GetWant().GetAction(); + if (g_requPageManagerAbilityST == eventName) { + auto target = data.GetData(); + auto handle = 0; + auto api = 1; + auto code = 2; + auto paramMinSize = 3; + vector_str splitResult = TestUtils::split(target, "_"); + auto keyMap = splitResult.at(handle); + if (mapTestFunc_.find(keyMap) != mapTestFunc_.end() && + splitResult.size() >= static_cast(paramMinSize)) { + auto apiIndex = atoi(splitResult.at(api).c_str()); + auto caseIndex = atoi(splitResult.at(code).c_str()); + mapTestFunc_[keyMap](apiIndex, caseIndex, data.GetCode()); + } else { + if (keyMap == "TerminateAbility") { + KitTerminateAbility(); + } else { + APP_LOGI("OnReceiveEvent: CommonEventData error(%{public}s)", target.c_str()); + } + } + } +} + +void KitTestManagerEventSubscriber::AbilityManagerStByCode(int apiIndex, int caseIndex, int code) +{ + if (kitTestAbility_ != nullptr) { + kitTestAbility_->AbilityManagerStByCode(apiIndex, caseIndex, code); + } +} + +void KitTestManagerEventSubscriber::KitTerminateAbility() +{ + if (kitTestAbility_ != nullptr) { + kitTestAbility_->TerminateAbility(); + } +} + +REGISTER_AA(KitTestAbilityManager) +} // namespace AppExecFwk +} // namespace OHOS diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/test_utils.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/test_utils.cpp new file mode 100644 index 0000000000000000000000000000000000000000..1f7fa556737647aecddbe3a8190286ad772fbb23 --- /dev/null +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSTAbilityManagerFirst/src/test_utils.cpp @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2021 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 "test_utils.h" +#include +#include +#include +#include +#include "common_event_data.h" +#include "common_event_manager.h" +namespace OHOS { +namespace AppExecFwk { +using namespace OHOS::EventFwk; +bool TestUtils::PublishEvent(const std::string &eventName, const int &code, const std::string &data) +{ + Want want; + want.SetAction(eventName); + CommonEventData commonData; + commonData.SetWant(want); + commonData.SetCode(code); + commonData.SetData(data); + return CommonEventManager::PublishCommonEvent(commonData); +} + +Want TestUtils::MakeWant( + std::string deviceId, std::string abilityName, std::string bundleName, std::map params) +{ + ElementName element(deviceId, bundleName, abilityName); + Want want; + want.SetElement(element); + for (const auto ¶m : params) { + want.SetParam(param.first, param.second); + } + return want; +} + +std::vector TestUtils::split(const std::string &in, const std::string &delim) +{ + std::regex reg(delim); + std::vector res = { + std::sregex_token_iterator(in.begin(), in.end(), reg, -1), std::sregex_token_iterator() + }; + return res; +} +} // namespace AppExecFwk +} // namespace OHOS \ No newline at end of file diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn index a93204d5740e197743574aa84e5ecb10dda1976b..a051169e093b7b5aed208403a0f3f7851a47861b 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/BUILD.gn @@ -70,6 +70,9 @@ ohos_shared_library("amsKitSystemTestDataA") { "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "native_appdatamgr:native_appdatafwk", + "native_appdatamgr:native_dataability", + "native_appdatamgr:native_rdb", ] subsystem_name = "amssystemtestability" } diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/include/ams_st_kit_data_ability_data_a1.h b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/include/ams_st_kit_data_ability_data_a1.h index b7b0e3a0109dfe8e31378671ea3231f1e3ae536a..9f08a10eadce1a266f308b5656af3faac2570d60 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/include/ams_st_kit_data_ability_data_a1.h +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/include/ams_st_kit_data_ability_data_a1.h @@ -24,6 +24,9 @@ #include "event.h" #include "skills.h" #include "stoperator.h" +#include "abs_shared_result_set.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" namespace OHOS { namespace AppExecFwk { @@ -52,11 +55,11 @@ protected: void Init(const std::shared_ptr &abilityInfo, const std::shared_ptr &application, std::shared_ptr &handler, const sptr &token) override; - virtual int Insert(const Uri &uri, const ValuesBucket &value) override; - virtual int Delete(const Uri &uri, const DataAbilityPredicates &predicates) override; - virtual int Update(const Uri &uri, const ValuesBucket &value, const DataAbilityPredicates &predicates) override; - virtual std::shared_ptr Query( - const Uri &uri, const std::vector &columns, const DataAbilityPredicates &predicates) override; + virtual int Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) override; + virtual int Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) override; + virtual int Update(const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates) override; + virtual std::shared_ptr Query( + const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) override; virtual std::vector GetFileTypes(const Uri &uri, const std::string &mimeTypeFilter) override; virtual int OpenFile(const Uri &uri, const std::string &mode) override; diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/include/ams_st_kit_data_ability_data_a2.h b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/include/ams_st_kit_data_ability_data_a2.h index 567be45bbbb6e5bb8391b268897bfdc26c407799..aa9e88cc6fa423408bbdae42f57f2e2e402fd51c 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/include/ams_st_kit_data_ability_data_a2.h +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/include/ams_st_kit_data_ability_data_a2.h @@ -24,6 +24,9 @@ #include "event.h" #include "skills.h" #include "stoperator.h" +#include "abs_shared_result_set.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" namespace OHOS { namespace AppExecFwk { @@ -52,11 +55,11 @@ protected: void Init(const std::shared_ptr &abilityInfo, const std::shared_ptr &application, std::shared_ptr &handler, const sptr &token) override; - virtual int Insert(const Uri &uri, const ValuesBucket &value) override; - virtual int Delete(const Uri &uri, const DataAbilityPredicates &predicates) override; - virtual int Update(const Uri &uri, const ValuesBucket &value, const DataAbilityPredicates &predicates) override; - virtual std::shared_ptr Query( - const Uri &uri, const std::vector &columns, const DataAbilityPredicates &predicates) override; + virtual int Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) override; + virtual int Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) override; + virtual int Update(const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates) override; + virtual std::shared_ptr Query( + const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) override; virtual std::vector GetFileTypes(const Uri &uri, const std::string &mimeTypeFilter) override; virtual int OpenFile(const Uri &uri, const std::string &mode) override; diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/include/ams_st_kit_data_ability_data_a3.h b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/include/ams_st_kit_data_ability_data_a3.h index 71a18a1da559871e689640ab1f84e7dfa62b3409..a5ad84581010067265754573ccca37835d1adcd6 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/include/ams_st_kit_data_ability_data_a3.h +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/include/ams_st_kit_data_ability_data_a3.h @@ -24,6 +24,9 @@ #include "event.h" #include "skills.h" #include "stoperator.h" +#include "abs_shared_result_set.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" namespace OHOS { namespace AppExecFwk { @@ -52,11 +55,11 @@ protected: void Init(const std::shared_ptr &abilityInfo, const std::shared_ptr &application, std::shared_ptr &handler, const sptr &token) override; - virtual int Insert(const Uri &uri, const ValuesBucket &value) override; - virtual int Delete(const Uri &uri, const DataAbilityPredicates &predicates) override; - virtual int Update(const Uri &uri, const ValuesBucket &value, const DataAbilityPredicates &predicates) override; - virtual std::shared_ptr Query( - const Uri &uri, const std::vector &columns, const DataAbilityPredicates &predicates) override; + virtual int Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) override; + virtual int Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) override; + virtual int Update(const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates) override; + virtual std::shared_ptr Query( + const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) override; virtual std::vector GetFileTypes(const Uri &uri, const std::string &mimeTypeFilter) override; virtual int OpenFile(const Uri &uri, const std::string &mode) override; diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a1.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a1.cpp index e90d848cc0386fbd33bd62b962fdd4b741755be2..fdefb6df2f6e9619bad16983f9adad553d33f961 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a1.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a1.cpp @@ -262,14 +262,14 @@ void AmsStKitDataAbilityDataA1::OnNewWant(const Want &want) PublishEvent(abilityEventName, ABILITY_DATA_CODE, "OnNewWant"); } -int AmsStKitDataAbilityDataA1::Insert(const Uri &uri, const ValuesBucket &value) +int AmsStKitDataAbilityDataA1::Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) { APP_LOGI("AmsStKitDataAbilityDataA1 <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_CODE, "Insert"); return DEFAULT_INSERT_RESULT; } -int AmsStKitDataAbilityDataA1::Delete(const Uri &uri, const DataAbilityPredicates &predicates) +int AmsStKitDataAbilityDataA1::Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("AmsStKitDataAbilityDataA1 <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_CODE, "Delete"); @@ -277,15 +277,15 @@ int AmsStKitDataAbilityDataA1::Delete(const Uri &uri, const DataAbilityPredicate } int AmsStKitDataAbilityDataA1::Update( - const Uri &uri, const ValuesBucket &value, const DataAbilityPredicates &predicates) + const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("AmsStKitDataAbilityDataA1 <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_CODE, "Update"); return DEFAULT_UPDATE_RESULT; } -std::shared_ptr AmsStKitDataAbilityDataA1::Query( - const Uri &uri, const std::vector &columns, const DataAbilityPredicates &predicates) +std::shared_ptr AmsStKitDataAbilityDataA1::Query( + const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) { subscriber_->vectorOperator_ = columns; APP_LOGI("AmsStKitDataAbilityDataA1 <<<>>>"); @@ -294,7 +294,9 @@ std::shared_ptr AmsStKitDataAbilityDataA1::Query( STtools::WaitCompleted(event, OPERATOR_QUERY, ABILITY_DATA_CODE); subscriber_->TestPost(); - std::shared_ptr resultValue = std::make_shared(OPERATOR_QUERY); + std::shared_ptr resultValue = std::make_shared(OPERATOR_QUERY); + AppDataFwk::SharedBlock *pSharedBlock = resultValue->GetBlock(); + pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1); return resultValue; } @@ -337,8 +339,8 @@ void AmsStKitDataAbilityDataA1::TestLifeCycle() static void GetResult(std::shared_ptr child, std::shared_ptr helper, AmsStKitDataAbilityDataA1 *mainAbility, Uri dataAbilityUri, string &result) { - AppExecFwk::DataAbilityPredicates predicates; - ValuesBucket bucket; + NativeRdb::DataAbilityPredicates predicates; + NativeRdb::ValuesBucket bucket; result = "failed"; if (child->GetOperatorName() == OPERATOR_INSERT) { result = std::to_string(helper->Insert(dataAbilityUri, bucket)); @@ -348,8 +350,12 @@ static void GetResult(std::shared_ptr child, std::shared_pt result = std::to_string(helper->Update(dataAbilityUri, bucket, predicates)); } else if (child->GetOperatorName() == OPERATOR_QUERY) { std::vector columns = STtools::SerializationStOperatorToVector(*child); - std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); - result = (resultValue != nullptr) ? (resultValue->testInf_) : "failed"; + std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); + result = "failed"; + if (resultValue != nullptr) { + resultValue->GoToRow(0); + resultValue->GetString(0, result); + } } else if (child->GetOperatorName() == OPERATOR_GETFILETYPES) { std::vector types = helper->GetFileTypes(dataAbilityUri, child->GetMessage()); result = (types.size() > 0) ? types[0] : "failed"; diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a2.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a2.cpp index a55f0cb723f234e70101ad6536be81d7501a1e35..0e91ff0e269bcd4e2deed06408c4fb23fa01ef05 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a2.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a2.cpp @@ -259,14 +259,14 @@ void AmsStKitDataAbilityDataA2::OnNewWant(const Want &want) PublishEvent(abilityEventName, ABILITY_DATA_CODE, "OnNewWant"); } -int AmsStKitDataAbilityDataA2::Insert(const Uri &uri, const ValuesBucket &value) +int AmsStKitDataAbilityDataA2::Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) { APP_LOGI("AmsStKitDataAbilityDataA2 <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_CODE, "Insert"); return DEFAULT_INSERT_RESULT; } -int AmsStKitDataAbilityDataA2::Delete(const Uri &uri, const DataAbilityPredicates &predicates) +int AmsStKitDataAbilityDataA2::Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("AmsStKitDataAbilityDataA2 <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_CODE, "Delete"); @@ -274,15 +274,15 @@ int AmsStKitDataAbilityDataA2::Delete(const Uri &uri, const DataAbilityPredicate } int AmsStKitDataAbilityDataA2::Update( - const Uri &uri, const ValuesBucket &value, const DataAbilityPredicates &predicates) + const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("AmsStKitDataAbilityDataA2 <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_CODE, "Update"); return DEFAULT_UPDATE_RESULT; } -std::shared_ptr AmsStKitDataAbilityDataA2::Query( - const Uri &uri, const std::vector &columns, const DataAbilityPredicates &predicates) +std::shared_ptr AmsStKitDataAbilityDataA2::Query( + const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) { subscriber_->vectorOperator_ = columns; APP_LOGI("AmsStKitDataAbilityDataA2 <<<>>>"); @@ -291,7 +291,9 @@ std::shared_ptr AmsStKitDataAbilityDataA2::Query( STtools::WaitCompleted(event, OPERATOR_QUERY, ABILITY_DATA_CODE); subscriber_->TestPost(); - std::shared_ptr resultValue = std::make_shared(OPERATOR_QUERY); + std::shared_ptr resultValue = std::make_shared(OPERATOR_QUERY); + AppDataFwk::SharedBlock *pSharedBlock = resultValue->GetBlock(); + pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1); return resultValue; } @@ -336,8 +338,8 @@ void AmsStKitDataAbilityDataA2::TestLifeCycle() static void GetResult(std::shared_ptr child, std::shared_ptr helper, AmsStKitDataAbilityDataA2 *mainAbility, Uri dataAbilityUri, string &result) { - AppExecFwk::DataAbilityPredicates predicates; - ValuesBucket bucket; + NativeRdb::DataAbilityPredicates predicates; + NativeRdb::ValuesBucket bucket; result = "failed"; if (child->GetOperatorName() == OPERATOR_INSERT) { result = std::to_string(helper->Insert(dataAbilityUri, bucket)); @@ -347,8 +349,12 @@ static void GetResult(std::shared_ptr child, std::shared_pt result = std::to_string(helper->Update(dataAbilityUri, bucket, predicates)); } else if (child->GetOperatorName() == OPERATOR_QUERY) { std::vector columns = STtools::SerializationStOperatorToVector(*child); - std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); - result = (resultValue != nullptr) ? (resultValue->testInf_) : "failed"; + std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); + result = "failed"; + if (resultValue != nullptr) { + resultValue->GoToRow(0); + resultValue->GetString(0, result); + } } else if (child->GetOperatorName() == OPERATOR_GETFILETYPES) { std::vector types = helper->GetFileTypes(dataAbilityUri, child->GetMessage()); result = (types.size() > 0) ? types[0] : "failed"; diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a3.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a3.cpp index db581024b182303dc63b123876ad03ea8a5e47bc..e74af5a4be66fef6580fbbd08b011356ef1ac03f 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a3.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_data_a3.cpp @@ -262,14 +262,14 @@ void AmsStKitDataAbilityDataA3::OnNewWant(const Want &want) PublishEvent(abilityEventName, ABILITY_DATA_CODE, "OnNewWant"); } -int AmsStKitDataAbilityDataA3::Insert(const Uri &uri, const ValuesBucket &value) +int AmsStKitDataAbilityDataA3::Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) { APP_LOGI("AmsStKitDataAbilityDataA3 <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_CODE, "Insert"); return DEFAULT_INSERT_RESULT; } -int AmsStKitDataAbilityDataA3::Delete(const Uri &uri, const DataAbilityPredicates &predicates) +int AmsStKitDataAbilityDataA3::Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("AmsStKitDataAbilityDataA3 <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_CODE, "Delete"); @@ -277,15 +277,15 @@ int AmsStKitDataAbilityDataA3::Delete(const Uri &uri, const DataAbilityPredicate } int AmsStKitDataAbilityDataA3::Update( - const Uri &uri, const ValuesBucket &value, const DataAbilityPredicates &predicates) + const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("AmsStKitDataAbilityDataA3 <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_CODE, "Update"); return DEFAULT_UPDATE_RESULT; } -std::shared_ptr AmsStKitDataAbilityDataA3::Query( - const Uri &uri, const std::vector &columns, const DataAbilityPredicates &predicates) +std::shared_ptr AmsStKitDataAbilityDataA3::Query( + const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) { subscriber_->vectorOperator_ = columns; APP_LOGI("AmsStKitDataAbilityDataA3 <<<>>>"); @@ -294,7 +294,9 @@ std::shared_ptr AmsStKitDataAbilityDataA3::Query( STtools::WaitCompleted(event, OPERATOR_QUERY, ABILITY_DATA_CODE); subscriber_->TestPost(); - std::shared_ptr resultValue = std::make_shared(OPERATOR_QUERY); + std::shared_ptr resultValue = std::make_shared(OPERATOR_QUERY); + AppDataFwk::SharedBlock *pSharedBlock = resultValue->GetBlock(); + pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1); return resultValue; } @@ -339,8 +341,8 @@ void AmsStKitDataAbilityDataA3::TestLifeCycle() static void GetResult(std::shared_ptr child, std::shared_ptr helper, AmsStKitDataAbilityDataA3 *mainAbility, Uri dataAbilityUri, string &result) { - AppExecFwk::DataAbilityPredicates predicates; - ValuesBucket bucket; + NativeRdb::DataAbilityPredicates predicates; + NativeRdb::ValuesBucket bucket; result = "failed"; if (child->GetOperatorName() == OPERATOR_INSERT) { result = std::to_string(helper->Insert(dataAbilityUri, bucket)); @@ -350,8 +352,12 @@ static void GetResult(std::shared_ptr child, std::shared_pt result = std::to_string(helper->Update(dataAbilityUri, bucket, predicates)); } else if (child->GetOperatorName() == OPERATOR_QUERY) { std::vector columns = STtools::SerializationStOperatorToVector(*child); - std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); - result = (resultValue != nullptr) ? (resultValue->testInf_) : "failed"; + std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); + result = "failed"; + if (resultValue != nullptr) { + resultValue->GoToRow(0); + resultValue->GetString(0, result); + } } else if (child->GetOperatorName() == OPERATOR_GETFILETYPES) { std::vector types = helper->GetFileTypes(dataAbilityUri, child->GetMessage()); result = (types.size() > 0) ? types[0] : "failed"; diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_page_a.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_page_a.cpp index d10c3ddf77d4138b487b4b8cbb6a839af782e7e0..a56a0c4d77a97fee280b49e121dbfe867ffe0664 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_page_a.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_page_a.cpp @@ -20,9 +20,9 @@ #include "app_log_wrapper.h" #include "data_ability_helper.h" -#include "dummy_data_ability_predicates.h" -#include "dummy_result_set.h" -#include "dummy_values_bucket.h" +#include "abs_shared_result_set.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" namespace OHOS { namespace AppExecFwk { @@ -152,8 +152,8 @@ void AmsStKitDataAbilityPageA::GetWantInfo(const Want &want) static void GetResult(std::shared_ptr child, std::shared_ptr helper, AmsStKitDataAbilityPageA *mainAbility, Uri dataAbilityUri, string &result) { - AppExecFwk::DataAbilityPredicates predicates; - ValuesBucket bucket; + NativeRdb::DataAbilityPredicates predicates; + NativeRdb::ValuesBucket bucket; result = "failed"; if (child->GetOperatorName() == OPERATOR_INSERT) { result = std::to_string(helper->Insert(dataAbilityUri, bucket)); @@ -163,8 +163,12 @@ static void GetResult(std::shared_ptr child, std::shared_pt result = std::to_string(helper->Update(dataAbilityUri, bucket, predicates)); } else if (child->GetOperatorName() == OPERATOR_QUERY) { std::vector columns = STtools::SerializationStOperatorToVector(*child); - std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); - result = (resultValue != nullptr) ? (resultValue->testInf_) : "failed"; + std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); + result = "failed"; + if (resultValue != nullptr) { + resultValue->GoToRow(0); + resultValue->GetString(0, result); + } } else if (child->GetOperatorName() == OPERATOR_GETFILETYPES) { std::vector types = helper->GetFileTypes(dataAbilityUri, child->GetMessage()); result = (types.size() > 0) ? types[0] : "failed"; diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_service_a.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_service_a.cpp index 23c6068037ef81a99b2b1bd1104260c1ef4af285..764709751a59e1be249ca1bba90eebc5de3bb08f 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_service_a.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataA/src/ams_st_kit_data_ability_service_a.cpp @@ -20,9 +20,9 @@ #include "app_log_wrapper.h" #include "data_ability_helper.h" -#include "dummy_data_ability_predicates.h" -#include "dummy_result_set.h" -#include "dummy_values_bucket.h" +#include "abs_shared_result_set.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" namespace OHOS { namespace AppExecFwk { @@ -178,8 +178,8 @@ void AmsStKitDataAbilityServiceA::GetWantInfo(const Want &want) static void GetResult(std::shared_ptr child, std::shared_ptr helper, AmsStKitDataAbilityServiceA *mainAbility, Uri dataAbilityUri, string &result) { - AppExecFwk::DataAbilityPredicates predicates; - ValuesBucket bucket; + NativeRdb::DataAbilityPredicates predicates; + NativeRdb::ValuesBucket bucket; result = "failed"; if (child->GetOperatorName() == OPERATOR_INSERT) { result = std::to_string(helper->Insert(dataAbilityUri, bucket)); @@ -189,8 +189,12 @@ static void GetResult(std::shared_ptr child, std::shared_pt result = std::to_string(helper->Update(dataAbilityUri, bucket, predicates)); } else if (child->GetOperatorName() == OPERATOR_QUERY) { std::vector columns = STtools::SerializationStOperatorToVector(*child); - std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); - result = (resultValue != nullptr) ? (resultValue->testInf_) : "failed"; + std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); + result = "failed"; + if (resultValue != nullptr) { + resultValue->GoToRow(0); + resultValue->GetString(0, result); + } } else if (child->GetOperatorName() == OPERATOR_GETFILETYPES) { std::vector types = helper->GetFileTypes(dataAbilityUri, child->GetMessage()); result = (types.size() > 0) ? types[0] : "failed"; diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn index 6b0bd12020f032563c46a00ab4e45506b16a7844..0006d0fdecc17b8b003284595c2644266d7c9c3a 100755 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/BUILD.gn @@ -68,6 +68,9 @@ ohos_shared_library("amsKitSystemTestDataB") { "ces_standard:cesfwk_innerkits", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "native_appdatamgr:native_appdatafwk", + "native_appdatamgr:native_dataability", + "native_appdatamgr:native_rdb", ] subsystem_name = "amssystemtestability" } diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/include/ams_st_kit_data_ability_data_b.h b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/include/ams_st_kit_data_ability_data_b.h index 4732d61bae3e8a7cfe4de37916c43c6c531b7164..964081eaa8738720fe6f3e6d759be298073038bb 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/include/ams_st_kit_data_ability_data_b.h +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/include/ams_st_kit_data_ability_data_b.h @@ -24,6 +24,9 @@ #include "event.h" #include "skills.h" #include "stoperator.h" +#include "abs_shared_result_set.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" namespace OHOS { namespace AppExecFwk { @@ -51,11 +54,11 @@ protected: void Init(const std::shared_ptr &abilityInfo, const std::shared_ptr &application, std::shared_ptr &handler, const sptr &token) override; - virtual int Insert(const Uri &uri, const ValuesBucket &value) override; - virtual int Delete(const Uri &uri, const DataAbilityPredicates &predicates) override; - virtual int Update(const Uri &uri, const ValuesBucket &value, const DataAbilityPredicates &predicates) override; - virtual std::shared_ptr Query( - const Uri &uri, const std::vector &columns, const DataAbilityPredicates &predicates) override; + virtual int Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) override; + virtual int Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) override; + virtual int Update(const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates) override; + virtual std::shared_ptr Query( + const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) override; virtual std::vector GetFileTypes(const Uri &uri, const std::string &mimeTypeFilter) override; virtual int OpenFile(const Uri &uri, const std::string &mode) override; diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_data_b.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_data_b.cpp index b15d455f71ae00b853bf854eaf2303f165dc5ce7..da3b1af7b45832565c8bd91cbceae25cedf1b8e4 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_data_b.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_data_b.cpp @@ -260,29 +260,29 @@ void AmsStKitDataAbilityDataB::OnBackground() PublishEvent(abilityEventName, ABILITY_DATA_CODE, "OnBackground"); } -int AmsStKitDataAbilityDataB::Insert(const Uri &uri, const ValuesBucket &value) +int AmsStKitDataAbilityDataB::Insert(const Uri &uri, const NativeRdb::ValuesBucket &value) { APP_LOGI("AmsStKitDataAbilityDataB <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_CODE, "Insert"); return DEFAULT_INSERT_RESULT; } -int AmsStKitDataAbilityDataB::Delete(const Uri &uri, const DataAbilityPredicates &predicates) +int AmsStKitDataAbilityDataB::Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("AmsStKitDataAbilityDataB <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_CODE, "Delete"); return DEFAULT_DELETE_RESULT; } -int AmsStKitDataAbilityDataB::Update(const Uri &uri, const ValuesBucket &value, const DataAbilityPredicates &predicates) +int AmsStKitDataAbilityDataB::Update(const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates) { APP_LOGI("AmsStKitDataAbilityDataB <<<>>>"); PublishEvent(abilityEventName, ABILITY_DATA_CODE, "Update"); return DEFAULT_UPDATE_RESULT; } -std::shared_ptr AmsStKitDataAbilityDataB::Query( - const Uri &uri, const std::vector &columns, const DataAbilityPredicates &predicates) +std::shared_ptr AmsStKitDataAbilityDataB::Query( + const Uri &uri, const std::vector &columns, const NativeRdb::DataAbilityPredicates &predicates) { subscriber_->vectorOperator_ = columns; APP_LOGI("AmsStKitDataAbilityDataB <<<>>>"); @@ -291,7 +291,9 @@ std::shared_ptr AmsStKitDataAbilityDataB::Query( STtools::WaitCompleted(event, OPERATOR_QUERY, ABILITY_DATA_CODE); subscriber_->TestPost(); - std::shared_ptr resultValue = std::make_shared(OPERATOR_QUERY); + std::shared_ptr resultValue = std::make_shared(OPERATOR_QUERY); + AppDataFwk::SharedBlock *pSharedBlock = resultValue->GetBlock(); + pSharedBlock->PutString(0, 0, OPERATOR_QUERY.c_str(), OPERATOR_QUERY.size() + 1); return resultValue; } @@ -319,8 +321,8 @@ int AmsStKitDataAbilityDataB::OpenFile(const Uri &uri, const std::string &mode) static void GetResult(std::shared_ptr child, std::shared_ptr helper, AmsStKitDataAbilityDataB *mainAbility, Uri dataAbilityUri, string &result) { - AppExecFwk::DataAbilityPredicates predicates; - ValuesBucket bucket; + NativeRdb::DataAbilityPredicates predicates; + NativeRdb::ValuesBucket bucket; result = "failed"; if (child->GetOperatorName() == OPERATOR_INSERT) { result = std::to_string(helper->Insert(dataAbilityUri, bucket)); @@ -330,8 +332,12 @@ static void GetResult(std::shared_ptr child, std::shared_pt result = std::to_string(helper->Update(dataAbilityUri, bucket, predicates)); } else if (child->GetOperatorName() == OPERATOR_QUERY) { std::vector columns = STtools::SerializationStOperatorToVector(*child); - std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); - result = (resultValue != nullptr) ? (resultValue->testInf_) : "failed"; + std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); + result = "failed"; + if (resultValue != nullptr) { + resultValue->GoToRow(0); + resultValue->GetString(0, result); + } } else if (child->GetOperatorName() == OPERATOR_GETFILETYPES) { std::vector types = helper->GetFileTypes(dataAbilityUri, child->GetMessage()); result = (types.size() > 0) ? types[0] : "failed"; diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_page_b.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_page_b.cpp index 8ceb1505dc642f92079ea8b4c34d16f7eb1a168e..8cb4ff8d39778fbe7cf54a303866c9c6f06d72bf 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_page_b.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_page_b.cpp @@ -20,9 +20,9 @@ #include "data_ability_helper.h" #include "app_log_wrapper.h" -#include "dummy_values_bucket.h" -#include "dummy_data_ability_predicates.h" -#include "dummy_result_set.h" +#include "abs_shared_result_set.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" namespace OHOS { namespace AppExecFwk { @@ -152,8 +152,8 @@ void AmsStKitDataAbilityPageB::GetWantInfo(const Want &want) static void GetResult(std::shared_ptr child, std::shared_ptr helper, AmsStKitDataAbilityPageB *mainAbility, Uri dataAbilityUri, string &result) { - AppExecFwk::DataAbilityPredicates predicates; - ValuesBucket bucket; + NativeRdb::DataAbilityPredicates predicates; + NativeRdb::ValuesBucket bucket; result = "failed"; if (child->GetOperatorName() == OPERATOR_INSERT) { result = std::to_string(helper->Insert(dataAbilityUri, bucket)); @@ -163,8 +163,12 @@ static void GetResult(std::shared_ptr child, std::shared_pt result = std::to_string(helper->Update(dataAbilityUri, bucket, predicates)); } else if (child->GetOperatorName() == OPERATOR_QUERY) { std::vector columns = STtools::SerializationStOperatorToVector(*child); - std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); - result = (resultValue != nullptr) ? (resultValue->testInf_) : "failed"; + std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); + result = "failed"; + if (resultValue != nullptr) { + resultValue->GoToRow(0); + resultValue->GetString(0, result); + } } else if (child->GetOperatorName() == OPERATOR_GETFILETYPES) { std::vector types = helper->GetFileTypes(dataAbilityUri, child->GetMessage()); result = (types.size() > 0) ? types[0] : "failed"; diff --git a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_service_b.cpp b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_service_b.cpp index a7001d80017feded2fd9ae91f13f0a13b5fedfd3..8e6115af0adaf5211af0f1a438da442d1f7aedc1 100644 --- a/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_service_b.cpp +++ b/test/resource/amssystemtestability/abilitySrc/amsKitSystemTestDataB/src/ams_st_kit_data_ability_service_b.cpp @@ -20,9 +20,9 @@ #include "data_ability_helper.h" #include "app_log_wrapper.h" -#include "dummy_values_bucket.h" -#include "dummy_data_ability_predicates.h" -#include "dummy_result_set.h" +#include "abs_shared_result_set.h" +#include "data_ability_predicates.h" +#include "values_bucket.h" namespace OHOS { namespace AppExecFwk { @@ -178,8 +178,8 @@ void AmsStKitDataAbilityServiceB::GetWantInfo(const Want &want) static void GetResult(std::shared_ptr child, std::shared_ptr helper, AmsStKitDataAbilityServiceB *mainAbility, Uri dataAbilityUri, string &result) { - AppExecFwk::DataAbilityPredicates predicates; - ValuesBucket bucket; + NativeRdb::DataAbilityPredicates predicates; + NativeRdb::ValuesBucket bucket; result = "failed"; if (child->GetOperatorName() == OPERATOR_INSERT) { result = std::to_string(helper->Insert(dataAbilityUri, bucket)); @@ -189,8 +189,12 @@ static void GetResult(std::shared_ptr child, std::shared_pt result = std::to_string(helper->Update(dataAbilityUri, bucket, predicates)); } else if (child->GetOperatorName() == OPERATOR_QUERY) { std::vector columns = STtools::SerializationStOperatorToVector(*child); - std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); - result = (resultValue != nullptr) ? (resultValue->testInf_) : "failed"; + std::shared_ptr resultValue = helper->Query(dataAbilityUri, columns, predicates); + result = "failed"; + if (resultValue != nullptr) { + resultValue->GoToRow(0); + resultValue->GetString(0, result); + } } else if (child->GetOperatorName() == OPERATOR_GETFILETYPES) { std::vector types = helper->GetFileTypes(dataAbilityUri, child->GetMessage()); result = (types.size() > 0) ? types[0] : "failed"; diff --git a/test/systemtest/common/ams/ams_ability_visible_test/ams_ability_visible_test.cpp b/test/systemtest/common/ams/ams_ability_visible_test/ams_ability_visible_test.cpp index 22a703ffbda6faf040c4f745626acba83dd18eee..a5e0b79835adb858f54dfff248b545a0821e30eb 100644 --- a/test/systemtest/common/ams/ams_ability_visible_test/ams_ability_visible_test.cpp +++ b/test/systemtest/common/ams/ams_ability_visible_test/ams_ability_visible_test.cpp @@ -174,13 +174,11 @@ public: static sptr abilityMs_; static STtools::Event event_; static std::shared_ptr subscriber_; - static int *memTestValue_; }; sptr AmsAbilityVisibleTest::appMs_ = nullptr; sptr AmsAbilityVisibleTest::abilityMs_ = nullptr; STtools::Event AmsAbilityVisibleTest::event_ = STtools::Event(); -int *AmsAbilityVisibleTest::memTestValue_ = nullptr; std::shared_ptr AmsAbilityVisibleTest::subscriber_ = nullptr; size_t AmsAbilityVisibleTest::AbilityConnectCallback::onAbilityConnectDoneCount = 0; int AmsAbilityVisibleTest::AbilityConnectCallback::resultConnectCode = 0; @@ -217,10 +215,6 @@ void AmsAbilityVisibleTest::SetUp(void) void AmsAbilityVisibleTest::TearDown(void) { GTEST_LOG_(INFO) << "void AmsAbilityVisibleTest::TearDown(void)"; - if (memTestValue_) { - delete[] memTestValue_; - } - std::vector bundleNames = GetBundleNames(bundleNameBase, bundleNameSuffix); STAbilityUtil::UninstallBundle(bundleNames); diff --git a/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_test.cpp b/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_test.cpp index 18cb82f287dd558692420e5ad7e9cffce7ab8fdb..5e3acade4475b8a4e2538a5f70a8db8068bac2f5 100644 --- a/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_test.cpp +++ b/test/systemtest/common/ams/ams_kit_test/acts_ams_kit_test.cpp @@ -52,6 +52,7 @@ using MAP_STR_STR = std::map; static const std::string bundleName1 = "com.ohos.amsst.AppKitAbilityManager"; static const std::string bundleName2 = "com.ohos.amsst.AppKit"; static const std::string bundleName3 = "com.ohos.amsst.appN"; +static const std::string bundleName4 = "ccom.ohos.amsst.AppKitAbilityManagerFirst"; static const std::string thirdAbilityName = "ThirdAbility"; static const std::string sixthAbilityName = "SixthAbility"; @@ -110,7 +111,7 @@ Event ActsAmsKitTest::event = Event(); Event ActsAmsKitTest::abilityEvent = Event(); sptr ActsAmsKitTest::appMs = nullptr; sptr ActsAmsKitTest::abilityMs = nullptr; -StressTestLevel ActsAmsKitTest::stLevel_ {}; +StressTestLevel ActsAmsKitTest::stLevel_{}; std::shared_ptr ActsAmsKitTest::subscriber_ = nullptr; void ActsAmsKitTest::AppEventSubscriber::OnReceiveEvent(const CommonEventData &data) @@ -206,7 +207,7 @@ void ActsAmsKitTest::ShowDump() */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_0100, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::GetAllRunningProcesses); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_0"; bool result = false; @@ -232,7 +233,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_0100, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_0200, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::GetAllRunningProcesses); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_1"; bool result = false; @@ -257,7 +258,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_0200, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_0300, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::GetAllRunningProcesses); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_2"; bool result = false; @@ -283,7 +284,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_0300, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_0400, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::GetAllRunningProcesses); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_3"; bool result = false; @@ -312,7 +313,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_0500, Function | MediumTest | L { bool result = false; for (int i = 1; i <= stLevel_.AMSLevel; i++) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::GetAllRunningProcesses); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_4"; @@ -340,7 +341,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_0600, Function | MediumTest | L { bool result = false; for (int i = 1; i <= stLevel_.AMSLevel; i++) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::GetAllRunningProcesses); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_5"; STAbilityUtil::PublishEvent(g_requPageManagerAbilityST, ++amsKitSTCode, eventData); @@ -367,7 +368,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_0700, Function | MediumTest | L { bool result = false; for (int i = 1; i <= stLevel_.AMSLevel; i++) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::GetAllRunningProcesses); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_6"; STAbilityUtil::PublishEvent(g_requPageManagerAbilityST, ++amsKitSTCode, eventData); @@ -394,7 +395,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_0800, Function | MediumTest | L { bool result = false; for (int i = 1; i <= stLevel_.AMSLevel; i++) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::GetAllRunningProcesses); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_7"; STAbilityUtil::PublishEvent(g_requPageManagerAbilityST, ++amsKitSTCode, eventData); @@ -420,7 +421,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_0800, Function | MediumTest | L HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_0900, Function | MediumTest | Level1) { bool result = false; - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); for (int i = 1; i <= stLevel_.AMSLevel; i++) { int apiIndex = static_cast(AbilityManagerApi::GetAllRunningProcesses); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_8"; @@ -448,7 +449,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_1000, Function | MediumTest | L { bool result = false; for (int i = 1; i <= stLevel_.AMSLevel; i++) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::GetAllRunningProcesses); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_9"; STAbilityUtil::PublishEvent(g_requPageManagerAbilityST, ++amsKitSTCode, eventData); @@ -472,7 +473,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_1000, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_1100, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::GetAllStackInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_0"; bool result = false; @@ -498,7 +499,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_1100, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_1200, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::GetAllStackInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_1"; bool result = false; @@ -524,7 +525,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_1200, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_1300, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::GetAllStackInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_2"; bool result = false; @@ -550,7 +551,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_1300, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_1400, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::GetAllStackInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_3"; bool result = false; @@ -579,7 +580,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_1500, Function | MediumTest | L { bool result = false; for (int i = 1; i <= stLevel_.AMSLevel; i++) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::GetAllStackInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_4"; STAbilityUtil::PublishEvent(g_requPageManagerAbilityST, ++amsKitSTCode, eventData); @@ -606,7 +607,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_1600, Function | MediumTest | L { bool result = false; for (int i = 1; i <= stLevel_.AMSLevel; i++) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::GetAllStackInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_5"; STAbilityUtil::PublishEvent(g_requPageManagerAbilityST, ++amsKitSTCode, eventData); @@ -633,7 +634,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_1700, Function | MediumTest | L { bool result = false; for (int i = 1; i <= stLevel_.AMSLevel; i++) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::GetAllStackInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_6"; STAbilityUtil::PublishEvent(g_requPageManagerAbilityST, ++amsKitSTCode, eventData); @@ -659,7 +660,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_1700, Function | MediumTest | L HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_1800, Function | MediumTest | Level1) { bool result = false; - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); for (int i = 1; i <= stLevel_.AMSLevel; i++) { int apiIndex = static_cast(AbilityManagerApi::GetAllStackInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_7"; @@ -687,7 +688,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_1900, Function | MediumTest | L { bool result = false; for (int i = 1; i <= stLevel_.AMSLevel; i++) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::GetAllStackInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_8"; STAbilityUtil::PublishEvent(g_requPageManagerAbilityST, ++amsKitSTCode, eventData); @@ -710,7 +711,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_1900, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2000, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::QueryRecentAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_0"; bool result = false; @@ -735,7 +736,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2000, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2100, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::QueryRecentAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_1"; bool result = false; @@ -760,7 +761,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2100, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2200, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::QueryRecentAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_2"; bool result = false; @@ -785,7 +786,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2200, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2300, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::QueryRecentAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_3"; bool result = false; @@ -811,7 +812,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2300, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2400, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::QueryRecentAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_4"; bool result = false; @@ -837,7 +838,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2400, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2500, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::QueryRecentAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_5"; bool result = false; @@ -863,7 +864,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2500, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2600, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::QueryRecentAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_6"; bool result = false; @@ -891,7 +892,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2600, Function | MediumTest | L HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2700, Function | MediumTest | Level1) { bool result = false; - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); for (int i = 1; i <= stLevel_.AMSLevel; i++) { int apiIndex = static_cast(AbilityManagerApi::QueryRecentAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_7"; @@ -918,7 +919,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2700, Function | MediumTest | L HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2800, Function | MediumTest | Level1) { bool result = false; - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); for (int i = 1; i <= stLevel_.AMSLevel; i++) { int apiIndex = static_cast(AbilityManagerApi::QueryRecentAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_8"; @@ -945,7 +946,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2800, Function | MediumTest | L HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2900, Function | MediumTest | Level1) { bool result = false; - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); for (int i = 1; i <= stLevel_.AMSLevel; i++) { int apiIndex = static_cast(AbilityManagerApi::QueryRecentAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_9"; @@ -969,7 +970,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_2900, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3000, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::QueryRunningAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_0"; bool result = false; @@ -994,7 +995,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3000, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3100, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::QueryRunningAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_1"; bool result = false; @@ -1019,7 +1020,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3100, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3200, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::QueryRunningAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_2"; bool result = false; @@ -1045,7 +1046,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3200, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3300, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::QueryRunningAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_3"; bool result = false; @@ -1073,7 +1074,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3300, Function | MediumTest | L HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3400, Function | MediumTest | Level1) { bool result = false; - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); for (int i = 1; i <= stLevel_.AMSLevel; i++) { int apiIndex = static_cast(AbilityManagerApi::QueryRunningAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_4"; @@ -1100,7 +1101,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3400, Function | MediumTest | L HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3500, Function | MediumTest | Level1) { bool result = false; - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); for (int i = 1; i <= stLevel_.AMSLevel; i++) { int apiIndex = static_cast(AbilityManagerApi::QueryRunningAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_5"; @@ -1127,7 +1128,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3500, Function | MediumTest | L HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3600, Function | MediumTest | Level1) { bool result = false; - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); for (int i = 1; i <= stLevel_.AMSLevel; i++) { int apiIndex = static_cast(AbilityManagerApi::QueryRunningAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_6"; @@ -1153,7 +1154,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3600, Function | MediumTest | L HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3700, Function | MediumTest | Level1) { bool result = false; - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); for (int i = 1; i <= stLevel_.AMSLevel; i++) { int apiIndex = static_cast(AbilityManagerApi::MoveMissionToTop); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_0"; @@ -1180,7 +1181,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3700, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3800, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::MoveMissionToTop); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_1"; bool result = false; @@ -1205,7 +1206,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3800, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3900, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::QueryRecentAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_10"; bool result = false; @@ -1230,7 +1231,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_3900, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_4000, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::QueryRecentAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_11"; bool result = false; @@ -1255,7 +1256,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_4000, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_4100, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::QueryRecentAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_12"; bool result = false; @@ -1280,7 +1281,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_4100, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_4200, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::QueryRecentAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_13"; bool result = false; @@ -1305,7 +1306,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_4200, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_4300, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::QueryRunningAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_7"; bool result = false; @@ -1330,7 +1331,7 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_4300, Function | MediumTest | L */ HWTEST_F(ActsAmsKitTest, AMS_Page_AbilityManager_4400, Function | MediumTest | Level1) { - StartAbilityKitTest(abilityManagerName, bundleName2); + StartAbilityKitTest(abilityManagerName, bundleName4); int apiIndex = static_cast(AbilityManagerApi::QueryRunningAbilityMissionInfo); std::string eventData = "AbilityManagerApi_" + std::to_string(apiIndex) + "_8"; bool result = false;