From adb2871cf5402e9cb6e20d2e85d0926f0301b116 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 10 Mar 2022 21:28:24 +0800 Subject: [PATCH] add user Signed-off-by: unknown --- .../mock_serviceability_manager_service.cpp | 5 - .../AMS/mock_serviceability_manager_service.h | 1 - ...mock_ability_manager_client_interface1.cpp | 5 - .../include/mock_ability_manager_service.cpp | 5 - .../include/mock_ability_manager_service.h | 1 - ...mock_ability_manager_client_interface1.cpp | 5 - .../Mock/include/mock_ability_mgr_service.h | 1 - .../mock/AMS/mock_ability_manager_service.cpp | 5 - .../mock/AMS/mock_ability_manager_service.h | 1 - .../mock_serviceability_manager_service.cpp | 5 - .../AMS/mock_serviceability_manager_service.h | 1 - .../include/ability_manager_client.h | 8 -- .../include/ability_manager_interface.h | 8 -- .../abilityManager/napi_ability_manager.cpp | 118 ------------------ .../abilityManager/napi_ability_manager.h | 1 - .../aafwk/abilityManager/native_module.cpp | 1 - .../include/ability_manager_proxy.h | 8 -- .../include/ability_manager_service.h | 8 -- .../abilitymgr/include/ability_manager_stub.h | 1 - .../include/ability_stack_manager.h | 8 -- .../abilitymgr/src/ability_manager_client.cpp | 7 -- .../abilitymgr/src/ability_manager_proxy.cpp | 22 ---- .../src/ability_manager_service.cpp | 10 -- .../abilitymgr/src/ability_manager_stub.cpp | 12 -- .../abilitymgr/src/ability_stack_manager.cpp | 17 --- .../ability_manager_stub_mock_test.h | 5 - .../ability_manager_proxy_test.cpp | 18 --- .../ability_manager_stub_mock.h | 5 - .../ability_manager_service_test.cpp | 48 ------- .../ability_manager_stub_impl_mock.h | 5 - .../ability_manager_stub_mock.h | 1 - .../ability_stack_manager_test.cpp | 83 ++---------- .../test/mock/include/mock_ability_manager.h | 8 -- .../include/appmgr/mock_ability_mgr_host.h | 4 - .../mock/include/mock_ability_manager_proxy.h | 1 - .../mock/include/mock_ability_mgr_service.h | 1 - .../ability_stack_module_test.cpp | 54 -------- .../ipc_ability_mgr_module_test.cpp | 26 ---- .../ams_app_process_manage_test.cpp | 1 - .../ams/ams_kit_test/acts_ams_kit_test.cpp | 57 --------- .../ams_page_ability_test.cpp | 1 - .../ams/ams_power_test/ams_power_test.cpp | 1 - .../common/ams/tool/include/st_ability_util.h | 11 -- .../common/ams/tool/src/st_ability_util.cpp | 16 --- .../common/include/system_test_form_util.h | 11 -- .../fms/common/src/system_test_form_util.cpp | 16 --- tools/test/mock/mock_ability_manager_stub.h | 1 - 47 files changed, 9 insertions(+), 629 deletions(-) diff --git a/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_serviceability_manager_service.cpp b/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_serviceability_manager_service.cpp index 89d93be8c6a..c688eafdc5e 100644 --- a/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_serviceability_manager_service.cpp +++ b/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_serviceability_manager_service.cpp @@ -143,11 +143,6 @@ int MockServiceAbilityManagerService::RemoveMission(int id) return 0; } -int MockServiceAbilityManagerService::RemoveStack(int id) -{ - return 0; -} - int MockServiceAbilityManagerService::MoveMissionToEnd(const sptr &token, const bool nonFirst) { return 0; diff --git a/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_serviceability_manager_service.h b/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_serviceability_manager_service.h index 79805a4cc33..1a62e617405 100644 --- a/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_serviceability_manager_service.h +++ b/frameworks/kits/ability/ability_runtime/test/mock/AMS/mock_serviceability_manager_service.h @@ -149,7 +149,6 @@ public: int RemoveMission(int id) override; - int RemoveStack(int id) override; int PowerOff() override; int PowerOn() override; int LockMission(int missionId) override diff --git a/frameworks/kits/ability/native/test/mock/include/mock_ability_manager_client_interface1.cpp b/frameworks/kits/ability/native/test/mock/include/mock_ability_manager_client_interface1.cpp index 9cd20832d35..e934cf1b242 100644 --- a/frameworks/kits/ability/native/test/mock/include/mock_ability_manager_client_interface1.cpp +++ b/frameworks/kits/ability/native/test/mock/include/mock_ability_manager_client_interface1.cpp @@ -180,11 +180,6 @@ ErrCode AbilityManagerClient::RemoveMissions(std::vector missionId) return ret; } -ErrCode AbilityManagerClient::RemoveStack(int id) -{ - return ERR_OK; -} - ErrCode AbilityManagerClient::KillProcess(const std::string &bundleName) { return ERR_OK; diff --git a/frameworks/kits/ability/native/test/mock/include/mock_ability_manager_service.cpp b/frameworks/kits/ability/native/test/mock/include/mock_ability_manager_service.cpp index d40a91e86cd..6bdf4f912f7 100644 --- a/frameworks/kits/ability/native/test/mock/include/mock_ability_manager_service.cpp +++ b/frameworks/kits/ability/native/test/mock/include/mock_ability_manager_service.cpp @@ -156,11 +156,6 @@ int MockAbilityManagerService::RemoveMission(int id) return 0; } -int MockAbilityManagerService::RemoveStack(int id) -{ - return 0; -} - int MockAbilityManagerService::MoveMissionToTop(int32_t missionId) { return 0; 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 b52b1b1867e..9aadc05adac 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 @@ -171,7 +171,6 @@ public: int RemoveMission(int id) override; - int RemoveStack(int id) override; sptr AcquireDataAbility( const Uri &uri, bool tryBind, const sptr &callerToken) override { diff --git a/frameworks/kits/appkit/native/test/mock/include/mock_ability_manager_client_interface1.cpp b/frameworks/kits/appkit/native/test/mock/include/mock_ability_manager_client_interface1.cpp index 2a86fb9e7c0..ae73ffc6c9c 100644 --- a/frameworks/kits/appkit/native/test/mock/include/mock_ability_manager_client_interface1.cpp +++ b/frameworks/kits/appkit/native/test/mock/include/mock_ability_manager_client_interface1.cpp @@ -175,11 +175,6 @@ ErrCode AbilityManagerClient::RemoveMissions(std::vector missionId) return ret; } -ErrCode AbilityManagerClient::RemoveStack(int id) -{ - return ERR_OK; -} - ErrCode AbilityManagerClient::KillProcess(const std::string &bundleName) { return ERR_OK; diff --git a/frameworks/kits/appkit/test/Mock/include/mock_ability_mgr_service.h b/frameworks/kits/appkit/test/Mock/include/mock_ability_mgr_service.h index d6588ed87ac..954b1140787 100644 --- a/frameworks/kits/appkit/test/Mock/include/mock_ability_mgr_service.h +++ b/frameworks/kits/appkit/test/Mock/include/mock_ability_mgr_service.h @@ -55,7 +55,6 @@ public: MOCK_METHOD3(GetRecentMissions, int(const int32_t, const int32_t, std::vector &)); MOCK_METHOD2(GetMissionSnapshot, int(const int32_t, MissionPixelMap &)); MOCK_METHOD1(RemoveMission, int(int)); - MOCK_METHOD1(RemoveStack, int(int)); MOCK_METHOD4(OnRemoteRequest, int(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option)); MOCK_METHOD1(MoveMissionToTop, int(int32_t)); diff --git a/frameworks/kits/test/mock/AMS/mock_ability_manager_service.cpp b/frameworks/kits/test/mock/AMS/mock_ability_manager_service.cpp index 38e407f46f1..9d78ed9e276 100644 --- a/frameworks/kits/test/mock/AMS/mock_ability_manager_service.cpp +++ b/frameworks/kits/test/mock/AMS/mock_ability_manager_service.cpp @@ -190,11 +190,6 @@ int MockAbilityManagerService::RemoveMission(int id) return 0; } -int MockAbilityManagerService::RemoveStack(int id) -{ - return 0; -} - sptr MockAbilityManagerService::AcquireDataAbility( const Uri &uri, bool tryBind, const sptr &callerToken) { 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 f6b37411010..3c21ceecdab 100644 --- a/frameworks/kits/test/mock/AMS/mock_ability_manager_service.h +++ b/frameworks/kits/test/mock/AMS/mock_ability_manager_service.h @@ -154,7 +154,6 @@ public: int RemoveMission(int id) override; - int RemoveStack(int id) override; int PowerOff() override; int PowerOn() override; int LockMission(int missionId) override diff --git a/frameworks/kits/test/mock/AMS/mock_serviceability_manager_service.cpp b/frameworks/kits/test/mock/AMS/mock_serviceability_manager_service.cpp index d45b1c8c003..e5af44a4188 100644 --- a/frameworks/kits/test/mock/AMS/mock_serviceability_manager_service.cpp +++ b/frameworks/kits/test/mock/AMS/mock_serviceability_manager_service.cpp @@ -181,11 +181,6 @@ int MockServiceAbilityManagerService::RemoveMission(int id) return 0; } -int MockServiceAbilityManagerService::RemoveStack(int id) -{ - return 0; -} - int MockServiceAbilityManagerService::MoveMissionToEnd(const sptr &token, const bool nonFirst) { return 0; 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 438c3e677a6..ad92b9a1efe 100644 --- a/frameworks/kits/test/mock/AMS/mock_serviceability_manager_service.h +++ b/frameworks/kits/test/mock/AMS/mock_serviceability_manager_service.h @@ -148,7 +148,6 @@ public: int RemoveMission(int id) override; - int RemoveStack(int id) override; int PowerOff() override; int PowerOn() override; int LockMission(int missionId) override diff --git a/interfaces/innerkits/ability_manager/include/ability_manager_client.h b/interfaces/innerkits/ability_manager/include/ability_manager_client.h index ab936d74dcf..ba964c84fcd 100644 --- a/interfaces/innerkits/ability_manager/include/ability_manager_client.h +++ b/interfaces/innerkits/ability_manager/include/ability_manager_client.h @@ -318,14 +318,6 @@ public: */ ErrCode RemoveMissions(std::vector missionId); - /** - * Remove the specified mission stack by stack id - * - * @param id. - * @return Returns ERR_OK on success, others on failure. - */ - ErrCode RemoveStack(int id); - /** * Kill the process immediately. * diff --git a/interfaces/innerkits/ability_manager/include/ability_manager_interface.h b/interfaces/innerkits/ability_manager/include/ability_manager_interface.h index 191d3d96360..63ce3566ef5 100644 --- a/interfaces/innerkits/ability_manager/include/ability_manager_interface.h +++ b/interfaces/innerkits/ability_manager/include/ability_manager_interface.h @@ -357,14 +357,6 @@ public: */ virtual int RemoveMission(int id) = 0; - /** - * Remove the specified mission stack by stack id - * - * @param id. - * @return Returns ERR_OK on success, others on failure. - */ - virtual int RemoveStack(int id) = 0; - /** * Kill the process immediately. * diff --git a/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp b/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp index c40ee7839f8..41126989dd1 100644 --- a/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp +++ b/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.cpp @@ -1361,124 +1361,6 @@ napi_value NAPI_RemoveMissions(napi_env env, napi_callback_info info) return ((callBackMode) ? (nullptr) : (ret)); } -auto NAPI_ClearMissionsAsyncExecuteCallback = [](napi_env env, void *data) { - HILOG_INFO("clearMissions called(CallBack Mode)..."); - AsyncClearMissionsCallbackInfo *async_callback_info = (AsyncClearMissionsCallbackInfo *)data; - async_callback_info->result = GetAbilityManagerInstance()->RemoveStack(NapiAbilityMgr::DEFAULT_STACK_ID); -}; - -auto NAPI_ClearMissionsAsyncCompleteCallback = [](napi_env env, napi_status status, void *data) { - HILOG_INFO("clearMissions compeleted(CallBack Mode)..."); - AsyncClearMissionsCallbackInfo *async_callback_info = (AsyncClearMissionsCallbackInfo *)data; - napi_value result[NUMBER_OF_PARAMETERS_TWO] = {0}; - napi_value callback = nullptr; - napi_value undefined = nullptr; - napi_value callResult = nullptr; - - result[0] = GetCallbackErrorValue(async_callback_info->env, NapiAbilityMgr::BUSINESS_ERROR_CODE_OK); - napi_create_int32(async_callback_info->env, async_callback_info->result, &result[1]); - napi_get_undefined(env, &undefined); - - napi_get_reference_value(env, async_callback_info->callback[0], &callback); - napi_call_function(env, undefined, callback, NUMBER_OF_PARAMETERS_TWO, &result[0], &callResult); - - if (async_callback_info->callback[0] != nullptr) { - napi_delete_reference(env, async_callback_info->callback[0]); - } - - napi_delete_async_work(env, async_callback_info->asyncWork); - delete async_callback_info; -}; - -auto NAPI_ClearMissionsPromiseCompleteCallback = [](napi_env env, napi_status status, void *data) { - HILOG_INFO("clearMissions compeleted(Promise Mode)..."); - AsyncClearMissionsCallbackInfo *async_callback_info = (AsyncClearMissionsCallbackInfo *)data; - napi_value result = nullptr; - napi_create_int32(async_callback_info->env, async_callback_info->result, &result); - napi_resolve_deferred(async_callback_info->env, async_callback_info->deferred, result); - napi_delete_async_work(env, async_callback_info->asyncWork); - delete async_callback_info; -}; - -napi_value NAPI_ClearMissionsWrap( - napi_env env, napi_callback_info info, bool callBackMode, AsyncClearMissionsCallbackInfo &async_callback_info) -{ - HILOG_INFO("NAPI_ClearMissions called..."); - if (callBackMode) { - napi_value resourceName = nullptr; - napi_create_string_latin1(env, "NAPI_ClearMissionsCallBack", NAPI_AUTO_LENGTH, &resourceName); - - napi_create_async_work(env, - nullptr, - resourceName, - NAPI_ClearMissionsAsyncExecuteCallback, - NAPI_ClearMissionsAsyncCompleteCallback, - (void *)&async_callback_info, - &async_callback_info.asyncWork); - - NAPI_CALL(env, napi_queue_async_work(env, async_callback_info.asyncWork)); - // create return - napi_value ret = 0; - NAPI_CALL(env, napi_create_int32(env, 0, &ret)); - return ret; - } else { - napi_value resourceName = nullptr; - napi_create_string_latin1(env, "NAPI_ClearMissionsPromise", NAPI_AUTO_LENGTH, &resourceName); - - napi_deferred deferred; - napi_value promise; - NAPI_CALL(env, napi_create_promise(env, &deferred, &promise)); - async_callback_info.deferred = deferred; - - napi_create_async_work(env, - nullptr, - resourceName, - NAPI_ClearMissionsAsyncExecuteCallback, - NAPI_ClearMissionsPromiseCompleteCallback, - (void *)&async_callback_info, - &async_callback_info.asyncWork); - napi_queue_async_work(env, async_callback_info.asyncWork); - return promise; - } -} - -napi_value NAPI_ClearMissions(napi_env env, napi_callback_info info) -{ - size_t argc = 1; - napi_value argv[1] = {}; - NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, NULL, NULL)); - HILOG_INFO("argc = [%{public}zu]", argc); - - bool callBackMode = false; - if (argc >= 1) { - napi_valuetype valuetype = napi_valuetype::napi_null; - NAPI_CALL(env, napi_typeof(env, argv[0], &valuetype)); - NAPI_ASSERT(env, valuetype == napi_function, "Wrong argument type. Function expected."); - callBackMode = true; - } - - AsyncClearMissionsCallbackInfo *async_callback_info = new (std::nothrow) AsyncClearMissionsCallbackInfo { - .env = env, - .asyncWork = nullptr, - .deferred = nullptr, - }; - if (async_callback_info == nullptr) { - return nullptr; - } - - if (callBackMode) { - napi_create_reference(env, argv[0], 1, &async_callback_info->callback[0]); - } - - napi_value ret = NAPI_ClearMissionsWrap(env, info, callBackMode, *async_callback_info); - if (ret == nullptr) { - delete async_callback_info; - async_callback_info = nullptr; - } - - return ((callBackMode) ? (nullptr) : (ret)); -} - auto NAPI_MoveMissionToTopAsyncExecuteCallback = [](napi_env env, void *data) { HILOG_INFO("moveMissionToTop called(CallBack Mode)..."); AsyncMoveMissionToTopCallbackInfo *async_callback_info = (AsyncMoveMissionToTopCallbackInfo *)data; diff --git a/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.h b/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.h index fb6d259d6ca..2cefa6198ef 100644 --- a/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.h +++ b/interfaces/kits/napi/aafwk/abilityManager/napi_ability_manager.h @@ -161,7 +161,6 @@ napi_value NAPI_QueryRecentAbilityMissionInfos(napi_env env, napi_callback_info napi_value NAPI_GetPreviousAbilityMissionInfos(napi_env env, napi_callback_info info); napi_value NAPI_RemoveMission(napi_env env, napi_callback_info info); napi_value NAPI_RemoveMissions(napi_env env, napi_callback_info info); -napi_value NAPI_ClearMissions(napi_env env, napi_callback_info info); napi_value NAPI_MoveMissionToTop(napi_env env, napi_callback_info info); napi_value NAPI_KillProcessesByBundleName(napi_env env, napi_callback_info info); napi_value NAPI_ClearUpApplicationData(napi_env env, napi_callback_info info); diff --git a/interfaces/kits/napi/aafwk/abilityManager/native_module.cpp b/interfaces/kits/napi/aafwk/abilityManager/native_module.cpp index 088ba3be018..08cb43573e6 100644 --- a/interfaces/kits/napi/aafwk/abilityManager/native_module.cpp +++ b/interfaces/kits/napi/aafwk/abilityManager/native_module.cpp @@ -49,7 +49,6 @@ static napi_value Init(napi_env env, napi_value exports) DECLARE_NAPI_FUNCTION("removeRecentTask", NAPI_RemoveMission), DECLARE_NAPI_FUNCTION("removeMissions", NAPI_RemoveMissions), DECLARE_NAPI_FUNCTION("deleteMissions", NAPI_RemoveMissions), - DECLARE_NAPI_FUNCTION("clearMissions", NAPI_ClearMissions), DECLARE_NAPI_FUNCTION("moveMissionToTop", NAPI_MoveMissionToTop), DECLARE_NAPI_FUNCTION("killProcessesByBundleName", NAPI_KillProcessesByBundleName), DECLARE_NAPI_FUNCTION("clearUpApplicationData", NAPI_ClearUpApplicationData), diff --git a/services/abilitymgr/include/ability_manager_proxy.h b/services/abilitymgr/include/ability_manager_proxy.h index 634ac10a388..75c42dc2243 100644 --- a/services/abilitymgr/include/ability_manager_proxy.h +++ b/services/abilitymgr/include/ability_manager_proxy.h @@ -320,14 +320,6 @@ public: */ virtual int RemoveMission(int id) override; - /** - * Remove the specified mission stack by stack id - * - * @param id. - * @return Returns ERR_OK on success, others on failure. - */ - virtual int RemoveStack(int id) override; - /** * Kill the process immediately. * diff --git a/services/abilitymgr/include/ability_manager_service.h b/services/abilitymgr/include/ability_manager_service.h index 6899170bc2b..5405f84e203 100644 --- a/services/abilitymgr/include/ability_manager_service.h +++ b/services/abilitymgr/include/ability_manager_service.h @@ -447,14 +447,6 @@ public: */ virtual int RemoveMission(int id) override; - /** - * Remove the specified mission stack by stack id - * - * @param id. - * @return Returns ERR_OK on success, others on failure. - */ - virtual int RemoveStack(int id) override; - /** * Kill the process immediately. * diff --git a/services/abilitymgr/include/ability_manager_stub.h b/services/abilitymgr/include/ability_manager_stub.h index 76bc7812ecf..d7e74888947 100644 --- a/services/abilitymgr/include/ability_manager_stub.h +++ b/services/abilitymgr/include/ability_manager_stub.h @@ -69,7 +69,6 @@ private: int GetAllStackInfoInner(MessageParcel &data, MessageParcel &reply); int GetRecentMissionsInner(MessageParcel &data, MessageParcel &reply); int RemoveMissionInner(MessageParcel &data, MessageParcel &reply); - int RemoveStackInner(MessageParcel &data, MessageParcel &reply); int ScheduleCommandAbilityDoneInner(MessageParcel &data, MessageParcel &reply); int GetMissionSnapshotInner(MessageParcel &data, MessageParcel &reply); int AcquireDataAbilityInner(MessageParcel &data, MessageParcel &reply); diff --git a/services/abilitymgr/include/ability_stack_manager.h b/services/abilitymgr/include/ability_stack_manager.h index 32553b3b2ef..0514f144c41 100644 --- a/services/abilitymgr/include/ability_stack_manager.h +++ b/services/abilitymgr/include/ability_stack_manager.h @@ -244,14 +244,6 @@ public: */ int RemoveMissionById(int missionId); - /** - * Remove the specified mission stack by stack id - * - * @param id. - * @return Returns ERR_OK on success, others on failure. - */ - int RemoveStack(int stackId); - /** * move the mission stack to the top. * diff --git a/services/abilitymgr/src/ability_manager_client.cpp b/services/abilitymgr/src/ability_manager_client.cpp index b3cabdb149b..f6931c02612 100644 --- a/services/abilitymgr/src/ability_manager_client.cpp +++ b/services/abilitymgr/src/ability_manager_client.cpp @@ -343,13 +343,6 @@ ErrCode AbilityManagerClient::RemoveMissions(std::vector missionId) return error; } - -ErrCode AbilityManagerClient::RemoveStack(int id) -{ - CHECK_REMOTE_OBJECT_AND_RETURN(remoteObject_, ABILITY_SERVICE_NOT_CONNECTED); - sptr abms = iface_cast(remoteObject_); - return abms->RemoveStack(id); -} #endif ErrCode AbilityManagerClient::KillProcess(const std::string &bundleName) diff --git a/services/abilitymgr/src/ability_manager_proxy.cpp b/services/abilitymgr/src/ability_manager_proxy.cpp index 12120c09917..c651a2347bb 100644 --- a/services/abilitymgr/src/ability_manager_proxy.cpp +++ b/services/abilitymgr/src/ability_manager_proxy.cpp @@ -842,28 +842,6 @@ int AbilityManagerProxy::RemoveMission(int id) return reply.ReadInt32(); } -int AbilityManagerProxy::RemoveStack(int id) -{ - int error; - MessageParcel data; - MessageParcel reply; - MessageOption option; - - if (!WriteInterfaceToken(data)) { - return INNER_ERR; - } - if (!data.WriteInt32(id)) { - HILOG_ERROR("id write failed."); - return ERR_INVALID_VALUE; - } - error = Remote()->SendRequest(IAbilityManager::REMOVE_STACK, data, reply, option); - if (error != NO_ERROR) { - HILOG_ERROR("Send request error: %{public}d", error); - return error; - } - return reply.ReadInt32(); -} - int AbilityManagerProxy::KillProcess(const std::string &bundleName) { MessageParcel data; diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp index d82a86fe878..ca074604404 100644 --- a/services/abilitymgr/src/ability_manager_service.cpp +++ b/services/abilitymgr/src/ability_manager_service.cpp @@ -922,16 +922,6 @@ int AbilityManagerService::RemoveMission(int id) } return currentStackManager_->RemoveMissionById(id); } - -int AbilityManagerService::RemoveStack(int id) -{ - HILOG_INFO("Remove stack."); - if (id < 0) { - HILOG_ERROR("Stack id is invalid."); - return ERR_INVALID_VALUE; - } - return currentStackManager_->RemoveStack(id); -} #endif int AbilityManagerService::ConnectAbility( diff --git a/services/abilitymgr/src/ability_manager_stub.cpp b/services/abilitymgr/src/ability_manager_stub.cpp index 9ad749d60d2..bd27fe41370 100644 --- a/services/abilitymgr/src/ability_manager_stub.cpp +++ b/services/abilitymgr/src/ability_manager_stub.cpp @@ -53,7 +53,6 @@ void AbilityManagerStub::FirstStepInit() requestFuncMap_[LIST_STACK_INFO] = &AbilityManagerStub::GetAllStackInfoInner; requestFuncMap_[GET_RECENT_MISSION] = &AbilityManagerStub::GetRecentMissionsInner; requestFuncMap_[REMOVE_MISSION] = &AbilityManagerStub::RemoveMissionInner; - requestFuncMap_[REMOVE_STACK] = &AbilityManagerStub::RemoveStackInner; requestFuncMap_[COMMAND_ABILITY_DONE] = &AbilityManagerStub::ScheduleCommandAbilityDoneInner; requestFuncMap_[GET_MISSION_SNAPSHOT] = &AbilityManagerStub::GetMissionSnapshotInner; requestFuncMap_[ACQUIRE_DATA_ABILITY] = &AbilityManagerStub::AcquireDataAbilityInner; @@ -313,17 +312,6 @@ int AbilityManagerStub::RemoveMissionInner(MessageParcel &data, MessageParcel &r return NO_ERROR; } -int AbilityManagerStub::RemoveStackInner(MessageParcel &data, MessageParcel &reply) -{ - int id = data.ReadInt32(); - int32_t result = RemoveStack(id); - if (!reply.WriteInt32(result)) { - HILOG_ERROR("remove stack error"); - return ERR_INVALID_VALUE; - } - return NO_ERROR; -} - int AbilityManagerStub::ScheduleCommandAbilityDoneInner(MessageParcel &data, MessageParcel &reply) { auto token = data.ReadParcelable(); diff --git a/services/abilitymgr/src/ability_stack_manager.cpp b/services/abilitymgr/src/ability_stack_manager.cpp index b99cdbfb6a1..bfc41f29265 100644 --- a/services/abilitymgr/src/ability_stack_manager.cpp +++ b/services/abilitymgr/src/ability_stack_manager.cpp @@ -765,23 +765,6 @@ int AbilityStackManager::RemoveMissionByIdLocked(int missionId) return TerminateAbilityLocked(terminateLists); } -int AbilityStackManager::RemoveStack(int stackId) -{ - HILOG_DEBUG("stackId : %{public}d", stackId); - std::lock_guard guard(stackLock_); - if (stackId < MIN_MISSION_STACK_ID) { - HILOG_ERROR("stackId:%{public}d is invalid.", stackId); - return ERR_INVALID_VALUE; - } - - if (lockMissionContainer_ && lockMissionContainer_->IsLockedMissionState()) { - HILOG_ERROR("current is lock mission state, refusing to operate other mission."); - return ERR_INVALID_VALUE; - } - - return RemoveStackLocked(stackId); -} - int AbilityStackManager::RemoveStackLocked(int stackId) { HILOG_DEBUG("stackId : %{public}d", stackId); diff --git a/services/abilitymgr/test/unittest/phone/ability_manager_client_test/ability_manager_stub_mock_test.h b/services/abilitymgr/test/unittest/phone/ability_manager_client_test/ability_manager_stub_mock_test.h index f064283b3ab..d0d6822a9a0 100644 --- a/services/abilitymgr/test/unittest/phone/ability_manager_client_test/ability_manager_stub_mock_test.h +++ b/services/abilitymgr/test/unittest/phone/ability_manager_client_test/ability_manager_stub_mock_test.h @@ -202,11 +202,6 @@ public: return 0; } - virtual int RemoveStack(int id) - { - return 0; - } - virtual int KillProcess(const std::string &bundleName) { return 0; diff --git a/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/ability_manager_proxy_test.cpp b/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/ability_manager_proxy_test.cpp index 73d01f90385..4510d2a1716 100644 --- a/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/ability_manager_proxy_test.cpp +++ b/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/ability_manager_proxy_test.cpp @@ -532,24 +532,6 @@ HWTEST_F(AbilityManagerProxyTest, AbilityManagerProxy_0023, TestSize.Level1) EXPECT_EQ(IAbilityManager::REMOVE_MISSION, mock_->code_); } -/* - * Feature: AbilityManagerService - * Function: RemoveStack - * SubFunction: NA - * FunctionPoints: AbilityManagerService RemoveStack - * EnvConditions: NA - * CaseDescription: Verify the normal conditions of RemoveStack - */ -HWTEST_F(AbilityManagerProxyTest, AbilityManagerProxy_0024, TestSize.Level1) -{ - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &AbilityManagerStubMock::InvokeSendRequest)); - proxy_->RemoveStack(1); - - EXPECT_EQ(IAbilityManager::REMOVE_STACK, mock_->code_); -} - /* * Feature: AbilityManagerService * Function: MoveMissionToTop 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 11cb38f66b7..bc045ed4edd 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 @@ -202,11 +202,6 @@ public: return 0; } - virtual int RemoveStack(int id) - { - return 0; - } - virtual int KillProcess(const std::string &bundleName) { return 0; diff --git a/services/abilitymgr/test/unittest/phone/ability_manager_service_test/ability_manager_service_test.cpp b/services/abilitymgr/test/unittest/phone/ability_manager_service_test/ability_manager_service_test.cpp index ae0b36b1d0f..4eebf329c30 100644 --- a/services/abilitymgr/test/unittest/phone/ability_manager_service_test/ability_manager_service_test.cpp +++ b/services/abilitymgr/test/unittest/phone/ability_manager_service_test/ability_manager_service_test.cpp @@ -797,54 +797,6 @@ HWTEST_F(AbilityManagerServiceTest, Interface_018, TestSize.Level1) EXPECT_EQ(info[0].topAbility.GetDeviceID(), want1.GetElement().GetDeviceID()); } -/* - * Feature: AbilityManagerService - * Function: RemoveStack - * SubFunction: NA - * FunctionPoints: AbilityManagerService RemoveStack - * EnvConditions: NA - * CaseDescription: 1.stackid < 0, RemoveStack failed - * 2.stackid no exist, RemoveStack failed - * 3.don't allow remove luncher mission stack - */ -HWTEST_F(AbilityManagerServiceTest, Interface_019, TestSize.Level1) -{ - EXPECT_EQ(abilityMs_->RemoveStack(-1), OHOS::ERR_INVALID_VALUE); - EXPECT_EQ(abilityMs_->RemoveStack(INT_MAX), REMOVE_STACK_ID_NOT_EXIST); - EXPECT_EQ(abilityMs_->RemoveStack(0), REMOVE_STACK_LAUNCHER_DENIED); -} - -/* - * Feature: AbilityManagerService - * Function: RemoveStack - * SubFunction: NA - * FunctionPoints: AbilityManagerService RemoveStack - * EnvConditions: NA - * CaseDescription: remove default stack success - */ -HWTEST_F(AbilityManagerServiceTest, Interface_020, TestSize.Level1) -{ - Want want; - ElementName element("device", "com.ix.music", "MusicAbility"); - want.SetElement(element); - auto result = StartAbility(want); - WaitUntilTaskFinished(); - EXPECT_EQ(OHOS::ERR_OK, result); - auto stackManage = abilityMs_->GetStackManager(); - stackManage->GetCurrentTopAbility()->SetAbilityState(OHOS::AAFwk::AbilityState::ACTIVE); - - Want want1; - ElementName element1("device", "com.ix.music", "MusicAbility"); - want1.SetElement(element1); - auto result1 = StartAbility(want); - WaitUntilTaskFinished(); - EXPECT_EQ(OHOS::ERR_OK, result1); - - EXPECT_EQ(stackManage->GetCurrentMissionStack()->GetMissionRecordCount(), 1); - EXPECT_EQ(abilityMs_->RemoveStack(1), ERR_OK); - -} - /* * Feature: AbilityManagerService * Function: ConnectAbility 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 1da93ac68b2..d7af3387acf 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 @@ -215,11 +215,6 @@ public: return 0; } - virtual int RemoveStack(int id) - { - return 0; - } - virtual int KillProcess(const std::string &bundleName) { return 0; 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 ebae85c6f74..99350177f83 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 @@ -62,7 +62,6 @@ public: MOCK_METHOD3(GetRecentMissions, int(const int32_t, const int32_t, std::vector &)); MOCK_METHOD2(GetMissionSnapshot, int(const int32_t, MissionSnapshotInfo &)); MOCK_METHOD1(RemoveMission, int(int)); - MOCK_METHOD1(RemoveStack, int(int)); MOCK_METHOD1(MoveMissionToTop, int(int32_t)); MOCK_METHOD1(KillProcess, int(const std::string &)); MOCK_METHOD2(UninstallApp, int(const std::string &, int32_t)); diff --git a/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/ability_stack_manager_test.cpp b/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/ability_stack_manager_test.cpp index 05d94121bd2..6832bfbb171 100644 --- a/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/ability_stack_manager_test.cpp +++ b/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/ability_stack_manager_test.cpp @@ -1585,76 +1585,11 @@ HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_044, TestSize. /* * Feature: AbilityStackManager - * Function: RemoveStack - * SubFunction: NA - * FunctionPoints: RemoveStack - * EnvConditions: NA - * CaseDescription: Failed to verify RemoveStack - */ -HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_045, TestSize.Level1) -{ - stackManager_->Init(); - auto result = stackManager_->StartAbility(launcherAbilityRequest_); - EXPECT_EQ(ERR_OK, result); - auto firstTopAbility = stackManager_->GetCurrentTopAbility(); - firstTopAbility->SetAbilityState(OHOS::AAFwk::ACTIVE); - - result = stackManager_->StartAbility(musicAbilityRequest_); - EXPECT_EQ(ERR_OK, result); - auto secondTopAbility = stackManager_->GetCurrentTopAbility(); - secondTopAbility->SetAbilityState(OHOS::AAFwk::ACTIVE); - - result = stackManager_->RemoveStack(-1); - EXPECT_EQ(ERR_INVALID_VALUE, result); - - result = stackManager_->RemoveStack(10); - EXPECT_EQ(REMOVE_STACK_ID_NOT_EXIST, result); - - result = stackManager_->RemoveStack(0); - EXPECT_EQ(REMOVE_STACK_LAUNCHER_DENIED, result); - - stackManager_->missionStackList_.clear(); - result = stackManager_->RemoveStack(1); - EXPECT_EQ(MISSION_STACK_LIST_IS_EMPTY, result); -} - -/* - * Feature: AbilityStackManager - * Function: RemoveStack - * SubFunction: NA - * FunctionPoints: RemoveStack - * EnvConditions: NA - * CaseDescription: Succeeded to verify RemoveStack - */ -HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_046, TestSize.Level1) -{ - stackManager_->Init(); - auto result = stackManager_->StartAbility(launcherAbilityRequest_); - EXPECT_EQ(ERR_OK, result); - auto firstTopAbility = stackManager_->GetCurrentTopAbility(); - firstTopAbility->SetAbilityState(OHOS::AAFwk::ACTIVE); - - result = stackManager_->StartAbility(musicAbilityRequest_); - EXPECT_EQ(ERR_OK, result); - auto secondTopAbility = stackManager_->GetCurrentTopAbility(); - secondTopAbility->SetAbilityState(OHOS::AAFwk::ACTIVE); - - result = stackManager_->StartAbility(launcherAbilityRequest_); - EXPECT_EQ(ERR_OK, result); - auto topAbility = stackManager_->GetCurrentTopAbility(); - topAbility->SetAbilityState(OHOS::AAFwk::ACTIVE); - - result = stackManager_->RemoveStack(1); - EXPECT_EQ(ERR_OK, result); -} - -/* - * Feature: AbilityStackManager - * Function: RemoveStack + * Function: StartAbility * SubFunction: NA - * FunctionPoints: RemoveStack + * FunctionPoints: StartAbility * EnvConditions: NA - * CaseDescription: Succeeded to verify RemoveStack + * CaseDescription: Succeeded to verify StartAbility */ HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_047, TestSize.Level1) { @@ -1675,11 +1610,11 @@ HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_047, TestSize. /* * Feature: AbilityStackManager - * Function: RemoveStack + * Function: StartAbility * SubFunction: NA - * FunctionPoints: RemoveStack + * FunctionPoints: StartAbility * EnvConditions: NA - * CaseDescription: Succeeded to verify RemoveStack + * CaseDescription: Succeeded to verify StartAbility */ HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_048, TestSize.Level1) { @@ -1740,11 +1675,11 @@ HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_048, TestSize. /* * Feature: AbilityStackManager - * Function: RemoveStack + * Function: StartAbility * SubFunction: NA - * FunctionPoints: RemoveStack + * FunctionPoints: StartAbility * EnvConditions: NA - * CaseDescription: Succeeded to verify RemoveStack + * CaseDescription: Succeeded to verify StartAbility */ HWTEST_F(AbilityStackManagerTest, ability_stack_manager_operating_049, TestSize.Level1) { diff --git a/services/formmgr/test/mock/include/mock_ability_manager.h b/services/formmgr/test/mock/include/mock_ability_manager.h index 5a773d2479e..e3f85d151c6 100644 --- a/services/formmgr/test/mock/include/mock_ability_manager.h +++ b/services/formmgr/test/mock/include/mock_ability_manager.h @@ -223,10 +223,6 @@ public: { return 0; } - virtual int RemoveStack(int id) - { - return 0; - } virtual int KillProcess(const std::string &bundleName) { return 0; @@ -606,10 +602,6 @@ public: { return 0; } - virtual int RemoveStack(int id) - { - return 0; - } virtual int KillProcess(const std::string &bundleName) { return 0; diff --git a/services/test/mock/include/appmgr/mock_ability_mgr_host.h b/services/test/mock/include/appmgr/mock_ability_mgr_host.h index 8101cdcc27a..5a080637db4 100644 --- a/services/test/mock/include/appmgr/mock_ability_mgr_host.h +++ b/services/test/mock/include/appmgr/mock_ability_mgr_host.h @@ -142,10 +142,6 @@ public: { return 0; } - virtual int RemoveStack(int id) override - { - return 0; - } virtual int KillProcess(const std::string &bundleName) override { return 0; diff --git a/services/test/mock/include/mock_ability_manager_proxy.h b/services/test/mock/include/mock_ability_manager_proxy.h index 869639d68d4..8a38505adca 100644 --- a/services/test/mock/include/mock_ability_manager_proxy.h +++ b/services/test/mock/include/mock_ability_manager_proxy.h @@ -53,7 +53,6 @@ public: MOCK_METHOD3(GetRecentMissions, int(const int32_t, const int32_t, std::vector &)); MOCK_METHOD2(GetMissionSnapshot, int(const int32_t, MissionPixelMap &)); MOCK_METHOD1(RemoveMission, int(int)); - MOCK_METHOD1(RemoveStack, int(int)); MOCK_METHOD1(MoveMissionToTop, int(int32_t)); MOCK_METHOD1(GetMissionIdByToken, int32_t(const sptr &token)); MOCK_METHOD1(KillProcess, int(const std::string &)); diff --git a/services/test/mock/include/mock_ability_mgr_service.h b/services/test/mock/include/mock_ability_mgr_service.h index c4609ad5c5a..fd35fee42cf 100644 --- a/services/test/mock/include/mock_ability_mgr_service.h +++ b/services/test/mock/include/mock_ability_mgr_service.h @@ -61,7 +61,6 @@ public: MOCK_METHOD3(GetRecentMissions, int(const int32_t, const int32_t, std::vector &)); MOCK_METHOD2(GetMissionSnapshot, int(const int32_t, MissionPixelMap &)); MOCK_METHOD1(RemoveMission, int(int)); - MOCK_METHOD1(RemoveStack, int(int)); MOCK_METHOD1(MoveMissionToTop, int(int32_t)); MOCK_METHOD1(GetMissionIdByToken, int32_t(const sptr &token)); MOCK_METHOD1(KillProcess, int(const std::string &)); diff --git a/services/test/moduletest/ability_stack_test/ability_stack_module_test.cpp b/services/test/moduletest/ability_stack_test/ability_stack_module_test.cpp index 268565fdf0a..47e4f0bbf1e 100644 --- a/services/test/moduletest/ability_stack_test/ability_stack_module_test.cpp +++ b/services/test/moduletest/ability_stack_test/ability_stack_module_test.cpp @@ -3487,60 +3487,6 @@ HWTEST_F(AbilityStackModuleTest, ability_stack_test_068, TestSize.Level1) EXPECT_EQ(stackManager_->GetCurrentTopAbility(), topAbilityRecordMusic); } -/* - * Feature: AaFwk - * Function:RemoveStack - * SubFunction:Remove Stack - * FunctionPoints: - * EnvConditions: NA - * CaseDescription:Remove Stack - */ -HWTEST_F(AbilityStackModuleTest, ability_stack_test_069, TestSize.Level1) -{ - stackManager_->isMultiWinMoving_ = false; - // start launcher - auto worldAbilityRequest = GenerateAbilityRequest("device", "WorldAbility", "world", "com.ix.hiworld"); - auto ref = stackManager_->StartAbility(worldAbilityRequest); - EXPECT_EQ(ERR_OK, ref); - auto abilityRecordWorld = stackManager_->GetCurrentTopAbility(); - EXPECT_TRUE(abilityRecordWorld); - abilityRecordWorld->SetAbilityState(OHOS::AAFwk::ACTIVE); - - auto musicTopAbilityRequest = GenerateAbilityRequest("device", "MusicTopAbility", "musicTop", "com.ix.hiTopMusic"); - ref = stackManager_->StartAbility(musicTopAbilityRequest); - EXPECT_EQ(ERR_OK, ref); - auto topAbilityRecordMusic = stackManager_->GetCurrentTopAbility(); - EXPECT_TRUE(topAbilityRecordMusic); - topAbilityRecordMusic->SetAbilityState(OHOS::AAFwk::ACTIVE); - - std::shared_ptr targetStack = stackManager_->GetTargetMissionStack(musicTopAbilityRequest); - EXPECT_EQ(stackManager_->currentMissionStack_, targetStack); - - // start split ability - auto radioAbilityRequest = GenerateAbilityRequest("device", "RadioAbility", "radio", "com.ix.hiRadio"); - auto abilityStartSetting = AbilityStartSetting::GetEmptySetting(); - EXPECT_TRUE(abilityStartSetting); - abilityStartSetting->AddProperty(AbilityStartSetting::WINDOW_MODE_KEY, - std::to_string(AbilityWindowConfiguration::MULTI_WINDOW_DISPLAY_SECONDARY)); - radioAbilityRequest.startSetting = abilityStartSetting; - ref = stackManager_->StartAbility(radioAbilityRequest); - EXPECT_EQ(ERR_OK, ref); - - auto topAbilityRecordRadio = stackManager_->GetCurrentTopAbility(); - EXPECT_TRUE(topAbilityRecordRadio); - topAbilityRecordRadio->SetAbilityState(OHOS::AAFwk::ACTIVE); - auto topMissionRecordRadio = stackManager_->GetTopMissionRecord(); - EXPECT_TRUE(topMissionRecordRadio); - -#ifdef SUPPORT_GRAPHICS - EXPECT_EQ(stackManager_->curSysWindowMode_, SystemWindowMode::SPLITSCREEN_WINDOW_MODE); -#endif - - auto stackId = topMissionRecordRadio->GetMissionStack()->GetMissionStackId(); - stackManager_->RemoveStack(stackId); - EXPECT_EQ(stackManager_->GetCurrentTopAbility(), abilityRecordWorld); -} - /* * Feature: AaFwk * Function:OnTimeOut diff --git a/services/test/moduletest/ipc_ability_mgr_test/ipc_ability_mgr_module_test.cpp b/services/test/moduletest/ipc_ability_mgr_test/ipc_ability_mgr_module_test.cpp index fde03e58f83..48f97ade8b3 100644 --- a/services/test/moduletest/ipc_ability_mgr_test/ipc_ability_mgr_module_test.cpp +++ b/services/test/moduletest/ipc_ability_mgr_test/ipc_ability_mgr_module_test.cpp @@ -517,32 +517,6 @@ HWTEST_F(IpcAbilityMgrModuleTest, AbilityMgrService_IPC_016, TestSize.Level1) GTEST_LOG_(INFO) << "IpcAbilityMgrModuleTest AbilityMgrService_IPC_016 end"; } -/* - * Feature: AAFwk - * Function: AbilityManagerService - * SubFunction: IPC of client and server - * FunctionPoints: RemoveStack - * EnvConditions: NA - * CaseDescription: verify RemoveStack IPC between client and server. - */ -HWTEST_F(IpcAbilityMgrModuleTest, AbilityMgrService_IPC_017, TestSize.Level1) -{ - GTEST_LOG_(INFO) << "IpcAbilityMgrModuleTest AbilityMgrService_IPC_017 start"; - - for (int i = 0; i < COUNT; i++) { - sptr mockAbilityMgr(new MockAbilityMgrService()); - sptr abilityMgrClient = iface_cast(mockAbilityMgr); - - EXPECT_CALL(*mockAbilityMgr, RemoveStack(_)) - .Times(1) - .WillOnce(InvokeWithoutArgs(mockAbilityMgr.GetRefPtr(), &MockAbilityMgrService::Post)); - abilityMgrClient->RemoveStack(1); - mockAbilityMgr->Wait(); - } - - GTEST_LOG_(INFO) << "IpcAbilityMgrModuleTest AbilityMgrService_IPC_017 end"; -} - /* * Feature: AAFwk * Function: AbilityManagerService diff --git a/test/systemtest/common/ams/ams_app_process_manage_test/ams_app_process_manage_test.cpp b/test/systemtest/common/ams/ams_app_process_manage_test/ams_app_process_manage_test.cpp index c1b1e6c1815..6245935d39f 100644 --- a/test/systemtest/common/ams/ams_app_process_manage_test/ams_app_process_manage_test.cpp +++ b/test/systemtest/common/ams/ams_app_process_manage_test/ams_app_process_manage_test.cpp @@ -126,7 +126,6 @@ void AmsAppProcessManageTest::SetUp(void) void AmsAppProcessManageTest::TearDown(void) { GTEST_LOG_(INFO) << "void AmsAppProcessManageTest::TearDown(void)"; - STAbilityUtil::RemoveStack(1, abilityMs_, WAIT_TIME, WAIT_LAUNCHER_OK); std::vector vecBundleName; for (const auto &suffix : bundleNameSuffix) { vecBundleName.push_back(bundleNameBase + suffix); 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 abd73ea412c..43423fcb8d1 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 @@ -148,7 +148,6 @@ void ActsAmsKitTest::SetUp(void) void ActsAmsKitTest::TearDown(void) { - STAbilityUtil::RemoveStack(1, abilityMs, WAIT_TIME, WAIT_LAUNCHER_OK); CleanMsg(); } @@ -2023,59 +2022,3 @@ HWTEST_F(ActsAmsKitTest, AMS_Page_Application_2600, Function | MediumTest | Leve } } } - -/** - * @tc.number : AMS_Page_Application_2700 - * @tc.name : OHOSApplicationApi::Lifecycle callback function - * @tc.desc : 1.Control the life cycle of the ability - * 2.Application registration capability life cycle callback - * 3.The callback function corresponding to the registered class will be called - */ -HWTEST_F(ActsAmsKitTest, AMS_Page_Application_2700, Function | MediumTest | Level1) -{ - for (int i = 1; i <= stLevel_.AMSLevel; i++) { - MAP_STR_STR params; - params["targetBundle"] = bundleName2; - params["targetAbility"] = thirdAbilityName; - Want want = STAbilityUtil::MakeWant("device", sixthAbilityName, bundleName2, params); - STAbilityUtil::StartAbility(want, abilityMs); - EXPECT_EQ(STAbilityUtil::WaitCompleted(abilityEvent, sixthAbilityName + g_onAbilityActive, 0), 0); - EXPECT_EQ(STAbilityUtil::WaitCompleted(abilityEvent, sixthAbilityName + g_onAbilityInactive, 0), 0); - EXPECT_EQ(STAbilityUtil::WaitCompleted(abilityEvent, thirdAbilityName + g_onAbilityStart, 0), 0); - EXPECT_EQ(STAbilityUtil::WaitCompleted(abilityEvent, thirdAbilityName + g_onAbilityActive, 0), 0); - EXPECT_EQ(STAbilityUtil::WaitCompleted(abilityEvent, sixthAbilityName + g_onAbilityBackground, 0), 0); - CleanMsg(); - STAbilityUtil::RemoveStack(1, abilityMs, WAIT_TIME, WAIT_LAUNCHER_OK); - } -} - -/** - * @tc.number : AMS_Page_Application_2800 - * @tc.name : OHOSApplicationApi::Lifecycle callback function - * @tc.desc : 1.Control the life cycle of the ability - * 2.Application registration capability life cycle callback - * 3.The callback function corresponding to the registered class will be called - */ -HWTEST_F(ActsAmsKitTest, AMS_Page_Application_2800, Function | MediumTest | Level1) -{ - for (int i = 1; i <= stLevel_.AMSLevel; i++) { - MAP_STR_STR params; - int onStopWantCount = 1; - params["targetBundle"] = bundleName3; - params["targetAbility"] = abilityNameBase; - Want want = STAbilityUtil::MakeWant("device", sixthAbilityName, bundleName2, params); - STAbilityUtil::StartAbility(want, abilityMs); - EXPECT_EQ(STAbilityUtil::WaitCompleted(abilityEvent, sixthAbilityName + g_onAbilityActive, 0), 0); - EXPECT_EQ(STAbilityUtil::WaitCompleted(abilityEvent, sixthAbilityName + g_onAbilityInactive, 0), 0); - EXPECT_EQ( - STAbilityUtil::WaitCompleted(abilityEvent, abilityNameBase + g_abilityStateOnActive, onStopWantCount), 0); - EXPECT_EQ(STAbilityUtil::WaitCompleted(abilityEvent, sixthAbilityName + g_onAbilityBackground, 0), 0); - STAbilityUtil::StopAbility(terminatePageAbility, 0, abilityNameBase); - EXPECT_EQ(STAbilityUtil::WaitCompleted(abilityEvent, sixthAbilityName + g_onAbilityActive, 0), 0); - EXPECT_EQ( - STAbilityUtil::WaitCompleted(abilityEvent, abilityNameBase + g_abilityStateOnStop, onStopWantCount), 0); - - CleanMsg(); - STAbilityUtil::RemoveStack(1, abilityMs, WAIT_TIME, WAIT_LAUNCHER_OK); - } -} \ No newline at end of file diff --git a/test/systemtest/common/ams/ams_page_ability_test/ams_page_ability_test.cpp b/test/systemtest/common/ams/ams_page_ability_test/ams_page_ability_test.cpp index 00988b712d7..f7e2f859586 100644 --- a/test/systemtest/common/ams/ams_page_ability_test/ams_page_ability_test.cpp +++ b/test/systemtest/common/ams/ams_page_ability_test/ams_page_ability_test.cpp @@ -177,7 +177,6 @@ void AmsPageAbilityTest::SetUp(void) void AmsPageAbilityTest::TearDown(void) { GTEST_LOG_(INFO) << "void AmsPageAbilityTest::TearDown(void)"; - STAbilityUtil::RemoveStack(1, abilityMs_, WAIT_TIME, WAIT_LAUNCHER_OK); std::vector vecBundleName; for (const auto &suffix : bundleNameSuffix) { vecBundleName.push_back(bundleNameBase + suffix); diff --git a/test/systemtest/common/ams/ams_power_test/ams_power_test.cpp b/test/systemtest/common/ams/ams_power_test/ams_power_test.cpp index c3448baf711..66b991c7daa 100644 --- a/test/systemtest/common/ams/ams_power_test/ams_power_test.cpp +++ b/test/systemtest/common/ams/ams_power_test/ams_power_test.cpp @@ -159,7 +159,6 @@ void AmsPowerTest::SetUp(void) void AmsPowerTest::TearDown(void) { GTEST_LOG_(INFO) << "void AmsPowerTest::TearDown(void)"; - STAbilityUtil::RemoveStack(1, abilityMs_, WAIT_TIME, WAIT_LAUNCHER_OK); std::vector vecBundleName; for (const auto &suffix : bundleNameSuffix) { vecBundleName.push_back(bundleNameBase + suffix); diff --git a/test/systemtest/common/ams/tool/include/st_ability_util.h b/test/systemtest/common/ams/tool/include/st_ability_util.h index f76e49f317a..6c1647af4e0 100644 --- a/test/systemtest/common/ams/tool/include/st_ability_util.h +++ b/test/systemtest/common/ams/tool/include/st_ability_util.h @@ -272,17 +272,6 @@ public: */ static ErrCode StopServiceAbility(const AAFwk::Want &want, unsigned int usec = 0); - /** - * Remove the specified mission stack by stack id - * - * @param id. - * @param {sptr} abilityMs : Ability Manager Service ptr - * @param {time_t} delay : Waiting time for ability to GetAppProcessInfo (milliseconds) - * @return Returns ERR_OK on success, others on failure. - */ - static int RemoveStack(int id, sptr &abilityMs, const time_t &backHmoeDelay = 0, - const time_t &removeDelay = 0); - /** * * @param {string} bundleFilePath : Hap File Name diff --git a/test/systemtest/common/ams/tool/src/st_ability_util.cpp b/test/systemtest/common/ams/tool/src/st_ability_util.cpp index 06c7694f6e5..f8596103f67 100644 --- a/test/systemtest/common/ams/tool/src/st_ability_util.cpp +++ b/test/systemtest/common/ams/tool/src/st_ability_util.cpp @@ -368,22 +368,6 @@ void STAbilityUtil::PullOperatorFromVector(StOperator &ParentOperator, std::vect } } -int STAbilityUtil::RemoveStack( - int id, sptr &abilityMs, const time_t &backHmoeDelay, const time_t &removeDelay) -{ - Want wantEntity; - wantEntity.AddEntity(Want::FLAG_HOME_INTENT_FROM_SYSTEM); - StartAbility(wantEntity, abilityMs); - std::this_thread::sleep_for(std::chrono::milliseconds(backHmoeDelay)); - if (!abilityMs) { - HILOG_INFO("RemoveStack abilityMs nullptr"); - return OHOS::ERR_INVALID_VALUE; - } - int result = abilityMs->RemoveStack(id); - std::this_thread::sleep_for(std::chrono::milliseconds(removeDelay)); - return result; -} - InstallToolStatusReceiver::InstallToolStatusReceiver() { std::cout << "create status receiver instance" << std::endl; diff --git a/test/systemtest/common/fms/common/include/system_test_form_util.h b/test/systemtest/common/fms/common/include/system_test_form_util.h index 2e4f801581e..3713e801097 100644 --- a/test/systemtest/common/fms/common/include/system_test_form_util.h +++ b/test/systemtest/common/fms/common/include/system_test_form_util.h @@ -258,17 +258,6 @@ public: */ static ErrCode StopServiceAbility(const AAFwk::Want &want, unsigned int usec = 0); - /** - * Remove the specified mission stack by stack id - * - * @param id. - * @param {sptr} abilityMs : Ability Manager Service ptr - * @param {time_t} delay : Waiting time for ability to GetAppProcessInfo (milliseconds) - * @return Returns ERR_OK on success, others on failure. - */ - static int RemoveStack(int id, sptr &abilityMs, const time_t &backHmoeDelay = 0, - const time_t &removeDelay = 0); - /** * * @param {string} bundleFilePath : Hap File Name diff --git a/test/systemtest/common/fms/common/src/system_test_form_util.cpp b/test/systemtest/common/fms/common/src/system_test_form_util.cpp index dd641b8f4d4..6b319666f55 100755 --- a/test/systemtest/common/fms/common/src/system_test_form_util.cpp +++ b/test/systemtest/common/fms/common/src/system_test_form_util.cpp @@ -315,22 +315,6 @@ void SystemTestFormUtil::CleanMsg(FormEvent &event) return event.Clean(); } -int SystemTestFormUtil::RemoveStack( - int id, sptr &abilityMs, const time_t &backHmoeDelay, const time_t &removeDelay) -{ - Want wantEntity; - wantEntity.AddEntity(Want::FLAG_HOME_INTENT_FROM_SYSTEM); - StartAbility(wantEntity, abilityMs); - std::this_thread::sleep_for(std::chrono::milliseconds(backHmoeDelay)); - if (!abilityMs) { - HILOG_INFO("RemoveStack abilityMs nullptr"); - return OHOS::ERR_INVALID_VALUE; - } - int result = abilityMs->RemoveStack(id); - std::this_thread::sleep_for(std::chrono::milliseconds(removeDelay)); - return result; -} - const std::string MSG_SUCCESS = "[SUCCESS]"; void SystemTestFormUtil::Install(const std::string &bundleFilePath, const InstallFlag installFlag) { diff --git a/tools/test/mock/mock_ability_manager_stub.h b/tools/test/mock/mock_ability_manager_stub.h index e900d080e28..1e7275d9eb7 100644 --- a/tools/test/mock/mock_ability_manager_stub.h +++ b/tools/test/mock/mock_ability_manager_stub.h @@ -83,7 +83,6 @@ public: MOCK_METHOD2(GetMissionSnapshot, int(const int32_t missionId, MissionPixelMap &missionPixelMap)); MOCK_METHOD1(MoveMissionToTop, int(int32_t missionId)); MOCK_METHOD1(RemoveMission, int(int id)); - MOCK_METHOD1(RemoveStack, int(int id)); MOCK_METHOD1(KillProcess, int(const std::string &bundleName)); MOCK_METHOD2(UninstallApp, int(const std::string &bundleName, int32_t uid)); -- Gitee