From 37a4e0ec6fb9825d9ccc0c7436b59b6a40674d02 Mon Sep 17 00:00:00 2001 From: hunili Date: Fri, 5 Jul 2024 13:06:36 +0800 Subject: [PATCH] test ut issue:https://gitee.com/openharmony/filemanagement_user_file_service/issues/IAAAVF?from=project-issue Signed-off-by: hunili --- .../file_access_ext_ability.js | 2 +- .../kits/picker/src/picker_n_exporter.cpp | 4 +- .../file_extension_hap/entry/hvigorfile.js | 2 +- services/file_extension_hap/hvigorfile.js | 2 +- .../include/file_access_service.h | 3 + .../src/file_access_service.cpp | 39 +- test/unittest/BUILD.gn | 61 +- test/unittest/external_file_access_test.cpp | 163 ++++++ ...st_basic.h => external_file_access_test.h} | 5 +- .../external_file_access_test_basic.cpp | 519 ++++++++---------- .../external_file_access_test_info.cpp | 6 +- .../external_file_access_test_management.cpp | 10 +- .../external_file_access_test_operations.cpp | 6 +- 13 files changed, 480 insertions(+), 342 deletions(-) create mode 100644 test/unittest/external_file_access_test.cpp rename test/unittest/{external_file_access_test_basic.h => external_file_access_test.h} (96%) diff --git a/frameworks/js/napi/file_access_ext_ability/file_access_ext_ability.js b/frameworks/js/napi/file_access_ext_ability/file_access_ext_ability.js index 26683525..2fc0f973 100644 --- a/frameworks/js/napi/file_access_ext_ability/file_access_ext_ability.js +++ b/frameworks/js/napi/file_access_ext_ability/file_access_ext_ability.js @@ -87,4 +87,4 @@ class FileAccessExtensionAbility { } } -export default FileAccessExtensionAbility \ No newline at end of file +export default FileAccessExtensionAbility; \ No newline at end of file diff --git a/interfaces/kits/picker/src/picker_n_exporter.cpp b/interfaces/kits/picker/src/picker_n_exporter.cpp index 1005dec4..afd9b706 100644 --- a/interfaces/kits/picker/src/picker_n_exporter.cpp +++ b/interfaces/kits/picker/src/picker_n_exporter.cpp @@ -80,9 +80,9 @@ static napi_value MakeResultWithPickerCallBack(napi_env env, std::shared_ptrwant.GetParams().HasParam("ability.params.stream")) { std::vector list = pickerCallBack->want.GetStringArrayParam("ability.params.stream"); - const int32_t len = list.size(); + const uint32_t len = list.size(); HILOG_INFO("modal picker: ability.params.stream size. %{public}d ", len); - for (int i = 0; i < len; i++) { + for (uint32_t i = 0; i < len; i++) { napi_value uri = nullptr; napi_create_string_utf8(env, list[i].c_str(), NAPI_AUTO_LENGTH, &uri); napi_set_element(env, array, i, uri); diff --git a/services/file_extension_hap/entry/hvigorfile.js b/services/file_extension_hap/entry/hvigorfile.js index 8371a4ae..44d43f85 100644 --- a/services/file_extension_hap/entry/hvigorfile.js +++ b/services/file_extension_hap/entry/hvigorfile.js @@ -14,4 +14,4 @@ */ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. -module.exports = require('@ohos/hvigor-ohos-plugin').hapTasks +module.exports = require('@ohos/hvigor-ohos-plugin').hapTasks; diff --git a/services/file_extension_hap/hvigorfile.js b/services/file_extension_hap/hvigorfile.js index 2d4f29ac..27c813b5 100644 --- a/services/file_extension_hap/hvigorfile.js +++ b/services/file_extension_hap/hvigorfile.js @@ -14,4 +14,4 @@ */ // Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently. -module.exports = require('@ohos/hvigor-ohos-plugin').appTasks \ No newline at end of file +module.exports = require('@ohos/hvigor-ohos-plugin').appTasks; \ No newline at end of file diff --git a/services/native/file_access_service/include/file_access_service.h b/services/native/file_access_service/include/file_access_service.h index b70b9222..924d9523 100644 --- a/services/native/file_access_service/include/file_access_service.h +++ b/services/native/file_access_service/include/file_access_service.h @@ -266,6 +266,8 @@ private: bool IsUnused(); int32_t RmUriObsNodeRelations(std::string &uriStr, std::shared_ptr &obsNode, const std::shared_ptr &info); + sptr FindExtProxyByBundleName(std::string bundleName); + void AddExtProxyInfo(std::string bundleName, sptr extProxy); std::shared_ptr unLoadTimer_ = nullptr; std::shared_ptr onDemandTimer_ = nullptr; static sptr instance_; @@ -277,6 +279,7 @@ private: std::mutex nodeMutex_; std::unordered_map> relationshipMap_; HolderManager> obsManager_; + std::mutex mapMutex_; std::unordered_map> cMap_; }; } // namespace FileAccessFwk diff --git a/services/native/file_access_service/src/file_access_service.cpp b/services/native/file_access_service/src/file_access_service.cpp index 4811f71c..3c15d447 100644 --- a/services/native/file_access_service/src/file_access_service.cpp +++ b/services/native/file_access_service/src/file_access_service.cpp @@ -179,24 +179,27 @@ sptr FileAccessService::ConnectExtension(Uri &uri, const sha { string bundleName; GetBundleNameFromUri(uri, bundleName); - lock_guard lock(mutex_); - auto iterator = cMap_.find(bundleName); - if (iterator != cMap_.end()) { - return iterator->second; + auto curBundleExtProxy = FindExtProxyByBundleName(bundleName); + if (curBundleExtProxy != nullptr) { + return curBundleExtProxy; } sptr extensionProxy; - int32_t ret = GetExensionProxy(info, extensionProxy); - if (ret != ERR_OK || extensionProxy == nullptr) { - return nullptr; + { + lock_guard lock(mutex_); + int32_t ret = GetExensionProxy(info, extensionProxy); + if (ret != ERR_OK || extensionProxy == nullptr) { + return nullptr; + } + auto object = extensionProxy->AsObject(); + object->AddDeathRecipient(extensionDeathRecipient_); } - auto object = extensionProxy->AsObject(); - object->AddDeathRecipient(extensionDeathRecipient_); - cMap_.emplace(bundleName, extensionProxy); + AddExtProxyInfo(bundleName, extensionProxy); return extensionProxy; } void FileAccessService::ResetProxy(const wptr &remote) { + lock_guard lock(mapMutex_); if (remote != nullptr && extensionDeathRecipient_ != nullptr) { for (auto iter = cMap_.begin(); iter != cMap_.end(); ++iter) { auto proxyRemote = iter->second->AsObject(); @@ -656,5 +659,21 @@ int32_t FileAccessService::RmUriObsNodeRelations(std::string &uriStr, std::share RemoveRelations(uriStr, obsNode); return ERR_OK; } + +sptr FileAccessService::FindExtProxyByBundleName(std::string bundleName) +{ + lock_guard lock(mapMutex_); + auto iterator = cMap_.find(bundleName); + if (iterator != cMap_.end()) { + return iterator->second; + } + return nullptr; +} + +void FileAccessService::AddExtProxyInfo(std::string bundleName, sptr extProxy) +{ + lock_guard lock(mapMutex_); + cMap_.emplace(bundleName, extProxy); +} } // namespace FileAccessFwk } // namespace OHOS diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index ac0f37ae..004bfe13 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -66,7 +66,7 @@ ohos_unittest("medialibrary_file_access_test") { "${user_file_service_path}/test/unittest/resources/ohos_test.xml" } -ohos_unittest("external_file_access_test") { +ohos_unittest("external_file_access_basic_test") { branch_protector_ret = "pac_ret" sanitize = { integer_overflow = true @@ -77,8 +77,62 @@ ohos_unittest("external_file_access_test") { module_out_path = "user_file_service/tests" sources = [ + "external_file_access_test.cpp", "external_file_access_test_basic.cpp", "external_file_access_test_info.cpp", + ] + + include_dirs = [ + "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context", + "//third_party/googletest/googlemock/include/gmock", + "${user_file_service_path}/interfaces/inner_api/file_access/include", + "${user_file_service_path}/services/native/file_access_service/include", + ] + + configs = [ "//build/config/compiler:exceptions" ] + + deps = [ + "${ability_runtime_path}/frameworks/native/ability/native:abilitykit_native", + "${ability_runtime_path}/frameworks/native/appkit:app_context", + "${user_file_service_path}/interfaces/inner_api/file_access:file_access_extension_ability_kit", + "${user_file_service_path}/services:file_access_service", + "//third_party/googletest:gmock_main", + ] + + external_deps = [ + "ability_base:want", + "ability_base:zuri", + "ability_runtime:ability_context_native", + "ability_runtime:ability_manager", + "ability_runtime:app_manager", + "ability_runtime:runtime", + "ability_runtime:wantagent_innerkits", + "access_token:libaccesstoken_sdk", + "access_token:libnativetoken", + "access_token:libtoken_setproc", + "bundle_framework:appexecfwk_core", + "c_utils:utils", + "hilog:libhilog", + "ipc:ipc_core", + "ipc:rpc", + "samgr:samgr_proxy", + ] + + defines = [ "private=public" ] +} + +ohos_unittest("external_file_access_management_test") { + branch_protector_ret = "pac_ret" + sanitize = { + integer_overflow = true + cfi = true + cfi_cross_dso = true + debug = false + } + module_out_path = "user_file_service/tests" + + sources = [ + "external_file_access_test.cpp", "external_file_access_test_management.cpp", "external_file_access_test_operations.cpp", ] @@ -118,6 +172,8 @@ ohos_unittest("external_file_access_test") { "ipc:rpc", "samgr:samgr_proxy", ] + + defines = [ "private=public" ] } ohos_unittest("external_file_access_notify_test") { @@ -376,8 +432,9 @@ group("user_file_service_unit_test") { deps = [ ":abnormal_file_access_test", + ":external_file_access_basic_test", + ":external_file_access_management_test", ":external_file_access_notify_test", - ":external_file_access_test", ":file_access_ext_stub_impl_test", ":file_access_service_proxy_test", ":js_file_access_ext_ability_test", diff --git a/test/unittest/external_file_access_test.cpp b/test/unittest/external_file_access_test.cpp new file mode 100644 index 00000000..42906b6d --- /dev/null +++ b/test/unittest/external_file_access_test.cpp @@ -0,0 +1,163 @@ +/* + * Copyright (c) 2024 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 +#include + +#include "external_file_access_test.h" +#include "accesstoken_kit.h" +#include "context_impl.h" +#include "file_access_framework_errno.h" +#include "file_info_shared_memory.h" +#include "iservice_registry.h" +#include "nativetoken_kit.h" +#include "token_setproc.h" + +namespace OHOS::FileAccessFwk { +static shared_ptr g_fah = nullptr; +static shared_ptr g_context = nullptr; + +void SetNativeToken() +{ + uint64_t tokenId; + const char **perms = new const char *[2]; + if (perms == nullptr) { + return; + } + perms[0] = "ohos.permission.FILE_ACCESS_MANAGER"; + perms[1] = "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"; + NativeTokenInfoParams infoInstance = { + .aplStr = "system_core", + .acls = nullptr, + .dcapsNum = 0, + .permsNum = 2, + .aclsNum = 0, + .dcaps = nullptr, + .perms = perms, + }; + + infoInstance.processName = "SetUpTestCase"; + tokenId = GetAccessTokenId(&infoInstance); + const uint64_t systemAppMask = (static_cast(1) << 32); + tokenId |= systemAppMask; + SetSelfTokenID(tokenId); + OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); + delete[] perms; +} + +void FileExtensionHelperTest::SetUpTestCase() +{ + cout << "FileExtensionHelperTest code test" << endl; + SetNativeToken(); + auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); + auto systemAbilityObj = saManager->GetSystemAbility(ABILITY_ID); + g_context = make_shared(); + g_context->SetToken(systemAbilityObj); + AAFwk::Want want; + vector wantVec; + setuid(UID_TRANSFORM_TMP); + int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(wantVec); + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); + bool isFound = false; + for (size_t i = 0; i < wantVec.size(); i++) { + auto element = wantVec[i].GetElement(); + if (element.GetBundleName() == "com.ohos.UserFile.ExternalFileManager" && + element.GetAbilityName() == "FileExtensionAbility") { + want = wantVec[i]; + isFound = true; + break; + } + } + EXPECT_TRUE(isFound); + vector wants{want}; + g_fah = FileAccessHelper::Creator(systemAbilityObj, wants); + if (g_fah == nullptr) { + GTEST_LOG_(ERROR) << "external_file_access_test g_fah is nullptr"; + exit(1); + } + setuid(UID_DEFAULT); +} +void FileExtensionHelperTest::TearDownTestCase() +{ + g_fah = nullptr; + g_context = nullptr; +} + +void FileExtensionHelperTest::SetUp() +{ +} + +void FileExtensionHelperTest::TearDown() +{ +} + +shared_ptr FileExtensionHelperTest::GetFileAccessHelper() +{ + return g_fah; +} + +shared_ptr FileExtensionHelperTest::GetContext() +{ + return g_context; +} + +bool FileExtensionHelperTest::ReplaceBundleNameFromPath(std::string &path, const std::string &newName) +{ + Uri uri(path); + std::string scheme = uri.GetScheme(); + if (scheme == FILE_SCHEME_NAME) { + std::string curName = uri.GetAuthority(); + if (curName.empty()) { + return false; + } + path.replace(path.find(curName), curName.length(), newName); + return true; + } + + std::string tPath = uri.GetPath(); + if (tPath.empty()) { + GTEST_LOG_(INFO) << "Uri path error."; + return false; + } + + if (tPath.front() != '/') { + GTEST_LOG_(INFO) << "Uri path format error."; + return false; + } + + auto index = tPath.substr(1).find_first_of("/"); + auto bundleName = tPath.substr(1, index); + if (bundleName.empty()) { + GTEST_LOG_(INFO) << "bundleName empty."; + return false; + } + + path.replace(path.find(bundleName), bundleName.length(), newName); + return true; +} + +bool FileExtensionHelperTest::ReplaceBundleName(std::string& str, const std::string& newBundleName) +{ + if (!ReplaceBundleNameFromPath(str, newBundleName)) { + GTEST_LOG_(ERROR) << "replace BundleName failed."; + return false; + } + return true; +} +} \ No newline at end of file diff --git a/test/unittest/external_file_access_test_basic.h b/test/unittest/external_file_access_test.h similarity index 96% rename from test/unittest/external_file_access_test_basic.h rename to test/unittest/external_file_access_test.h index 2d6dbe10..d04005c7 100644 --- a/test/unittest/external_file_access_test_basic.h +++ b/test/unittest/external_file_access_test.h @@ -17,9 +17,7 @@ #include -#define private public #include "file_access_helper.h" -#undef private namespace OHOS { namespace FileAccessFwk { @@ -45,8 +43,9 @@ public: void SetUp() override; void TearDown() override; static bool ReplaceBundleNameFromPath(std::string &path, const std::string &newName); - static shared_ptr GetFileAccessHelper(); static bool ReplaceBundleName(std::string& str, const std::string& newBundleName); + static shared_ptr GetFileAccessHelper(); + static shared_ptr GetContext(); }; } // namespace FileAccessFwk } // namespace OHOS diff --git a/test/unittest/external_file_access_test_basic.cpp b/test/unittest/external_file_access_test_basic.cpp index a57c5327..af589987 100644 --- a/test/unittest/external_file_access_test_basic.cpp +++ b/test/unittest/external_file_access_test_basic.cpp @@ -20,7 +20,7 @@ #include #include -#include "external_file_access_test_basic.h" +#include "external_file_access_test.h" #include "accesstoken_kit.h" #include "context_impl.h" #include "file_access_framework_errno.h" @@ -29,93 +29,8 @@ #include "nativetoken_kit.h" #include "token_setproc.h" -#define private public -#include "file_access_helper.h" -#undef private - namespace OHOS::FileAccessFwk { static int g_num = 0; -shared_ptr g_fah = nullptr; -shared_ptr g_context = nullptr; - -void SetNativeToken() -{ - uint64_t tokenId; - const char **perms = new const char *[2]; - if (perms == nullptr) { - return; - } - perms[0] = "ohos.permission.FILE_ACCESS_MANAGER"; - perms[1] = "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"; - NativeTokenInfoParams infoInstance = { - .aplStr = "system_core", - .acls = nullptr, - .dcapsNum = 0, - .permsNum = 2, - .aclsNum = 0, - .dcaps = nullptr, - .perms = perms, - }; - - infoInstance.processName = "SetUpTestCase"; - tokenId = GetAccessTokenId(&infoInstance); - const uint64_t systemAppMask = (static_cast(1) << 32); - tokenId |= systemAppMask; - SetSelfTokenID(tokenId); - OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); - delete[] perms; -} - -void FileExtensionHelperTest::SetUpTestCase() -{ - cout << "FileExtensionHelperTest code test" << endl; - SetNativeToken(); - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto systemAbilityObj = saManager->GetSystemAbility(ABILITY_ID); - g_context = make_shared(); - g_context->SetToken(systemAbilityObj); - AAFwk::Want want; - vector wantVec; - setuid(UID_TRANSFORM_TMP); - int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(wantVec); - EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); - bool isFound = false; - for (size_t i = 0; i < wantVec.size(); i++) { - auto element = wantVec[i].GetElement(); - if (element.GetBundleName() == "com.ohos.UserFile.ExternalFileManager" && - element.GetAbilityName() == "FileExtensionAbility") { - want = wantVec[i]; - isFound = true; - break; - } - } - EXPECT_TRUE(isFound); - vector wants{want}; - g_fah = FileAccessHelper::Creator(systemAbilityObj, wants); - if (g_fah == nullptr) { - GTEST_LOG_(ERROR) << "external_file_access_test g_fah is nullptr"; - exit(1); - } - setuid(UID_DEFAULT); -} -void FileExtensionHelperTest::TearDownTestCase() -{ - g_fah->Release(); - g_fah = nullptr; -} - -void FileExtensionHelperTest::SetUp() -{ -} - -void FileExtensionHelperTest::TearDown() -{ -} - -shared_ptr FileExtensionHelperTest::GetFileAccessHelper() -{ - return g_fah; -} /** * @tc.number: user_file_service_external_file_access_OpenFile_0000 @@ -126,28 +41,29 @@ shared_ptr FileExtensionHelperTest::GetFileAccessHelper() * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0490, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0000"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); GTEST_LOG_(INFO) << parentUri.ToString(); Uri newDirUriTest1(""); - result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); - result = g_fah->CreateFile(newDirUriTest1, "external_file_access_OpenFile_0000.txt", newFileUri); + result = fileAccessHelper->CreateFile(newDirUriTest1, "external_file_access_OpenFile_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = g_fah->OpenFile(newFileUri, WRITE_READ, fd); + result = fileAccessHelper->OpenFile(newFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result; close(fd); - result = g_fah->Delete(newDirUriTest1); + result = fileAccessHelper->Delete(newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -171,7 +87,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0001, testing::e try { Uri uri(""); int fd; - int result = g_fah->OpenFile(uri, WRITE_READ, fd); + int result = FileExtensionHelperTest::GetFileAccessHelper()->OpenFile(uri, WRITE_READ, fd); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0001 result:" << result; } catch (...) { @@ -193,20 +109,21 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0002, testing::e { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0002"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newFileUri(""); - result = g_fah->CreateFile(parentUri, "external_file_access_OpenFile_0002.txt", newFileUri); + result = fileAccessHelper->CreateFile(parentUri, "external_file_access_OpenFile_0002.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri uri("storage/media/100/local/files/Download/external_file_access_OpenFile_0002.txt"); int fd; - result = g_fah->OpenFile(uri, WRITE_READ, fd); + result = fileAccessHelper->OpenFile(uri, WRITE_READ, fd); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0002 result:" << result; - result = g_fah->Delete(newFileUri); + result = fileAccessHelper->Delete(newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -230,7 +147,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0003, testing::e try { Uri uri("~!@#$%^&*()_"); int fd; - int result = g_fah->OpenFile(uri, WRITE_READ, fd); + int result = FileExtensionHelperTest::GetFileAccessHelper()->OpenFile(uri, WRITE_READ, fd); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0003 result:" << result; } catch (...) { @@ -252,20 +169,21 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0004, testing::e { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0004"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newFileUri(""); - result = g_fah->CreateFile(parentUri, "external_file_access_OpenFile_0004.txt", newFileUri); + result = fileAccessHelper->CreateFile(parentUri, "external_file_access_OpenFile_0004.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; int flag = -1; - result = g_fah->OpenFile(newFileUri, flag, fd); + result = fileAccessHelper->OpenFile(newFileUri, flag, fd); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0004 result:" << result; - result = g_fah->Delete(newFileUri); + result = fileAccessHelper->Delete(newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -287,20 +205,21 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0005, testing::e { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0005"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newFileUri(""); - result = g_fah->CreateFile(parentUri, "external_file_access_OpenFile_0005.txt", newFileUri); + result = fileAccessHelper->CreateFile(parentUri, "external_file_access_OpenFile_0005.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = g_fah->OpenFile(newFileUri, READ, fd); + result = fileAccessHelper->OpenFile(newFileUri, READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0005 result:" << result; close(fd); - result = g_fah->Delete(newFileUri); + result = fileAccessHelper->Delete(newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -322,20 +241,21 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0006, testing::e { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0006"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newFileUri(""); - result = g_fah->CreateFile(parentUri, "external_file_access_OpenFile_0006.txt", newFileUri); + result = fileAccessHelper->CreateFile(parentUri, "external_file_access_OpenFile_0006.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = g_fah->OpenFile(newFileUri, WRITE, fd); + result = fileAccessHelper->OpenFile(newFileUri, WRITE, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0006 result:" << result; close(fd); - result = g_fah->Delete(newFileUri); + result = fileAccessHelper->Delete(newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -357,20 +277,21 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0007, testing::e { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0007"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newFileUri(""); - result = g_fah->CreateFile(parentUri, "external_file_access_OpenFile_0007.txt", newFileUri); + result = fileAccessHelper->CreateFile(parentUri, "external_file_access_OpenFile_0007.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = g_fah->OpenFile(newFileUri, WRITE_READ, fd); + result = fileAccessHelper->OpenFile(newFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0007 result:" << result; close(fd); - result = g_fah->Delete(newFileUri); + result = fileAccessHelper->Delete(newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -407,8 +328,9 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0008, testing::e { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0008"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); @@ -416,14 +338,14 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0008, testing::e int fd; std::string displayName = "test1.txt"; g_num = 0; - result = g_fah->CreateFile(parentUri, displayName, newFileUri); + result = fileAccessHelper->CreateFile(parentUri, displayName, newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t j = 0; j < INIT_THREADS_NUMBER; j++) { - std::thread execthread(OpenFileTdd, g_fah, newFileUri, WRITE_READ, fd); + std::thread execthread(OpenFileTdd, fileAccessHelper, newFileUri, WRITE_READ, fd); execthread.join(); } EXPECT_EQ(g_num, INIT_THREADS_NUMBER); - result = g_fah->Delete(newFileUri); + result = fileAccessHelper->Delete(newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -432,50 +354,6 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0008, testing::e GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0008"; } -bool FileExtensionHelperTest::ReplaceBundleNameFromPath(std::string &path, const std::string &newName) -{ - Uri uri(path); - std::string scheme = uri.GetScheme(); - if (scheme == FILE_SCHEME_NAME) { - std::string curName = uri.GetAuthority(); - if (curName.empty()) { - return false; - } - path.replace(path.find(curName), curName.length(), newName); - return true; - } - - std::string tPath = uri.GetPath(); - if (tPath.empty()) { - GTEST_LOG_(INFO) << "Uri path error."; - return false; - } - - if (tPath.front() != '/') { - GTEST_LOG_(INFO) << "Uri path format error."; - return false; - } - - auto index = tPath.substr(1).find_first_of("/"); - auto bundleName = tPath.substr(1, index); - if (bundleName.empty()) { - GTEST_LOG_(INFO) << "bundleName empty."; - return false; - } - - path.replace(path.find(bundleName), bundleName.length(), newName); - return true; -} - -bool FileExtensionHelperTest::ReplaceBundleName(std::string& str, const std::string& newBundleName) -{ - if (!ReplaceBundleNameFromPath(str, newBundleName)) { - GTEST_LOG_(ERROR) << "replace BundleName failed."; - return false; - } - return true; -} - /** * @tc.number: user_file_service_external_file_access_OpenFile_0009 * @tc.name: external_file_access_OpenFile_0009 @@ -489,15 +367,16 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0009, testing::e { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0009"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { std::string str = info[i].uri; if (ReplaceBundleName(str, "ohos.com.NotExistBundleName")) { int fd; Uri newFileUri(str + "/NotExistFile.txt"); - result = g_fah->OpenFile(newFileUri, WRITE_READ, fd); + result = fileAccessHelper->OpenFile(newFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::E_IPCS); GTEST_LOG_(INFO) << "OpenFile_0009 result:" << result; } else { @@ -523,26 +402,27 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0010, testing::e { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0010"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); GTEST_LOG_(INFO) << parentUri.ToString(); Uri newDirUriTest1(""); - result = g_fah->Mkdir(parentUri, "测试目录", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "测试目录", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(newDirUriTest1.ToString().find("测试目录"), std::string::npos); Uri newFileUri(""); - result = g_fah->CreateFile(newDirUriTest1, "打开文件.txt", newFileUri); + result = fileAccessHelper->CreateFile(newDirUriTest1, "打开文件.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(newFileUri.ToString().find("打开文件.txt"), std::string::npos); int fd; - result = g_fah->OpenFile(newFileUri, WRITE_READ, fd); + result = fileAccessHelper->OpenFile(newFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0010 result:" << result; close(fd); - result = g_fah->Delete(newDirUriTest1); + result = fileAccessHelper->Delete(newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -564,21 +444,22 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0000, testing::ext { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Delete_0000"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = g_fah->Mkdir(parentUri, "test", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); - result = g_fah->CreateFile(newDirUriTest, "external_file_access_Delete_0000.txt", newFileUri); + result = fileAccessHelper->CreateFile(newDirUriTest, "external_file_access_Delete_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newFileUri); + result = fileAccessHelper->Delete(newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0000 result:" << result; - result = g_fah->Delete(newDirUriTest); + result = fileAccessHelper->Delete(newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -600,15 +481,16 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0001, testing::ext { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Delete_0001"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = g_fah->Mkdir(parentUri, "test", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newDirUriTest); + result = fileAccessHelper->Delete(newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0001 result:" << result; } @@ -632,7 +514,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0002, testing::ext GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Delete_0002"; try { Uri selectFileUri(""); - int result = g_fah->Delete(selectFileUri); + int result = FileExtensionHelperTest::GetFileAccessHelper()->Delete(selectFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0002 result:" << result; } catch (...) { @@ -654,18 +536,19 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0003, testing::ext { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Delete_0003"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = g_fah->Mkdir(parentUri, "test", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri selectFileUri("storage/media/100/local/files/Download/test"); - result = g_fah->Delete(selectFileUri); + result = fileAccessHelper->Delete(selectFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newDirUriTest); + result = fileAccessHelper->Delete(newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0003 result:" << result; } @@ -689,7 +572,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0004, testing::ext GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Delete_0004"; try { Uri selectFileUri("!@#$%^&*()"); - int result = g_fah->Delete(selectFileUri); + int result = FileExtensionHelperTest::GetFileAccessHelper()->Delete(selectFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0004 result:" << result; } catch (...) { @@ -724,25 +607,26 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0005, testing::ext { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Delete_0005"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = g_fah->Mkdir(parentUri, "test", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); std::string displayName = "test1.txt"; - result = g_fah->CreateFile(newDirUriTest, displayName, newFileUri); + result = fileAccessHelper->CreateFile(newDirUriTest, displayName, newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); g_num = 0; for (int j = 0; j < INIT_THREADS_NUMBER; j++) { - std::thread execthread(DeleteTdd, g_fah, newFileUri); + std::thread execthread(DeleteTdd, fileAccessHelper, newFileUri); execthread.join(); } EXPECT_EQ(g_num, ACTUAL_SUCCESS_THREADS_NUMBER); - result = g_fah->Delete(newDirUriTest); + result = fileAccessHelper->Delete(newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -764,14 +648,15 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0006, testing::ext { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Delete_0006"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { std::string str = info[i].uri; if (ReplaceBundleName(str, "ohos.com.NotExistBundleName")) { Uri selectFileUri(str); - int result = g_fah->Delete(selectFileUri); + int result = fileAccessHelper->Delete(selectFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::E_IPCS); GTEST_LOG_(INFO) << "Delete_0006 result:" << result; } else { @@ -797,23 +682,24 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0007, testing::ext { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Delete_0007"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = g_fah->Mkdir(parentUri, "测试目录", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "测试目录", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(newDirUriTest.ToString().find("测试目录"), std::string::npos); Uri newFileUri(""); - result = g_fah->CreateFile(newDirUriTest, "删除文件.txt", newFileUri); + result = fileAccessHelper->CreateFile(newDirUriTest, "删除文件.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(newFileUri.ToString().find("删除文件.txt"), std::string::npos); - result = g_fah->Delete(newFileUri); + result = fileAccessHelper->Delete(newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0007 result:" << result; - result = g_fah->Delete(newDirUriTest); + result = fileAccessHelper->Delete(newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -835,27 +721,28 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0000, testing::ext:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0000"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest1(""); Uri newDirUriTest2(""); - result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); + result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); - result = g_fah->Move(testUri, newDirUriTest2, testUri2); + result = fileAccessHelper->Move(testUri, newDirUriTest2, testUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0000 result:" << result; - result = g_fah->Delete(newDirUriTest1); + result = fileAccessHelper->Delete(newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newDirUriTest2); + result = fileAccessHelper->Delete(newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -877,25 +764,26 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0001, testing::ext:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0001"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest1(""); Uri newDirUriTest2(""); - result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); + result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); - result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); + result = fileAccessHelper->Move(newDirUriTest1, newDirUriTest2, testUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0001 result:" << result; - result = g_fah->Delete(newDirUriTest2); + result = fileAccessHelper->Delete(newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -917,20 +805,21 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0002, testing::ext:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0002"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = g_fah->Mkdir(parentUri, "test", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); Uri sourceFileUri(""); - result = g_fah->Move(sourceFileUri, newDirUriTest, testUri); + result = fileAccessHelper->Move(sourceFileUri, newDirUriTest, testUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0002 result:" << result; - result = g_fah->Delete(newDirUriTest); + result = fileAccessHelper->Delete(newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -952,28 +841,29 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0003, testing::ext:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0003"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest1(""); Uri newDirUriTest2(""); - result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); + result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); Uri sourceFileUri("storage/media/100/local/files/Download/test1/test.txt"); - result = g_fah->Move(sourceFileUri, newDirUriTest2, testUri2); + result = fileAccessHelper->Move(sourceFileUri, newDirUriTest2, testUri2); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0003 result:" << result; - result = g_fah->Delete(newDirUriTest1); + result = fileAccessHelper->Delete(newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newDirUriTest2); + result = fileAccessHelper->Delete(newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -995,20 +885,21 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0004, testing::ext:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0004"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = g_fah->Mkdir(parentUri, "test", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); Uri sourceFileUri("~!@#$%^&*()_"); - result = g_fah->Move(sourceFileUri, newDirUriTest, testUri); + result = fileAccessHelper->Move(sourceFileUri, newDirUriTest, testUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0004 result:" << result; - result = g_fah->Delete(newDirUriTest); + result = fileAccessHelper->Delete(newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1030,23 +921,24 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0005, testing::ext:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0005"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = g_fah->Mkdir(parentUri, "test1", newDirUriTest); + result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = g_fah->CreateFile(newDirUriTest, "test.txt", testUri); + result = fileAccessHelper->CreateFile(newDirUriTest, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); Uri targetParentUri(""); - result = g_fah->Move(testUri, targetParentUri, testUri2); + result = fileAccessHelper->Move(testUri, targetParentUri, testUri2); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0005 result:" << result; - result = g_fah->Delete(newDirUriTest); + result = fileAccessHelper->Delete(newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1068,28 +960,29 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0006, testing::ext:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0006"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest1(""); Uri newDirUriTest2(""); - result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); + result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); Uri targetParentUri("storage/media/100/local/files/Download/test2"); - result = g_fah->Move(testUri, targetParentUri, testUri2); + result = fileAccessHelper->Move(testUri, targetParentUri, testUri2); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0006 result:" << result; - result = g_fah->Delete(newDirUriTest1); + result = fileAccessHelper->Delete(newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newDirUriTest2); + result = fileAccessHelper->Delete(newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1111,28 +1004,29 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0007, testing::ext:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0007"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest1(""); Uri newDirUriTest2(""); - result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); + result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); Uri targetParentUri("~!@#$^%&*()_"); - result = g_fah->Move(testUri, targetParentUri, testUri2); + result = fileAccessHelper->Move(testUri, targetParentUri, testUri2); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0007 result:" << result; - result = g_fah->Delete(newDirUriTest1); + result = fileAccessHelper->Delete(newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newDirUriTest2); + result = fileAccessHelper->Delete(newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1154,22 +1048,23 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0008, testing::ext:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0008"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest1(""); Uri newDirUriTest2(""); - result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri); + result = fileAccessHelper->Move(newDirUriTest1, newDirUriTest2, testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0008 result:" << result; - result = g_fah->Delete(newDirUriTest2); + result = fileAccessHelper->Delete(newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1191,29 +1086,30 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0009, testing::ext:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0009"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest1(""); Uri newDirUriTest2(""); - result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); size_t fileNumbers = 2000; for (size_t j = 0; j < fileNumbers; j++) { string fileName = "test" + ToString(j) + ".txt"; - result = g_fah->CreateFile(newDirUriTest1, fileName, testUri); + result = fileAccessHelper->CreateFile(newDirUriTest1, fileName, testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } Uri testUri2(""); - result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); + result = fileAccessHelper->Move(newDirUriTest1, newDirUriTest2, testUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0009 result:" << result; - result = g_fah->Delete(newDirUriTest2); + result = fileAccessHelper->Delete(newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1235,30 +1131,31 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0010, testing::ext:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0010"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest1(""); Uri newDirUriTest2(""); - result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = g_fah->Mkdir(newDirUriTest1, "test", testUri); + result = fileAccessHelper->Mkdir(newDirUriTest1, "test", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); size_t directoryNumbers = 64; for (size_t j = 0; j < directoryNumbers; j++) { - result = g_fah->Mkdir(testUri, "test", testUri); + result = fileAccessHelper->Mkdir(testUri, "test", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } Uri testUri2(""); - result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); + result = fileAccessHelper->Move(newDirUriTest1, newDirUriTest2, testUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0010 result:" << result; - result = g_fah->Delete(newDirUriTest2); + result = fileAccessHelper->Delete(newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1280,31 +1177,32 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0011, testing::ext:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0011"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest1(""); Uri newDirUriTest2(""); - result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); + result = fileAccessHelper->CreateFile(newDirUriTest1, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t j = i + 1; j < info.size(); j++) { Uri otherUri(info[j].uri); - result = g_fah->Mkdir(otherUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(otherUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Move(testUri, newDirUriTest2, testUri); + result = fileAccessHelper->Move(testUri, newDirUriTest2, testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Move(testUri, newDirUriTest1, testUri); + result = fileAccessHelper->Move(testUri, newDirUriTest1, testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0011 result:" << result; - result = g_fah->Delete(newDirUriTest2); + result = fileAccessHelper->Delete(newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } - result = g_fah->Delete(newDirUriTest1); + result = fileAccessHelper->Delete(newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1339,31 +1237,32 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0012, testing::ext:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0012"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest1(""); Uri newDirUriTest2(""); - result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); std::string displayName = "test3.txt"; - result = g_fah->CreateFile(newDirUriTest1, displayName, testUri); + result = fileAccessHelper->CreateFile(newDirUriTest1, displayName, testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); g_num = 0; for (int j = 0; j < INIT_THREADS_NUMBER; j++) { - std::thread execthread(MoveTdd, g_fah, testUri, newDirUriTest2, testUri2); + std::thread execthread(MoveTdd, fileAccessHelper, testUri, newDirUriTest2, testUri2); execthread.join(); } EXPECT_EQ(g_num, ACTUAL_SUCCESS_THREADS_NUMBER); - result = g_fah->Delete(newDirUriTest1); + result = fileAccessHelper->Delete(newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newDirUriTest2); + result = fileAccessHelper->Delete(newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1385,18 +1284,19 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0013, testing::ext:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0013"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(info[0].uri); Uri newDirUriTest1(""); Uri newDirUriTest2(""); - result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = g_fah->Mkdir(newDirUriTest1, "test", testUri); + result = fileAccessHelper->Mkdir(newDirUriTest1, "test", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); std::string str = newDirUriTest1.ToString(); if (!ReplaceBundleNameFromPath(str, "ohos.com.NotExistBundleName")) { @@ -1405,12 +1305,12 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0013, testing::ext:: } Uri uri(str); Uri testUri2(""); - result = g_fah->Move(uri, newDirUriTest2, testUri2); + result = fileAccessHelper->Move(uri, newDirUriTest2, testUri2); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0013 result:" << result; - result = g_fah->Delete(newDirUriTest1); + result = fileAccessHelper->Delete(newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newDirUriTest2); + result = fileAccessHelper->Delete(newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(ERROR) << "external_file_access_Move_0013 occurs an exception."; @@ -1431,30 +1331,31 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0014, testing::ext:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0014"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest1(""); Uri newDirUriTest2(""); - result = g_fah->Mkdir(parentUri, "测试目录1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "测试目录1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(newDirUriTest1.ToString().find("测试目录1"), std::string::npos); - result = g_fah->Mkdir(parentUri, "测试目录2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "测试目录2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(newDirUriTest2.ToString().find("测试目录2"), std::string::npos); Uri testUri(""); - result = g_fah->CreateFile(newDirUriTest1, "移动文件.txt", testUri); + result = fileAccessHelper->CreateFile(newDirUriTest1, "移动文件.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(testUri.ToString().find("移动文件.txt"), std::string::npos); Uri testUri2(""); - result = g_fah->Move(testUri, newDirUriTest2, testUri2); + result = fileAccessHelper->Move(testUri, newDirUriTest2, testUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0014 result:" << result; - result = g_fah->Delete(newDirUriTest1); + result = fileAccessHelper->Delete(newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newDirUriTest2); + result = fileAccessHelper->Delete(newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1477,23 +1378,24 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0015, testing::ext:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0015"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest1(""); Uri newDirUriTest2(""); - result = g_fah->Mkdir(parentUri, "移动目录", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "移动目录", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(newDirUriTest1.ToString().find("移动目录"), std::string::npos); - result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); - result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); + result = fileAccessHelper->Move(newDirUriTest1, newDirUriTest2, testUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0015 result:" << result; - result = g_fah->Delete(newDirUriTest2); + result = fileAccessHelper->Delete(newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1516,22 +1418,23 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0016, testing::ext:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0016"; try { + shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); vector info; - int result = g_fah->GetRoots(info); + int result = fileAccessHelper->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest1(""); Uri newDirUriTest2(""); - result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fileAccessHelper->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(parentUri, "移动目录", newDirUriTest2); + result = fileAccessHelper->Mkdir(parentUri, "移动目录", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); - result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); + result = fileAccessHelper->Move(newDirUriTest1, newDirUriTest2, testUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0016 result:" << result; - result = g_fah->Delete(newDirUriTest2); + result = fileAccessHelper->Delete(newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1555,7 +1458,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_creator_0000, testing::ex GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_creator_0000"; try { setuid(UID_TRANSFORM_TMP); - std::pair, int> helper = FileAccessHelper::Creator(g_context); + std::pair, int> helper = + FileAccessHelper::Creator(FileExtensionHelperTest::GetContext()); setuid(UID_DEFAULT); ASSERT_TRUE(helper.first != nullptr); bool succ = helper.first->Release(); @@ -1597,7 +1501,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_creator_0001, testing::ex } EXPECT_TRUE(sus); vector wants{want}; - std::pair, int> helper = FileAccessHelper::Creator(g_context, wants); + std::pair, int> helper = + FileAccessHelper::Creator(FileExtensionHelperTest::GetContext(), wants); setuid(UID_DEFAULT); ASSERT_TRUE(helper.first != nullptr); bool succ = helper.first->Release(); @@ -1670,7 +1575,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_creator_0004, testing::ex GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_creator_0004"; try { std::vector wants; - std::pair, int> helper = FileAccessHelper::Creator(g_context, wants); + std::pair, int> helper = + FileAccessHelper::Creator(FileExtensionHelperTest::GetContext(), wants); ASSERT_TRUE(helper.first == nullptr); } catch (...) { GTEST_LOG_(ERROR) << "external_file_access_creator_0004 occurs an exception."; @@ -1695,7 +1601,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_creator_0005, testing::ex AAFwk::Want want; want.SetElementName("NotExistBundleName", "NotExistAbilityName"); std::vector wants{want}; - std::pair, int> helper = FileAccessHelper::Creator(g_context, wants); + std::pair, int> helper = + FileAccessHelper::Creator(FileExtensionHelperTest::GetContext(), wants); ASSERT_TRUE(helper.first == nullptr); } catch (...) { GTEST_LOG_(ERROR) << "external_file_access_creator_0005 occurs an exception."; @@ -1742,7 +1649,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_creator_0007, testing::ex GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_creator_0007"; try { std::vector wants; - shared_ptr helper = FileAccessHelper::Creator(g_context->GetToken(), wants); + shared_ptr helper = + FileAccessHelper::Creator(FileExtensionHelperTest::GetContext()->GetToken(), wants); ASSERT_TRUE(helper == nullptr); } catch (...) { GTEST_LOG_(ERROR) << "external_file_access_creator_0007 occurs an exception."; @@ -1767,7 +1675,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_creator_0008, testing::ex AAFwk::Want want; want.SetElementName("NotExistBundleName", "NotExistAbilityName"); std::vector wants{want}; - shared_ptr helper = FileAccessHelper::Creator(g_context->GetToken(), wants); + shared_ptr helper = + FileAccessHelper::Creator(FileExtensionHelperTest::GetContext()->GetToken(), wants); ASSERT_TRUE(helper == nullptr); } catch (...) { GTEST_LOG_(ERROR) << "external_file_access_creator_0008 occurs an exception."; diff --git a/test/unittest/external_file_access_test_info.cpp b/test/unittest/external_file_access_test_info.cpp index 0c2fb316..2f3e38e8 100644 --- a/test/unittest/external_file_access_test_info.cpp +++ b/test/unittest/external_file_access_test_info.cpp @@ -20,7 +20,7 @@ #include #include -#include "external_file_access_test_basic.h" +#include "external_file_access_test.h" #include "accesstoken_kit.h" #include "context_impl.h" #include "file_access_framework_errno.h" @@ -29,10 +29,6 @@ #include "nativetoken_kit.h" #include "token_setproc.h" -#define private public -#include "file_access_helper.h" -#undef private - namespace OHOS::FileAccessFwk { using json = nlohmann::json; static int g_num = 0; diff --git a/test/unittest/external_file_access_test_management.cpp b/test/unittest/external_file_access_test_management.cpp index a4ac3274..195e4953 100644 --- a/test/unittest/external_file_access_test_management.cpp +++ b/test/unittest/external_file_access_test_management.cpp @@ -20,7 +20,7 @@ #include #include -#include "external_file_access_test_basic.h" +#include "external_file_access_test.h" #include "accesstoken_kit.h" #include "context_impl.h" #include "file_access_framework_errno.h" @@ -29,10 +29,6 @@ #include "nativetoken_kit.h" #include "token_setproc.h" -#define private public -#include "file_access_helper.h" -#undef private - namespace OHOS::FileAccessFwk { static int g_num = 0; @@ -130,7 +126,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0002, testing: HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0003, testing::ext::TestSize.Level1) { shared_ptr fileAccessHelper = FileExtensionHelperTest::GetFileAccessHelper(); - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_CreateFile_0002"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_CreateFile_0003"; try { Uri newFileUri(""); Uri parentUri("~!@#$%^&*()_"); @@ -209,7 +205,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0005, testing: for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newFileUri(""); - std::string displayName = "test1.txt"; + std::string displayName = "external_file_access_CreateFile_0005.txt"; g_num = 0; for (int j = 0; j < INIT_THREADS_NUMBER; j++) { std::thread execthread(CreateFileTdd, fileAccessHelper, parentUri, displayName, newFileUri); diff --git a/test/unittest/external_file_access_test_operations.cpp b/test/unittest/external_file_access_test_operations.cpp index d3a7e56d..32f14d98 100644 --- a/test/unittest/external_file_access_test_operations.cpp +++ b/test/unittest/external_file_access_test_operations.cpp @@ -20,7 +20,7 @@ #include #include -#include "external_file_access_test_basic.h" +#include "external_file_access_test.h" #include "accesstoken_kit.h" #include "context_impl.h" #include "file_access_framework_errno.h" @@ -29,10 +29,6 @@ #include "nativetoken_kit.h" #include "token_setproc.h" -#define private public -#include "file_access_helper.h" -#undef private - namespace OHOS::FileAccessFwk { static int g_num = 0; -- Gitee