From fffa58a0b71a10e2839f550ddededf9bd5d0cd49 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Fri, 2 Sep 2022 20:35:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9TDD=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=89=A7=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../test/file_extension_helper_test.cpp | 181 ++++++++++-------- 1 file changed, 96 insertions(+), 85 deletions(-) diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index 1d1dadbb..a20860d3 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -30,6 +30,82 @@ using namespace OHOS; using namespace FileAccessFwk; int ABILITY_ID = 5003; shared_ptr fah = nullptr; +OHOS::Security::AccessToken::AccessTokenID tokenId; + +// permission state +OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState = { + .permissionName = "ohos.permission.FILE_ACCESS_MANAGER", + .isGeneral = true, + .resDeviceID = {"local"}, + .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED}, + .grantFlags = {1} +}; + +OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState1 = { + .permissionName = "ohos.permission.READ_MEDIA", + .isGeneral = true, + .resDeviceID = {"local"}, + .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED}, + .grantFlags = {1} +}; + +OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState2 = { + .permissionName = "ohos.permission.WRITE_MEDIA", + .isGeneral = true, + .resDeviceID = {"local"}, + .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED}, + .grantFlags = {1} +}; + +// permission define +OHOS::Security::AccessToken::PermissionDef g_infoManagerTestPermDef = { + .permissionName = "ohos.permission.FILE_ACCESS_MANAGER", + .bundleName = "ohos.acts.multimedia.mediaLibrary", + .grantMode = 1, + .availableLevel = OHOS::Security::AccessToken::APL_NORMAL, + .label = "label", + .labelId = 1, + .description = "FILE_ACCESS_MANAGER", + .descriptionId = 1 +}; + +OHOS::Security::AccessToken::PermissionDef g_infoManagerTestPermDef1 = { + .permissionName = "ohos.permission.READ_MEDIA", + .bundleName = "ohos.acts.multimedia.mediaLibrary", + .grantMode = 1, + .availableLevel = OHOS::Security::AccessToken::APL_NORMAL, + .label = "label", + .labelId = 1, + .description = "READ_MEDIA", + .descriptionId = 1 +}; + +OHOS::Security::AccessToken::PermissionDef g_infoManagerTestPermDef2 = { + .permissionName = "ohos.permission.WRITE_MEDIA", + .bundleName = "ohos.acts.multimedia.mediaLibrary", + .grantMode = 1, + .availableLevel = OHOS::Security::AccessToken::APL_NORMAL, + .label = "label", + .labelId = 1, + .description = "WRITE_MEDIA", + .descriptionId = 1 +}; + +// permission info +OHOS::Security::AccessToken::HapPolicyParams g_infoManagerTestPolicyPrams = { + .apl = OHOS::Security::AccessToken::APL_NORMAL, + .domain = "test.domain", + .permList = {g_infoManagerTestPermDef, g_infoManagerTestPermDef1, g_infoManagerTestPermDef2}, + .permStateList = {g_infoManagerTestState, g_infoManagerTestState1, g_infoManagerTestState2} +}; + +// hap info +OHOS::Security::AccessToken::HapInfoParams g_infoManagerTestInfoParms = { + .userID = 1, + .bundleName = "FileExtensionHelperTest", + .instIndex = 0, + .appIDDesc = "testtesttesttest" +}; class FileExtensionHelperTest : public testing::Test { public: @@ -56,85 +132,21 @@ public: EXPECT_TRUE(sus); vector wants {want}; fah = FileAccessHelper::Creator(remoteObj, wants); + + OHOS::Security::AccessToken::AccessTokenIDEx tokenIdEx = {0}; + tokenIdEx = OHOS::Security::AccessToken::AccessTokenKit::AllocHapToken + (g_infoManagerTestInfoParms, g_infoManagerTestPolicyPrams); + tokenId = tokenIdEx.tokenIdExStruct.tokenID; + SetSelfTokenID(tokenId); } - static void TearDownTestCase() {}; + static void TearDownTestCase() + { + fah->Release(); + fah = nullptr; + OHOS::Security::AccessToken::AccessTokenKit::DeleteToken(tokenId); + }; void SetUp() {}; void TearDown() {}; - - // permission state - OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState = { - .permissionName = "ohos.permission.FILE_ACCESS_MANAGER", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} - }; - - OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState1 = { - .permissionName = "ohos.permission.READ_MEDIA", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} - }; - - OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState2 = { - .permissionName = "ohos.permission.WRITE_MEDIA", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} - }; - - // permission define - OHOS::Security::AccessToken::PermissionDef g_infoManagerTestPermDef = { - .permissionName = "ohos.permission.FILE_ACCESS_MANAGER", - .bundleName = "ohos.acts.multimedia.mediaLibrary", - .grantMode = 1, - .availableLevel = OHOS::Security::AccessToken::APL_NORMAL, - .label = "label", - .labelId = 1, - .description = "FILE_ACCESS_MANAGER", - .descriptionId = 1 - }; - - OHOS::Security::AccessToken::PermissionDef g_infoManagerTestPermDef1 = { - .permissionName = "ohos.permission.READ_MEDIA", - .bundleName = "ohos.acts.multimedia.mediaLibrary", - .grantMode = 1, - .availableLevel = OHOS::Security::AccessToken::APL_NORMAL, - .label = "label", - .labelId = 1, - .description = "READ_MEDIA", - .descriptionId = 1 - }; - - OHOS::Security::AccessToken::PermissionDef g_infoManagerTestPermDef2 = { - .permissionName = "ohos.permission.WRITE_MEDIA", - .bundleName = "ohos.acts.multimedia.mediaLibrary", - .grantMode = 1, - .availableLevel = OHOS::Security::AccessToken::APL_NORMAL, - .label = "label", - .labelId = 1, - .description = "WRITE_MEDIA", - .descriptionId = 1 - }; - - // permission info - OHOS::Security::AccessToken::HapPolicyParams g_infoManagerTestPolicyPrams = { - .apl = OHOS::Security::AccessToken::APL_NORMAL, - .domain = "test.domain", - .permList = {g_infoManagerTestPermDef, g_infoManagerTestPermDef1, g_infoManagerTestPermDef2}, - .permStateList = {g_infoManagerTestState, g_infoManagerTestState1, g_infoManagerTestState2} - }; - - // hap info - OHOS::Security::AccessToken::HapInfoParams g_infoManagerTestInfoParms = { - .userID = 1, - .bundleName = "FileExtensionHelperTest", - .instIndex = 0, - .appIDDesc = "testtesttesttest" - }; }; /** @@ -150,12 +162,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0000, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0000"; try { - OHOS::Security::AccessToken::AccessTokenIDEx tokenIdEx = {0}; - tokenIdEx = OHOS::Security::AccessToken::AccessTokenKit::AllocHapToken - (g_infoManagerTestInfoParms, g_infoManagerTestPolicyPrams); - OHOS::Security::AccessToken::AccessTokenID tokenId = tokenIdEx.tokenIdExStruct.tokenID; - SetSelfTokenID(tokenId); - vector info; int result = fah->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -1726,9 +1732,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi string uri = parentUri.ToString(); GTEST_LOG_(INFO) << uri; - Uri documentUri(""); - result = fahs->Mkdir(parentUri, "Documents", documentUri); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + string document = uri + "/Documents"; + Uri documentUri(document); + bool isExist = false; + result = fahs->Access(documentUri, isExist); + if (!isExist) { + result = fahs->Mkdir(parentUri, "Documents", documentUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + } Uri newDirUriTest1(""); Uri newDirUriTest2(""); -- Gitee