From 7fd8ec60b74c5cf9db5f31f68578f6df9c546056 Mon Sep 17 00:00:00 2001 From: zhongjianfei Date: Sat, 8 Jan 2022 11:20:25 +0800 Subject: [PATCH] zhongjianfei@huawei.com Signed-off-by: zhongjianfei Change-Id: I655b32387050b2731dbe216f01989e138e66e506 --- frameworks/kits/ability/native/test/BUILD.gn | 48 +++++------ .../test/mock/include/bundle_mgr_interface.h | 15 +++- .../include/mock_ability_manager_service.h | 10 +++ .../test/mock/include/mock_bundle_manager.cpp | 8 +- .../test/mock/include/mock_bundle_manager.h | 38 ++++++++- .../mock/include/mock_bundle_manager_form.h | 36 +++++++- frameworks/kits/content/cpp/test/BUILD.gn | 10 +-- frameworks/kits/test/BUILD.gn | 9 +- .../mock/AMS/mock_ability_manager_service.h | 11 ++- .../AMS/mock_serviceability_manager_service.h | 10 +++ .../abilityManager/napi_ability_manager.cpp | 2 +- services/BUILD.gn | 4 +- services/abilitymgr/BUILD.gn | 3 +- .../abilitymgr/include/screenshot_handler.h | 4 +- .../abilitymgr/include/screenshot_response.h | 8 +- .../abilitymgr/src/screenshot_handler.cpp | 6 +- .../abilitymgr/src/screenshot_response.cpp | 12 +-- services/abilitymgr/test/BUILD.gn | 84 +++++++++---------- .../include/bundlemgr/bundle_mgr_interface.h | 13 ++- .../include/bundlemgr/mock_bundle_manager.h | 38 ++++++++- .../src/bundlemgr/mock_bundle_manager.cpp | 4 +- .../ability_manager_stub_mock.h | 10 +++ .../ability_manager_stub_impl_mock.h | 54 ++++++++++++ .../ability_manager_stub_mock.h | 8 ++ .../phone/app_scheduler_test/BUILD.gn | 1 + .../phone/data_ability_manager_test/BUILD.gn | 1 + .../lock_screen_white_list_test/BUILD.gn | 1 + .../phone/screenshot_handler_test/BUILD.gn | 1 + .../screenshot_handler_test.cpp | 8 +- services/test/BUILD.gn | 20 ++--- .../mock/include/mock_ability_mgr_service.h | 12 ++- services/test/mock/include/mock_bundle_mgr.h | 37 +++++++- .../test/mock/include/mock_window_manager.h | 8 ++ services/test/mock/src/mock_bundle_mgr.cpp | 2 +- .../ability_mgr_service_test/BUILD.gn | 3 +- .../ability_mgr_module_test.cpp | 56 +------------ .../moduletest/ability_record_test/BUILD.gn | 3 +- .../moduletest/ability_stack_test/BUILD.gn | 3 +- .../test/moduletest/dump_module_test/BUILD.gn | 4 +- .../ipc_ability_connect_test/BUILD.gn | 3 +- .../moduletest/ipc_ability_mgr_test/BUILD.gn | 3 +- .../ipc_ability_scheduler_test/BUILD.gn | 3 +- .../panding_want_manager_test/BUILD.gn | 4 +- tools/test/BUILD.gn | 9 +- tools/test/mock/mock_ability_manager_stub.h | 10 +++ tools/test/moduletest/aa/BUILD.gn | 6 +- 46 files changed, 426 insertions(+), 217 deletions(-) diff --git a/frameworks/kits/ability/native/test/BUILD.gn b/frameworks/kits/ability/native/test/BUILD.gn index 2ba81adb8cd..f9146af6092 100644 --- a/frameworks/kits/ability/native/test/BUILD.gn +++ b/frameworks/kits/ability/native/test/BUILD.gn @@ -1082,29 +1082,29 @@ group("unittest") { testonly = true deps = [] - #deps += [ - # ":ability_context_test", - # ":ability_impl_test", - # ":ability_lifecycle_executor_test", - # ":ability_lifecycle_test", - # ":ability_permission_test", - # ":ability_test", - # ":ability_thread_dataability_test", - # ":ability_thread_test", - # ":continuation_test", - # ":data_ability_helper_test", - # ":data_ability_impl_file_secondpart_test", - # ":data_ability_impl_file_test", - # ":data_ability_impl_test", - # ":data_ability_operation_test", - # ":data_ability_result_test", - # ":data_uri_utils_test", - # ":form_host_client_test", - # ":form_provider_client_test", - # ":pac_map_test", - # ":page_ability_impl_test", - # ":service_ability_impl_test", - # ":task_handler_client_test", - #] + deps += [ + ":ability_context_test", + ":ability_impl_test", + ":ability_lifecycle_executor_test", + ":ability_lifecycle_test", + ":ability_permission_test", + ":ability_test", + ":ability_thread_dataability_test", + ":ability_thread_test", + ":continuation_test", + ":data_ability_helper_test", + ":data_ability_impl_file_secondpart_test", + ":data_ability_impl_file_test", + ":data_ability_impl_test", + ":data_ability_operation_test", + ":data_ability_result_test", + ":data_uri_utils_test", + ":form_host_client_test", + ":form_provider_client_test", + ":pac_map_test", + ":page_ability_impl_test", + ":service_ability_impl_test", + ":task_handler_client_test", + ] } ############################################################################### diff --git a/frameworks/kits/ability/native/test/mock/include/bundle_mgr_interface.h b/frameworks/kits/ability/native/test/mock/include/bundle_mgr_interface.h index 04619ca6a2b..cea500ac69b 100644 --- a/frameworks/kits/ability/native/test/mock/include/bundle_mgr_interface.h +++ b/frameworks/kits/ability/native/test/mock/include/bundle_mgr_interface.h @@ -22,6 +22,7 @@ #include "iremote_object.h" #include "bundle_info.h" +#include "common_event_info.h" #include "hap_module_info.h" #include "ohos/aafwk/content/want.h" #include "permission_def.h" @@ -191,7 +192,7 @@ public: virtual bool IsSafeMode() = 0; virtual bool CleanBundleCacheFiles( const std::string &bundleName, const sptr &cleanCacheCallback) = 0; - virtual bool CleanBundleDataFiles(const std::string &bundleName) = 0; + virtual bool CleanBundleDataFiles(const std::string &bundleName, const int userId = 0) = 0; virtual bool RegisterBundleStatusCallback(const sptr &bundleStatusCallback) = 0; virtual bool ClearBundleStatusCallback(const sptr &bundleStatusCallback) = 0; virtual bool UnregisterBundleStatusCallback() = 0; @@ -218,7 +219,15 @@ public: virtual bool GetModuleUsageRecords(const int32_t number, std::vector &moduleUsageRecords) = 0; virtual sptr GetBundleInstaller() = 0; virtual bool NotifyAbilityLifeStatus( - const std::string &bundleName, const std::string &abilityName, const int64_t launchTime) = 0; + const std::string &bundleName, const std::string &abilityName, const int64_t launchTime, const int uid = 0) = 0; + virtual bool GetBundleGidsByUid(const std::string &bundleName, const int &uid, std::vector &gids) = 0; + virtual bool QueryAbilityInfosByUri(const std::string &abilityUri, std::vector &abilityInfos) = 0; + virtual int CheckPermissionByUid( + const std::string &bundleName, const std::string &permission, const int userId) = 0; + virtual bool GetAllCommonEventInfo(const std::string &eventKey, std::vector &commonEventInfos) = 0; + virtual bool RemoveClonedBundle(const std::string &bundleName, const int32_t uid) = 0; + virtual bool BundleClone(const std::string &bundleName) = 0; + virtual bool CheckBundleNameInAllowList(const std::string &bundleName) = 0; enum class Message { GET_APPLICATION_INFO, @@ -278,4 +287,4 @@ public: }; } // namespace AppExecFwk } // namespace OHOS -#endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_BUNDLEMGR_INCLUDE_MOCK_BUNDLE_MGR_INTERFACE_H \ No newline at end of file +#endif // FOUNDATION_APPEXECFWK_INTERFACES_INNERKITS_BUNDLEMGR_INCLUDE_MOCK_BUNDLE_MGR_INTERFACE_H diff --git a/frameworks/kits/ability/native/test/mock/include/mock_ability_manager_service.h b/frameworks/kits/ability/native/test/mock/include/mock_ability_manager_service.h index 58430d0f6e0..f3e8291a8d0 100644 --- a/frameworks/kits/ability/native/test/mock/include/mock_ability_manager_service.h +++ b/frameworks/kits/ability/native/test/mock/include/mock_ability_manager_service.h @@ -186,6 +186,16 @@ public: return 0; } + virtual int StartUser(int userId) override + { + return 0; + } + + virtual int StopUser(int userId, const sptr &callback) override + { + return 0; + } + enum RequestCode { E_STATE_INITIAL = 0, E_STATE_INACTIVE, diff --git a/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager.cpp b/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager.cpp index 079a4ad9da6..0caca14c280 100644 --- a/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager.cpp +++ b/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager.cpp @@ -166,7 +166,7 @@ bool BundleMgrProxy::CleanBundleCacheFiles( { return true; } -bool BundleMgrProxy::CleanBundleDataFiles(const std::string &bundleName) +bool BundleMgrProxy::CleanBundleDataFiles(const std::string &bundleName, const int userId) { return true; } @@ -256,7 +256,7 @@ sptr BundleMgrProxy::GetBundleInstaller() return nullptr; } bool BundleMgrProxy::NotifyAbilityLifeStatus( - const std::string &bundleName, const std::string &abilityName, const int64_t launchTime) + const std::string &bundleName, const std::string &abilityName, const int64_t launchTime, const int uid) { return true; } @@ -420,7 +420,7 @@ bool BundleMgrService::CleanBundleCacheFiles( { return true; } -bool BundleMgrService::CleanBundleDataFiles(const std::string &bundleName) +bool BundleMgrService::CleanBundleDataFiles(const std::string &bundleName, const int userId) { return true; } @@ -510,7 +510,7 @@ sptr BundleMgrService::GetBundleInstaller() return nullptr; } bool BundleMgrService::NotifyAbilityLifeStatus( - const std::string &bundleName, const std::string &abilityName, const int64_t launchTime) + const std::string &bundleName, const std::string &abilityName, const int64_t launchTime, const int uid) { return true; } diff --git a/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager.h b/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager.h index 152802ab670..96c88016bae 100644 --- a/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager.h +++ b/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager.h @@ -70,7 +70,7 @@ public: virtual bool IsSafeMode() override; virtual bool CleanBundleCacheFiles( const std::string &bundleName, const sptr &cleanCacheCallback) override; - virtual bool CleanBundleDataFiles(const std::string &bundleName) override; + virtual bool CleanBundleDataFiles(const std::string &bundleName, const int userId) override; virtual bool RegisterBundleStatusCallback(const sptr &bundleStatusCallback) override; virtual bool ClearBundleStatusCallback(const sptr &bundleStatusCallback) override; virtual bool UnregisterBundleStatusCallback() override; @@ -98,7 +98,7 @@ public: const int32_t number, std::vector &moduleUsageRecords) override; virtual sptr GetBundleInstaller() override; virtual bool NotifyAbilityLifeStatus( - const std::string &bundleName, const std::string &abilityName, const int64_t launchTime) override; + const std::string &bundleName, const std::string &abilityName, const int64_t launchTime, const int uid) override; }; class BundleMgrStub : public IRemoteStub { @@ -146,7 +146,7 @@ public: virtual bool IsSafeMode() override; virtual bool CleanBundleCacheFiles( const std::string &bundleName, const sptr &cleanCacheCallback) override; - virtual bool CleanBundleDataFiles(const std::string &bundleName) override; + virtual bool CleanBundleDataFiles(const std::string &bundleName, const int userId) override; virtual bool RegisterBundleStatusCallback(const sptr &bundleStatusCallback) override; virtual bool ClearBundleStatusCallback(const sptr &bundleStatusCallback) override; virtual bool UnregisterBundleStatusCallback() override; @@ -174,7 +174,37 @@ public: const int32_t number, std::vector &moduleUsageRecords) override; virtual sptr GetBundleInstaller() override; virtual bool NotifyAbilityLifeStatus( - const std::string &bundleName, const std::string &abilityName, const int64_t launchTime) override; + const std::string &bundleName, const std::string &abilityName, const int64_t launchTime, const int uid) override; + virtual bool GetBundleGidsByUid(const std::string &bundleName, const int &uid, std::vector &gids) override + { + return true; + } + virtual bool QueryAbilityInfosByUri(const std::string &abilityUri, std::vector &abilityInfos) override + { + return true; + } + virtual int CheckPermissionByUid( + const std::string &bundleName, const std::string &permission, const int userId) override + { + return true; + } + virtual bool GetAllCommonEventInfo(const std::string &eventKey, + std::vector &commonEventInfos) override + { + return true; + } + virtual bool RemoveClonedBundle(const std::string &bundleName, const int32_t uid) override + { + return true; + } + virtual bool BundleClone(const std::string &bundleName) override + { + return true; + } + virtual bool CheckBundleNameInAllowList(const std::string &bundleName) override + { + return true; + } }; } // namespace AppExecFwk } // namespace OHOS diff --git a/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager_form.h b/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager_form.h index 289eaa8a9bb..a00e7c19e76 100644 --- a/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager_form.h +++ b/frameworks/kits/ability/native/test/mock/include/mock_bundle_manager_form.h @@ -152,7 +152,7 @@ public: { return true; } - virtual bool CleanBundleDataFiles(const std::string &bundleName) override + virtual bool CleanBundleDataFiles(const std::string &bundleName, const int userId) override { return true; } @@ -243,7 +243,7 @@ public: ~BundleMgrService() = default; MOCK_METHOD2(GetAppIdByBundleName, std::string(const std::string &bundleName, const int userId)); MOCK_METHOD2(CheckPermission, int(const std::string &bundleName, const std::string &permission)); - MOCK_METHOD1(CleanBundleDataFiles, bool(const std::string &bundleName)); + MOCK_METHOD2(CleanBundleDataFiles, bool(const std::string &bundleName, const int userId)); MOCK_METHOD3( CanRequestPermission, bool(const std::string &bundleName, const std::string &permissionName, const int userId)); MOCK_METHOD3(RequestPermissionFromUser, @@ -421,7 +421,37 @@ public: return true; } virtual bool NotifyAbilityLifeStatus( - const std::string &bundleName, const std::string &abilityName, const int64_t launchTime) override + const std::string &bundleName, const std::string &abilityName, const int64_t launchTime, const int uid) override + { + return true; + } + virtual bool GetBundleGidsByUid(const std::string &bundleName, const int &uid, std::vector &gids) override + { + return true; + } + virtual bool QueryAbilityInfosByUri(const std::string &abilityUri, std::vector &abilityInfos) override + { + return true; + } + virtual int CheckPermissionByUid( + const std::string &bundleName, const std::string &permission, const int userId) override + { + return true; + } + virtual bool GetAllCommonEventInfo(const std::string &eventKey, + std::vector &commonEventInfos) override + { + return true; + } + virtual bool RemoveClonedBundle(const std::string &bundleName, const int32_t uid) override + { + return true; + } + virtual bool BundleClone(const std::string &bundleName) override + { + return true; + } + virtual bool CheckBundleNameInAllowList(const std::string &bundleName) override { return true; } diff --git a/frameworks/kits/content/cpp/test/BUILD.gn b/frameworks/kits/content/cpp/test/BUILD.gn index 7d0b245cd77..1d4348288ff 100644 --- a/frameworks/kits/content/cpp/test/BUILD.gn +++ b/frameworks/kits/content/cpp/test/BUILD.gn @@ -337,11 +337,11 @@ group("unittest") { deps = [] deps += [ - ## ":intent_params_test", - ## ":intent_parameters_test", - ## ":intent_parse_to_uri_test", - ## ":intent_base_test", - ## ":intent_filter_test", + ":intent_base_test", + ":intent_filter_test", + ":intent_parameters_test", + ":intent_params_test", + ":intent_parse_to_uri_test", ":operation_test", ":patterns_matcher_test", ":skills_test", diff --git a/frameworks/kits/test/BUILD.gn b/frameworks/kits/test/BUILD.gn index 75c808c9e6b..a26b64980ad 100644 --- a/frameworks/kits/test/BUILD.gn +++ b/frameworks/kits/test/BUILD.gn @@ -91,6 +91,7 @@ ohos_moduletest("ability_moduletest") { "//base/hiviewdfx/hiview/adapter/utility:hiview_adapter_utility", "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native", "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes", + "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/aafwk/standard/interfaces/innerkits/base:base", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/appexecfwk/standard/common:libappexecfwk_common", @@ -298,10 +299,10 @@ group("moduletest") { if (is_phone_product) { deps += [ - #":ability_conetxt_test", - #":ability_moduletest", - #":data_ability_helper_module_test", - #":data_ability_operation_moduletest", + ":ability_conetxt_test", + ":ability_moduletest", + ":data_ability_helper_module_test", + ":data_ability_operation_moduletest", ] } } diff --git a/frameworks/kits/test/mock/AMS/mock_ability_manager_service.h b/frameworks/kits/test/mock/AMS/mock_ability_manager_service.h index b4f6fd42fab..630f7a00633 100644 --- a/frameworks/kits/test/mock/AMS/mock_ability_manager_service.h +++ b/frameworks/kits/test/mock/AMS/mock_ability_manager_service.h @@ -109,7 +109,6 @@ public: MOCK_METHOD1(CleanMission, int(int32_t missionId)); MOCK_METHOD0(CleanAllMissions, int()); MOCK_METHOD1(MoveMissionToFront, int(int32_t missionId)); - MOCK_METHOD1(GetSystemMemoryAttr, void(AppExecFwk::SystemMemoryAttr &memoryInfo)); MOCK_METHOD2(GetWantSenderInfo, int(const sptr &target, std::shared_ptr &info)); int MoveMissionToEnd(const sptr &token, const bool nonFirst) override; @@ -154,6 +153,16 @@ public: return 0; } + virtual int StartUser(int userId) override + { + return 0; + } + + virtual int StopUser(int userId, const sptr &callback) override + { + return 0; + } + AbilityLifeCycleState curstate_ = AbilityLifeCycleState::ABILITY_STATE_INITIAL; sptr abilityScheduler_; // kit interface used to schedule ability life Want want_; diff --git a/frameworks/kits/test/mock/AMS/mock_serviceability_manager_service.h b/frameworks/kits/test/mock/AMS/mock_serviceability_manager_service.h index cddce9ac2d9..f5f6afc353d 100644 --- a/frameworks/kits/test/mock/AMS/mock_serviceability_manager_service.h +++ b/frameworks/kits/test/mock/AMS/mock_serviceability_manager_service.h @@ -171,6 +171,16 @@ public: return 0; } + virtual int StartUser(int userId) override + { + return 0; + } + + virtual int StopUser(int userId, const sptr &callback) override + { + return 0; + } + sptr abilityScheduler_ = nullptr; // kit interface used to schedule ability life Want want_; bool startAbility = false; diff --git a/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp b/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp index 653888abc74..6f33960308b 100644 --- a/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp +++ b/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp @@ -1935,7 +1935,7 @@ napi_value NAPI_GetAbilityMissionSnapshot(napi_env env, napi_callback_info info) size_t argc = 2; napi_value argv[argc]; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, NULL, NULL)); - HILOG_INFO("argc = [%{public}d]", argc); + HILOG_INFO("argc = [%{public}d]", (int32_t)argc); napi_valuetype valuetype0; NAPI_CALL(env, napi_typeof(env, argv[0], &valuetype0)); diff --git a/services/BUILD.gn b/services/BUILD.gn index 2fa30f84eb8..f3d58e1151e 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -22,7 +22,7 @@ group("unittest") { testonly = true deps = [ - #"abilitymgr:unittest", - #"dataobsmgr:unittest", + "abilitymgr:unittest", + "dataobsmgr:unittest", ] } diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn index eefb631469e..6865fc8bc2f 100644 --- a/services/abilitymgr/BUILD.gn +++ b/services/abilitymgr/BUILD.gn @@ -25,9 +25,8 @@ group("abilityms_target") { group("unittest") { testonly = true - deps = [] - #deps = [ "test:unittest" ] + deps = [ "test:unittest" ] } config("abilityms_config") { diff --git a/services/abilitymgr/include/screenshot_handler.h b/services/abilitymgr/include/screenshot_handler.h index 5f40b5cb351..ed8f9f366ac 100644 --- a/services/abilitymgr/include/screenshot_handler.h +++ b/services/abilitymgr/include/screenshot_handler.h @@ -32,11 +32,11 @@ public: virtual ~ScreenshotHandler() = default; void StartScreenshot(int32_t missionId, int32_t winId); - WMImageInfo GetImageInfo(int32_t missionId); + OHOS::WMImageInfo GetImageInfo(int32_t missionId); void RemoveImageInfo(int32_t missionId); private: - std::map screenShot_; + std::map screenShot_; sptr windowMS_; }; } // namespace AAFwk diff --git a/services/abilitymgr/include/screenshot_response.h b/services/abilitymgr/include/screenshot_response.h index 10a58b95d56..4b4d8c78dec 100644 --- a/services/abilitymgr/include/screenshot_response.h +++ b/services/abilitymgr/include/screenshot_response.h @@ -22,7 +22,7 @@ #include #include "nocopyable.h" #include -#include "wm_common.h" +#include "../wmclient/wm_common.h" namespace OHOS { namespace AAFwk { @@ -31,14 +31,14 @@ public: ScreenShotResponse() = default; virtual ~ScreenShotResponse() = default; - void OnWindowShot(const struct WMImageInfo &info); - WMImageInfo GetImageInfo(); + void OnWindowShot(const OHOS::WMImageInfo &info); + OHOS::WMImageInfo GetImageInfo(); private: static constexpr int TIME_OUT = 200 * 1000; std::mutex mutex_; std::condition_variable condition_; - std::shared_ptr info_; + std::shared_ptr info_; }; } // namespace AAFwk } // namespace OHOS diff --git a/services/abilitymgr/src/screenshot_handler.cpp b/services/abilitymgr/src/screenshot_handler.cpp index 350f342602e..3cab309ddf4 100644 --- a/services/abilitymgr/src/screenshot_handler.cpp +++ b/services/abilitymgr/src/screenshot_handler.cpp @@ -48,7 +48,7 @@ void ScreenshotHandler::StartScreenshot(int32_t missionId, int32_t winId) } auto then = [response](const auto &wmsinfo) { - WMImageInfo wminfo = { + OHOS::WMImageInfo wminfo = { .wret = wmsinfo.wret, .width = wmsinfo.width, .height = wmsinfo.height, @@ -75,10 +75,10 @@ void ScreenshotHandler::StartScreenshot(int32_t missionId, int32_t winId) screenShot_.emplace(missionId, imageInfo); } -WMImageInfo ScreenshotHandler::GetImageInfo(int32_t missionId) +OHOS::WMImageInfo ScreenshotHandler::GetImageInfo(int32_t missionId) { HILOG_DEBUG("%{public}s begin", __func__); - WMImageInfo imageInfo; + OHOS::WMImageInfo imageInfo; auto iter = screenShot_.find(missionId); if (iter != screenShot_.end()) { imageInfo = iter->second; diff --git a/services/abilitymgr/src/screenshot_response.cpp b/services/abilitymgr/src/screenshot_response.cpp index b1449277f3d..b54be5f62e8 100644 --- a/services/abilitymgr/src/screenshot_response.cpp +++ b/services/abilitymgr/src/screenshot_response.cpp @@ -23,11 +23,11 @@ namespace OHOS { namespace AAFwk { -void ScreenShotResponse::OnWindowShot(const struct WMImageInfo &info) +void ScreenShotResponse::OnWindowShot(const OHOS::WMImageInfo &info) { HILOG_INFO("On screen shot call back."); std::unique_lock lock(mutex_); - info_ = std::make_shared(); + info_ = std::make_shared(); if (!info_) { return; } @@ -39,18 +39,18 @@ void ScreenShotResponse::OnWindowShot(const struct WMImageInfo &info) condition_.notify_all(); } -WMImageInfo ScreenShotResponse::GetImageInfo() +OHOS::WMImageInfo ScreenShotResponse::GetImageInfo() { std::unique_lock lock(mutex_); if (info_ == nullptr) { if (condition_.wait_for(lock, std::chrono::milliseconds(TIME_OUT)) == std::cv_status::timeout) { - return WMImageInfo(); + return OHOS::WMImageInfo(); } } - WMImageInfo info = *info_; + OHOS::WMImageInfo info = *info_; info_.reset(); return info; } } // namespace AAFwk -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/services/abilitymgr/test/BUILD.gn b/services/abilitymgr/test/BUILD.gn index 4a4f35d5084..4a2e2f3ad9b 100644 --- a/services/abilitymgr/test/BUILD.gn +++ b/services/abilitymgr/test/BUILD.gn @@ -147,47 +147,47 @@ group("unittest") { testonly = true deps = [ - # "unittest/phone/ability_connect_callback_proxy_test:unittest", - # "unittest/phone/ability_connect_callback_stub_test:unittest", - # "unittest/phone/ability_connect_manage_test:unittest", - # "unittest/phone/ability_dump_test:unittest", - # "unittest/phone/ability_manager_proxy_test:unittest", - # "unittest/phone/ability_manager_service_test:unittest", - # "unittest/phone/ability_manager_stub_test:unittest", - # "unittest/phone/ability_record_test:unittest", - # "unittest/phone/ability_scheduler_proxy_test:unittest", - # "unittest/phone/ability_scheduler_stub_test:unittest", - # "unittest/phone/ability_service_start_test:unittest", - # "unittest/phone/ability_stack_manager_test:unittest", - # "unittest/phone/ability_token_proxy_test:unittest", - # "unittest/phone/ability_token_stub_test:unittest", - # "unittest/phone/ability_with_applications_test:unittest", - # "unittest/phone/abilityms_appms_test:unittest", - # "unittest/phone/app_scheduler_test:unittest", - # "unittest/phone/configuration_test:unittest", - # "unittest/phone/connection_record_test:unittest", - # "unittest/phone/data_ability_manager_test:unittest", - # "unittest/phone/data_ability_record_test:unittest", - # "unittest/phone/info_test:unittest", - # "unittest/phone/kernal_system_app_manager_test:unittest", - # "unittest/phone/lifecycle_deal_test:unittest", - # "unittest/phone/lifecycle_test:unittest", - # "unittest/phone/lock_screen_white_list_test:unittest", - # "unittest/phone/mission_record_test:unittest", - # "unittest/phone/mission_stack_test:unittest", - # "unittest/phone/pending_want_key_test:unittest", - # "unittest/phone/pending_want_manager_test:unittest", - # "unittest/phone/pending_want_record_test:unittest", - # "unittest/phone/resume_mission_container_test:unittest", - # "unittest/phone/screenshot_handler_test:unittest", - # "unittest/phone/sender_info_test:unittest", - # "unittest/phone/terminate_ability_test:unittest", - # "unittest/phone/want_receiver_proxy_test:unittest", - # "unittest/phone/want_receiver_stub_test:unittest", - # "unittest/phone/want_sender_info_test:unittest", - # "unittest/phone/want_sender_proxy_test:unittest", - # "unittest/phone/want_sender_stub_test:unittest", - # "unittest/phone/wants_info_test:unittest", - # "unittest/phone/window_info_test:unittest", + "unittest/phone/ability_connect_callback_proxy_test:unittest", + "unittest/phone/ability_connect_callback_stub_test:unittest", + "unittest/phone/ability_connect_manage_test:unittest", + "unittest/phone/ability_dump_test:unittest", + "unittest/phone/ability_manager_proxy_test:unittest", + "unittest/phone/ability_manager_service_test:unittest", + "unittest/phone/ability_manager_stub_test:unittest", + "unittest/phone/ability_record_test:unittest", + "unittest/phone/ability_scheduler_proxy_test:unittest", + "unittest/phone/ability_scheduler_stub_test:unittest", + "unittest/phone/ability_service_start_test:unittest", + "unittest/phone/ability_stack_manager_test:unittest", + "unittest/phone/ability_token_proxy_test:unittest", + "unittest/phone/ability_token_stub_test:unittest", + "unittest/phone/ability_with_applications_test:unittest", + "unittest/phone/abilityms_appms_test:unittest", + "unittest/phone/app_scheduler_test:unittest", + "unittest/phone/configuration_test:unittest", + "unittest/phone/connection_record_test:unittest", + "unittest/phone/data_ability_manager_test:unittest", + "unittest/phone/data_ability_record_test:unittest", + "unittest/phone/info_test:unittest", + "unittest/phone/kernal_system_app_manager_test:unittest", + "unittest/phone/lifecycle_deal_test:unittest", + "unittest/phone/lifecycle_test:unittest", + "unittest/phone/lock_screen_white_list_test:unittest", + "unittest/phone/mission_record_test:unittest", + "unittest/phone/mission_stack_test:unittest", + "unittest/phone/pending_want_key_test:unittest", + "unittest/phone/pending_want_manager_test:unittest", + "unittest/phone/pending_want_record_test:unittest", + "unittest/phone/resume_mission_container_test:unittest", + "unittest/phone/screenshot_handler_test:unittest", + "unittest/phone/sender_info_test:unittest", + "unittest/phone/terminate_ability_test:unittest", + "unittest/phone/want_receiver_proxy_test:unittest", + "unittest/phone/want_receiver_stub_test:unittest", + "unittest/phone/want_sender_info_test:unittest", + "unittest/phone/want_sender_proxy_test:unittest", + "unittest/phone/want_sender_stub_test:unittest", + "unittest/phone/wants_info_test:unittest", + "unittest/phone/window_info_test:unittest", ] } diff --git a/services/abilitymgr/test/mock/libs/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h b/services/abilitymgr/test/mock/libs/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h index 8ce38181039..adcaa9c71fd 100644 --- a/services/abilitymgr/test/mock/libs/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h +++ b/services/abilitymgr/test/mock/libs/appexecfwk_core/include/bundlemgr/bundle_mgr_interface.h @@ -28,6 +28,7 @@ #include "bundle_installer_interface.h" #include "bundle_status_callback_interface.h" #include "clean_cache_callback_interface.h" +#include "common_event_info.h" #include "on_permission_changed_callback_interface.h" #include "ohos/aafwk/content/want.h" @@ -270,7 +271,7 @@ public: * @param bundleName Indicates the bundle name of the application whose data is to be cleared. * @return Returns true if the data cleared successfully; returns false otherwise. */ - virtual bool CleanBundleDataFiles(const std::string &bundleName) = 0; + virtual bool CleanBundleDataFiles(const std::string &bundleName, const int userId = 0) = 0; /** * @brief Register the specific bundle status callback. * @param bundleStatusCallback Indicates the callback to be invoked for returning the bundle status changed result. @@ -431,7 +432,15 @@ public: * @return Returns true if this function is successfully called; returns false otherwise. */ virtual bool NotifyAbilityLifeStatus( - const std::string &bundleName, const std::string &abilityName, const int64_t launchTime) = 0; + const std::string &bundleName, const std::string &abilityName, const int64_t launchTime, const int uid = 0) = 0; + virtual bool GetBundleGidsByUid(const std::string &bundleName, const int &uid, std::vector &gids) = 0; + virtual bool QueryAbilityInfosByUri(const std::string &abilityUri, std::vector &abilityInfos) = 0; + virtual int CheckPermissionByUid( + const std::string &bundleName, const std::string &permission, const int userId) = 0; + virtual bool GetAllCommonEventInfo(const std::string &eventKey, std::vector &commonEventInfos) = 0; + virtual bool RemoveClonedBundle(const std::string &bundleName, const int32_t uid) = 0; + virtual bool BundleClone(const std::string &bundleName) = 0; + virtual bool CheckBundleNameInAllowList(const std::string &bundleName) = 0; enum class Message { GET_APPLICATION_INFO, diff --git a/services/abilitymgr/test/mock/libs/appexecfwk_core/include/bundlemgr/mock_bundle_manager.h b/services/abilitymgr/test/mock/libs/appexecfwk_core/include/bundlemgr/mock_bundle_manager.h index a012b6b0b2d..2eea64e4954 100644 --- a/services/abilitymgr/test/mock/libs/appexecfwk_core/include/bundlemgr/mock_bundle_manager.h +++ b/services/abilitymgr/test/mock/libs/appexecfwk_core/include/bundlemgr/mock_bundle_manager.h @@ -143,7 +143,7 @@ public: const std::string &bundleName, const BundleFlag flag, BundleInfo &bundleInfo, int32_t userId) override; virtual bool NotifyAbilityLifeStatus( - const std::string &bundleName, const std::string &abilityName, const int64_t launchTime) override; + const std::string &bundleName, const std::string &abilityName, const int64_t launchTime, const int uid) override; virtual bool CheckIsSystemAppByUid(const int uid) override; MOCK_METHOD3(GetApplicationInfos, bool(const ApplicationFlag flag, const int userId, std::vector &appInfos)); @@ -170,7 +170,7 @@ public: MOCK_METHOD0(IsSafeMode, bool()); MOCK_METHOD2(CleanBundleCacheFiles, bool(const std::string &bundleName, const sptr &cleanCacheCallback)); - MOCK_METHOD1(CleanBundleDataFiles, bool(const std::string &bundleName)); + MOCK_METHOD2(CleanBundleDataFiles, bool(const std::string &bundleName, const int userId)); MOCK_METHOD3(RequestPermissionFromUser, bool(const std::string &bundleName, const std::string &permission, const int userId)); MOCK_METHOD1(RegisterBundleStatusCallback, bool(const sptr &bundleStatusCallback)); @@ -227,7 +227,7 @@ public: bool CheckWantEntity(const AAFwk::Want &, AbilityInfo &); virtual bool NotifyAbilityLifeStatus( - const std::string &bundleName, const std::string &abilityName, const int64_t launchTime) override; + const std::string &bundleName, const std::string &abilityName, const int64_t launchTime, const int uid) override; MOCK_METHOD2(QueryWantAbility, int(const AAFwk::Want &want, std::vector &abilityInfos)); MOCK_METHOD3(GetApplicationInfos, bool(const ApplicationFlag flag, const int userId, std::vector &appInfos)); @@ -253,7 +253,7 @@ public: MOCK_METHOD0(IsSafeMode, bool()); MOCK_METHOD2(CleanBundleCacheFiles, bool(const std::string &bundleName, const sptr &cleanCacheCallback)); - MOCK_METHOD1(CleanBundleDataFiles, bool(const std::string &bundleName)); + MOCK_METHOD2(CleanBundleDataFiles, bool(const std::string &bundleName, const int userId)); MOCK_METHOD3(RequestPermissionFromUser, bool(const std::string &bundleName, const std::string &permission, const int userId)); MOCK_METHOD1(RegisterBundleStatusCallback, bool(const sptr &bundleStatusCallback)); @@ -285,6 +285,36 @@ public: MOCK_METHOD4( DumpInfos, bool(const DumpFlag flag, const std::string &bundleName, int32_t userId, std::string &result)); MOCK_METHOD1(IsApplicationEnabled, bool(const std::string &bundleName)); + virtual bool GetBundleGidsByUid(const std::string &bundleName, const int &uid, std::vector &gids) override + { + return true; + } + virtual bool QueryAbilityInfosByUri(const std::string &abilityUri, std::vector &abilityInfos) override + { + return true; + } + virtual int CheckPermissionByUid( + const std::string &bundleName, const std::string &permission, const int userId) override + { + return true; + } + virtual bool GetAllCommonEventInfo(const std::string &eventKey, + std::vector &commonEventInfos) override + { + return true; + } + virtual bool RemoveClonedBundle(const std::string &bundleName, const int32_t uid) override + { + return true; + } + virtual bool BundleClone(const std::string &bundleName) override + { + return true; + } + virtual bool CheckBundleNameInAllowList(const std::string &bundleName) override + { + return true; + } public: using QueryAbilityInfoFunType = diff --git a/services/abilitymgr/test/mock/libs/appexecfwk_core/src/bundlemgr/mock_bundle_manager.cpp b/services/abilitymgr/test/mock/libs/appexecfwk_core/src/bundlemgr/mock_bundle_manager.cpp index 3e3ee1edeec..989dfbfbef4 100644 --- a/services/abilitymgr/test/mock/libs/appexecfwk_core/src/bundlemgr/mock_bundle_manager.cpp +++ b/services/abilitymgr/test/mock/libs/appexecfwk_core/src/bundlemgr/mock_bundle_manager.cpp @@ -69,7 +69,7 @@ bool BundleMgrProxy::GetApplicationInfo( } bool BundleMgrProxy::NotifyAbilityLifeStatus( - const std::string &bundleName, const std::string &abilityName, const int64_t launchTime) + const std::string &bundleName, const std::string &abilityName, const int64_t launchTime, const int uid) { GTEST_LOG_(INFO) << "BundleMgrProxy::NotifyAbilityLifeStatus()"; return true; @@ -202,7 +202,7 @@ int BundleMgrService::GetUidByBundleName(const std::string &bundleName, const in } bool BundleMgrService::NotifyAbilityLifeStatus( - const std::string &bundleName, const std::string &abilityName, const int64_t launchTime) + const std::string &bundleName, const std::string &abilityName, const int64_t launchTime, const int uid) { GTEST_LOG_(INFO) << "BundleMgrService::NotifyAbilityLifeStatus()"; return true; diff --git a/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/ability_manager_stub_mock.h b/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/ability_manager_stub_mock.h index 8ee8b2b9aac..550281f4ed1 100644 --- a/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/ability_manager_stub_mock.h +++ b/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/ability_manager_stub_mock.h @@ -299,6 +299,16 @@ public: return 0; } + virtual int StartUser(int userId) override + { + return 0; + } + + virtual int StopUser(int userId, const sptr &callback) override + { + return 0; + } + MOCK_METHOD2(TerminateAbilityByCaller, int(const sptr &callerToken, int requestCode)); MOCK_METHOD3(StartAbility, int(const Want &want, const sptr &callerToken, int requestCode)); MOCK_METHOD2( diff --git a/services/abilitymgr/test/unittest/phone/ability_manager_stub_test/ability_manager_stub_impl_mock.h b/services/abilitymgr/test/unittest/phone/ability_manager_stub_test/ability_manager_stub_impl_mock.h index 09c085e9498..84e003ae49c 100644 --- a/services/abilitymgr/test/unittest/phone/ability_manager_stub_test/ability_manager_stub_impl_mock.h +++ b/services/abilitymgr/test/unittest/phone/ability_manager_stub_test/ability_manager_stub_impl_mock.h @@ -297,6 +297,60 @@ public: { return 0; } + virtual int StartContinuation(const Want &want, const sptr &abilityToken) override + { + return 0; + } + virtual int NotifyContinuationResult(const sptr &abilityToken, const int32_t result) override + { + return 0; + } + virtual int LockMissionForCleanup(int32_t missionId) override + { + return 0; + } + virtual int UnlockMissionForCleanup(int32_t missionId) override + { + return 0; + } + virtual int RegisterMissionListener(const sptr &listener) override + { + return 0; + } + virtual int UnRegisterMissionListener(const sptr &listener) override + { + return 0; + } + virtual int CleanMission(int32_t missionId) override + { + return 0; + } + virtual int CleanAllMissions() override + { + return 0; + } + virtual int MoveMissionToFront(int32_t missionId) override + { + return 0; + } + virtual int GetMissionInfos(const std::string& deviceId, int32_t numMax, + std::vector &missionInfos) override + { + return 0; + } + virtual int GetMissionInfo(const std::string& deviceId, int32_t missionId, + MissionInfo &missionInfo) override + { + return 0; + } + virtual int StartUser(int userId) override + { + return 0; + } + virtual int StopUser(int userId, const sptr &callback) override + { + return 0; + } }; } // namespace AAFwk } // namespace OHOS diff --git a/services/abilitymgr/test/unittest/phone/ability_manager_test/ability_manager_stub_mock.h b/services/abilitymgr/test/unittest/phone/ability_manager_test/ability_manager_stub_mock.h index e91f26b8ec8..ce73212fa75 100644 --- a/services/abilitymgr/test/unittest/phone/ability_manager_test/ability_manager_stub_mock.h +++ b/services/abilitymgr/test/unittest/phone/ability_manager_test/ability_manager_stub_mock.h @@ -98,6 +98,14 @@ public: MOCK_METHOD1(TerminateAbilityTest, void(int id)); MOCK_METHOD1(MoveMissionToEnd, int(int id)); MOCK_METHOD2(GetWantSenderInfo, int(const sptr &target, std::shared_ptr &info)); + virtual int StartUser(int userId) override + { + return 0; + } + virtual int StopUser(int userId, const sptr &callback) override + { + return 0; + } }; } // namespace AAFwk } // namespace OHOS diff --git a/services/abilitymgr/test/unittest/phone/app_scheduler_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/app_scheduler_test/BUILD.gn index 6b6015c3320..f843d15dbe8 100644 --- a/services/abilitymgr/test/unittest/phone/app_scheduler_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/app_scheduler_test/BUILD.gn @@ -39,6 +39,7 @@ ohos_unittest("app_scheduler_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${innerkits_path}/ability_manager:ability_manager", "${innerkits_path}/want:want", "${services_path}/abilitymgr/test:abilityms_test_source", "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", diff --git a/services/abilitymgr/test/unittest/phone/data_ability_manager_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/data_ability_manager_test/BUILD.gn index 355753233cb..10ae2540c82 100644 --- a/services/abilitymgr/test/unittest/phone/data_ability_manager_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/data_ability_manager_test/BUILD.gn @@ -46,6 +46,7 @@ ohos_unittest("data_ability_manager_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${innerkits_path}/ability_manager:ability_manager", "${innerkits_path}/want:want", "${services_path}/abilitymgr/test:abilityms_test_source", "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", diff --git a/services/abilitymgr/test/unittest/phone/lock_screen_white_list_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/lock_screen_white_list_test/BUILD.gn index 4db30a91451..80a2dc77c96 100644 --- a/services/abilitymgr/test/unittest/phone/lock_screen_white_list_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/lock_screen_white_list_test/BUILD.gn @@ -40,6 +40,7 @@ ohos_unittest("lock_screen_white_list_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${innerkits_path}/ability_manager:ability_manager", "${innerkits_path}/want:want", "${services_path}/abilitymgr/test:abilityms_test_source", "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", diff --git a/services/abilitymgr/test/unittest/phone/screenshot_handler_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/screenshot_handler_test/BUILD.gn index 0f1087409a8..c4c5034a2b0 100644 --- a/services/abilitymgr/test/unittest/phone/screenshot_handler_test/BUILD.gn +++ b/services/abilitymgr/test/unittest/phone/screenshot_handler_test/BUILD.gn @@ -40,6 +40,7 @@ ohos_unittest("ability_screenshot_handler_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${innerkits_path}/ability_manager:ability_manager", "${innerkits_path}/want:want", "${services_path}/abilitymgr/test:abilityms_test_source", "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock", diff --git a/services/abilitymgr/test/unittest/phone/screenshot_handler_test/screenshot_handler_test.cpp b/services/abilitymgr/test/unittest/phone/screenshot_handler_test/screenshot_handler_test.cpp index c60cbc9640e..bdead0aaf08 100644 --- a/services/abilitymgr/test/unittest/phone/screenshot_handler_test/screenshot_handler_test.cpp +++ b/services/abilitymgr/test/unittest/phone/screenshot_handler_test/screenshot_handler_test.cpp @@ -76,14 +76,14 @@ void ScreenShotHandlerTest::TearDown() */ HWTEST_F(ScreenShotHandlerTest, ability_screenshot_response_001, TestSize.Level1) { - WMImageInfo info; + OHOS::WMImageInfo info; info.width = 1; info.size = 5; info.height = 2; info.format = 3; info.data = nullptr; screenShotResponse_->OnWindowShot(info); - WMImageInfo infos = screenShotResponse_->GetImageInfo(); + OHOS::WMImageInfo infos = screenShotResponse_->GetImageInfo(); EXPECT_EQ(infos.width, static_cast(1)); EXPECT_EQ(infos.size, static_cast(5)); EXPECT_EQ(infos.height, static_cast(2)); @@ -102,7 +102,7 @@ HWTEST_F(ScreenShotHandlerTest, ability_screenshot_response_001, TestSize.Level1 HWTEST_F(ScreenShotHandlerTest, ability_screenshot_handler_001, TestSize.Level1) { int missionId = 0; - WMImageInfo info; + OHOS::WMImageInfo info; info.width = 1; info.size = 5; info.height = 2; @@ -130,7 +130,7 @@ HWTEST_F(ScreenShotHandlerTest, ability_screenshot_handler_001, TestSize.Level1) HWTEST_F(ScreenShotHandlerTest, ability_screenshot_handler_002, TestSize.Level1) { int missionId = 0; - WMImageInfo info; + OHOS::WMImageInfo info; info.width = 1; info.size = 5; info.height = 2; diff --git a/services/test/BUILD.gn b/services/test/BUILD.gn index 212c80c2fd1..b43f69e222c 100644 --- a/services/test/BUILD.gn +++ b/services/test/BUILD.gn @@ -31,15 +31,15 @@ group("moduletest") { testonly = true deps = [ - #"moduletest/ability_mgr_service_test:moduletest", - #"moduletest/ability_record_test:moduletest", - #"moduletest/ability_stack_test:moduletest", - #"moduletest/dump_module_test:moduletest", - #"moduletest/ipc_ability_connect_test:moduletest", - #"moduletest/ipc_ability_mgr_test:moduletest", - #"moduletest/ipc_ability_scheduler_test:moduletest", - #"moduletest/module_test_dump_util:module_test_dump_util", - #"moduletest/panding_want_manager_test:moduletest", - #"//third_party/jsoncpp:jsoncpp", + "moduletest/ability_mgr_service_test:moduletest", + "moduletest/ability_record_test:moduletest", + "moduletest/ability_stack_test:moduletest", + "moduletest/dump_module_test:moduletest", + "moduletest/ipc_ability_connect_test:moduletest", + "moduletest/ipc_ability_mgr_test:moduletest", + "moduletest/ipc_ability_scheduler_test:moduletest", + "moduletest/module_test_dump_util:module_test_dump_util", + "moduletest/panding_want_manager_test:moduletest", + "//third_party/jsoncpp:jsoncpp", ] } diff --git a/services/test/mock/include/mock_ability_mgr_service.h b/services/test/mock/include/mock_ability_mgr_service.h index d9f1de9f09f..9f75a9e71ae 100644 --- a/services/test/mock/include/mock_ability_mgr_service.h +++ b/services/test/mock/include/mock_ability_mgr_service.h @@ -104,7 +104,17 @@ public: MOCK_METHOD1(ClearUpApplicationData, int(const std::string &)); MOCK_METHOD2(GetWantSenderInfo, int(const sptr &target, std::shared_ptr &info)); - + + virtual int StartUser(int userId) override + { + return 0; + } + + virtual int StopUser(int userId, const sptr &callback) override + { + return 0; + } + void Wait() { sem_.Wait(); diff --git a/services/test/mock/include/mock_bundle_mgr.h b/services/test/mock/include/mock_bundle_mgr.h index 72d77a7e4f1..c3bfb9e307d 100644 --- a/services/test/mock/include/mock_bundle_mgr.h +++ b/services/test/mock/include/mock_bundle_mgr.h @@ -231,7 +231,7 @@ public: MOCK_METHOD0(IsSafeMode, bool()); MOCK_METHOD2(CleanBundleCacheFiles, bool(const std::string &bundleName, const sptr &cleanCacheCallback)); - MOCK_METHOD1(CleanBundleDataFiles, bool(const std::string &bundleName)); + MOCK_METHOD2(CleanBundleDataFiles, bool(const std::string &bundleName, const int userId)); MOCK_METHOD1(RegisterBundleStatusCallback, bool(const sptr &bundleStatusCallback)); MOCK_METHOD1(ClearBundleStatusCallback, bool(const sptr &bundleStatusCallback)); MOCK_METHOD0(UnregisterBundleStatusCallback, bool()); @@ -295,7 +295,7 @@ public: MOCK_METHOD0(IsSafeMode, bool()); MOCK_METHOD2(CleanBundleCacheFiles, bool(const std::string &bundleName, const sptr &cleanCacheCallback)); - MOCK_METHOD1(CleanBundleDataFiles, bool(const std::string &bundleName)); + MOCK_METHOD2(CleanBundleDataFiles, bool(const std::string &bundleName, const int userId)); MOCK_METHOD1(RegisterBundleStatusCallback, bool(const sptr &bundleStatusCallback)); MOCK_METHOD1(ClearBundleStatusCallback, bool(const sptr &bundleStatusCallback)); MOCK_METHOD0(UnregisterBundleStatusCallback, bool()); @@ -341,8 +341,39 @@ public: bool GetApplicationInfo( const std::string &appName, const ApplicationFlag flag, const int userId, ApplicationInfo &appInfo) override; bool NotifyAbilityLifeStatus( - const std::string &bundleName, const std::string &abilityName, const int64_t launchTime) override; + const std::string &bundleName, const std::string &abilityName, const int64_t launchTime, const int uid) override; virtual bool CheckIsSystemAppByUid(const int uid) override; + virtual bool GetBundleGidsByUid(const std::string &bundleName, const int &uid, std::vector &gids) override + { + return true; + } + virtual bool QueryAbilityInfosByUri(const std::string &abilityUri, std::vector &abilityInfos) override + { + return true; + } + virtual int CheckPermissionByUid( + const std::string &bundleName, const std::string &permission, const int userId) override + { + return true; + } + virtual bool GetAllCommonEventInfo(const std::string &eventKey, + std::vector &commonEventInfos) override + { + return true; + } + virtual bool RemoveClonedBundle(const std::string &bundleName, const int32_t uid) override + { + return true; + } + virtual bool BundleClone(const std::string &bundleName) override + { + return true; + } + virtual bool CheckBundleNameInAllowList(const std::string &bundleName) override + { + return true; + } + BundleMgrService() { abilityInfoMap_.emplace(COM_IX_HIWORLD, HiWordInfo); diff --git a/services/test/mock/include/mock_window_manager.h b/services/test/mock/include/mock_window_manager.h index 43b13451571..e52573be3ba 100644 --- a/services/test/mock/include/mock_window_manager.h +++ b/services/test/mock/include/mock_window_manager.h @@ -50,6 +50,14 @@ public: MOCK_METHOD3(ScaleTo, sptr(int32_t wid, uint32_t width, uint32_t height)); MOCK_METHOD2(SetWindowType, sptr(int32_t wid, WindowType type)); MOCK_METHOD2(SetWindowMode, sptr(int32_t wid, WindowMode mode)); + virtual sptr CreateVirtualDisplay(int32_t x, int32_t y, int32_t width, int32_t height) override + { + return nullptr; + } + virtual sptr DestroyVirtualDisplay(uint32_t did) override + { + return nullptr; + } }; } // namespace OHOS diff --git a/services/test/mock/src/mock_bundle_mgr.cpp b/services/test/mock/src/mock_bundle_mgr.cpp index c9d1ce2486f..d6927e35ade 100644 --- a/services/test/mock/src/mock_bundle_mgr.cpp +++ b/services/test/mock/src/mock_bundle_mgr.cpp @@ -164,7 +164,7 @@ bool BundleMgrService::CheckWantEntity(const AAFwk::Want &want, AbilityInfo &abi } bool BundleMgrService::NotifyAbilityLifeStatus( - const std::string &bundleName, const std::string &abilityName, const int64_t launchTime) + const std::string &bundleName, const std::string &abilityName, const int64_t launchTime, const int uid) { return true; } diff --git a/services/test/moduletest/ability_mgr_service_test/BUILD.gn b/services/test/moduletest/ability_mgr_service_test/BUILD.gn index d32ca7212ff..4c131077445 100644 --- a/services/test/moduletest/ability_mgr_service_test/BUILD.gn +++ b/services/test/moduletest/ability_mgr_service_test/BUILD.gn @@ -116,7 +116,6 @@ ohos_moduletest("ability_mgr_module_test") { group("moduletest") { testonly = true - deps = [] - #deps = [ ":ability_mgr_module_test" ] + deps = [ ":ability_mgr_module_test" ] } diff --git a/services/test/moduletest/ability_mgr_service_test/ability_mgr_module_test.cpp b/services/test/moduletest/ability_mgr_service_test/ability_mgr_module_test.cpp index 15847138abd..2e5de6b2087 100644 --- a/services/test/moduletest/ability_mgr_service_test/ability_mgr_module_test.cpp +++ b/services/test/moduletest/ability_mgr_service_test/ability_mgr_module_test.cpp @@ -1917,7 +1917,7 @@ HWTEST_F(AbilityMgrModuleTest, UpdateConfiguration_029, TestSize.Level1) HWTEST_F(AbilityMgrModuleTest, UpdateConfiguration_030, TestSize.Level1) { EXPECT_TRUE(abilityMgrServ_); - std::string abilityName = "luncher"; + std::string abilityName = "hiworld"; std::string bundleName = "com.ix.hiworld"; SetActive(); @@ -1961,60 +1961,6 @@ HWTEST_F(AbilityMgrModuleTest, UpdateConfiguration_030, TestSize.Level1) EXPECT_EQ(size, num); } -/* - * Feature: AbilityManagerService - * Function: UpdateConfiguration - * SubFunction: NA - * FunctionPoints: NA - * EnvConditions: NA - * CaseDescription: luncher ability - */ -HWTEST_F(AbilityMgrModuleTest, UpdateConfiguration_030, TestSize.Level1) -{ - EXPECT_TRUE(abilityMgrServ_); - std::string abilityName = "hiworld"; - std::string bundleName = "com.ix.hiworld"; - - SetActive(); - EXPECT_CALL(*mockAppMgrClient_, LoadAbility(_, _, _, _)).Times(1); - EXPECT_CALL(*mockAppMgrClient_, UpdateAbilityState(_, _)).Times(2).WillOnce(Return(AppMgrResultCode::RESULT_OK)); - Want want = CreateWant(abilityName, bundleName); - auto startRef = abilityMgrServ_->StartAbility(want); - EXPECT_EQ(startRef, 0); - - std::shared_ptr abilityRecord = abilityMgrServ_->GetStackManager()->GetCurrentTopAbility(); - EXPECT_TRUE(abilityRecord); - - int displeyId = 1001; - std::string key = GlobalConfigurationKey::SYSTEM_LANGUAGE; - std::string val = "意大利文"; - auto Compare = [displeyId, key, val](const AppExecFwk::Configuration &config) { - auto item = config.GetItem(displeyId, key); - EXPECT_EQ(item, val); - }; - - sptr scheduler(new MockAbilityScheduler()); - EXPECT_CALL(*scheduler, ScheduleUpdateConfiguration(_)).Times(1).WillOnce(Invoke(Compare)); - - abilityMgrServ_->AttachAbilityThread(scheduler, abilityRecord->GetToken()); - - int size = DelayedSingleton::GetInstance()->observerList_.size(); - EXPECT_TRUE(size > 0); - - AppExecFwk::Configuration newConfig; - newConfig.AddItem(displeyId, key, val); - - auto updateRef = abilityMgrServ_->UpdateConfiguration(newConfig); - EXPECT_EQ(updateRef, 0); - - PacMap saveData; - abilityMgrServ_->AbilityTransitionDone(abilityRecord->GetToken(), 0, saveData); - - int num = size - 1; - size = DelayedSingleton::GetInstance()->observerList_.size(); - EXPECT_EQ(size, num); -} - /* * Function: UninstallApp * SubFunction: NA diff --git a/services/test/moduletest/ability_record_test/BUILD.gn b/services/test/moduletest/ability_record_test/BUILD.gn index 1c379461458..61304209019 100644 --- a/services/test/moduletest/ability_record_test/BUILD.gn +++ b/services/test/moduletest/ability_record_test/BUILD.gn @@ -118,7 +118,6 @@ ohos_moduletest("AbilityRecordModuleTest") { group("moduletest") { testonly = true - deps = [] - #deps = [ ":AbilityRecordModuleTest" ] + deps = [ ":AbilityRecordModuleTest" ] } diff --git a/services/test/moduletest/ability_stack_test/BUILD.gn b/services/test/moduletest/ability_stack_test/BUILD.gn index c20b22affb0..1ff05c1af5d 100644 --- a/services/test/moduletest/ability_stack_test/BUILD.gn +++ b/services/test/moduletest/ability_stack_test/BUILD.gn @@ -116,7 +116,6 @@ ohos_moduletest("ability_stack_module_test") { group("moduletest") { testonly = true - deps = [] - #deps = [ ":ability_stack_module_test" ] + deps = [ ":ability_stack_module_test" ] } diff --git a/services/test/moduletest/dump_module_test/BUILD.gn b/services/test/moduletest/dump_module_test/BUILD.gn index 6fdb590aa0b..264dc405001 100644 --- a/services/test/moduletest/dump_module_test/BUILD.gn +++ b/services/test/moduletest/dump_module_test/BUILD.gn @@ -42,6 +42,7 @@ ohos_moduletest("dump_module_test") { cflags += [ "-DBINDER_IPC_32BIT" ] } deps = [ + "${innerkits_path}/ability_manager:ability_manager", "${innerkits_path}/want:want", "${services_path}/abilitymgr/test:abilityms_test_source", "${services_path}/abilitymgr/test/mock/appmgr_test_service:appmgr_test_service", @@ -68,7 +69,6 @@ ohos_moduletest("dump_module_test") { group("moduletest") { testonly = true - deps = [] - #deps = [ ":dump_module_test" ] + deps = [ ":dump_module_test" ] } diff --git a/services/test/moduletest/ipc_ability_connect_test/BUILD.gn b/services/test/moduletest/ipc_ability_connect_test/BUILD.gn index c0219cd6dbe..4b226686fbd 100644 --- a/services/test/moduletest/ipc_ability_connect_test/BUILD.gn +++ b/services/test/moduletest/ipc_ability_connect_test/BUILD.gn @@ -45,7 +45,6 @@ ohos_moduletest("IpcAbilityConnectModuleTest") { group("moduletest") { testonly = true - deps = [] - #deps = [ ":IpcAbilityConnectModuleTest" ] + deps = [ ":IpcAbilityConnectModuleTest" ] } diff --git a/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn b/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn index 951e81733ac..a07b9f281d4 100644 --- a/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn +++ b/services/test/moduletest/ipc_ability_mgr_test/BUILD.gn @@ -50,7 +50,6 @@ ohos_moduletest("IpcAbilityMgrServiceModuleTest") { group("moduletest") { testonly = true - deps = [] - #deps = [ ":IpcAbilityMgrServiceModuleTest" ] + deps = [ ":IpcAbilityMgrServiceModuleTest" ] } diff --git a/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn b/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn index f777e6096de..568dec71797 100644 --- a/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn +++ b/services/test/moduletest/ipc_ability_scheduler_test/BUILD.gn @@ -69,7 +69,6 @@ ohos_moduletest("IpcAbilitySchedulerModuleTest") { group("moduletest") { testonly = true - deps = [] - #deps = [ ":IpcAbilitySchedulerModuleTest" ] + deps = [ ":IpcAbilitySchedulerModuleTest" ] } diff --git a/services/test/moduletest/panding_want_manager_test/BUILD.gn b/services/test/moduletest/panding_want_manager_test/BUILD.gn index 0344df5ceba..36928d3e212 100644 --- a/services/test/moduletest/panding_want_manager_test/BUILD.gn +++ b/services/test/moduletest/panding_want_manager_test/BUILD.gn @@ -73,6 +73,7 @@ ohos_moduletest("PandingWantMgrTest") { "dsoftbus_standard:softbus_client", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimedia_image_standard:image_native", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", @@ -81,7 +82,6 @@ ohos_moduletest("PandingWantMgrTest") { group("moduletest") { testonly = true - deps = [] - #deps = [ ":PandingWantMgrTest" ] + deps = [ ":PandingWantMgrTest" ] } diff --git a/tools/test/BUILD.gn b/tools/test/BUILD.gn index fed81e06a30..3f24c965754 100644 --- a/tools/test/BUILD.gn +++ b/tools/test/BUILD.gn @@ -15,21 +15,18 @@ import("//build/test.gni") group("systemtest") { testonly = true - deps = [] - #deps = [ "systemtest/aa:systemtest" ] + deps = [ "systemtest/aa:systemtest" ] } group("moduletest") { testonly = true - deps = [] - #deps = [ "moduletest/aa:moduletest" ] + deps = [ "moduletest/aa:moduletest" ] } group("unittest") { testonly = true - deps = [] - #deps = [ "unittest/aa:unittest" ] + deps = [ "unittest/aa:unittest" ] } diff --git a/tools/test/mock/mock_ability_manager_stub.h b/tools/test/mock/mock_ability_manager_stub.h index 1ee0bd746d0..5ee888ec7ec 100644 --- a/tools/test/mock/mock_ability_manager_stub.h +++ b/tools/test/mock/mock_ability_manager_stub.h @@ -130,6 +130,16 @@ public: MOCK_METHOD1(ClearUpApplicationData, int(const std::string &)); MOCK_METHOD2(GetWantSenderInfo, int(const sptr &target, std::shared_ptr &info)); + virtual int StartUser(int userId) override + { + return 0; + } + + virtual int StopUser(int userId, const sptr &callback) override + { + return 0; + } + public: std::string powerState_; }; diff --git a/tools/test/moduletest/aa/BUILD.gn b/tools/test/moduletest/aa/BUILD.gn index 9ad4db44420..3061a85fb38 100644 --- a/tools/test/moduletest/aa/BUILD.gn +++ b/tools/test/moduletest/aa/BUILD.gn @@ -108,8 +108,8 @@ group("moduletest") { testonly = true deps = [ - #":aa_command_dump_module_test", - #":aa_command_start_module_test", - #":aa_command_stop_service_module_test", + ":aa_command_dump_module_test", + ":aa_command_start_module_test", + ":aa_command_stop_service_module_test", ] } -- Gitee