From b511837a9eb2a26b43b875ee79d00e68cddde292 Mon Sep 17 00:00:00 2001 From: l00520400 Date: Tue, 1 Mar 2022 19:46:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=89=8D=E7=BD=AE=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: l00520400 Change-Id: I8e6c58efeec286b043c86d80bc4801a8f21e6a5d --- .../unittest/src/accesstoken_kit_test.cpp | 32 ------------------- .../cpp/src/native_token_receptor_test.cpp | 10 ++++-- 2 files changed, 8 insertions(+), 34 deletions(-) diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp index 37d277463..5761c17f3 100644 --- a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp +++ b/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp @@ -3062,36 +3062,4 @@ HWTEST_F(AccessTokenKitTest, GetAllNativeTokenInfo001, TestSize.Level1) HWTEST_F(AccessTokenKitTest, SetRemoteNativeTokenInfo001, TestSize.Level1) { ACCESSTOKEN_LOG_INFO(LABEL, "GetAllNativeTokenInfo001 start."); -} - -HWTEST_F(AccessTokenKitTest, VerifyNativeToken001, TestSize.Level1) -{ - ACCESSTOKEN_LOG_INFO(LABEL, "VerifyNativeToken001 start."); - - const char **dcaps = (const char **)malloc(sizeof(char *) * 1); - dcaps[0] = "AT_CAP_01"; - int dcapNum = 1; - - char apl3[32]; - strcpy(apl3, "system_core"); - char apl2[32]; - strcpy(apl2, "system_basic"); - char apl1[32]; - strcpy(apl1, "normal"); - - uint64_t tokenIdApl3 = GetAccessTokenId("ProcessNativeTokenInfos007_003", dcaps, dcapNum, apl3); - ASSERT_NE(tokenIdApl3, 0); - uint64_t tokenIdApl2 = GetAccessTokenId("ProcessNativeTokenInfos007_002", dcaps, dcapNum, apl2); - ASSERT_NE(tokenIdApl2, 0); - uint64_t tokenIdApl1 = GetAccessTokenId("ProcessNativeTokenInfos007_001", dcaps, dcapNum, apl1); - ASSERT_NE(tokenIdApl1, 0); - ACCESSTOKEN_LOG_INFO(LABEL, "tokenIdApl1 = %{public}llu.", tokenIdApl1); - - const std::string permissionName = "ohos.permission.SEND_MESSAGES"; - int ret = AccessTokenKit::VerifyNativeToken(tokenIdApl3, permissionName); - ASSERT_EQ(ret, PERMISSION_GRANTED); - ret = AccessTokenKit::VerifyNativeToken(tokenIdApl2, permissionName); - ASSERT_EQ(ret, PERMISSION_GRANTED); - ret = AccessTokenKit::VerifyNativeToken(tokenIdApl1, permissionName); - ASSERT_EQ(ret, PERMISSION_DENIED); } \ No newline at end of file diff --git a/services/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_test.cpp b/services/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_test.cpp index 943cf600a..484ef456e 100644 --- a/services/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_test.cpp +++ b/services/accesstokenmanager/test/unittest/cpp/src/native_token_receptor_test.cpp @@ -573,7 +573,7 @@ HWTEST_F(NativeTokenReceptorTest, init001, TestSize.Level1) } /** - * @tc.name: init001 + * @tc.name: ProcessNativeTokenInfos007 * @tc.desc: test get native cfg * @tc.type: FUNC * @tc.require: Issue Number @@ -600,7 +600,13 @@ HWTEST_F(NativeTokenReceptorTest, ProcessNativeTokenInfos007, TestSize.Level1) uint64_t tokenIdApl1 = ::GetAccessTokenId("ProcessNativeTokenInfos007_001", dcaps, dcapNum, apl1); ASSERT_NE(tokenIdApl1, 0); - NativeTokenReceptor::GetInstance().Init(); + NativeTokenReceptor& receptor = NativeTokenReceptor::GetInstance(); + receptor.ready_ = false; + + receptor.Init(); + // wait fresh tokens to sql. + sleep(3); + const std::string permission = "ohos.permission.SEND_MESSAGES"; int ret = PermissionManager::GetInstance().VerifyNativeToken(tokenIdApl3, permission); ASSERT_EQ(ret, PERMISSION_GRANTED); -- Gitee