diff --git a/frameworks/privacy/test/BUILD.gn b/frameworks/privacy/test/BUILD.gn index f85625c5b5373ef6134ab1a4d511211555b63be6..b749dbe5c67eaeaad74248218f0cbc31fdd09fdf 100644 --- a/frameworks/privacy/test/BUILD.gn +++ b/frameworks/privacy/test/BUILD.gn @@ -23,52 +23,12 @@ config("accesstoken_test_config") { ] } -ohos_unittest("libperm_active_response_parcel_test") { +ohos_unittest("libprivacy_parcel_test") { subsystem_name = "security" part_name = "access_token" module_out_path = part_name + "/" + part_name - sources = [ "unittest/src/perm_active_response_parcel_test.cpp" ] - - configs = [ - ":accesstoken_test_config", - "//base/security/access_token/config:coverage_flags", - ] - - deps = [ "//base/security/access_token/frameworks/privacy:privacy_communication_adapter_cxx" ] - - external_deps = [ - "c_utils:utils", - "ipc:ipc_single", - ] -} - -ohos_unittest("libpermission_used_record_parcel_test") { - subsystem_name = "security" - part_name = "access_token" - module_out_path = part_name + "/" + part_name - - sources = [ "unittest/src/permission_used_record_parcel_test.cpp" ] - - configs = [ - ":accesstoken_test_config", - "//base/security/access_token/config:coverage_flags", - ] - - deps = [ "//base/security/access_token/frameworks/privacy:privacy_communication_adapter_cxx" ] - - external_deps = [ - "c_utils:utils", - "ipc:ipc_single", - ] -} - -ohos_unittest("libpermission_used_request_parcel_test") { - subsystem_name = "security" - part_name = "access_token" - module_out_path = part_name + "/" + part_name - - sources = [ "unittest/src/permission_used_request_parcel_test.cpp" ] + sources = [ "unittest/src/privacy_parcel_test.cpp" ] configs = [ ":accesstoken_test_config", @@ -85,9 +45,5 @@ ohos_unittest("libpermission_used_request_parcel_test") { group("unittest") { testonly = true - deps = [ - ":libperm_active_response_parcel_test", - ":libpermission_used_record_parcel_test", - ":libpermission_used_request_parcel_test", - ] + deps = [ ":libprivacy_parcel_test" ] } diff --git a/frameworks/privacy/test/unittest/src/permission_used_request_parcel_test.cpp b/frameworks/privacy/test/unittest/src/permission_used_request_parcel_test.cpp deleted file mode 100644 index 61c9ed8b96527bdaead66e0a5ba4b98ff13b6fad..0000000000000000000000000000000000000000 --- a/frameworks/privacy/test/unittest/src/permission_used_request_parcel_test.cpp +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (c) 2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include "permission_used_request_parcel.h" -#include "parcel.h" - -using namespace testing::ext; - -namespace OHOS { -namespace Security { -namespace AccessToken { -class PermissionUsedRequestParcelTest : public testing::Test { -public: - static void SetUpTestCase(void); - static void TearDownTestCase(void); - void SetUp(); - void TearDown(); -}; - -void PermissionUsedRequestParcelTest::SetUpTestCase(void) {} -void PermissionUsedRequestParcelTest::TearDownTestCase(void) {} -void PermissionUsedRequestParcelTest::SetUp(void) {} -void PermissionUsedRequestParcelTest::TearDown(void) {} - -/** - * @tc.name: PermissionUsedRequestParcel001 - * @tc.desc: Verify the PermissionUsedRequestParcel Marshalling and Unmarshalling function. - * @tc.type: FUNC - * @tc.require: issueI5RUP1 - */ -HWTEST_F(PermissionUsedRequestParcelTest, PermissionUsedRequestParcel001, TestSize.Level1) -{ - PermissionUsedRequestParcel permissionUsedRequestParcel; - - permissionUsedRequestParcel.request = { - .tokenId = 100, - .isRemote = false, - .deviceId = "you guess", - .bundleName = "com.ohos.permissionmanager", - .beginTimeMillis = 0L, - .endTimeMillis = 0L, - .flag = FLAG_PERMISSION_USAGE_SUMMARY, - }; - permissionUsedRequestParcel.request.permissionList.emplace_back("ohos.permission.CAMERA"); - permissionUsedRequestParcel.request.permissionList.emplace_back("ohos.permission.LOCATION"); - - Parcel parcel; - EXPECT_EQ(true, permissionUsedRequestParcel.Marshalling(parcel)); - - std::shared_ptr readedData(PermissionUsedRequestParcel::Unmarshalling(parcel)); - EXPECT_EQ(true, readedData != nullptr); - - EXPECT_EQ(permissionUsedRequestParcel.request.tokenId, readedData->request.tokenId); - EXPECT_EQ(permissionUsedRequestParcel.request.isRemote, readedData->request.isRemote); - EXPECT_EQ(permissionUsedRequestParcel.request.deviceId, readedData->request.deviceId); - EXPECT_EQ(permissionUsedRequestParcel.request.bundleName, readedData->request.bundleName); - EXPECT_EQ(permissionUsedRequestParcel.request.beginTimeMillis, readedData->request.beginTimeMillis); - EXPECT_EQ(permissionUsedRequestParcel.request.endTimeMillis, readedData->request.endTimeMillis); - EXPECT_EQ(permissionUsedRequestParcel.request.flag, readedData->request.flag); - - for(uint32_t i = 0; i < permissionUsedRequestParcel.request.permissionList.size(); i++) { - EXPECT_EQ(permissionUsedRequestParcel.request.permissionList[i], readedData->request.permissionList[i]); - } -} -} // namespace AccessToken -} // namespace Security -} // namespace OHOS diff --git a/frameworks/privacy/test/unittest/src/permission_used_record_parcel_test.cpp b/frameworks/privacy/test/unittest/src/privacy_parcel_test.cpp similarity index 43% rename from frameworks/privacy/test/unittest/src/permission_used_record_parcel_test.cpp rename to frameworks/privacy/test/unittest/src/privacy_parcel_test.cpp index 1bdfae5b6815a1d7a3eead595e11e5dd53d5e9ca..007bf45a16d558f42c54eb0368847992c88b4555 100644 --- a/frameworks/privacy/test/unittest/src/permission_used_record_parcel_test.cpp +++ b/frameworks/privacy/test/unittest/src/privacy_parcel_test.cpp @@ -13,11 +13,16 @@ * limitations under the License. */ -#include +#include "privacy_parcel_test.h" + #include #include -#include "permission_used_record_parcel.h" + +#include "bundle_used_record_parcel.h" #include "parcel.h" +#include "perm_active_response_parcel.h" +#include "permission_used_record_parcel.h" +#include "permission_used_request_parcel.h" using namespace testing::ext; @@ -48,19 +53,107 @@ UsedRecordDetail g_rejectRecord2 = { .timestamp = 3L, .accessDuration = 3L, }; -} -class PermissionUsedRecordParcelTest : public testing::Test { -public: - static void SetUpTestCase(void); - static void TearDownTestCase(void); - void SetUp(); - void TearDown(); + +PermissionUsedRecord g_permissionRecord1 = { + .permissionName = "ohos.permission.CAMERA", + .accessCount = 2, + .rejectCount = 2, + .lastAccessTime = 0L, + .lastRejectTime = 0L, + .lastAccessDuration = 0L, +}; + +PermissionUsedRecord g_permissionRecord2 = { + .permissionName = "ohos.permission.LOCATION", + .accessCount = 2, + .rejectCount = 2, + .lastAccessTime = 1L, + .lastRejectTime = 1L, + .lastAccessDuration = 1L, }; +} -void PermissionUsedRecordParcelTest::SetUpTestCase(void) {} -void PermissionUsedRecordParcelTest::TearDownTestCase(void) {} -void PermissionUsedRecordParcelTest::SetUp(void) {} -void PermissionUsedRecordParcelTest::TearDown(void) {} +void PrivacyParcelTest::SetUpTestCase() +{ +} + +void PrivacyParcelTest::TearDownTestCase() +{ +} + +void PrivacyParcelTest::SetUp() +{ +} + +void PrivacyParcelTest::TearDown() +{ +} + +/** + * @tc.name: BundleUsedRecordParcel001 + * @tc.desc: Verify the CreateHapTokenInfo add one hap token function. + * @tc.type: FUNC + * @tc.require: issueI5RUCC + */ +HWTEST_F(PrivacyParcelTest, BundleUsedRecordParcel001, TestSize.Level1) +{ + BundleUsedRecordParcel bundleUsedRecordParcel; + + bundleUsedRecordParcel.bundleRecord = { + .tokenId = 100, + .isRemote = false, + .deviceId = "you guess", + .bundleName = "com.ohos.permissionmanager", + }; + + g_permissionRecord1.accessRecords.emplace_back(g_accessRecord1); + g_permissionRecord1.accessRecords.emplace_back(g_accessRecord2); + g_permissionRecord2.rejectRecords.emplace_back(g_rejectRecord1); + g_permissionRecord2.rejectRecords.emplace_back(g_rejectRecord2); + + bundleUsedRecordParcel.bundleRecord.permissionRecords.emplace_back(g_permissionRecord1); + bundleUsedRecordParcel.bundleRecord.permissionRecords.emplace_back(g_permissionRecord2); + + Parcel parcel; + EXPECT_EQ(true, bundleUsedRecordParcel.Marshalling(parcel)); + + std::shared_ptr readedData(BundleUsedRecordParcel::Unmarshalling(parcel)); + EXPECT_EQ(true, readedData != nullptr); + + EXPECT_EQ(bundleUsedRecordParcel.bundleRecord.tokenId, readedData->bundleRecord.tokenId); + EXPECT_EQ(bundleUsedRecordParcel.bundleRecord.isRemote, readedData->bundleRecord.isRemote); + EXPECT_EQ(bundleUsedRecordParcel.bundleRecord.deviceId, readedData->bundleRecord.deviceId); + EXPECT_EQ(bundleUsedRecordParcel.bundleRecord.bundleName, readedData->bundleRecord.bundleName); +} + +/** + * @tc.name: ActiveChangeResponseParcel001 + * @tc.desc: Verify ActiveChangeResponseParcel Marshalling and Unmarshalling function. + * @tc.type: FUNC + * @tc.require: issueI5RRLJ + */ +HWTEST_F(PrivacyParcelTest, ActiveChangeResponseParcel001, TestSize.Level1) +{ + ActiveChangeResponseParcel activeChangeResponseParcel; + + activeChangeResponseParcel.changeResponse = { + .tokenID = 100, + .permissionName = "ohos.permission.CAMERA", + .deviceId = "you guess", + .type = PERM_INACTIVE, + }; + + Parcel parcel; + EXPECT_EQ(true, activeChangeResponseParcel.Marshalling(parcel)); + + std::shared_ptr readedData(ActiveChangeResponseParcel::Unmarshalling(parcel)); + EXPECT_EQ(true, readedData != nullptr); + + EXPECT_EQ(activeChangeResponseParcel.changeResponse.tokenID, readedData->changeResponse.tokenID); + EXPECT_EQ(activeChangeResponseParcel.changeResponse.permissionName, readedData->changeResponse.permissionName); + EXPECT_EQ(activeChangeResponseParcel.changeResponse.deviceId, readedData->changeResponse.deviceId); + EXPECT_EQ(activeChangeResponseParcel.changeResponse.type, readedData->changeResponse.type); +} /** * @tc.name: PermissionUsedRecordParcel001 @@ -68,7 +161,7 @@ void PermissionUsedRecordParcelTest::TearDown(void) {} * @tc.type: FUNC * @tc.require: issueI5RUCC */ -HWTEST_F(PermissionUsedRecordParcelTest, PermissionUsedRecordParcel001, TestSize.Level1) +HWTEST_F(PrivacyParcelTest, PermissionUsedRecordParcel001, TestSize.Level1) { PermissionUsedRecordParcel permissionUsedRecordParcel; @@ -117,6 +210,47 @@ HWTEST_F(PermissionUsedRecordParcelTest, PermissionUsedRecordParcel001, TestSize readedData->permissionRecord.rejectRecords[i].accessDuration); } } + +/** + * @tc.name: PermissionUsedRequestParcel001 + * @tc.desc: Verify the PermissionUsedRequestParcel Marshalling and Unmarshalling function. + * @tc.type: FUNC + * @tc.require: issueI5RUP1 + */ +HWTEST_F(PrivacyParcelTest, PermissionUsedRequestParcel001, TestSize.Level1) +{ + PermissionUsedRequestParcel permissionUsedRequestParcel; + + permissionUsedRequestParcel.request = { + .tokenId = 100, + .isRemote = false, + .deviceId = "you guess", + .bundleName = "com.ohos.permissionmanager", + .beginTimeMillis = 0L, + .endTimeMillis = 0L, + .flag = FLAG_PERMISSION_USAGE_SUMMARY, + }; + permissionUsedRequestParcel.request.permissionList.emplace_back("ohos.permission.CAMERA"); + permissionUsedRequestParcel.request.permissionList.emplace_back("ohos.permission.LOCATION"); + + Parcel parcel; + EXPECT_EQ(true, permissionUsedRequestParcel.Marshalling(parcel)); + + std::shared_ptr readedData(PermissionUsedRequestParcel::Unmarshalling(parcel)); + EXPECT_EQ(true, readedData != nullptr); + + EXPECT_EQ(permissionUsedRequestParcel.request.tokenId, readedData->request.tokenId); + EXPECT_EQ(permissionUsedRequestParcel.request.isRemote, readedData->request.isRemote); + EXPECT_EQ(permissionUsedRequestParcel.request.deviceId, readedData->request.deviceId); + EXPECT_EQ(permissionUsedRequestParcel.request.bundleName, readedData->request.bundleName); + EXPECT_EQ(permissionUsedRequestParcel.request.beginTimeMillis, readedData->request.beginTimeMillis); + EXPECT_EQ(permissionUsedRequestParcel.request.endTimeMillis, readedData->request.endTimeMillis); + EXPECT_EQ(permissionUsedRequestParcel.request.flag, readedData->request.flag); + + for(uint32_t i = 0; i < permissionUsedRequestParcel.request.permissionList.size(); i++) { + EXPECT_EQ(permissionUsedRequestParcel.request.permissionList[i], readedData->request.permissionList[i]); + } +} } // namespace AccessToken } // namespace Security } // namespace OHOS diff --git a/frameworks/privacy/test/unittest/src/perm_active_response_parcel_test.cpp b/frameworks/privacy/test/unittest/src/privacy_parcel_test.h similarity index 32% rename from frameworks/privacy/test/unittest/src/perm_active_response_parcel_test.cpp rename to frameworks/privacy/test/unittest/src/privacy_parcel_test.h index 5638e8c37746a0080bc5186cbe700934d8248c79..f18f664a9a8b6ddf0e0adca897836c9b1fb52c8a 100644 --- a/frameworks/privacy/test/unittest/src/perm_active_response_parcel_test.cpp +++ b/frameworks/privacy/test/unittest/src/privacy_parcel_test.h @@ -14,60 +14,18 @@ */ #include -#include -#include -#include "perm_active_response_parcel.h" -#include "parcel.h" - -using namespace testing::ext; namespace OHOS { namespace Security { namespace AccessToken { -namespace { - -} -class ActiveChangeResponseParcelTest : public testing::Test { +class PrivacyParcelTest : public testing::Test { public: - static void SetUpTestCase(void); - static void TearDownTestCase(void); + static void SetUpTestCase(); + static void TearDownTestCase(); + void SetUp(); void TearDown(); }; - -void ActiveChangeResponseParcelTest::SetUpTestCase(void) {} -void ActiveChangeResponseParcelTest::TearDownTestCase(void) {} -void ActiveChangeResponseParcelTest::SetUp(void) {} -void ActiveChangeResponseParcelTest::TearDown(void) {} - -/** - * @tc.name: ActiveChangeResponseParcel001 - * @tc.desc: Verify ActiveChangeResponseParcel Marshalling and Unmarshalling function. - * @tc.type: FUNC - * @tc.require: issueI5RRLJ - */ -HWTEST_F(ActiveChangeResponseParcelTest, ActiveChangeResponseParcel001, TestSize.Level1) -{ - ActiveChangeResponseParcel activeChangeResponseParcel; - - activeChangeResponseParcel.changeResponse = { - .tokenID = 100, - .permissionName = "ohos.permission.CAMERA", - .deviceId = "you guess", - .type = PERM_INACTIVE, - }; - - Parcel parcel; - EXPECT_EQ(true, activeChangeResponseParcel.Marshalling(parcel)); - - std::shared_ptr readedData(ActiveChangeResponseParcel::Unmarshalling(parcel)); - EXPECT_EQ(true, readedData != nullptr); - - EXPECT_EQ(activeChangeResponseParcel.changeResponse.tokenID, readedData->changeResponse.tokenID); - EXPECT_EQ(activeChangeResponseParcel.changeResponse.permissionName, readedData->changeResponse.permissionName); - EXPECT_EQ(activeChangeResponseParcel.changeResponse.deviceId, readedData->changeResponse.deviceId); - EXPECT_EQ(activeChangeResponseParcel.changeResponse.type, readedData->changeResponse.type); -} } // namespace AccessToken } // namespace Security } // namespace OHOS