diff --git a/frameworks/js/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp b/frameworks/js/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp index 935f828e5975fad985389c683c8f3413f9b50513..b75e3142c6e8a03aa6e3439f159c48c9552906cd 100644 --- a/frameworks/js/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp +++ b/frameworks/js/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp @@ -76,7 +76,18 @@ static int MakeResult(napi_value &objFileInfoExporter, FileIteratorEntity *fileI FileInfoEntity *fileInfoEntity, napi_env env, NVal &nVal) { std::lock_guard lock(fileIteratorEntity->entityOperateMutex); - if (fileIteratorEntity->fileInfoVec.size() == 0) { + if (fileIteratorEntity->fileInfoVec.empty()) { + //fileIteratorEntity->fileInfoVec.clear(); + fileIteratorEntity->offset = 0; + fileIteratorEntity->pos = 0; + fileInfoEntity = nullptr;//没有可用的文件信息 + objFileInfoExporter = NVal::CreateUndefined(env).val_;//没有可导出的文件信息 + nVal.AddProp("value", objFileInfoExporter); + nVal.AddProp("done", NVal::CreateBool(env, true).val_); + return ERR_OK; + } + + if (fileIteratorEntity->pos == fileIteratorEntity->fileInfoVec.size()) { fileIteratorEntity->fileInfoVec.clear(); fileIteratorEntity->offset = 0; fileIteratorEntity->pos = 0; @@ -87,10 +98,11 @@ static int MakeResult(napi_value &objFileInfoExporter, FileIteratorEntity *fileI return ERR_OK; } - if (fileIteratorEntity->pos == MAX_COUNT) { + if (fileIteratorEntity->pos == MAX_COUNT || fileIteratorEntity->pos == 0) { fileIteratorEntity->fileInfoVec.clear(); fileIteratorEntity->offset += MAX_COUNT; fileIteratorEntity->pos = 0; + int ret = ERR_OK; if (fileIteratorEntity->flag == 0) { int ret = fileIteratorEntity->fileAccessHelper->ListFile(fileIteratorEntity->fileInfo, fileIteratorEntity->offset, MAX_COUNT, fileIteratorEntity->filter, fileIteratorEntity->fileInfoVec); @@ -108,20 +120,9 @@ static int MakeResult(napi_value &objFileInfoExporter, FileIteratorEntity *fileI } } - if (fileIteratorEntity->pos == fileIteratorEntity->fileInfoVec.size()) { - fileIteratorEntity->fileInfoVec.clear(); - fileIteratorEntity->offset = 0; - fileIteratorEntity->pos = 0; - fileInfoEntity = nullptr; - objFileInfoExporter = NVal::CreateUndefined(env).val_; - nVal.AddProp("value", objFileInfoExporter); - nVal.AddProp("done", NVal::CreateBool(env, true).val_); - return ERR_OK; - } fileInfoEntity->fileAccessHelper = fileIteratorEntity->fileAccessHelper; - fileInfoEntity->fileInfo = fileIteratorEntity->fileInfoVec[fileIteratorEntity->pos]; - fileIteratorEntity->pos++; + fileInfoEntity->fileInfo = fileIteratorEntity->fileInfoVec[fileIteratorEntity->pos++]; nVal.AddProp("value", objFileInfoExporter); nVal.AddProp("done", NVal::CreateBool(env, false).val_); return ERR_OK; diff --git a/frameworks/js/napi/file_access_module/napi_fileaccess_helper.cpp b/frameworks/js/napi/file_access_module/napi_fileaccess_helper.cpp index cad006215ed8e426d15379a065701b3cf9907e1f..ab6180c700e22133f7ac966811370095ecc0e342 100644 --- a/frameworks/js/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/frameworks/js/napi/file_access_module/napi_fileaccess_helper.cpp @@ -377,10 +377,10 @@ napi_value NAPI_CreateFile(napi_env env, napi_callback_info info) NError(EINVAL).ThrowErr(env); return nullptr; } - - bool succ = false; + std::unique_ptr uri; std::unique_ptr displayName; + bool succ = false; std::tie(succ, uri, displayName) = GetReadArg(env, funcArg[NARG_POS::FIRST], funcArg[NARG_POS::SECOND]); if (!succ) { return nullptr; @@ -397,8 +397,8 @@ napi_value NAPI_CreateFile(napi_env env, napi_callback_info info) return nullptr; } - string uriString(uri.get()); - string name(displayName.get()); + string name(displayName.get()); + string uriString(uri.get()); auto cbExec = [uriString, name, result, fileAccessHelper]() -> NError { OHOS::Uri uri(uriString); std::string newFile = ""; @@ -434,9 +434,9 @@ napi_value NAPI_Mkdir(napi_env env, napi_callback_info info) NError(EINVAL).ThrowErr(env); return nullptr; } - - bool succ = false; + std::unique_ptr uri; + bool succ = false; std::unique_ptr displayName; std::tie(succ, uri, displayName) = GetReadArg(env, funcArg[NARG_POS::FIRST], funcArg[NARG_POS::SECOND]); if (!succ) { @@ -491,9 +491,8 @@ napi_value NAPI_Delete(napi_env env, napi_callback_info info) NError(EINVAL).ThrowErr(env); return nullptr; } - - bool succ = false; - std::unique_ptr uri; + bool succ = false; + std::unique_ptr uri; std::tie(succ, uri, std::ignore) = NVal(env, funcArg[NARG_POS::FIRST]).ToUTF8String(); if (!succ) { NError(EINVAL).ThrowErr(env); diff --git a/frameworks/js/napi/file_access_module/napi_utils.cpp b/frameworks/js/napi/file_access_module/napi_utils.cpp index 3257720dbd231b8e686987927488f66b50b2f8b6..b4646e501e5ccd7345b172fe538855c02a0c4325 100644 --- a/frameworks/js/napi/file_access_module/napi_utils.cpp +++ b/frameworks/js/napi/file_access_module/napi_utils.cpp @@ -41,7 +41,7 @@ int IsDirectory(const int64_t mode) return ERR_OK; } -bool CheckSuffix(std::vector suffixs) +static bool CheckSuffix(const std::vector &suffixs) { for (std::string suffix : suffixs) { if (suffix.length() <= 1 || suffix.length() > MAX_SUFFIX_LENGTH) { diff --git a/interfaces/inner_api/file_access/src/file_access_ext_proxy.cpp b/interfaces/inner_api/file_access/src/file_access_ext_proxy.cpp index 3d23ae5aab344b538b690d60d09c208ea04ab556..c954a6f7ec08640b9ff3e42748cb00813b89aa55 100644 --- a/interfaces/inner_api/file_access/src/file_access_ext_proxy.cpp +++ b/interfaces/inner_api/file_access/src/file_access_ext_proxy.cpp @@ -827,8 +827,8 @@ int FileAccessExtProxy::GetFileInfoFromUri(const Uri &selectFile, FileInfo &file return E_IPCS; } - MessageParcel reply; - MessageOption option; + MessageOption option; + MessageParcel reply; int err = Remote()->SendRequest(CMD_GET_FILEINFO_FROM_URI, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); diff --git a/interfaces/inner_api/file_access/src/file_access_ext_stub.cpp b/interfaces/inner_api/file_access/src/file_access_ext_stub.cpp index 22988fbd23b49e002f8dbe796bd3fb6d2c4fee59..365f0d1bae35b708c33b5f3e469b1cb0b2842e34 100644 --- a/interfaces/inner_api/file_access/src/file_access_ext_stub.cpp +++ b/interfaces/inner_api/file_access/src/file_access_ext_stub.cpp @@ -753,7 +753,6 @@ bool FileAccessExtStub::CheckCallingPermission(const std::string &permission) FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return false; } - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return true; } diff --git a/services/native/file_access_service/src/file_access_service_stub.cpp b/services/native/file_access_service/src/file_access_service_stub.cpp index ea39ef8347c4f223f0e73a44a9a116097d64e6ee..be51bafcf099a904ea5e5935c5f69a141780690c 100644 --- a/services/native/file_access_service/src/file_access_service_stub.cpp +++ b/services/native/file_access_service/src/file_access_service_stub.cpp @@ -62,16 +62,15 @@ int32_t FileAccessServiceStub::OnRemoteRequest(uint32_t code, MessageParcel &dat } const auto &itFunc = stubFuncMap_.find(code); - if (itFunc != stubFuncMap_.end()) { - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return (this->*(itFunc->second))(data, reply); - } - - if (!CheckCallingPermission(FILE_ACCESS_PERMISSION)) { + if (!CheckCallingPermission(FILE_ACCESS_PERMISSION)) { HILOG_ERROR("permission error"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return E_PERMISSION; } + if (itFunc != stubFuncMap_.end()) { + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return (this->*(itFunc->second))(data, reply); + } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return IPCObjectStub::OnRemoteRequest(code, data, reply, option); } @@ -183,7 +182,6 @@ bool FileAccessServiceStub::CheckCallingPermission(const std::string &permission FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return false; } - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return true; } diff --git a/test/fuzztest/medialibraryfileaccess_fuzzer/medialibrary_file_access_fuzzer.cpp b/test/fuzztest/medialibraryfileaccess_fuzzer/medialibrary_file_access_fuzzer.cpp index 1a9e07f011cc4eec7f2b68a0dced19163393c83e..76bd6da8a810231ffef8c5aa8818f15301fec26a 100644 --- a/test/fuzztest/medialibraryfileaccess_fuzzer/medialibrary_file_access_fuzzer.cpp +++ b/test/fuzztest/medialibraryfileaccess_fuzzer/medialibrary_file_access_fuzzer.cpp @@ -34,9 +34,9 @@ using namespace OHOS; using namespace FileAccessFwk; const int ABILITY_ID = 5003; -shared_ptr g_fah = nullptr; const int UID_TRANSFORM_TMP = 20000000; const int UID_DEFAULT = 0; +shared_ptr g_fah = nullptr; void SetNativeToken() { @@ -44,12 +44,12 @@ void SetNativeToken() const char **perms = new const char *; *perms = "ohos.permission.FILE_ACCESS_MANAGER"; NativeTokenInfoParams infoInstance = { + .aclsNum = 0, .dcapsNum = 0, - .permsNum = 1, - .aclsNum = 0, + .permsNum = 1, .dcaps = nullptr, - .perms = perms, - .acls = nullptr, + .acls = nullptr, + .perms = perms, .aplStr = "system_core", }; @@ -61,7 +61,6 @@ void SetNativeToken() OHOS::Security::AccessToken::AccessTokenKit::ReloadNativeTokenInfo(); delete perms; } - shared_ptr GetFileAccessHelper() { if (g_fah != nullptr) { @@ -81,7 +80,7 @@ shared_ptr GetFileAccessHelper() bool sus = false; for (size_t i = 0; i < wantVec.size(); i++) { auto element = wantVec[i].GetElement(); - if (element.GetBundleName() == "com.ohos.medialibrary.medialibrarydata" && + if (element.GetBundleName() == "com.ohos.UserFile.ExternalFileManager" && element.GetAbilityName() == "FileExtensionAbility") { want = wantVec[i]; sus = true; @@ -94,11 +93,11 @@ shared_ptr GetFileAccessHelper() } vector wants {want}; g_fah = FileAccessHelper::Creator(remoteObj, wants); + setuid(UID_DEFAULT); if (g_fah == nullptr) { HILOG_ERROR("creator fileAccessHelper return nullptr."); return nullptr; } - setuid(UID_DEFAULT); return g_fah; } @@ -109,12 +108,12 @@ bool CreatorFuzzTest(const uint8_t* data, size_t size) HILOG_ERROR("parameter data is nullptr or parameter size <= 0."); return false; } - std::string bundleName(reinterpret_cast(data), size); - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); + auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); + std::string bundleName(reinterpret_cast(data), size); AAFwk::Want want; - want.SetElementName(bundleName, "FileExtensionAbility"); vector wants {want}; + want.SetElementName(bundleName, "FileExtensionAbility"); setuid(UID_TRANSFORM_TMP); shared_ptr helper = nullptr; helper = FileAccessHelper::Creator(remoteObj, wants); @@ -185,11 +184,11 @@ bool AccessFuzzTest(const uint8_t* data, size_t size) bool OpenFileFuzzTest(const uint8_t* data, size_t size) { + auto [helper, downloadUri] = GetDownloadUri(); if ((data == nullptr) || (size <= 0)) { HILOG_ERROR("parameter data is nullptr or parameter size <= 0."); return false; } - auto [helper, downloadUri] = GetDownloadUri(); if (helper == nullptr || downloadUri.ToString() == "") { HILOG_ERROR("helper is nullptr or downloadUri is empty"); return false; @@ -207,11 +206,11 @@ bool OpenFileFuzzTest(const uint8_t* data, size_t size) bool CreateFileFuzzTest(const uint8_t* data, size_t size) { + auto [helper, downloadUri] = GetDownloadUri(); if ((data == nullptr) || (size <= 0)) { HILOG_ERROR("parameter data is nullptr or parameter size <= 0."); return false; } - auto [helper, downloadUri] = GetDownloadUri(); if (helper == nullptr || downloadUri.ToString() == "") { HILOG_ERROR("helper is nullptr or downloadUri is empty"); return false; @@ -277,11 +276,11 @@ bool DeleteFuzzTest(const uint8_t* data, size_t size) bool MoveFuzzTest(const uint8_t* data, size_t size) { + auto [helper, downloadUri] = GetDownloadUri(); if ((data == nullptr) || (size <= 0)) { HILOG_ERROR("parameter data is nullptr or parameter size <= 0."); return false; - } - auto [helper, downloadUri] = GetDownloadUri(); + } if (helper == nullptr || downloadUri.ToString() == "") { HILOG_ERROR("helper is nullptr or downloadUri is empty"); return false; @@ -305,21 +304,21 @@ bool MoveFuzzTest(const uint8_t* data, size_t size) return false; } Uri testUri2(""); - result = helper->Move(testUri, newDirUriTest2, testUri2); + result = helper->Delete(newDirUriTest1); if (result != OHOS::FileAccessFwk::ERR_OK) { - HILOG_ERROR("Move failed. ret : %{public}d", result); + HILOG_ERROR("Delete failed. ret : %{public}d", result); return false; } - result = helper->Delete(newDirUriTest1); + result = helper->Delete(newDirUriTest2); if (result != OHOS::FileAccessFwk::ERR_OK) { HILOG_ERROR("Delete failed. ret : %{public}d", result); return false; } - result = helper->Delete(newDirUriTest2); + result = helper->Move(testUri, newDirUriTest2, testUri2); if (result != OHOS::FileAccessFwk::ERR_OK) { - HILOG_ERROR("Delete failed. ret : %{public}d", result); + HILOG_ERROR("Move failed. ret : %{public}d", result); return false; - } + } return true; } @@ -367,10 +366,10 @@ bool ListFileFuzzTest(const uint8_t* data, size_t size) } FileInfo fileInfo; fileInfo.uri = downloadUri.ToString() + "/" + std::string(reinterpret_cast(data), size); - int64_t offset = 0; - int64_t maxCount = 1000; + int64_t maxCount = 1000; + int64_t offset = 0; + FileFilter filter; std::vector fileInfoVec; - FileFilter filter; int result = helper->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); if (result != OHOS::FileAccessFwk::ERR_OK) { HILOG_ERROR("ListFile failed. ret : %{public}d", result); @@ -392,10 +391,10 @@ bool ScanFileFuzzTest(const uint8_t* data, size_t size) } FileInfo fileInfo; fileInfo.uri = downloadUri.ToString() + "/" + std::string(reinterpret_cast(data), size); + int64_t maxCount = 1000; int64_t offset = 0; - int64_t maxCount = 1000; + FileFilter filter; std::vector fileInfoVec; - FileFilter filter; int result = helper->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); if (result != OHOS::FileAccessFwk::ERR_OK) { HILOG_ERROR("ScanFile failed. ret : %{public}d", result); @@ -410,15 +409,15 @@ bool ScanFileFuzzTest(const uint8_t* data, size_t size) extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) { /* Run your code on data */ - OHOS::CreatorFuzzTest(data, size); - OHOS::AccessFuzzTest(data, size); + OHOS::AccessFuzzTest(data, size); + OHOS::ScanFileFuzzTest(data, size); + OHOS::ListFileFuzzTest(data, size); + OHOS::RenameFuzzTest(data, size); + OHOS::MoveFuzzTest(data, size); + OHOS::DeleteFuzzTest(data, size); + OHOS::CreateFileFuzzTest(data, size); + OHOS::CreatorFuzzTest(data, size); OHOS::OpenFileFuzzTest(data, size); - OHOS::MkdirFuzzTest(data, size); - OHOS::CreateFileFuzzTest(data, size); - OHOS::DeleteFuzzTest(data, size); - OHOS::MoveFuzzTest(data, size); - OHOS::RenameFuzzTest(data, size); - OHOS::ListFileFuzzTest(data, size); - OHOS::ScanFileFuzzTest(data, size); + OHOS::MkdirFuzzTest(data, size); return 0; } \ No newline at end of file diff --git a/test/unittest/abnormal_file_access_test.cpp b/test/unittest/abnormal_file_access_test.cpp index 97772bd3968c119d362f42a283fcc8308327cdc0..295e9d0d8374de1fd007cc6a2b64953edf3e8cb6 100755 --- a/test/unittest/abnormal_file_access_test.cpp +++ b/test/unittest/abnormal_file_access_test.cpp @@ -69,10 +69,10 @@ public: { cout << "AbnormalFileExtensionHelperTest code test" << endl; SetNativeToken(true); - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); - g_context = make_shared(); - g_context->SetToken(remoteObj); + auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); + g_context->SetToken(remoteObj); + g_context = make_shared(); AAFwk::Want want; vector wantVec; setuid(UID_TRANSFORM_TMP); @@ -83,8 +83,8 @@ public: auto element = wantVec[i].GetElement(); if (element.GetBundleName() == "com.ohos.UserFile.ExternalFileManager" && element.GetAbilityName() == "FileExtensionAbility") { - want = wantVec[i]; - sus = true; + sus = true; + want = wantVec[i]; break; } } diff --git a/test/unittest/external_file_access_test.cpp b/test/unittest/external_file_access_test.cpp index 51623611118c855e0436f472e3814f9b9527c1ed..b187cf87aeb48e6fcbc6864f404ad96d24afc44b 100644 --- a/test/unittest/external_file_access_test.cpp +++ b/test/unittest/external_file_access_test.cpp @@ -57,12 +57,12 @@ void SetNativeToken() const char **perms = new const char *[1]; perms[0] = "ohos.permission.FILE_ACCESS_MANAGER"; NativeTokenInfoParams infoInstance = { + .aclsNum = 0, .dcapsNum = 0, .permsNum = 1, - .aclsNum = 0, + .acls = nullptr, .dcaps = nullptr, - .perms = perms, - .acls = nullptr, + .perms = perms, .aplStr = "system_core", }; @@ -95,8 +95,8 @@ public: auto element = wantVec[i].GetElement(); if (element.GetBundleName() == "com.ohos.UserFile.ExternalFileManager" && element.GetAbilityName() == "FileExtensionAbility") { - want = wantVec[i]; sus = true; + want = wantVec[i]; break; } } @@ -1364,7 +1364,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0000, testing::ext:: for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest1(""); - Uri newDirUriTest2(""); + Uri newDirUriTest2(""); result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); @@ -1404,8 +1404,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0001, testing::ext:: int result = g_fah->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 parentUri(info[i].uri); + Uri newDirUriTest1(""); Uri newDirUriTest2(""); result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -1444,12 +1444,12 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0002, testing::ext:: int result = g_fah->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(""); + Uri parentUri(info[i].uri); result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); Uri sourceFileUri(""); + Uri testUri(""); result = g_fah->Move(sourceFileUri, newDirUriTest, testUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0002 result:" << result; @@ -1489,8 +1489,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0003, testing::ext:: Uri testUri(""); result = g_fah->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"); + Uri testUri2(""); result = g_fah->Move(sourceFileUri, newDirUriTest2, testUri2); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0003 result:" << result; @@ -3745,9 +3745,9 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ScanFile_0000, testing::e static void ScanFileFilter1(Uri newDirUriTest) { FileInfo fileInfo; - fileInfo.uri = newDirUriTest.ToString(); int64_t offset = 0; - int64_t maxCount = 1000; + int64_t maxCount = 1000; + fileInfo.uri = newDirUriTest.ToString(); std::vector fileInfoVec; FileFilter filter; int result = g_fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); @@ -4222,8 +4222,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_GetFileInfoFromUri_0002, int result = g_fah->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(""); + Uri parentUri(info[i].uri); result = g_fah->Mkdir(parentUri, "testDir", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); diff --git a/test/unittest/medialibrary_file_access_test.cpp b/test/unittest/medialibrary_file_access_test.cpp index 2c4605d55615329457788096b3b7160c23fd0ece..c1f10a456a5b7f84184f22294284953d8da165f4 100644 --- a/test/unittest/medialibrary_file_access_test.cpp +++ b/test/unittest/medialibrary_file_access_test.cpp @@ -53,9 +53,9 @@ void SetNativeToken() .dcapsNum = 0, .permsNum = 1, .aclsNum = 0, - .dcaps = nullptr, - .perms = perms, + .dcaps = nullptr, .acls = nullptr, + .perms = perms, .aplStr = "system_core", }; @@ -1122,9 +1122,9 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0005, testing::ext: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); result = g_fah->CreateFile(newDirUriTest, "test.txt", testUri); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri2(""); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri targetParentUri(""); + Uri testUri2(""); result = g_fah->Move(testUri, targetParentUri, testUri2); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0005 result:" << result; @@ -1157,9 +1157,9 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0006, testing::ext: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); result = g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri2(""); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri targetParentUri("storage/media/100/local/files/Download/test2"); + Uri testUri2(""); result = g_fah->Move(testUri, targetParentUri, testUri2); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0006 result:" << result; @@ -2690,8 +2690,8 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_GetFileInfoFromUri_0002, result = g_fah->GetFileInfoFromUri(newFileUri, fileinfo); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - int64_t offset = 0; int64_t maxCount = 1000; + int64_t offset = 0; FileFilter filter; std::vector fileInfoVecTemp; result = g_fah->ListFile(fileinfo, offset, maxCount, filter, fileInfoVecTemp); @@ -2724,8 +2724,8 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_GetFileInfoFromUri_0003, int result = g_fah->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { - Uri parentUri(std::string("\?\?\?\?/") + info[i].uri); FileInfo fileinfo; + Uri parentUri(std::string("\?\?\?\?/") + info[i].uri); result = g_fah->GetFileInfoFromUri(parentUri, fileinfo); EXPECT_EQ(result, OHOS::FileAccessFwk::E_URIS); } @@ -2758,8 +2758,8 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_GetFileInfoFromUri_0004, GTEST_LOG_(ERROR) << "replace BundleName failed."; EXPECT_TRUE(false); } - Uri parentUri(str); FileInfo fileinfo; + Uri parentUri(str); result = g_fah->GetFileInfoFromUri(parentUri, fileinfo); EXPECT_EQ(result, OHOS::FileAccessFwk::E_IPCS); }