From 0ce1f51dc7348c943e25de8e02401bccbcfb987c Mon Sep 17 00:00:00 2001 From: chennian Date: Thu, 16 Jun 2022 16:26:37 +0800 Subject: [PATCH 1/5] Signed-off-by:chennianchennian1@huawei.com Signed-off-by: chennian --- interfaces/innerkits/privacy/test/BUILD.gn | 2 -- .../test/unittest/src/privacy_kit_test.cpp | 18 +----------------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/interfaces/innerkits/privacy/test/BUILD.gn b/interfaces/innerkits/privacy/test/BUILD.gn index e35fc3d4d..e4afdc821 100644 --- a/interfaces/innerkits/privacy/test/BUILD.gn +++ b/interfaces/innerkits/privacy/test/BUILD.gn @@ -24,7 +24,6 @@ ohos_unittest("libprivacy_sdk_test") { "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//base/security/access_token/interfaces/innerkits/nativetoken/include", "//base/security/access_token/interfaces/innerkits/privacy/include", - "//base/security/access_token/interfaces/innerkits/token_setproc/include", "//base/security/access_token/services/privacymanager/include/record", ] @@ -36,7 +35,6 @@ ohos_unittest("libprivacy_sdk_test") { "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken", "//base/security/access_token/interfaces/innerkits/privacy:libprivacy_sdk", - "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", "//base/security/access_token/services/privacymanager:privacy_manager_service", "//utils/native/base:utils", ] diff --git a/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp b/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp index 245e09e7c..14fea4206 100644 --- a/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp +++ b/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp @@ -19,7 +19,6 @@ #include "nativetoken_kit.h" #include "parameter.h" #include "privacy_kit.h" -#include "token_setproc.h" using namespace testing::ext; using namespace OHOS::Security::AccessToken; @@ -53,23 +52,8 @@ static HapInfoParams g_InfoParmsB = { void PrivacyKitTest::SetUpTestCase() { - uint64_t tokenId; - const char **perms = new const char *[1]; - perms[0] = "ohos.permission.PERMISSION_USED_STATS"; - NativeTokenInfoParams infoInstance = { - .dcapsNum = 0, - .permsNum = 1, - .aclsNum = 0, - .dcaps = nullptr, - .perms = perms, - .acls = nullptr, - .processName = "PrivacyKitTest", - .aplStr = "system_core", - }; - tokenId = GetAccessTokenId(&infoInstance); + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.permissionmanager", 0); SetSelfTokenID(tokenId); - - delete[] perms; } void PrivacyKitTest::TearDownTestCase() -- Gitee From 7f0368156ef645314dbb0a69e8a02bcb4ed09ac4 Mon Sep 17 00:00:00 2001 From: chennian Date: Thu, 16 Jun 2022 17:35:27 +0800 Subject: [PATCH 2/5] Signed-off-by:chennianchennian1@huawei.com Signed-off-by: chennian --- .../innerkits/privacy/test/unittest/src/privacy_kit_test.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp b/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp index 14fea4206..b14982325 100644 --- a/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp +++ b/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp @@ -19,6 +19,7 @@ #include "nativetoken_kit.h" #include "parameter.h" #include "privacy_kit.h" +#include "token_setproc.h" using namespace testing::ext; using namespace OHOS::Security::AccessToken; -- Gitee From 7a16d09afe9125014407ad7408450ea909ce1c72 Mon Sep 17 00:00:00 2001 From: chennian Date: Thu, 16 Jun 2022 23:09:47 +0800 Subject: [PATCH 3/5] Signed-off-by:chennianchennian1@huawei.com Signed-off-by: chennian --- interfaces/innerkits/privacy/test/BUILD.gn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interfaces/innerkits/privacy/test/BUILD.gn b/interfaces/innerkits/privacy/test/BUILD.gn index e4afdc821..e35fc3d4d 100644 --- a/interfaces/innerkits/privacy/test/BUILD.gn +++ b/interfaces/innerkits/privacy/test/BUILD.gn @@ -24,6 +24,7 @@ ohos_unittest("libprivacy_sdk_test") { "//base/security/access_token/interfaces/innerkits/accesstoken/include", "//base/security/access_token/interfaces/innerkits/nativetoken/include", "//base/security/access_token/interfaces/innerkits/privacy/include", + "//base/security/access_token/interfaces/innerkits/token_setproc/include", "//base/security/access_token/services/privacymanager/include/record", ] @@ -35,6 +36,7 @@ ohos_unittest("libprivacy_sdk_test") { "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken", "//base/security/access_token/interfaces/innerkits/privacy:libprivacy_sdk", + "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", "//base/security/access_token/services/privacymanager:privacy_manager_service", "//utils/native/base:utils", ] -- Gitee From 362c4d5c958ed90c2a87f6f0cda71f8d0b876e33 Mon Sep 17 00:00:00 2001 From: chennian Date: Fri, 17 Jun 2022 09:58:02 +0800 Subject: [PATCH 4/5] Signed-off-by:chennianchennian1@huawei.com Signed-off-by: chennian --- .../test/unittest/src/privacy_kit_test.cpp | 239 ++++++------------ 1 file changed, 74 insertions(+), 165 deletions(-) diff --git a/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp b/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp index b14982325..22d35ac37 100644 --- a/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp +++ b/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp @@ -51,10 +51,13 @@ static HapInfoParams g_InfoParmsB = { .appIDDesc = "privacy_test.bundleB" }; +static AccessTokenID g_selfTokenId = 0; +static AccessTokenID g_TokenId_A = 0; +static AccessTokenID g_TokenId_B = 0; + void PrivacyKitTest::SetUpTestCase() { - AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.permissionmanager", 0); - SetSelfTokenID(tokenId); + g_selfTokenId = GetSelfTokenID(); } void PrivacyKitTest::TearDownTestCase() @@ -65,10 +68,22 @@ void PrivacyKitTest::SetUp() { AccessTokenKit::AllocHapToken(g_InfoParmsA, g_PolicyPramsA); AccessTokenKit::AllocHapToken(g_InfoParmsB, g_PolicyPramsB); + + g_TokenId_A = AccessTokenKit::GetHapTokenID(g_InfoParmsA.userID, + g_InfoParmsA.bundleName, + g_InfoParmsA.instIndex); + g_TokenId_B = AccessTokenKit::GetHapTokenID(g_InfoParmsB.userID, + g_InfoParmsB.bundleName, + g_InfoParmsB.instIndex); + + AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.permissionmanager", 0); + GTEST_LOG_(INFO) << "tokenId :" << tokenId; + SetSelfTokenID(tokenId); } void PrivacyKitTest::TearDown() { + SetSelfTokenID(g_selfTokenId); AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(g_InfoParmsA.userID, g_InfoParmsA.bundleName, g_InfoParmsA.instIndex); @@ -127,22 +142,16 @@ void PrivacyKitTest::CheckPermissionUsedResult(const PermissionUsedRequest& requ */ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord001, TestSize.Level1) { - int32_t successCount = 1; - int32_t failCount = 0; - AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(g_InfoParmsA.userID, - g_InfoParmsA.bundleName, - g_InfoParmsA.instIndex); - ASSERT_NE(0, tokenId); ASSERT_EQ(RET_ERROR, PrivacyKit::AddPermissionUsedRecord( - 0, "ohos.permission.READ_CONTACTS", successCount, failCount)); - ASSERT_EQ(RET_ERROR, PrivacyKit::AddPermissionUsedRecord(tokenId, "", successCount, failCount)); + 0, "ohos.permission.READ_CONTACTS", 1, 0)); + ASSERT_EQ(RET_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "", 1, 0)); ASSERT_EQ(RET_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId, "ohos.permission.READ_CONTACTS", -1, failCount)); + g_TokenId_A, "ohos.permission.READ_CONTACTS", -1, 0)); PermissionUsedRequest request; PermissionUsedResult result; std::vector permissionList; - BuildQueryRequest(tokenId, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); + BuildQueryRequest(g_TokenId_A, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); ASSERT_EQ(RET_NO_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); ASSERT_EQ(0, result.bundleRecords.size()); } @@ -155,17 +164,9 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord001, TestSize.Level1) */ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord002, TestSize.Level1) { - int32_t successCount = 1; - int32_t failCount = 0; - AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(g_InfoParmsA.userID, - g_InfoParmsA.bundleName, - g_InfoParmsA.instIndex); - ASSERT_NE(0, tokenId); - - ASSERT_EQ(RET_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId, "ohos.permission.test", successCount, failCount)); - ASSERT_EQ(RET_ERROR, PrivacyKit::AddPermissionUsedRecord(123, "ohos.permission.CAMERA", successCount, failCount)); - ASSERT_EQ(RET_ERROR, PrivacyKit::AddPermissionUsedRecord(tokenId, "ohos.permission.READ_CONTACTS", 0, 0)); + ASSERT_EQ(RET_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.test", 1, 0)); + ASSERT_EQ(RET_ERROR, PrivacyKit::AddPermissionUsedRecord(123, "ohos.permission.CAMERA", 1, 0)); + ASSERT_EQ(RET_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.READ_CONTACTS", 0, 0)); PermissionUsedRequest request; PermissionUsedResult result; @@ -174,7 +175,7 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord002, TestSize.Level1) ASSERT_EQ(RET_NO_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); ASSERT_EQ(0, result.bundleRecords.size()); - BuildQueryRequest(tokenId, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); + BuildQueryRequest(g_TokenId_A, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); ASSERT_EQ(RET_NO_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); ASSERT_EQ(0, result.bundleRecords.size()); } @@ -214,10 +215,8 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord003, TestSize.Level1) delete[] dcaps; delete[] acls; - int32_t successCount = 1; - int32_t failCount = 0; ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId, "ohos.permission.READ_CONTACTS", successCount, failCount)); + tokenId, "ohos.permission.READ_CONTACTS", 1, 0)); PermissionUsedRequest request; PermissionUsedResult result; @@ -236,21 +235,14 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord003, TestSize.Level1) */ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord004, TestSize.Level1) { - int32_t count_0 = 0; - int32_t count_1 = 1; - AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(g_InfoParmsA.userID, - g_InfoParmsA.bundleName, - g_InfoParmsA.instIndex); - ASSERT_NE(0, tokenId); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(tokenId, "ohos.permission.CAMERA", count_1, count_0)); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId, "ohos.permission.WRITE_CONTACTS", count_0, count_1)); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(tokenId, "ohos.permission.LOCATION", count_1, count_1)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.CAMERA", 1, 0)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.WRITE_CONTACTS", 0, 1)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.LOCATION", 1, 1)); PermissionUsedRequest request; PermissionUsedResult result; std::vector permissionList; - BuildQueryRequest(tokenId, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); + BuildQueryRequest(g_TokenId_A, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); ASSERT_EQ(RET_NO_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); ASSERT_EQ(1, result.bundleRecords.size()); @@ -265,35 +257,23 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord004, TestSize.Level1) */ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord005, TestSize.Level1) { - int32_t count_0 = 0; - int32_t count_1 = 1; - AccessTokenID tokenId1 = AccessTokenKit::GetHapTokenID(g_InfoParmsA.userID, - g_InfoParmsA.bundleName, - g_InfoParmsA.instIndex); - ASSERT_NE(0, tokenId1); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(tokenId1, "ohos.permission.CAMERA", count_1, count_0)); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId1, "ohos.permission.LOCATION", count_0, count_1)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.CAMERA", 1, 0)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.LOCATION", 0, 1)); - AccessTokenID tokenId2 = AccessTokenKit::GetHapTokenID(g_InfoParmsB.userID, - g_InfoParmsB.bundleName, - g_InfoParmsB.instIndex); - ASSERT_NE(0, tokenId2); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(tokenId2, "ohos.permission.CAMERA", count_0, count_1)); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId2, "ohos.permission.LOCATION", count_1, count_0)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_B, "ohos.permission.CAMERA", 0, 1)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_B, "ohos.permission.LOCATION", 1, 0)); PermissionUsedRequest request; PermissionUsedResult result; std::vector permissionList; - BuildQueryRequest(tokenId1, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); + BuildQueryRequest(g_TokenId_A, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); ASSERT_EQ(RET_NO_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); ASSERT_EQ(1, result.bundleRecords.size()); CheckPermissionUsedResult(request, result, 2, 1, 1); - BuildQueryRequest(tokenId2, GetLocalDeviceUdid(), g_InfoParmsB.bundleName, permissionList, request); + BuildQueryRequest(g_TokenId_B, GetLocalDeviceUdid(), g_InfoParmsB.bundleName, permissionList, request); ASSERT_EQ(RET_NO_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); ASSERT_EQ(1, result.bundleRecords.size()); @@ -308,21 +288,15 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord005, TestSize.Level1) */ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord006, TestSize.Level1) { - int32_t count_0 = 0; - int32_t count_1 = 1; - AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(g_InfoParmsA.userID, - g_InfoParmsA.bundleName, - g_InfoParmsA.instIndex); - ASSERT_NE(0, tokenId); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(tokenId, "ohos.permission.CAMERA", count_1, count_0)); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(tokenId, "ohos.permission.CAMERA", count_1, count_0)); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(tokenId, "ohos.permission.CAMERA", count_1, count_0)); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(tokenId, "ohos.permission.CAMERA", count_1, count_0)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.CAMERA", 1, 0)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.CAMERA", 1, 0)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.CAMERA", 1, 0)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.CAMERA", 1, 0)); PermissionUsedRequest request; PermissionUsedResult result; std::vector permissionList; - BuildQueryRequest(tokenId, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); + BuildQueryRequest(g_TokenId_A, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); request.flag = FLAG_PERMISSION_USAGE_DETAIL; ASSERT_EQ(RET_NO_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); @@ -332,7 +306,7 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord006, TestSize.Level1) CheckPermissionUsedResult(request, result, 1, 4, 0); sleep(61); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(tokenId, "ohos.permission.CAMERA", count_1, count_0)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.CAMERA", 1, 0)); ASSERT_EQ(RET_NO_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); @@ -362,20 +336,13 @@ HWTEST_F(PrivacyKitTest, RemovePermissionUsedRecords001, TestSize.Level1) */ HWTEST_F(PrivacyKitTest, RemovePermissionUsedRecords002, TestSize.Level1) { - int32_t successCount = 1; - int32_t failCount = 0; - AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(g_InfoParmsA.userID, - g_InfoParmsA.bundleName, - g_InfoParmsA.instIndex); - ASSERT_NE(0, tokenId); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId, "ohos.permission.CAMERA", successCount, failCount)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.CAMERA", 1, 0)); PermissionUsedRequest request; PermissionUsedResult result; std::vector permissionList; - BuildQueryRequest(tokenId, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); + BuildQueryRequest(g_TokenId_A, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::RemovePermissionUsedRecords(tokenId, "invalid_device")); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::RemovePermissionUsedRecords(g_TokenId_A, "invalid_device")); ASSERT_EQ(RET_NO_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); ASSERT_EQ(1, result.bundleRecords.size()); @@ -392,20 +359,13 @@ HWTEST_F(PrivacyKitTest, RemovePermissionUsedRecords002, TestSize.Level1) */ HWTEST_F(PrivacyKitTest, RemovePermissionUsedRecords003, TestSize.Level1) { - int32_t successCount = 1; - int32_t failCount = 0; - AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(g_InfoParmsA.userID, - g_InfoParmsA.bundleName, - g_InfoParmsA.instIndex); - ASSERT_NE(0, tokenId); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId, "ohos.permission.CAMERA", successCount, failCount)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.CAMERA", 1, 0)); PermissionUsedRequest request; PermissionUsedResult result; std::vector permissionList; - BuildQueryRequest(tokenId, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); + BuildQueryRequest(g_TokenId_A, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::RemovePermissionUsedRecords(tokenId, "")); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::RemovePermissionUsedRecords(g_TokenId_A, "")); ASSERT_EQ(RET_NO_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); ASSERT_EQ(0, result.bundleRecords.size()); } @@ -418,18 +378,11 @@ HWTEST_F(PrivacyKitTest, RemovePermissionUsedRecords003, TestSize.Level1) */ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords001, TestSize.Level1) { - int32_t successCount = 1; - int32_t failCount = 0; - AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(g_InfoParmsA.userID, - g_InfoParmsA.bundleName, - g_InfoParmsA.instIndex); - ASSERT_NE(0, tokenId); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId, "ohos.permission.MICROPHONE", successCount, failCount)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.MICROPHONE", 1, 0)); PermissionUsedRequest request; PermissionUsedResult result; std::vector permissionList; - BuildQueryRequest(tokenId, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); + BuildQueryRequest(g_TokenId_A, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); request.beginTimeMillis = -1; request.endTimeMillis = -1; ASSERT_EQ(RET_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); @@ -447,24 +400,15 @@ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords001, TestSize.Level1) */ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords002, TestSize.Level1) { - int32_t successCount = 1; - int32_t failCount = 0; - AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(g_InfoParmsA.userID, - g_InfoParmsA.bundleName, - g_InfoParmsA.instIndex); - ASSERT_NE(0, tokenId); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId, "ohos.permission.MICROPHONE", successCount, failCount)); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId, "ohos.permission.CAMERA", successCount, failCount)); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId, "ohos.permission.READ_CALENDAR", successCount, failCount)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.MICROPHONE", 1, 0)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.CAMERA", 1, 0)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.READ_CALENDAR", 1, 0)); PermissionUsedRequest request; PermissionUsedResult result; std::vector permissionList; // query by tokenId - BuildQueryRequest(tokenId, "", "", permissionList, request); + BuildQueryRequest(g_TokenId_A, "", "", permissionList, request); ASSERT_EQ(RET_NO_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); ASSERT_EQ(1, result.bundleRecords.size()); request.deviceId = GetLocalDeviceUdid(); @@ -475,7 +419,7 @@ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords002, TestSize.Level1) BuildQueryRequest(0, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); ASSERT_EQ(RET_NO_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); ASSERT_EQ(1, result.bundleRecords.size()); - request.tokenId = tokenId; + request.tokenId = g_TokenId_A; CheckPermissionUsedResult(request, result, 3, 3, 0); // query by unmatched tokenId, deviceId and bundle Name @@ -484,12 +428,12 @@ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords002, TestSize.Level1) ASSERT_EQ(0, result.bundleRecords.size()); // query by unmatched tokenId, deviceId and bundle Name - BuildQueryRequest(tokenId, "local device", g_InfoParmsA.bundleName, permissionList, request); + BuildQueryRequest(g_TokenId_A, "local device", g_InfoParmsA.bundleName, permissionList, request); ASSERT_EQ(RET_NO_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); ASSERT_EQ(0, result.bundleRecords.size()); // query by unmatched tokenId, deviceId and bundle Name - BuildQueryRequest(tokenId, GetLocalDeviceUdid(), "bundleA", permissionList, request); + BuildQueryRequest(g_TokenId_A, GetLocalDeviceUdid(), "bundleA", permissionList, request); ASSERT_EQ(RET_NO_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); ASSERT_EQ(0, result.bundleRecords.size()); } @@ -502,37 +446,24 @@ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords002, TestSize.Level1) */ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords003, TestSize.Level1) { - int32_t successCount = 1; - int32_t failCount = 0; - AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(g_InfoParmsA.userID, - g_InfoParmsA.bundleName, - g_InfoParmsA.instIndex); - ASSERT_NE(0, tokenId); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId, "ohos.permission.MICROPHONE", successCount, failCount)); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId, "ohos.permission.MICROPHONE", successCount, failCount)); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId, "ohos.permission.MICROPHONE", successCount, failCount)); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId, "ohos.permission.MICROPHONE", successCount, failCount)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.MICROPHONE", 1, 0)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.MICROPHONE", 1, 0)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.MICROPHONE", 1, 0)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.MICROPHONE", 1, 0)); PermissionUsedRequest request; PermissionUsedResult result; std::vector permissionList; - BuildQueryRequest(tokenId, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); + BuildQueryRequest(g_TokenId_A, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); ASSERT_EQ(RET_NO_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); ASSERT_EQ(1, result.bundleRecords.size()); CheckPermissionUsedResult(request, result, 1, 4, 0); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId, "ohos.permission.CAMERA", successCount, failCount)); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId, "ohos.permission.READ_CALENDAR", successCount, failCount)); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId, "ohos.permission.WRITE_CALENDAR", successCount, failCount)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.CAMERA", 1, 0)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.READ_CALENDAR", 1, 0)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.WRITE_CALENDAR", 1, 0)); - BuildQueryRequest(tokenId, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); + BuildQueryRequest(g_TokenId_A, GetLocalDeviceUdid(), g_InfoParmsA.bundleName, permissionList, request); ASSERT_EQ(RET_NO_ERROR, PrivacyKit::GetPermissionUsedRecords(request, result)); ASSERT_EQ(1, result.bundleRecords.size()); CheckPermissionUsedResult(request, result, 4, 7, 0); @@ -546,22 +477,10 @@ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords003, TestSize.Level1) */ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords004, TestSize.Level1) { - int32_t successCount = 1; - int32_t failCount = 0; - AccessTokenID tokenId1 = AccessTokenKit::GetHapTokenID(g_InfoParmsA.userID, - g_InfoParmsA.bundleName, - g_InfoParmsA.instIndex); - AccessTokenID tokenId2 = AccessTokenKit::GetHapTokenID(g_InfoParmsB.userID, - g_InfoParmsB.bundleName, - g_InfoParmsB.instIndex); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId1, "ohos.permission.CAMERA", successCount, failCount)); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId1, "ohos.permission.READ_CALENDAR", successCount, failCount)); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId2, "ohos.permission.CAMERA", successCount, failCount)); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord( - tokenId2, "ohos.permission.READ_CALENDAR", successCount, failCount)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.CAMERA", 1, 0)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, "ohos.permission.READ_CALENDAR", 1, 0)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_B, "ohos.permission.CAMERA", 1, 0)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_B, "ohos.permission.READ_CALENDAR", 1, 0)); PermissionUsedRequest request; PermissionUsedResult result; @@ -582,16 +501,11 @@ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords004, TestSize.Level1) */ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecordsAsync001, TestSize.Level1) { - int32_t successCount = 1; - int32_t failCount = 0; std::string permission = "ohos.permission.CAMERA"; - AccessTokenID tokenID = AccessTokenKit::GetHapTokenID(g_InfoParmsA.userID, - g_InfoParmsA.bundleName, - g_InfoParmsA.instIndex); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(tokenID, permission, successCount, failCount)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, permission, 1, 0)); PermissionUsedRequest request; std::vector permissionList; - BuildQueryRequest(tokenID, GetLocalDeviceUdid(), "", permissionList, request); + BuildQueryRequest(g_TokenId_A, GetLocalDeviceUdid(), "", permissionList, request); request.beginTimeMillis = -1; request.endTimeMillis = -1; OHOS::sptr callback(new TestCallBack()); @@ -606,16 +520,11 @@ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecordsAsync001, TestSize.Level1) */ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecordsAsync002, TestSize.Level1) { - int32_t successCount = 1; - int32_t failCount = 0; std::string permission = "ohos.permission.CAMERA"; - AccessTokenID tokenID = AccessTokenKit::GetHapTokenID(g_InfoParmsA.userID, - g_InfoParmsA.bundleName, - g_InfoParmsA.instIndex); - ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(tokenID, permission, successCount, failCount)); + ASSERT_EQ(RET_NO_ERROR, PrivacyKit::AddPermissionUsedRecord(g_TokenId_A, permission, 1, 0)); PermissionUsedRequest request; std::vector permissionList; - BuildQueryRequest(tokenID, GetLocalDeviceUdid(), "", permissionList, request); + BuildQueryRequest(g_TokenId_A, GetLocalDeviceUdid(), "", permissionList, request); OHOS::sptr callback(new TestCallBack()); ASSERT_EQ(RET_NO_ERROR, PrivacyKit::GetPermissionUsedRecords(request, callback)); } \ No newline at end of file -- Gitee From f62b5c91ccbbead34cdb3ff5d5395b0ef8036ea5 Mon Sep 17 00:00:00 2001 From: chennian Date: Fri, 17 Jun 2022 10:08:44 +0800 Subject: [PATCH 5/5] Signed-off-by:chennianchennian1@huawei.com Signed-off-by: chennian --- .../innerkits/privacy/test/unittest/src/privacy_kit_test.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp b/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp index 22d35ac37..836f66420 100644 --- a/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp +++ b/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp @@ -77,7 +77,6 @@ void PrivacyKitTest::SetUp() g_InfoParmsB.instIndex); AccessTokenID tokenId = AccessTokenKit::GetHapTokenID(100, "com.ohos.permissionmanager", 0); - GTEST_LOG_(INFO) << "tokenId :" << tokenId; SetSelfTokenID(tokenId); } -- Gitee