From 5e95cf98a8cb569637e961bb1e8d313b5e2606c0 Mon Sep 17 00:00:00 2001 From: Atsws Date: Fri, 13 Dec 2024 15:26:33 +0800 Subject: [PATCH] test Signed-off-by: Atsws --- .../accesstoken/include/accesstoken_kit.h | 14 -------- .../accesstoken/libaccesstoken_sdk.map | 2 -- .../accesstoken/src/accesstoken_kit.cpp | 10 ------ .../src/accesstoken_kit_extension_test.cpp | 32 ------------------- 4 files changed, 58 deletions(-) diff --git a/interfaces/innerkits/accesstoken/include/accesstoken_kit.h b/interfaces/innerkits/accesstoken/include/accesstoken_kit.h index c366046f0..0442d19bf 100644 --- a/interfaces/innerkits/accesstoken/include/accesstoken_kit.h +++ b/interfaces/innerkits/accesstoken/include/accesstoken_kit.h @@ -429,20 +429,6 @@ public: * @return error code, see access_token_error.h */ static int32_t ClearUserPolicy(); - - /** - * @brief Whether it is a system application - * @param tokenId token id. - * @return bool - */ - static bool IsSystemAppByFullTokenID(uint64_t tokenId); - - /** - * @brief Gets the render process tokenId. - * @param tokenId token id. - * @return tokenId - */ - static uint64_t GetRenderTokenID(uint64_t tokenId); }; } // namespace AccessToken } // namespace Security diff --git a/interfaces/innerkits/accesstoken/libaccesstoken_sdk.map b/interfaces/innerkits/accesstoken/libaccesstoken_sdk.map index 4870dfcd2..7f35bfed9 100644 --- a/interfaces/innerkits/accesstoken/libaccesstoken_sdk.map +++ b/interfaces/innerkits/accesstoken/libaccesstoken_sdk.map @@ -74,8 +74,6 @@ "OHOS::Security::AccessToken::TokenSyncKitInterface::~TokenSyncKitInterface()"; "OHOS::Security::AccessToken::AccessTokenKit::GrantPermissionForSpecifiedTime(unsigned int, std::__h::basic_string, std::__h::allocator> const&, unsigned int)"; "OHOS::Security::AccessToken::AccessTokenKit::GetHapTokenInfoExtension(unsigned int, OHOS::Security::AccessToken::HapTokenInfoExt&)"; - OHOS::Security::AccessToken::AccessTokenKit::IsSystemAppByFullTokenID*; - OHOS::Security::AccessToken::AccessTokenKit::GetRenderTokenID*; ""; ""; }; diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp index eaa4f3d67..7feb24573 100644 --- a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp +++ b/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp @@ -596,16 +596,6 @@ int32_t AccessTokenKit::ClearUserPolicy() ACCESSTOKEN_LOG_INFO(LABEL, "Enter."); return AccessTokenManagerClient::GetInstance().ClearUserPolicy(); } - -bool AccessTokenKit::IsSystemAppByFullTokenID(uint64_t tokenId) -{ - return TokenIdKit::IsSystemAppByFullTokenID(tokenId); -} - -uint64_t AccessTokenKit::GetRenderTokenID(uint64_t tokenId) -{ - return TokenIdKit::GetRenderTokenID(tokenId); -} } // namespace AccessToken } // namespace Security } // namespace OHOS diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_extension_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_extension_test.cpp index 42b8ea258..689a5b530 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_extension_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_extension_test.cpp @@ -2062,38 +2062,6 @@ HWTEST_F(AccessTokenKitExtensionTest, GetRenderTokenIDTest002, TestSize.Level1) ASSERT_EQ(invalidTokenID, retTokenId); } -/** - * @tc.name: IsSystemAppByFullTokenIDTest003 - * @tc.desc: check systemapp level by TokenIDEx after AllocHapToken function set isSystemApp false. - * @tc.type: FUNC - * @tc.require: - */ -HWTEST_F(AccessTokenKitExtensionTest, IsSystemAppByFullTokenIDTest003, TestSize.Level1) -{ - AccessTokenIDEx tokenIdEx = {0}; - tokenIdEx = AccessTokenKit::AllocHapToken(g_infoManagerTestSystemInfoParms, g_infoManagerTestPolicyPrams); - AccessTokenIDEx tokenIdEx1 = AccessTokenKit::GetHapTokenIDEx(1, "accesstoken_test", 0); - ASSERT_EQ(tokenIdEx.tokenIDEx, tokenIdEx1.tokenIDEx); - bool res = AccessTokenKit::IsSystemAppByFullTokenID(tokenIdEx.tokenIDEx); - ASSERT_TRUE(res); - ASSERT_EQ(RET_SUCCESS, AccessTokenKit::DeleteToken(tokenIdEx.tokenIdExStruct.tokenID)); -} - -/** - * @tc.name: GetRenderTokenIDTest003 - * @tc.desc: AccessTokenKit::GetRenderTokenID function test - * @tc.type: FUNC - * @tc.require: - */ -HWTEST_F(AccessTokenKitExtensionTest, GetRenderTokenIDTest003, TestSize.Level1) -{ - uint64_t invalidTokenID = 0; - uint64_t retTokenId = 1; /* 1, for testing purposes */ - - retTokenId = AccessTokenKit::GetRenderTokenID(invalidTokenID); - ASSERT_EQ(invalidTokenID, retTokenId); -} - #ifdef TOKEN_SYNC_ENABLE namespace { class TokenSyncCallbackStubTest : public TokenSyncCallbackStub { -- Gitee