From a6578e2f5f39be64282598dbf3321bb233dc9555 Mon Sep 17 00:00:00 2001 From: sqc <974827073@qq.com> Date: Wed, 2 Mar 2022 04:06:19 +0000 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E6=BA=90=E6=A3=80=E8=A7=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: sqc <974827073@qq.com> Change-Id: I48bb0f37e4f2e4147283a33e969f554538d57cc5 --- frameworks/kits/test/mock/AMS/mock_ability_manager_service.h | 2 -- .../kits/test/mock/AMS/mock_serviceability_manager_service.h | 2 -- services/abilitymgr/src/ability_connect_manager.cpp | 2 +- .../ability_manager_stub_test/ability_manager_stub_impl_mock.h | 2 -- .../phone/ability_manager_test/ability_manager_stub_mock.h | 2 -- services/test/mock/include/mock_ability_mgr_service.h | 2 -- tools/test/mock/mock_ability_manager_stub.h | 2 -- 7 files changed, 1 insertion(+), 13 deletions(-) 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 af41bc48cc..149f1e14e2 100644 --- a/frameworks/kits/test/mock/AMS/mock_ability_manager_service.h +++ b/frameworks/kits/test/mock/AMS/mock_ability_manager_service.h @@ -142,8 +142,6 @@ public: MOCK_METHOD2(GetExtensionRunningInfos, int(int upperLimit, std::vector &info)); MOCK_METHOD1(GetProcessRunningInfos, int(std::vector &info)); MOCK_METHOD3(StartAbilityByCall, int(const Want &, const sptr &, const sptr &)); - MOCK_METHOD1(StartUser, int(int userId)); - MOCK_METHOD1(StopUser, int(int userId, const sptr&callback)); int MoveMissionToEnd(const sptr &token, const bool nonFirst) override; bool IsFirstInMission(const sptr &token) override; 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 52d5ccb213..8e25026e18 100644 --- a/frameworks/kits/test/mock/AMS/mock_serviceability_manager_service.h +++ b/frameworks/kits/test/mock/AMS/mock_serviceability_manager_service.h @@ -136,8 +136,6 @@ public: MOCK_METHOD1(MoveMissionToFront, int(int32_t missionId)); MOCK_METHOD2(MoveMissionToFront, int(int32_t missionId, const StartOptions &startOptions)); MOCK_METHOD2(SetMissionLabel, int(const sptr &token, const std::string &label)); - MOCK_METHOD1(StartUser, int(int userId)); - MOCK_METHOD1(StopUser, int(int userId, const sptr&callback)); MOCK_METHOD2(GetWantSenderInfo, int(const sptr &target, std::shared_ptr &info)); MOCK_METHOD1(GetAbilityRunningInfos, int(std::vector &info)); MOCK_METHOD2(GetExtensionRunningInfos, int(int upperLimit, std::vector &info)); diff --git a/services/abilitymgr/src/ability_connect_manager.cpp b/services/abilitymgr/src/ability_connect_manager.cpp index a0c52400df..a75fdebec4 100755 --- a/services/abilitymgr/src/ability_connect_manager.cpp +++ b/services/abilitymgr/src/ability_connect_manager.cpp @@ -69,7 +69,7 @@ int AbilityConnectManager::TerminateAbility(const std::shared_ptr }); if (!targetAbility) { - HILOG_ERROR("targetAbility error."); + HILOG_ERROR("targetAbility error."); return NO_FOUND_ABILITY_BY_CALLER; } if (result != ERR_OK) { 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 b8d69fe657..371c0f28f4 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 @@ -58,8 +58,6 @@ public: MOCK_METHOD2(GetExtensionRunningInfos, int(int upperLimit, std::vector &info)); MOCK_METHOD1(GetProcessRunningInfos, int(std::vector &info)); MOCK_METHOD3(StartAbilityByCall, int(const Want &, const sptr &, const sptr &)); - MOCK_METHOD1(StartUser, int(int userId)); - MOCK_METHOD1(StopUser, int(int userId, const sptr&callback)); int InvokeSendRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { 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 e5d11cfeb3..86e8505154 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 @@ -128,8 +128,6 @@ public: { return 0; } - MOCK_METHOD1(StartUser, int(int userId)); - MOCK_METHOD1(StopUser, int(int userId, const sptr&callback)); MOCK_METHOD3(StartContinuation, int(const Want &want, const sptr &abilityToken, int32_t status)); MOCK_METHOD2(NotifyContinuationResult, int(int32_t missionId, int32_t result)); MOCK_METHOD5(ContinueMission, int(const std::string &srcDeviceId, const std::string &dstDeviceId, diff --git a/services/test/mock/include/mock_ability_mgr_service.h b/services/test/mock/include/mock_ability_mgr_service.h index 97ef1fbd1f..044e7defe3 100644 --- a/services/test/mock/include/mock_ability_mgr_service.h +++ b/services/test/mock/include/mock_ability_mgr_service.h @@ -121,8 +121,6 @@ public: MOCK_METHOD2(MoveMissionToFront, int(int32_t missionId, const StartOptions &startOptions)); MOCK_METHOD2(SetMissionLabel, int(const sptr &token, const std::string &label)); MOCK_METHOD1(ClearUpApplicationData, int(const std::string &)); - MOCK_METHOD1(StartUser, int(int userId)); - MOCK_METHOD1(StopUser, int(int userId, const sptr&callback)); MOCK_METHOD2(GetWantSenderInfo, int(const sptr &target, std::shared_ptr &info)); diff --git a/tools/test/mock/mock_ability_manager_stub.h b/tools/test/mock/mock_ability_manager_stub.h index 175713a00c..d5184efe34 100644 --- a/tools/test/mock/mock_ability_manager_stub.h +++ b/tools/test/mock/mock_ability_manager_stub.h @@ -146,8 +146,6 @@ public: MOCK_METHOD1(GetAbilityRunningInfos, int(std::vector &info)); MOCK_METHOD2(GetExtensionRunningInfos, int(int upperLimit, std::vector &info)); MOCK_METHOD1(GetProcessRunningInfos, int(std::vector &info)); - MOCK_METHOD1(StartUser, int(int userId)); - MOCK_METHOD1(StopUser, int(int userId, const sptr&callback)); MOCK_METHOD2(GetWantSenderInfo, int(const sptr &target, std::shared_ptr &info)); virtual int StartAbility(