From 9d0d566e432290f6e4e511767f27c8b88507513a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=A5=E7=BB=B4?= Date: Fri, 12 Sep 2025 12:42:23 +0800 Subject: [PATCH] =?UTF-8?q?description:=E5=88=A0=E9=99=A4=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E5=A5=97=E9=87=8D=E5=A4=8D=E7=AC=A6=E5=8F=B7=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 查维 --- .../ability_manager_service_first_test/BUILD.gn | 1 - .../mock/include/mock_permission_verification.h | 6 +++++- .../mock/src/mock_permission_verification.cpp | 14 +++++++++++++- .../ability_manager_service_sixth_test/BUILD.gn | 1 - .../mock/include/mock_permission_verification.h | 6 +++++- .../mock/src/mock_permission_verification.cpp | 12 +++++++++++- 6 files changed, 34 insertions(+), 6 deletions(-) diff --git a/test/unittest/ability_manager_service_first_test/BUILD.gn b/test/unittest/ability_manager_service_first_test/BUILD.gn index 73b7da4790c..6582a8da136 100644 --- a/test/unittest/ability_manager_service_first_test/BUILD.gn +++ b/test/unittest/ability_manager_service_first_test/BUILD.gn @@ -58,7 +58,6 @@ ohos_unittest("ability_manager_service_first_test") { "${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..d7701e4243a 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,7 +18,13 @@ 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_); } @@ -120,6 +126,12 @@ bool PermissionVerification::VerifyPrepareTerminatePermission() const { return true; } + +bool PermissionVerification::VerifyPrepareTerminatePermission(const int &tokenId) +{ + 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..50533785b0d 100644 --- a/test/unittest/ability_manager_service_sixth_test/BUILD.gn +++ b/test/unittest/ability_manager_service_sixth_test/BUILD.gn @@ -73,7 +73,6 @@ ohos_unittest("ability_manager_service_sixth_test") { "${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..59b1322c3cd 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,7 +18,13 @@ 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_); } @@ -123,6 +129,10 @@ bool PermissionVerification::VerifyPrepareTerminatePermission() const { return true; } +bool PermissionVerification::VerifyPrepareTerminatePermission(const int &tokenId) const +{ + return true; +} bool PermissionVerification::IsSystemAppCall() const { return MyFlag::systemCallFlag_; -- Gitee