diff --git a/test/unittest/ability_manager_service_first_test/BUILD.gn b/test/unittest/ability_manager_service_first_test/BUILD.gn index 73b7da4790cda653cf22dc64cfe256d011c5f742..6582a8da136f483a149793796244876de0a9bfad 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 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..d7701e4243a833149a6a1b282f31cdeece05b581 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 6f326eeea24ecb2fb8daab7ba1fc582fdf8d84bc..50533785b0d9cdd6f63d9c997ce6eab574c9ca43 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 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..59b1322c3cd947ff9c725ab58aa238b6e22ee134 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_;