From 87d172b700221d7429f26f84bc311c3ad41dbc04 Mon Sep 17 00:00:00 2001 From: cc_ggboy Date: Wed, 7 Sep 2022 15:57:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=9A=90=E7=A7=81=E6=96=B0=E5=A2=9ETDD?= =?UTF-8?q?=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cc_ggboy --- .../test/unittest/src/privacy_kit_test.cpp | 243 +++++++++++++++--- 1 file changed, 211 insertions(+), 32 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 607b4e066..78709a6e2 100644 --- a/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp +++ b/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp @@ -221,7 +221,7 @@ static void DeleteTokenID(std::vector& g_InfoParms_List) * @tc.name: AddPermissionUsedRecord001 * @tc.desc: cannot AddPermissionUsedRecord with illegal tokenId and permission. * @tc.type: FUNC - * @tc.require: issueI5P4IU + * @tc.require:Issue Number */ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord001, TestSize.Level1) { @@ -243,7 +243,7 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord001, TestSize.Level1) * @tc.name: AddPermissionUsedRecord002 * @tc.desc: cannot AddPermissionUsedRecord with invalid tokenId and permission. * @tc.type: FUNC - * @tc.require: issueI5P4IU + * @tc.require:Issue Number */ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord002, TestSize.Level1) { @@ -267,7 +267,7 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord002, TestSize.Level1) * @tc.name: AddPermissionUsedRecord003 * @tc.desc: cannot AddPermissionUsedRecord with native tokenId. * @tc.type: FUNC - * @tc.require: issueI5P4IU + * @tc.require:Issue Number */ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord003, TestSize.Level1) { @@ -314,7 +314,7 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord003, TestSize.Level1) * @tc.name: AddPermissionUsedRecord004 * @tc.desc: AddPermissionUsedRecord user_grant permission. * @tc.type: FUNC - * @tc.require: issueI5P4IU + * @tc.require:Issue Number */ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord004, TestSize.Level1) { @@ -336,7 +336,7 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord004, TestSize.Level1) * @tc.name: AddPermissionUsedRecord005 * @tc.desc: AddPermissionUsedRecord user_grant permission. * @tc.type: FUNC - * @tc.require: issueI5P4IU + * @tc.require:Issue Number */ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord005, TestSize.Level1) { @@ -367,7 +367,7 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord005, TestSize.Level1) * @tc.name: AddPermissionUsedRecord006 * @tc.desc: AddPermissionUsedRecord permission combine records. * @tc.type: FUNC - * @tc.require: issueI5P4IU + * @tc.require:Issue Number */ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord006, TestSize.Level1) { @@ -404,7 +404,7 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord006, TestSize.Level1) * @tc.name: AddPermissionUsedRecord007 * @tc.desc: AddPermissionUsedRecord user_grant permission. * @tc.type: FUNC - * @tc.require: issueI5P4IU + * @tc.require:Issue Number */ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord007, TestSize.Level1) { @@ -449,7 +449,7 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord007, TestSize.Level1) * @tc.name: RemovePermissionUsedRecords001 * @tc.desc: cannot RemovePermissionUsedRecords with illegal tokenId and deviceID. * @tc.type: FUNC - * @tc.require: issueI5P4IU + * @tc.require:Issue Number */ HWTEST_F(PrivacyKitTest, RemovePermissionUsedRecords001, TestSize.Level1) { @@ -460,7 +460,7 @@ HWTEST_F(PrivacyKitTest, RemovePermissionUsedRecords001, TestSize.Level1) * @tc.name: RemovePermissionUsedRecords002 * @tc.desc: RemovePermissionUsedRecords with invalid tokenId and deviceID. * @tc.type: FUNC - * @tc.require: issueI5P4IU + * @tc.require:Issue Number */ HWTEST_F(PrivacyKitTest, RemovePermissionUsedRecords002, TestSize.Level1) { @@ -483,7 +483,7 @@ HWTEST_F(PrivacyKitTest, RemovePermissionUsedRecords002, TestSize.Level1) * @tc.name: RemovePermissionUsedRecords003 * @tc.desc: RemovePermissionUsedRecords with valid tokenId and deviceID. * @tc.type: FUNC - * @tc.require: issueI5P4IU + * @tc.require:Issue Number */ HWTEST_F(PrivacyKitTest, RemovePermissionUsedRecords003, TestSize.Level1) { @@ -502,7 +502,7 @@ HWTEST_F(PrivacyKitTest, RemovePermissionUsedRecords003, TestSize.Level1) * @tc.name: GetPermissionUsedRecords001 * @tc.desc: cannot GetPermissionUsedRecords with invalid query time. * @tc.type: FUNC - * @tc.require: issueI5P4IU + * @tc.require:Issue Number */ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords001, TestSize.Level1) { @@ -527,7 +527,7 @@ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords001, TestSize.Level1) * @tc.name: GetPermissionUsedRecords002 * @tc.desc: cannot GetPermissionUsedRecords with valid query time. * @tc.type: FUNC - * @tc.require: issueI5P4IU + * @tc.require:Issue Number */ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords002, TestSize.Level1) { @@ -563,7 +563,7 @@ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords002, TestSize.Level1) * @tc.name: GetPermissionUsedRecords003 * @tc.desc: can GetPermissionUsedRecords with valid query time. * @tc.type: FUNC - * @tc.require: issueI5P4IU + * @tc.require:Issue Number */ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords003, TestSize.Level1) { @@ -594,7 +594,7 @@ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords003, TestSize.Level1) * @tc.name: GetPermissionUsedRecords004 * @tc.desc: can GetPermissionUsedRecords with valid query time. * @tc.type: FUNC - * @tc.require: issueI5P4IU + * @tc.require:Issue Number */ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords004, TestSize.Level1) { @@ -618,7 +618,7 @@ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords004, TestSize.Level1) * @tc.name: GetPermissionUsedRecordsAsync001 * @tc.desc: cannot GetPermissionUsedRecordsAsync with invalid query time. * @tc.type: FUNC - * @tc.require: issueI5P4IU + * @tc.require:Issue Number */ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecordsAsync001, TestSize.Level1) { @@ -637,7 +637,7 @@ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecordsAsync001, TestSize.Level1) * @tc.name: GetPermissionUsedRecordsAsync002 * @tc.desc: cannot GetPermissionUsedRecordsAsync with valid query time. * @tc.type: FUNC - * @tc.require: issueI5P4IU + * @tc.require:Issue Number */ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecordsAsync002, TestSize.Level1) { @@ -702,7 +702,7 @@ public: * @tc.name: RegisterPermActiveStatusCallback001 * @tc.desc: RegisterPermActiveStatusCallback with valid permission. * @tc.type: FUNC - * @tc.require: issueI5NT1X issueI5P4IU + * @tc.require: issueI5NT1X */ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback001, TestSize.Level1) { @@ -717,7 +717,7 @@ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback001, TestSize.Level1) ASSERT_EQ(RET_NO_ERROR, res); usleep(500000); // 500000us = 0.5s - ASSERT_EQ(PERM_ACTIVE_IN_FOREGROUND, callbackPtr->type_); + ASSERT_EQ(PERM_ACTIVE_IN_BACKGROUND, callbackPtr->type_); res = PrivacyKit::StopUsingPermission(g_TokenId_E, "ohos.permission.CAMERA"); ASSERT_EQ(RET_NO_ERROR, res); @@ -742,7 +742,7 @@ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback001, TestSize.Level1) * @tc.name: RegisterPermActiveStatusCallback002 * @tc.desc: RegisterPermActiveStatusCallback with valid permission. * @tc.type: FUNC - * @tc.require: issueI5NT1X issueI5P4IU + * @tc.require: issueI5NT1X */ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback002, TestSize.Level1) @@ -762,7 +762,7 @@ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback002, TestSize.Level1) ASSERT_EQ(RET_NO_ERROR, res); usleep(500000); // 500000us = 0.5s - ASSERT_EQ(PERM_ACTIVE_IN_FOREGROUND, callbackPtr1->type_); + ASSERT_EQ(PERM_ACTIVE_IN_BACKGROUND, callbackPtr1->type_); ASSERT_EQ(PERM_INACTIVE, callbackPtr2->type_); res = PrivacyKit::StopUsingPermission(g_TokenId_E, "ohos.permission.CAMERA"); @@ -776,7 +776,7 @@ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback002, TestSize.Level1) usleep(500000); // 500000us = 0.5s ASSERT_EQ(PERM_INACTIVE, callbackPtr1->type_); - ASSERT_EQ(PERM_ACTIVE_IN_FOREGROUND, callbackPtr2->type_); + ASSERT_EQ(PERM_ACTIVE_IN_BACKGROUND, callbackPtr2->type_); res = PrivacyKit::StopUsingPermission(g_TokenId_E, "ohos.permission.MICROPHONE"); ASSERT_EQ(RET_NO_ERROR, res); @@ -790,11 +790,190 @@ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback002, TestSize.Level1) ASSERT_EQ(RET_NO_ERROR, res); } +/** + * @tc.name: RegisterPermActiveStatusCallback003 + * @tc.desc: RegisterPermActiveStatusCallback empty permission name + * @tc.type: FUNC + * @tc.require:IssueI5PHM0 + */ + +HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback003, TestSize.Level1) +{ + std::vector permList = {}; + auto callbackPtr = std::make_shared(permList); + callbackPtr->type_ = PERM_INACTIVE; + + int32_t res = PrivacyKit::RegisterPermActiveStatusCallback(callbackPtr); + ASSERT_EQ(RET_NO_ERROR, res); + res = PrivacyKit::StartUsingPermission(g_TokenId_E, "ohos.permission.CAMERA"); + ASSERT_EQ(RET_NO_ERROR, res); + ASSERT_EQ(PERM_ACTIVE_IN_BACKGROUND, callbackPtr->type_); + res = PrivacyKit::StopUsingPermission(g_TokenId_E, "ohos.permission.CAMERA"); + ASSERT_EQ(RET_NO_ERROR, res); + ASSERT_EQ(PERM_INACTIVE, callbackPtr->type_); + + res = PrivacyKit::UnRegisterPermActiveStatusCallback(callbackPtr); + ASSERT_EQ(RET_NO_ERROR, res); + callbackPtr->type_ = PERM_INACTIVE; + res = PrivacyKit::StartUsingPermission(g_TokenId_E, "ohos.permission.CAMERA"); + ASSERT_EQ(RET_NO_ERROR, res); + ASSERT_EQ(PERM_INACTIVE, callbackPtr->type_); +} + +/** + * @tc.name: RegisterPermActiveStatusCallback004 + * @tc.desc: RegisterPermActiveStatusCallback repeatedly register a permission + * @tc.type: FUNC + * @tc.require:IssueI5PHM0 + */ +HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback004, TestSize.Level1) +{ + std::vector permList = {"ohos.permission.CAMERA"}; + auto callbackPtr = std::make_shared(permList); + callbackPtr->type_ = PERM_INACTIVE; + + int32_t res = PrivacyKit::RegisterPermActiveStatusCallback(callbackPtr); + ASSERT_EQ(RET_NO_ERROR, res); + res = PrivacyKit::StartUsingPermission(g_TokenId_E, "ohos.permission.CAMERA"); + ASSERT_EQ(RET_NO_ERROR, res); + ASSERT_EQ(PERM_ACTIVE_IN_BACKGROUND, callbackPtr->type_); + res = PrivacyKit::StopUsingPermission(g_TokenId_E, "ohos.permission.CAMERA"); + ASSERT_EQ(RET_NO_ERROR, res); + ASSERT_EQ(PERM_INACTIVE, callbackPtr->type_); + + res = PrivacyKit::RegisterPermActiveStatusCallback(callbackPtr); + ASSERT_EQ(RET_ERROR, res); + res = PrivacyKit::StartUsingPermission(g_TokenId_E, "ohos.permission.CAMERA"); + ASSERT_EQ(RET_NO_ERROR, res); + ASSERT_EQ(PERM_ACTIVE_IN_BACKGROUND, callbackPtr->type_); + res = PrivacyKit::StopUsingPermission(g_TokenId_E, "ohos.permission.CAMERA"); + ASSERT_EQ(RET_NO_ERROR, res); + ASSERT_EQ(PERM_INACTIVE, callbackPtr->type_); + + res = PrivacyKit::UnRegisterPermActiveStatusCallback(callbackPtr); + ASSERT_EQ(RET_NO_ERROR, res); +} + +/** + * @tc.name: RegisterPermActiveStatusCallback005 + * @tc.desc: RegisterPermActiveStatusCallback repeatedly cancel monitoring a permission + * @tc.type: FUNC + * @tc.require:IssueI5PHM0 + */ +HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback005, TestSize.Level1) +{ + std::vector permList = {"ohos.permission.CAMERA"}; + auto callbackPtr = std::make_shared(permList); + callbackPtr->type_ = PERM_INACTIVE; + int32_t res = PrivacyKit::RegisterPermActiveStatusCallback(callbackPtr); + ASSERT_EQ(RET_NO_ERROR, res); + + res = PrivacyKit::UnRegisterPermActiveStatusCallback(callbackPtr); + ASSERT_EQ(RET_NO_ERROR, res); + callbackPtr->type_ = PERM_INACTIVE; + res = PrivacyKit::UnRegisterPermActiveStatusCallback(callbackPtr); + ASSERT_EQ(RET_ERROR, res); + callbackPtr->type_ = PERM_INACTIVE; + + res = PrivacyKit::StartUsingPermission(g_TokenId_E, "ohos.permission.CAMERA"); + ASSERT_EQ(RET_NO_ERROR, res); + ASSERT_EQ(PERM_INACTIVE, callbackPtr->type_); + res = PrivacyKit::StopUsingPermission(g_TokenId_E, "ohos.permission.CAMERA"); + ASSERT_EQ(RET_NO_ERROR, res); + ASSERT_EQ(PERM_INACTIVE, callbackPtr->type_); +} + +/** + * @tc.name: RegisterPermActiveStatusCallback006 + * @tc.desc: RegisterPermActiveStatusCallback registering invalid permissions + * @tc.type: FUNC + * @tc.require:IssueI5PHM0 + */ +HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback006, TestSize.Level1) +{ + std::vector permList = {"ohos.permission.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}; + + auto callbackPtr = std::make_shared(permList); + callbackPtr->type_ = PERM_INACTIVE; + int32_t res = PrivacyKit::RegisterPermActiveStatusCallback(callbackPtr); + ASSERT_EQ(RET_ERROR, res); +} + +/** + * @tc.name: UnRegisterPermActiveStatusCallback007 + * @tc.desc: UnRegisterPermActiveStatusCallback cancel unregistered permissions + * @tc.type: FUNC + * @tc.require:IssueI5PHM0 + */ +HWTEST_F(PrivacyKitTest, UnRegisterPermActiveStatusCallback007, TestSize.Level1) +{ + std::vector permList = {"ohos.permission.CAMERA"}; + + auto callbackPtr = std::make_shared(permList); + callbackPtr->type_ = PERM_INACTIVE; + int32_t res = PrivacyKit::UnRegisterPermActiveStatusCallback(callbackPtr); + ASSERT_EQ(RET_ERROR, res); +} + +/** + * @tc.name: RegisterPermActiveStatusCallback008 + * @tc.desc: RegisterPermActiveStatusCallback registering invalid permissions + * @tc.type: FUNC + * @tc.require:IssueI5PHM0 + */ +HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback008, TestSize.Level1) +{ + std::vector permList = {"ohos.permission.INVALID"}; + + auto callbackPtr = std::make_shared(permList); + callbackPtr->type_ = PERM_INACTIVE; + int32_t res = PrivacyKit::RegisterPermActiveStatusCallback(callbackPtr); + ASSERT_EQ(RET_ERROR, res); +} + +/** + * @tc.name: RegisterPermActiveStatusCallback009 + * @tc.desc: RegisterPermActiveStatusCallback with valid permission. + * @tc.type: FUNC + * @tc.require: issueI5NT1X + */ + +HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback009, TestSize.Level1) +{ + std::vector permList1 = { + "ohos.permission.CAMERA", + "ohos.permission.uttestpermission", + }; + auto callbackPtr1 = std::make_shared(permList1); + callbackPtr1->type_ = PERM_INACTIVE; + int32_t res = PrivacyKit::RegisterPermActiveStatusCallback(callbackPtr1); + ASSERT_EQ(RET_NO_ERROR, res); + + res = PrivacyKit::StartUsingPermission(g_TokenId_E, "ohos.permission.CAMERA"); + ASSERT_EQ(RET_NO_ERROR, res); + usleep(500000); // 500000us = 0.5s + ASSERT_EQ(PERM_ACTIVE_IN_BACKGROUND, callbackPtr1->type_); + res = PrivacyKit::StopUsingPermission(g_TokenId_E, "ohos.permission.CAMERA"); + ASSERT_EQ(RET_NO_ERROR, res); + + res = PrivacyKit::StartUsingPermission(g_TokenId_E, "ohos.permission.uttestpermission"); + ASSERT_EQ(RET_ERROR, res); + usleep(500000); // 500000us = 0.5s + ASSERT_EQ(PERM_INACTIVE, callbackPtr1->type_); + res = PrivacyKit::StopUsingPermission(g_TokenId_E, "ohos.permission.uttestpermission"); + ASSERT_EQ(RET_ERROR, res); + usleep(500000); // 500000us = 0.5s + ASSERT_EQ(PERM_INACTIVE, callbackPtr1->type_); + + res = PrivacyKit::UnRegisterPermActiveStatusCallback(callbackPtr1); + ASSERT_EQ(RET_NO_ERROR, res); +} + /** * @tc.name: StartUsingPermission001 * @tc.desc: StartUsingPermission with invalid tokenId or permission. * @tc.type: FUNC - * @tc.require: issueI5NT1X issueI5P4IU + * @tc.require: issueI5NT1X */ HWTEST_F(PrivacyKitTest, StartUsingPermission001, TestSize.Level1) { @@ -810,7 +989,7 @@ HWTEST_F(PrivacyKitTest, StartUsingPermission001, TestSize.Level1) * @tc.name: StartUsingPermission002 * @tc.desc: StartUsingPermission is called twice with same permission. * @tc.type: FUNC - * @tc.require: issueI5NT1X issueI5P4IU + * @tc.require: issueI5NT1X */ HWTEST_F(PrivacyKitTest, StartUsingPermission002, TestSize.Level1) { @@ -830,7 +1009,7 @@ HWTEST_F(PrivacyKitTest, StartUsingPermission002, TestSize.Level1) * @tc.name: StopUsingPermission003 * @tc.desc: Add record when StopUsingPermission is called. * @tc.type: FUNC - * @tc.require: issueI5NT1X issueI5P4IU + * @tc.require: issueI5NT1X */ HWTEST_F(PrivacyKitTest, StartUsingPermission003, TestSize.Level1) { @@ -858,7 +1037,7 @@ HWTEST_F(PrivacyKitTest, StartUsingPermission003, TestSize.Level1) * @tc.name: StartUsingPermission004 * @tc.desc: StartUsingPermission basic functional verification * @tc.type: FUNC - * @tc.require: issueI5NT1X issueI5P4IU + * @tc.require:IssueI5PHM0 */ HWTEST_F(PrivacyKitTest, StartUsingPermission004, TestSize.Level1) { @@ -873,7 +1052,7 @@ HWTEST_F(PrivacyKitTest, StartUsingPermission004, TestSize.Level1) * @tc.name: StartUsingPermission005 * @tc.desc: StartUsingPermission with invalid tokenId or permission. * @tc.type: FUNC - * @tc.require: issueI5NT1X issueI5P4IU + * @tc.require:IssueI5PHM0 */ HWTEST_F(PrivacyKitTest, StartUsingPermission005, TestSize.Level1) { @@ -890,7 +1069,7 @@ HWTEST_F(PrivacyKitTest, StartUsingPermission005, TestSize.Level1) * @tc.name: StopUsingPermission001 * @tc.desc: StopUsingPermission with invalid tokenId or permission. * @tc.type: FUNC - * @tc.require: issueI5NT1X issueI5P4IU + * @tc.require: issueI5NT1X */ HWTEST_F(PrivacyKitTest, StopUsingPermission001, TestSize.Level1) { @@ -905,7 +1084,7 @@ HWTEST_F(PrivacyKitTest, StopUsingPermission001, TestSize.Level1) * @tc.name: StopUsingPermission002 * @tc.desc: StopUsingPermission cancel permissions that you haven't started using * @tc.type: FUNC - * @tc.require: issueI5NT1X issueI5P4IU + * @tc.require:IssueI5PHM0 */ HWTEST_F(PrivacyKitTest, StopUsingPermission002, TestSize.Level1) { @@ -918,7 +1097,7 @@ HWTEST_F(PrivacyKitTest, StopUsingPermission002, TestSize.Level1) * @tc.name: StopUsingPermission003 * @tc.desc: StopUsingPermission invalid tokenid, permission * @tc.type: FUNC - * @tc.require: issueI5NT1X issueI5P4IU + * @tc.require:IssueI5PHM0 */ HWTEST_F(PrivacyKitTest, StopUsingPermission003, TestSize.Level1) { @@ -927,9 +1106,9 @@ HWTEST_F(PrivacyKitTest, StopUsingPermission003, TestSize.Level1) ASSERT_EQ(RET_NO_ERROR, ret); ret = PrivacyKit::StopUsingPermission(g_TokenId_E, "ohos.permission.uttestpermission"); ASSERT_EQ(RET_ERROR, ret); - ret = PrivacyKit::StopUsingPermission(0, permissionName); + ret = PrivacyKit::StopUsingPermission(0,permissionName); ASSERT_EQ(RET_ERROR, ret); - ret = PrivacyKit::StopUsingPermission(g_TokenId_E, permissionName); + ret = PrivacyKit::StopUsingPermission(g_TokenId_E,permissionName); ASSERT_EQ(RET_NO_ERROR, ret); } @@ -937,7 +1116,7 @@ HWTEST_F(PrivacyKitTest, StopUsingPermission003, TestSize.Level1) * @tc.name: StopUsingPermission004 * @tc.desc: StopUsingPermission stop a use repeatedly * @tc.type: FUNC - * @tc.require: issueI5NT1X issueI5P4IU + * @tc.require:IssueI5PHM0 */ HWTEST_F(PrivacyKitTest, StopUsingPermission004, TestSize.Level1) { -- Gitee From 9764e1475b1cef18183638b10fa59c17a06feacf Mon Sep 17 00:00:00 2001 From: cc_ggboy Date: Wed, 7 Sep 2022 16:02:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=9A=90=E7=A7=81=E6=96=B0=E5=A2=9ETDD?= =?UTF-8?q?=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cc_ggboy --- .../test/unittest/src/privacy_kit_test.cpp | 82 +++++++++---------- 1 file changed, 40 insertions(+), 42 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 78709a6e2..7d5bfb67a 100644 --- a/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp +++ b/interfaces/innerkits/privacy/test/unittest/src/privacy_kit_test.cpp @@ -221,7 +221,7 @@ static void DeleteTokenID(std::vector& g_InfoParms_List) * @tc.name: AddPermissionUsedRecord001 * @tc.desc: cannot AddPermissionUsedRecord with illegal tokenId and permission. * @tc.type: FUNC - * @tc.require:Issue Number + * @tc.require: issueI5P4IU */ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord001, TestSize.Level1) { @@ -243,7 +243,7 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord001, TestSize.Level1) * @tc.name: AddPermissionUsedRecord002 * @tc.desc: cannot AddPermissionUsedRecord with invalid tokenId and permission. * @tc.type: FUNC - * @tc.require:Issue Number + * @tc.require: issueI5P4IU */ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord002, TestSize.Level1) { @@ -267,7 +267,7 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord002, TestSize.Level1) * @tc.name: AddPermissionUsedRecord003 * @tc.desc: cannot AddPermissionUsedRecord with native tokenId. * @tc.type: FUNC - * @tc.require:Issue Number + * @tc.require: issueI5P4IU */ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord003, TestSize.Level1) { @@ -314,7 +314,7 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord003, TestSize.Level1) * @tc.name: AddPermissionUsedRecord004 * @tc.desc: AddPermissionUsedRecord user_grant permission. * @tc.type: FUNC - * @tc.require:Issue Number + * @tc.require: issueI5P4IU */ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord004, TestSize.Level1) { @@ -336,7 +336,7 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord004, TestSize.Level1) * @tc.name: AddPermissionUsedRecord005 * @tc.desc: AddPermissionUsedRecord user_grant permission. * @tc.type: FUNC - * @tc.require:Issue Number + * @tc.require: issueI5P4IU */ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord005, TestSize.Level1) { @@ -367,7 +367,7 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord005, TestSize.Level1) * @tc.name: AddPermissionUsedRecord006 * @tc.desc: AddPermissionUsedRecord permission combine records. * @tc.type: FUNC - * @tc.require:Issue Number + * @tc.require: issueI5P4IU */ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord006, TestSize.Level1) { @@ -404,7 +404,7 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord006, TestSize.Level1) * @tc.name: AddPermissionUsedRecord007 * @tc.desc: AddPermissionUsedRecord user_grant permission. * @tc.type: FUNC - * @tc.require:Issue Number + * @tc.require: issueI5P4IU */ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord007, TestSize.Level1) { @@ -449,7 +449,7 @@ HWTEST_F(PrivacyKitTest, AddPermissionUsedRecord007, TestSize.Level1) * @tc.name: RemovePermissionUsedRecords001 * @tc.desc: cannot RemovePermissionUsedRecords with illegal tokenId and deviceID. * @tc.type: FUNC - * @tc.require:Issue Number + * @tc.require: issueI5P4IU */ HWTEST_F(PrivacyKitTest, RemovePermissionUsedRecords001, TestSize.Level1) { @@ -460,7 +460,7 @@ HWTEST_F(PrivacyKitTest, RemovePermissionUsedRecords001, TestSize.Level1) * @tc.name: RemovePermissionUsedRecords002 * @tc.desc: RemovePermissionUsedRecords with invalid tokenId and deviceID. * @tc.type: FUNC - * @tc.require:Issue Number + * @tc.require: issueI5P4IU */ HWTEST_F(PrivacyKitTest, RemovePermissionUsedRecords002, TestSize.Level1) { @@ -483,7 +483,7 @@ HWTEST_F(PrivacyKitTest, RemovePermissionUsedRecords002, TestSize.Level1) * @tc.name: RemovePermissionUsedRecords003 * @tc.desc: RemovePermissionUsedRecords with valid tokenId and deviceID. * @tc.type: FUNC - * @tc.require:Issue Number + * @tc.require: issueI5P4IU */ HWTEST_F(PrivacyKitTest, RemovePermissionUsedRecords003, TestSize.Level1) { @@ -502,7 +502,7 @@ HWTEST_F(PrivacyKitTest, RemovePermissionUsedRecords003, TestSize.Level1) * @tc.name: GetPermissionUsedRecords001 * @tc.desc: cannot GetPermissionUsedRecords with invalid query time. * @tc.type: FUNC - * @tc.require:Issue Number + * @tc.require: issueI5P4IU */ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords001, TestSize.Level1) { @@ -527,7 +527,7 @@ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords001, TestSize.Level1) * @tc.name: GetPermissionUsedRecords002 * @tc.desc: cannot GetPermissionUsedRecords with valid query time. * @tc.type: FUNC - * @tc.require:Issue Number + * @tc.require: issueI5P4IU */ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords002, TestSize.Level1) { @@ -563,7 +563,7 @@ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords002, TestSize.Level1) * @tc.name: GetPermissionUsedRecords003 * @tc.desc: can GetPermissionUsedRecords with valid query time. * @tc.type: FUNC - * @tc.require:Issue Number + * @tc.require: issueI5P4IU */ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords003, TestSize.Level1) { @@ -594,7 +594,7 @@ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords003, TestSize.Level1) * @tc.name: GetPermissionUsedRecords004 * @tc.desc: can GetPermissionUsedRecords with valid query time. * @tc.type: FUNC - * @tc.require:Issue Number + * @tc.require: issueI5P4IU */ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords004, TestSize.Level1) { @@ -618,7 +618,7 @@ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecords004, TestSize.Level1) * @tc.name: GetPermissionUsedRecordsAsync001 * @tc.desc: cannot GetPermissionUsedRecordsAsync with invalid query time. * @tc.type: FUNC - * @tc.require:Issue Number + * @tc.require: issueI5P4IU */ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecordsAsync001, TestSize.Level1) { @@ -637,7 +637,7 @@ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecordsAsync001, TestSize.Level1) * @tc.name: GetPermissionUsedRecordsAsync002 * @tc.desc: cannot GetPermissionUsedRecordsAsync with valid query time. * @tc.type: FUNC - * @tc.require:Issue Number + * @tc.require: issueI5P4IU */ HWTEST_F(PrivacyKitTest, GetPermissionUsedRecordsAsync002, TestSize.Level1) { @@ -702,7 +702,7 @@ public: * @tc.name: RegisterPermActiveStatusCallback001 * @tc.desc: RegisterPermActiveStatusCallback with valid permission. * @tc.type: FUNC - * @tc.require: issueI5NT1X + * @tc.require: issueI5NT1X issueI5P4IU */ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback001, TestSize.Level1) { @@ -742,7 +742,7 @@ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback001, TestSize.Level1) * @tc.name: RegisterPermActiveStatusCallback002 * @tc.desc: RegisterPermActiveStatusCallback with valid permission. * @tc.type: FUNC - * @tc.require: issueI5NT1X + * @tc.require: issueI5NT1X issueI5P4IU */ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback002, TestSize.Level1) @@ -794,7 +794,7 @@ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback002, TestSize.Level1) * @tc.name: RegisterPermActiveStatusCallback003 * @tc.desc: RegisterPermActiveStatusCallback empty permission name * @tc.type: FUNC - * @tc.require:IssueI5PHM0 + * @tc.require: issueI5NT1X issueI5P4IU */ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback003, TestSize.Level1) @@ -802,7 +802,6 @@ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback003, TestSize.Level1) std::vector permList = {}; auto callbackPtr = std::make_shared(permList); callbackPtr->type_ = PERM_INACTIVE; - int32_t res = PrivacyKit::RegisterPermActiveStatusCallback(callbackPtr); ASSERT_EQ(RET_NO_ERROR, res); res = PrivacyKit::StartUsingPermission(g_TokenId_E, "ohos.permission.CAMERA"); @@ -824,7 +823,7 @@ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback003, TestSize.Level1) * @tc.name: RegisterPermActiveStatusCallback004 * @tc.desc: RegisterPermActiveStatusCallback repeatedly register a permission * @tc.type: FUNC - * @tc.require:IssueI5PHM0 + * @tc.require: issueI5NT1X issueI5P4IU */ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback004, TestSize.Level1) { @@ -858,7 +857,7 @@ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback004, TestSize.Level1) * @tc.name: RegisterPermActiveStatusCallback005 * @tc.desc: RegisterPermActiveStatusCallback repeatedly cancel monitoring a permission * @tc.type: FUNC - * @tc.require:IssueI5PHM0 + * @tc.require: issueI5NT1X issueI5P4IU */ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback005, TestSize.Level1) { @@ -887,11 +886,11 @@ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback005, TestSize.Level1) * @tc.name: RegisterPermActiveStatusCallback006 * @tc.desc: RegisterPermActiveStatusCallback registering invalid permissions * @tc.type: FUNC - * @tc.require:IssueI5PHM0 + * @tc.require: issueI5NT1X issueI5P4IU */ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback006, TestSize.Level1) { - std::vector permList = {"ohos.permission.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}; + std::vector permList = {"ohos.permission.extra_long_charactersaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}; auto callbackPtr = std::make_shared(permList); callbackPtr->type_ = PERM_INACTIVE; @@ -900,12 +899,12 @@ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback006, TestSize.Level1) } /** - * @tc.name: UnRegisterPermActiveStatusCallback007 - * @tc.desc: UnRegisterPermActiveStatusCallback cancel unregistered permissions + * @tc.name: RegisterPermActiveStatusCallback007 + * @tc.desc: RegisterPermActiveStatusCallback cancel unregistered permissions * @tc.type: FUNC - * @tc.require:IssueI5PHM0 + * @tc.require: issueI5NT1X issueI5P4IU */ -HWTEST_F(PrivacyKitTest, UnRegisterPermActiveStatusCallback007, TestSize.Level1) +HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback007, TestSize.Level1) { std::vector permList = {"ohos.permission.CAMERA"}; @@ -919,7 +918,7 @@ HWTEST_F(PrivacyKitTest, UnRegisterPermActiveStatusCallback007, TestSize.Level1) * @tc.name: RegisterPermActiveStatusCallback008 * @tc.desc: RegisterPermActiveStatusCallback registering invalid permissions * @tc.type: FUNC - * @tc.require:IssueI5PHM0 + * @tc.require: issueI5NT1X issueI5P4IU */ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback008, TestSize.Level1) { @@ -935,9 +934,8 @@ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback008, TestSize.Level1) * @tc.name: RegisterPermActiveStatusCallback009 * @tc.desc: RegisterPermActiveStatusCallback with valid permission. * @tc.type: FUNC - * @tc.require: issueI5NT1X + * @tc.require: issueI5NT1X issueI5P4IU */ - HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback009, TestSize.Level1) { std::vector permList1 = { @@ -973,7 +971,7 @@ HWTEST_F(PrivacyKitTest, RegisterPermActiveStatusCallback009, TestSize.Level1) * @tc.name: StartUsingPermission001 * @tc.desc: StartUsingPermission with invalid tokenId or permission. * @tc.type: FUNC - * @tc.require: issueI5NT1X + * @tc.require: issueI5NT1X issueI5P4IU */ HWTEST_F(PrivacyKitTest, StartUsingPermission001, TestSize.Level1) { @@ -989,7 +987,7 @@ HWTEST_F(PrivacyKitTest, StartUsingPermission001, TestSize.Level1) * @tc.name: StartUsingPermission002 * @tc.desc: StartUsingPermission is called twice with same permission. * @tc.type: FUNC - * @tc.require: issueI5NT1X + * @tc.require: issueI5NT1X issueI5P4IU */ HWTEST_F(PrivacyKitTest, StartUsingPermission002, TestSize.Level1) { @@ -1009,7 +1007,7 @@ HWTEST_F(PrivacyKitTest, StartUsingPermission002, TestSize.Level1) * @tc.name: StopUsingPermission003 * @tc.desc: Add record when StopUsingPermission is called. * @tc.type: FUNC - * @tc.require: issueI5NT1X + * @tc.require: issueI5NT1X issueI5P4IU */ HWTEST_F(PrivacyKitTest, StartUsingPermission003, TestSize.Level1) { @@ -1037,7 +1035,7 @@ HWTEST_F(PrivacyKitTest, StartUsingPermission003, TestSize.Level1) * @tc.name: StartUsingPermission004 * @tc.desc: StartUsingPermission basic functional verification * @tc.type: FUNC - * @tc.require:IssueI5PHM0 + * @tc.require: issueI5NT1X issueI5P4IU */ HWTEST_F(PrivacyKitTest, StartUsingPermission004, TestSize.Level1) { @@ -1052,7 +1050,7 @@ HWTEST_F(PrivacyKitTest, StartUsingPermission004, TestSize.Level1) * @tc.name: StartUsingPermission005 * @tc.desc: StartUsingPermission with invalid tokenId or permission. * @tc.type: FUNC - * @tc.require:IssueI5PHM0 + * @tc.require: issueI5NT1X issueI5P4IU */ HWTEST_F(PrivacyKitTest, StartUsingPermission005, TestSize.Level1) { @@ -1069,7 +1067,7 @@ HWTEST_F(PrivacyKitTest, StartUsingPermission005, TestSize.Level1) * @tc.name: StopUsingPermission001 * @tc.desc: StopUsingPermission with invalid tokenId or permission. * @tc.type: FUNC - * @tc.require: issueI5NT1X + * @tc.require: issueI5NT1X issueI5P4IU */ HWTEST_F(PrivacyKitTest, StopUsingPermission001, TestSize.Level1) { @@ -1084,7 +1082,7 @@ HWTEST_F(PrivacyKitTest, StopUsingPermission001, TestSize.Level1) * @tc.name: StopUsingPermission002 * @tc.desc: StopUsingPermission cancel permissions that you haven't started using * @tc.type: FUNC - * @tc.require:IssueI5PHM0 + * @tc.require: issueI5NT1X issueI5P4IU */ HWTEST_F(PrivacyKitTest, StopUsingPermission002, TestSize.Level1) { @@ -1097,7 +1095,7 @@ HWTEST_F(PrivacyKitTest, StopUsingPermission002, TestSize.Level1) * @tc.name: StopUsingPermission003 * @tc.desc: StopUsingPermission invalid tokenid, permission * @tc.type: FUNC - * @tc.require:IssueI5PHM0 + * @tc.require: issueI5NT1X issueI5P4IU */ HWTEST_F(PrivacyKitTest, StopUsingPermission003, TestSize.Level1) { @@ -1106,9 +1104,9 @@ HWTEST_F(PrivacyKitTest, StopUsingPermission003, TestSize.Level1) ASSERT_EQ(RET_NO_ERROR, ret); ret = PrivacyKit::StopUsingPermission(g_TokenId_E, "ohos.permission.uttestpermission"); ASSERT_EQ(RET_ERROR, ret); - ret = PrivacyKit::StopUsingPermission(0,permissionName); + ret = PrivacyKit::StopUsingPermission(0, permissionName); ASSERT_EQ(RET_ERROR, ret); - ret = PrivacyKit::StopUsingPermission(g_TokenId_E,permissionName); + ret = PrivacyKit::StopUsingPermission(g_TokenId_E, permissionName); ASSERT_EQ(RET_NO_ERROR, ret); } @@ -1116,7 +1114,7 @@ HWTEST_F(PrivacyKitTest, StopUsingPermission003, TestSize.Level1) * @tc.name: StopUsingPermission004 * @tc.desc: StopUsingPermission stop a use repeatedly * @tc.type: FUNC - * @tc.require:IssueI5PHM0 + * @tc.require: issueI5NT1X issueI5P4IU */ HWTEST_F(PrivacyKitTest, StopUsingPermission004, TestSize.Level1) { -- Gitee