From 002ae7eaaa001d2f24259e12ff74b66173062099 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=A5=E7=BB=B4?= Date: Fri, 12 Sep 2025 12:52:26 +0800 Subject: [PATCH] =?UTF-8?q?description=EF=BC=9A=E5=88=A0=E9=99=A4=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E5=A5=97=E9=87=8D=E5=A4=8D=E5=AE=9A=E4=B9=89=E7=AC=A6?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 查维 --- services/common/include/hilog_tag_wrapper.h | 2 +- .../ability_manager_service_first_test/BUILD.gn | 3 +-- .../mock/include/mock_permission_verification.h | 6 +++++- .../mock/src/mock_permission_verification.cpp | 15 ++++++++++++++- .../ability_manager_service_sixth_test/BUILD.gn | 3 +-- .../mock/include/mock_permission_verification.h | 6 +++++- .../mock/src/mock_permission_verification.cpp | 15 ++++++++++++++- 7 files changed, 41 insertions(+), 9 deletions(-) diff --git a/services/common/include/hilog_tag_wrapper.h b/services/common/include/hilog_tag_wrapper.h index c87425eb837..15f285de862 100644 --- a/services/common/include/hilog_tag_wrapper.h +++ b/services/common/include/hilog_tag_wrapper.h @@ -190,7 +190,7 @@ inline const char* GetDomainName6(AAFwkLogTag tag) inline std::string GetAbbreviatedFileName(const std::string& fileName) { - std::map abbreviatedFileNameMap { + static std::map abbreviatedFileNameMap { { "ability_manager_client", "AMC" }, { "app_running_manager", "ARM" }, { "ability_connect_manager", "ACM" }, diff --git a/test/unittest/ability_manager_service_first_test/BUILD.gn b/test/unittest/ability_manager_service_first_test/BUILD.gn index 73b7da4790c..8b9c774a2dd 100644 --- a/test/unittest/ability_manager_service_first_test/BUILD.gn +++ b/test/unittest/ability_manager_service_first_test/BUILD.gn @@ -42,6 +42,7 @@ ohos_unittest("ability_manager_service_first_test") { sources = [ "${ability_runtime_path}/services/abilitymgr/src/ability_auto_startup_service.cpp", "${ability_runtime_services_path}/abilitymgr/src/ability_connect_callback_stub.cpp", + "${ability_runtime_services_path}/abilitymgr/src/ability_manager_service.cpp", "${ability_runtime_services_path}/abilitymgr/src/utils/window_options_utils.cpp", "ability_manager_service_first_test.cpp", "mock/src/mock_my_flag.cpp", @@ -56,9 +57,7 @@ ohos_unittest("ability_manager_service_first_test") { "${ability_runtime_innerkits_path}/app_manager:app_manager", "${ability_runtime_innerkits_path}/deps_wrapper:ability_deps_wrapper", "${ability_runtime_native_path}/ability/native:auto_startup_callback", - "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/common:app_util", - "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:task_handler_wrap", "${ability_runtime_test_path}/mock/services_abilitymgr_test/libs/aakit:aakit_mock", ] diff --git a/test/unittest/ability_manager_service_first_test/mock/include/mock_permission_verification.h b/test/unittest/ability_manager_service_first_test/mock/include/mock_permission_verification.h index 94e39a2e2d6..80dec2e7650 100644 --- a/test/unittest/ability_manager_service_first_test/mock/include/mock_permission_verification.h +++ b/test/unittest/ability_manager_service_first_test/mock/include/mock_permission_verification.h @@ -39,7 +39,9 @@ struct VerificationInfo { PermissionVerification() = default; ~PermissionVerification() = default; - bool VerifyCallingPermission(const std::string &permissionName) const; + bool VerifyPermissionByTokenId(const int &tokenId, const std::string &permissionName) const; + + bool VerifyCallingPermission(const std::string &permissionName, const uint32_t specifyTokenId = 0) const; bool IsSACall() const; @@ -95,6 +97,8 @@ struct VerificationInfo { bool VerifyPrepareTerminatePermission() const; + bool VerifyPrepareTerminatePermission(const int &tokenId) const; + bool VerifySetProcessCachePermission() const; }; } // namespace AAFwk diff --git a/test/unittest/ability_manager_service_first_test/mock/src/mock_permission_verification.cpp b/test/unittest/ability_manager_service_first_test/mock/src/mock_permission_verification.cpp index a084b6676ef..13452dbb09b 100644 --- a/test/unittest/ability_manager_service_first_test/mock/src/mock_permission_verification.cpp +++ b/test/unittest/ability_manager_service_first_test/mock/src/mock_permission_verification.cpp @@ -18,10 +18,17 @@ namespace OHOS { namespace AAFwk { -bool PermissionVerification::VerifyCallingPermission(const std::string &permissionName) const +bool PermissionVerification::VerifyPermissionByTokenId(const int &tokenId, const std::string &permissionName) const { return !!(MyFlag::flag_); } + +bool PermissionVerification::VerifyCallingPermission( + const std::string &permissionName, const uint32_t specifyTokenId) const +{ + return !!(MyFlag::flag_); +} + bool PermissionVerification::IsSACall() const { return (MyFlag::flag_ & MyFlag::FLAG::IS_SA_CALL); @@ -120,6 +127,12 @@ bool PermissionVerification::VerifyPrepareTerminatePermission() const { return true; } + +bool PermissionVerification::VerifyPrepareTerminatePermission(const int &tokenId) const +{ + return true; +} + bool PermissionVerification::IsSystemAppCall() const { return true; diff --git a/test/unittest/ability_manager_service_sixth_test/BUILD.gn b/test/unittest/ability_manager_service_sixth_test/BUILD.gn index 6f326eeea24..f18d1da0384 100644 --- a/test/unittest/ability_manager_service_sixth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_sixth_test/BUILD.gn @@ -43,6 +43,7 @@ ohos_unittest("ability_manager_service_sixth_test") { "${ability_runtime_path}/frameworks/native/appkit/ability_bundle_manager_helper/bundle_mgr_helper.cpp", "${ability_runtime_services_path}/abilitymgr/src/ability_cache_manager.cpp", "${ability_runtime_services_path}/abilitymgr/src/ability_connect_callback_stub.cpp", + "${ability_runtime_services_path}/abilitymgr/src/ability_manager_service.cpp", "${ability_runtime_services_path}/abilitymgr/src/scene_board/ui_ability_lifecycle_manager.cpp", "${ability_runtime_services_path}/abilitymgr/src/sub_managers_helper.cpp", "${ability_runtime_services_path}/abilitymgr/src/utils/timeout_state_utils.cpp", @@ -68,12 +69,10 @@ ohos_unittest("ability_manager_service_sixth_test") { "${ability_runtime_native_path}/appkit:appkit_native", "${ability_runtime_path}/utils/global/freeze:freeze_util", "${ability_runtime_path}/utils/server/startup:startup_util", - "${ability_runtime_services_path}/abilitymgr:abilityms", "${ability_runtime_services_path}/abilitymgr:mission_list", "${ability_runtime_services_path}/abilitymgr:wantagent_manager", "${ability_runtime_services_path}/common:app_util", "${ability_runtime_services_path}/common:event_report", - "${ability_runtime_services_path}/common:perm_verification", "${ability_runtime_services_path}/common:record_cost_time_util", "${ability_runtime_services_path}/common:task_handler_wrap", ] diff --git a/test/unittest/ability_manager_service_sixth_test/mock/include/mock_permission_verification.h b/test/unittest/ability_manager_service_sixth_test/mock/include/mock_permission_verification.h index 63b23513f15..1993437d383 100644 --- a/test/unittest/ability_manager_service_sixth_test/mock/include/mock_permission_verification.h +++ b/test/unittest/ability_manager_service_sixth_test/mock/include/mock_permission_verification.h @@ -39,7 +39,9 @@ struct VerificationInfo { PermissionVerification() = default; ~PermissionVerification() = default; - bool VerifyCallingPermission(const std::string &permissionName) const; + bool VerifyPermissionByTokenId(const int &tokenId, const std::string &permissionName) const; + + bool VerifyCallingPermission(const std::string &permissionName, const uint32_t specifyTokenId = 0) const; bool IsSACall() const; @@ -95,6 +97,8 @@ struct VerificationInfo { bool VerifyPrepareTerminatePermission() const; + bool VerifyPrepareTerminatePermission(const int &tokenId) const; + bool VerifySetProcessCachePermission() const; }; } // namespace AAFwk diff --git a/test/unittest/ability_manager_service_sixth_test/mock/src/mock_permission_verification.cpp b/test/unittest/ability_manager_service_sixth_test/mock/src/mock_permission_verification.cpp index b5b383f74d4..439cc4ba2e3 100644 --- a/test/unittest/ability_manager_service_sixth_test/mock/src/mock_permission_verification.cpp +++ b/test/unittest/ability_manager_service_sixth_test/mock/src/mock_permission_verification.cpp @@ -18,10 +18,17 @@ namespace OHOS { namespace AAFwk { -bool PermissionVerification::VerifyCallingPermission(const std::string &permissionName) const +bool PermissionVerification::VerifyPermissionByTokenId(const int &tokenId, const std::string &permissionName) const { return !!(MyFlag::flag_); } + +bool PermissionVerification::VerifyCallingPermission( + const std::string &permissionName, const uint32_t specifyTokenId) const +{ + return !!(MyFlag::flag_); +} + bool PermissionVerification::IsSACall() const { return (MyFlag::flag_ & MyFlag::FLAG::IS_SA_CALL); @@ -123,6 +130,12 @@ bool PermissionVerification::VerifyPrepareTerminatePermission() const { return true; } + +bool PermissionVerification::VerifyPrepareTerminatePermission(const int &tokenId) const +{ + return true; +} + bool PermissionVerification::IsSystemAppCall() const { return MyFlag::systemCallFlag_; -- Gitee