diff --git a/services/common/include/hilog_tag_wrapper.h b/services/common/include/hilog_tag_wrapper.h index c87425eb8379b79758bfccfd06dfcb2a3e9f20a1..15f285de862d8858d71ed79ee5e64eb030919995 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 73b7da4790cda653cf22dc64cfe256d011c5f742..8b9c774a2ddf128fcfef3ecbdb0be4bde650e73c 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 94e39a2e2d635f74e39060736ad1e6b20e591c81..80dec2e76502472f9a3c068d82411fedc92ce49a 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 a084b6676eff0a19afd2703409f37fc362c985d1..13452dbb09bba962eedfd8abb0a21343a88c0680 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 6f326eeea24ecb2fb8daab7ba1fc582fdf8d84bc..f18d1da0384bb64b767891d55e39591797046368 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 63b23513f15b64292b2362dae483cbc5b569108a..1993437d38349b9e528e97024de0f45e85883c64 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 b5b383f74d4ebc55a23726c43b710a50c0fed141..439cc4ba2e3f7eaf3036835e1b89c2758b72f12c 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_;