From 573fc37beba97c84a632fcc5727eb331a715367e Mon Sep 17 00:00:00 2001 From: "wanning.fang" Date: Fri, 1 Jul 2022 18:36:24 +0800 Subject: [PATCH 001/122] =?UTF-8?q?DataShare=E8=B7=A8=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E8=A7=A3=E8=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wanning.fang --- services/src/fileoper/media_file_utils.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/src/fileoper/media_file_utils.cpp b/services/src/fileoper/media_file_utils.cpp index 454e9204..b352834a 100644 --- a/services/src/fileoper/media_file_utils.cpp +++ b/services/src/fileoper/media_file_utils.cpp @@ -324,10 +324,10 @@ int MediaFileUtils::DoInsert(const string &name, const string &path, const strin ERR_LOG("path not exist"); return E_NOEXIST; } - values.PutString(Media::MEDIA_DATA_DB_RELATIVE_PATH, albumPath); - values.PutString(Media::MEDIA_DATA_DB_NAME, name); - values.PutString(Media::MEDIA_DATA_DB_MIME_TYPE, GetMimeType(name)); - values.PutInt(Media::MEDIA_DATA_DB_MEDIA_TYPE, GetMediaType(name)); + values.Put(Media::MEDIA_DATA_DB_RELATIVE_PATH, albumPath); + values.Put(Media::MEDIA_DATA_DB_NAME, name); + values.Put(Media::MEDIA_DATA_DB_MIME_TYPE, GetMimeType(name)); + values.Put(Media::MEDIA_DATA_DB_MEDIA_TYPE, GetMediaType(name)); Uri createAsset(Media::MEDIALIBRARY_DATA_URI + "/" + Media::MEDIA_FILEOPRN + "/" + Media::MEDIA_FILEOPRN_CREATEASSET); int index = abilityHelper->Insert(createAsset, values); -- Gitee From 840b4a2282ae0fc3631bac667a0e9d7078cebb15 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Mon, 8 Aug 2022 14:25:24 +0800 Subject: [PATCH 002/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../file_access/src/file_access_ext_proxy.cpp | 14 +- .../file_access/src/file_access_ext_stub.cpp | 6 +- .../src/file_access_ext_stub_impl.cpp | 35 ++--- .../file_access/src/file_access_helper.cpp | 36 ++--- .../src/js_file_access_ext_ability.cpp | 145 ++++++++++-------- .../napi_fileaccess_helper.cpp | 63 ++++---- utils/file_access_framework_errno.h | 8 +- utils/napi_error.h | 48 ++++++ 8 files changed, 205 insertions(+), 150 deletions(-) create mode 100644 utils/napi_error.h diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 9b801773..52799ff3 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -52,7 +52,7 @@ int FileAccessExtProxy::OpenFile(const Uri &uri, const int flags) if (err != NO_ERROR) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return err; + return ERR_IPC_ERROR; } int fd = reply.ReadFileDescriptor(); @@ -100,7 +100,7 @@ int FileAccessExtProxy::CreateFile(const Uri &parent, const std::string &display if (err != NO_ERROR) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return err; + return ERR_IPC_ERROR; } int ret = reply.ReadInt32(); @@ -156,7 +156,7 @@ int FileAccessExtProxy::Mkdir(const Uri &parent, const std::string &displayName, if (err != NO_ERROR) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return err; + return ERR_IPC_ERROR; } int ret = reply.ReadInt32(); @@ -201,7 +201,7 @@ int FileAccessExtProxy::Delete(const Uri &sourceFile) if (err != NO_ERROR) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return err; + return ERR_IPC_ERROR; } int ret = reply.ReadInt32(); @@ -249,7 +249,7 @@ int FileAccessExtProxy::Move(const Uri &sourceFile, const Uri &targetParent, Uri if (err != NO_ERROR) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return err; + return ERR_IPC_ERROR; } int ret = reply.ReadInt32(); @@ -305,7 +305,7 @@ int FileAccessExtProxy::Rename(const Uri &sourceFile, const std::string &display if (err != NO_ERROR) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return err; + return ERR_IPC_ERROR; } int ret = reply.ReadInt32(); @@ -427,7 +427,7 @@ int FileAccessExtProxy::IsFileExist(const Uri &uri, bool &isExist) if (err != NO_ERROR) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return err; + return ERR_IPC_ERROR; } int ret = reply.ReadInt32(); diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp index ec76e1bd..9ae5a7bd 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp @@ -131,7 +131,7 @@ ErrCode FileAccessExtStub::CmdCreateFile(MessageParcel &data, MessageParcel &rep if (displayName.empty()) { HILOG_ERROR("parameter CreateFile displayName is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; + return ERR_PARAM_FORMAT; } std::shared_ptr fileNew(data.ReadParcelable()); @@ -178,7 +178,7 @@ ErrCode FileAccessExtStub::CmdMkdir(MessageParcel &data, MessageParcel &reply) if (displayName.empty()) { HILOG_ERROR("parameter Mkdir mode is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; + return ERR_PARAM_FORMAT; } std::shared_ptr fileNew(data.ReadParcelable()); @@ -299,7 +299,7 @@ ErrCode FileAccessExtStub::CmdRename(MessageParcel &data, MessageParcel &reply) if (displayName.empty()) { HILOG_ERROR("parameter Rename mode is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; + return ERR_PARAM_FORMAT; } std::shared_ptr fileNew(data.ReadParcelable()); diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp index 9a632255..e53e1024 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp @@ -29,14 +29,13 @@ std::shared_ptr FileAccessExtStubImpl::GetOwner() int FileAccessExtStubImpl::OpenFile(const Uri &uri, const int flags) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "OpenFile"); - int ret = ERR_ERROR; if (extension_ == nullptr) { HILOG_ERROR("OpenFile get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_FILEIO_FAIL; } - ret = extension_->OpenFile(uri, flags); + int ret = extension_->OpenFile(uri, flags); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -44,14 +43,13 @@ int FileAccessExtStubImpl::OpenFile(const Uri &uri, const int flags) int FileAccessExtStubImpl::CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CreateFile"); - int ret = ERR_ERROR; if (extension_ == nullptr) { HILOG_ERROR("CreateFile get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_FILEIO_FAIL; } - ret = extension_->CreateFile(parent, displayName, newFile); + int ret = extension_->CreateFile(parent, displayName, newFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -59,14 +57,13 @@ int FileAccessExtStubImpl::CreateFile(const Uri &parent, const std::string &disp int FileAccessExtStubImpl::Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Mkdir"); - int ret = ERR_ERROR; if (extension_ == nullptr) { HILOG_ERROR("Mkdir get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_FILEIO_FAIL; } - ret = extension_->Mkdir(parent, displayName, newFile); + int ret = extension_->Mkdir(parent, displayName, newFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -74,14 +71,13 @@ int FileAccessExtStubImpl::Mkdir(const Uri &parent, const std::string &displayNa int FileAccessExtStubImpl::Delete(const Uri &sourceFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Delete"); - int ret = ERR_ERROR; if (extension_ == nullptr) { HILOG_ERROR("Delete get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_FILEIO_FAIL; } - ret = extension_->Delete(sourceFile); + int ret = extension_->Delete(sourceFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -89,14 +85,13 @@ int FileAccessExtStubImpl::Delete(const Uri &sourceFile) int FileAccessExtStubImpl::Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Move"); - int ret = ERR_ERROR; if (extension_ == nullptr) { HILOG_ERROR("Move get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_FILEIO_FAIL; } - ret = extension_->Move(sourceFile, targetParent, newFile); + int ret = extension_->Move(sourceFile, targetParent, newFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -104,14 +99,13 @@ int FileAccessExtStubImpl::Move(const Uri &sourceFile, const Uri &targetParent, int FileAccessExtStubImpl::Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Rename"); - int ret = ERR_ERROR; if (extension_ == nullptr) { HILOG_ERROR("Rename get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_FILEIO_FAIL; } - ret = extension_->Rename(sourceFile, displayName, newFile); + int ret = extension_->Rename(sourceFile, displayName, newFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -149,14 +143,13 @@ std::vector FileAccessExtStubImpl::GetRoots() int FileAccessExtStubImpl::IsFileExist(const Uri &uri, bool &isExist) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "IsFileExist"); - int ret = ERR_ERROR; if (extension_ == nullptr) { HILOG_ERROR("IsFileExist get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_FILEIO_FAIL; } - ret = extension_->IsFileExist(uri, isExist); + int ret = extension_->IsFileExist(uri, isExist); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 901b8f51..f9fef9fc 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -363,15 +363,14 @@ bool FileAccessHelper::GetProxy() int FileAccessHelper::OpenFile(Uri &uri, int flags) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "OpenFile"); - int fd = ERR_ERROR; sptr fileExtProxy = GetProxy(uri); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return fd; + return ERR_FILEIO_FAIL; } - fd = fileExtProxy->OpenFile(uri, flags); + int fd = fileExtProxy->OpenFile(uri, flags); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return fd; } @@ -379,15 +378,14 @@ int FileAccessHelper::OpenFile(Uri &uri, int flags) int FileAccessHelper::CreateFile(Uri &parent, const std::string &displayName, Uri &newFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CreateFile"); - int index = ERR_ERROR; sptr fileExtProxy = GetProxy(parent); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return index; + return ERR_FILEIO_FAIL; } - index = fileExtProxy->CreateFile(parent, displayName, newFile); + int index = fileExtProxy->CreateFile(parent, displayName, newFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return index; } @@ -395,15 +393,14 @@ int FileAccessHelper::CreateFile(Uri &parent, const std::string &displayName, Ur int FileAccessHelper::Mkdir(Uri &parent, const std::string &displayName, Uri &newDir) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Mkdir"); - int index = ERR_ERROR; sptr fileExtProxy = GetProxy(parent); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return index; + return ERR_FILEIO_FAIL; } - index = fileExtProxy->Mkdir(parent, displayName, newDir); + int index = fileExtProxy->Mkdir(parent, displayName, newDir); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return index; } @@ -411,15 +408,14 @@ int FileAccessHelper::Mkdir(Uri &parent, const std::string &displayName, Uri &ne int FileAccessHelper::Delete(Uri &selectFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Delete"); - int index = ERR_ERROR; sptr fileExtProxy = GetProxy(selectFile); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return index; + return ERR_FILEIO_FAIL; } - index = fileExtProxy->Delete(selectFile); + int index = fileExtProxy->Delete(selectFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return index; } @@ -434,15 +430,14 @@ int FileAccessHelper::Move(Uri &sourceFile, Uri &targetParent, Uri &newFile) return ERR_OPERATION_NOT_PERMITTED; } - int index = ERR_ERROR; sptr fileExtProxy = GetProxy(sourceFile); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return index; + return ERR_FILEIO_FAIL; } - index = fileExtProxy->Move(sourceFile, targetParent, newFile); + int index = fileExtProxy->Move(sourceFile, targetParent, newFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return index; } @@ -450,15 +445,14 @@ int FileAccessHelper::Move(Uri &sourceFile, Uri &targetParent, Uri &newFile) int FileAccessHelper::Rename(Uri &sourceFile, const std::string &displayName, Uri &newFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Rename"); - int index = ERR_ERROR; sptr fileExtProxy = GetProxy(sourceFile); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return index; + return ERR_FILEIO_FAIL; } - index = fileExtProxy->Rename(sourceFile, displayName, newFile); + int index = fileExtProxy->Rename(sourceFile, displayName, newFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return index; } @@ -529,16 +523,14 @@ std::vector FileAccessHelper::GetRegisterFileAccessExtAbilityInfo() int FileAccessHelper::IsFileExist(Uri &uri, bool &isExist) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "IsFileExist"); - int ret = ERR_ERROR; - sptr fileExtProxy = GetProxy(uri); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_FILEIO_FAIL; } - ret = fileExtProxy->IsFileExist(uri, isExist); + int ret = fileExtProxy->IsFileExist(uri, isExist); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index d68feda8..fdcb8295 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -162,7 +162,7 @@ static int DoCallJsMethod(CallJsParam *param) if (jsRuntime == nullptr) { HILOG_ERROR("failed to get jsRuntime."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; + return ERR_PARAM_FORMAT; } HandleScope handleScope(*jsRuntime); auto& nativeEngine = jsRuntime->GetNativeEngine(); @@ -172,7 +172,7 @@ static int DoCallJsMethod(CallJsParam *param) if (!param->argParser(nativeEngine, argv, argc)) { HILOG_ERROR("failed to get params."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; + return ERR_PARAM_FORMAT; } } NativeValue *value = param->jsObj->Get(); @@ -196,7 +196,7 @@ static int DoCallJsMethod(CallJsParam *param) if (param->retParser == nullptr) { HILOG_ERROR("ResultValueParser must not null."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; + return ERR_PARAM_FORMAT; } if (!param->retParser(nativeEngine, handleScope.Escape(nativeEngine.CallFunction(value, method, argv, argc)))) { HILOG_INFO("Parser js result fail."); @@ -281,10 +281,16 @@ void JsFileAccessExtAbility::GetSrcPath(std::string &srcPath) FinishTrace(HITRACE_TAG_FILEMANAGEMENT); } +template +struct Value { + T data; + int code {0}; +}; + int JsFileAccessExtAbility::OpenFile(const Uri &uri, int flags) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "OpenFile"); - auto fd = std::make_shared(); + auto value = std::make_shared>(); auto argParser = [uri, flags](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *nativeUri = engine.CreateString(uri.ToString().c_str(), uri.ToString().length()); if (nativeUri == nullptr) { @@ -301,8 +307,10 @@ int JsFileAccessExtAbility::OpenFile(const Uri &uri, int flags) argc = ARGC_TWO; return true; }; - auto retParser = [fd](NativeEngine &engine, NativeValue *result) -> bool { - bool ret = ConvertFromJsValue(engine, result, *fd); + auto retParser = [value](NativeEngine &engine, NativeValue *result) -> bool { + NativeObject *obj = ConvertNativeValueTo(result); + bool ret = ConvertFromJsValue(engine, obj->GetProperty("fd"), value->data); + ret = ret && ConvertFromJsValue(engine, obj->GetProperty("code"), value->code); if (!ret) { HILOG_ERROR("Convert js value fail."); } @@ -316,13 +324,13 @@ int JsFileAccessExtAbility::OpenFile(const Uri &uri, int flags) return errCode; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return *fd; + return value->data; } int JsFileAccessExtAbility::CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CreateFile"); - auto uri = std::make_shared(); + auto value = std::make_shared>(); auto argParser = [parent, displayName](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *nativeParent = engine.CreateString(parent.ToString().c_str(), parent.ToString().length()); if (nativeParent == nullptr) { @@ -339,8 +347,10 @@ int JsFileAccessExtAbility::CreateFile(const Uri &parent, const std::string &dis argc = ARGC_TWO; return true; }; - auto retParser = [uri](NativeEngine &engine, NativeValue *result) -> bool { - bool ret = ConvertFromJsValue(engine, result, *uri); + auto retParser = [value](NativeEngine &engine, NativeValue *result) -> bool { + NativeObject *obj = ConvertNativeValueTo(result); + bool ret = ConvertFromJsValue(engine, obj->GetProperty("uri"), value->data); + ret = ret && ConvertFromJsValue(engine, obj->GetProperty("code"), value->code); if (!ret) { HILOG_ERROR("Convert js value fail."); } @@ -353,12 +363,13 @@ int JsFileAccessExtAbility::CreateFile(const Uri &parent, const std::string &dis FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errCode; } - if ((*uri).empty()) { + + if ((value->data).empty()) { HILOG_ERROR("call CreateFile with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_ERROR; } - newFile = Uri(*uri); + newFile = Uri(value->data); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errCode; } @@ -366,7 +377,7 @@ int JsFileAccessExtAbility::CreateFile(const Uri &parent, const std::string &dis int JsFileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Mkdir"); - auto uri = std::make_shared(); + auto value = std::make_shared>(); auto argParser = [parent, displayName](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *nativeParent = engine.CreateString(parent.ToString().c_str(), parent.ToString().length()); if (nativeParent == nullptr) { @@ -383,8 +394,10 @@ int JsFileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayN argc = ARGC_TWO; return true; }; - auto retParser = [uri](NativeEngine &engine, NativeValue *result) -> bool { - bool ret = ConvertFromJsValue(engine, result, *uri); + auto retParser = [value](NativeEngine &engine, NativeValue *result) -> bool { + NativeObject *obj = ConvertNativeValueTo(result); + bool ret = ConvertFromJsValue(engine, obj->GetProperty("uri"), value->data); + ret = ret && ConvertFromJsValue(engine, obj->GetProperty("code"), value->code); if (!ret) { HILOG_ERROR("Convert js value fail."); } @@ -397,12 +410,13 @@ int JsFileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayN FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errCode; } - if ((*uri).empty()) { + + if ((value->data).empty()) { HILOG_ERROR("call Mkdir with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_ERROR; } - newFile = Uri(*uri); + newFile = Uri(value->data); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errCode; } @@ -410,7 +424,7 @@ int JsFileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayN int JsFileAccessExtAbility::Delete(const Uri &sourceFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Delete"); - auto ret = std::make_shared(); + auto value = std::make_shared>(); auto argParser = [uri = sourceFile](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *nativeUri = engine.CreateString(uri.ToString().c_str(), uri.ToString().length()); if (nativeUri == nullptr) { @@ -421,12 +435,14 @@ int JsFileAccessExtAbility::Delete(const Uri &sourceFile) argc = ARGC_ONE; return true; }; - auto retParser = [ret](NativeEngine &engine, NativeValue *result) -> bool { - bool res = ConvertFromJsValue(engine, result, *ret); - if (!res) { + auto retParser = [value](NativeEngine &engine, NativeValue *result) -> bool { + NativeObject *obj = ConvertNativeValueTo(result); + bool ret = ConvertFromJsValue(engine, obj->GetProperty("index"), value->data); + ret = ret && ConvertFromJsValue(engine, obj->GetProperty("code"), value->code); + if (!ret) { HILOG_ERROR("Convert js value fail."); } - return res; + return ret; }; auto errCode = CallJsMethod("delete", jsRuntime_, jsObj_.get(), argParser, retParser); @@ -436,13 +452,13 @@ int JsFileAccessExtAbility::Delete(const Uri &sourceFile) return errCode; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return *ret; + return value->data; } int JsFileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Move"); - auto uri = std::make_shared(); + auto value = std::make_shared>(); auto argParser = [sourceFile, targetParent](NativeEngine &engine, NativeValue* argv[], size_t &argc) -> bool { NativeValue *srcUri = engine.CreateString(sourceFile.ToString().c_str(), sourceFile.ToString().length()); @@ -461,8 +477,10 @@ int JsFileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, argc = ARGC_TWO; return true; }; - auto retParser = [uri](NativeEngine &engine, NativeValue *result) -> bool { - bool ret = ConvertFromJsValue(engine, result, *uri); + auto retParser = [value](NativeEngine &engine, NativeValue *result) -> bool { + NativeObject *obj = ConvertNativeValueTo(result); + bool ret = ConvertFromJsValue(engine, obj->GetProperty("uri"), value->data); + ret = ret && ConvertFromJsValue(engine, obj->GetProperty("code"), value->code); if (!ret) { HILOG_ERROR("Convert js value fail."); } @@ -475,12 +493,13 @@ int JsFileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errCode; } - if ((*uri).empty()) { + + if ((value->data).empty()) { HILOG_ERROR("call move with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_ERROR; } - newFile = Uri(*uri); + newFile = Uri(value->data); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errCode; } @@ -488,7 +507,7 @@ int JsFileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, int JsFileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Rename"); - auto uri = std::make_shared(); + auto value = std::make_shared>(); auto argParser = [sourceFile, displayName](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *nativeSourceFile = engine.CreateString(sourceFile.ToString().c_str(), sourceFile.ToString().length()); @@ -506,8 +525,10 @@ int JsFileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &dis argc = ARGC_TWO; return true; }; - auto retParser = [uri](NativeEngine &engine, NativeValue *result) -> bool { - bool ret = ConvertFromJsValue(engine, result, *uri); + auto retParser = [value](NativeEngine &engine, NativeValue *result) -> bool { + NativeObject *obj = ConvertNativeValueTo(result); + bool ret = ConvertFromJsValue(engine, obj->GetProperty("uri"), value->data); + ret = ret && ConvertFromJsValue(engine, obj->GetProperty("code"), value->code); if (!ret) { HILOG_ERROR("Convert js value fail."); } @@ -520,20 +541,21 @@ int JsFileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &dis FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errCode; } - if ((*uri).empty()) { + + if ((value->data).empty()) { HILOG_ERROR("call Rename with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_ERROR; } - newFile = Uri(*uri); + newFile = Uri(value->data); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errCode; } std::vector JsFileAccessExtAbility::ListFile(const Uri &sourceFile) { - StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); - auto fileVec = std::make_shared>(); + StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); + auto value = std::make_shared>>(); auto argParser = [sourceFile](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *uri = engine.CreateString(sourceFile.ToString().c_str(), sourceFile.ToString().length()); if (uri == nullptr) { @@ -544,19 +566,16 @@ std::vector JsFileAccessExtAbility::ListFile(const Uri &sourceFile) argc = ARGC_ONE; return true; }; - auto retParser = [fileVec](NativeEngine &engine, NativeValue *result) -> bool { - if (!result->IsArray()) { - HILOG_INFO("result is not array."); - return false; - } - - NativeArray *nativeArray = ConvertNativeValueTo(result); + auto retParser = [value](NativeEngine &engine, NativeValue *result) -> bool { + NativeObject *obj = ConvertNativeValueTo(result); + bool ret = ConvertFromJsValue(engine, obj->GetProperty("code"), value->code); + NativeArray *nativeArray = ConvertNativeValueTo(obj->GetProperty("infos")); for (uint32_t i = 0; i < nativeArray->GetLength(); i++) { NativeValue *nativeFileInfo = nativeArray->GetElement(i); - NativeObject *obj = ConvertNativeValueTo(nativeFileInfo); + obj = ConvertNativeValueTo(nativeFileInfo); FileInfo fileInfo; std::string uri; - bool ret = ConvertFromJsValue(engine, obj->GetProperty("uri"), uri); + ret = ret && ConvertFromJsValue(engine, obj->GetProperty("uri"), uri); fileInfo.uri = Uri(uri); ret = ret && ConvertFromJsValue(engine, obj->GetProperty("fileName"), fileInfo.fileName); ret = ret && ConvertFromJsValue(engine, obj->GetProperty("mode"), fileInfo.mode); @@ -567,7 +586,7 @@ std::vector JsFileAccessExtAbility::ListFile(const Uri &sourceFile) HILOG_ERROR("Convert js value fail."); return ret; } - (*fileVec).emplace_back(std::move(fileInfo)); + (value->data).emplace_back(std::move(fileInfo)); } return true; }; @@ -577,29 +596,27 @@ std::vector JsFileAccessExtAbility::ListFile(const Uri &sourceFile) HILOG_ERROR("CallJsMethod error, code:%{public}d.", errCode); } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return std::move(*fileVec); + return value->data; } std::vector JsFileAccessExtAbility::GetRoots() { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); - auto devVec = std::make_shared>(); + auto value = std::make_shared>>(); auto argParser = [](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { argc = ARGC_ZERO; return true; }; - auto retParser = [devVec](NativeEngine &engine, NativeValue *result) -> bool { - if (!result->IsArray()) { - HILOG_INFO("result is not array."); - return false; - } - NativeArray *nativeArray = ConvertNativeValueTo(result); + auto retParser = [value](NativeEngine &engine, NativeValue *result) -> bool { + NativeObject *obj = ConvertNativeValueTo(result); + bool ret = ConvertFromJsValue(engine, obj->GetProperty("code"), value->code); + NativeArray *nativeArray = ConvertNativeValueTo(obj->GetProperty("roots")); for (uint32_t i = 0; i < nativeArray->GetLength(); i++) { NativeValue *nativeDeviceInfo = nativeArray->GetElement(i); - NativeObject *obj = ConvertNativeValueTo(nativeDeviceInfo); + obj = ConvertNativeValueTo(nativeDeviceInfo); DeviceInfo deviceInfo; std::string uri; - bool ret = ConvertFromJsValue(engine, obj->GetProperty("uri"), uri); + ret = ret && ConvertFromJsValue(engine, obj->GetProperty("uri"), uri); deviceInfo.uri = Uri(uri); ret = ret && ConvertFromJsValue(engine, obj->GetProperty("displayName"), deviceInfo.displayName); ret = ret && ConvertFromJsValue(engine, obj->GetProperty("deviceId"), deviceInfo.deviceId); @@ -609,7 +626,7 @@ std::vector JsFileAccessExtAbility::GetRoots() HILOG_ERROR("Convert js value fail."); return ret; } - (*devVec).emplace_back(std::move(deviceInfo)); + (value->data).emplace_back(std::move(deviceInfo)); } return true; }; @@ -619,25 +636,27 @@ std::vector JsFileAccessExtAbility::GetRoots() HILOG_ERROR("CallJsMethod error, code:%{public}d.", errCode); } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return std::move(*devVec); + return value->data; } int JsFileAccessExtAbility::IsFileExist(const Uri &uri, bool &isExist) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "IsFileExist"); - auto ret = std::make_shared(); + auto value = std::make_shared>(); auto argParser = [uri](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *nativeUri = engine.CreateString(uri.ToString().c_str(), uri.ToString().length()); argv[ARGC_ZERO] = nativeUri; argc = ARGC_ONE; return true; }; - auto retParser = [ret](NativeEngine &engine, NativeValue *result) -> bool { - bool res = ConvertFromJsValue(engine, result, *ret); - if (!res) { + auto retParser = [value](NativeEngine &engine, NativeValue *result) -> bool { + NativeObject *obj = ConvertNativeValueTo(result); + bool ret = ConvertFromJsValue(engine, obj->GetProperty("isExist"), value->data); + ret = ret && ConvertFromJsValue(engine, obj->GetProperty("code"), value->code); + if (!ret) { HILOG_ERROR("Convert js value fail."); } - return res; + return ret; }; auto errCode = CallJsMethod("isFileExist", jsRuntime_, jsObj_.get(), argParser, retParser); @@ -646,7 +665,7 @@ int JsFileAccessExtAbility::IsFileExist(const Uri &uri, bool &isExist) FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errCode; } - isExist = *ret; + isExist = value->data; FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errCode; } diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index f15564b5..282d3d89 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -24,6 +24,7 @@ #include "hilog_wrapper.h" #include "napi_base_context.h" #include "napi_common_fileaccess.h" +#include "napi_error.h" #include "n_val.h" #include "securec.h" #include "uri.h" @@ -46,7 +47,7 @@ static napi_value FileAccessHelperConstructor(napi_env env, napi_callback_info i { NFuncArg funcArg(env, info); if (!funcArg.InitArgs(NARG_CNT::ONE, NARG_CNT::TWO)) { - NError(EINVAL).ThrowErr(env, "Number of arguments unmatched"); + NapiError(ERR_PARAM_NUMBER).ThrowErr(env); return nullptr; } @@ -104,7 +105,7 @@ napi_value AcquireFileAccessHelperWrap(napi_env env, napi_callback_info info) { NFuncArg funcArg(env, info); if (!funcArg.InitArgs(NARG_CNT::ONE, NARG_CNT::TWO)) { - NError(EINVAL).ThrowErr(env, "Number of arguments unmatched"); + NapiError(ERR_PARAM_NUMBER).ThrowErr(env); return nullptr; } @@ -175,7 +176,7 @@ napi_value NAPI_GetRegisterFileAccessExtAbilityInfo(napi_env env, napi_callback_ { NFuncArg funcArg(env, info); if (!funcArg.InitArgs(NARG_CNT::ZERO, NARG_CNT::ONE)) { - NError(EINVAL).ThrowErr(env, "Number of arguments unmatched"); + NapiError(ERR_PARAM_NUMBER).ThrowErr(env); return nullptr; } @@ -198,7 +199,7 @@ napi_value NAPI_GetRegisterFileAccessExtAbilityInfo(napi_env env, napi_callback_ } NVal cb(env, funcArg[NARG_POS::FIRST]); if (!cb.TypeIs(napi_function)) { - NError(EINVAL).ThrowErr(env, "argument type unmatched"); + NapiError(ERR_PARAM_FORMAT).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; @@ -243,14 +244,14 @@ napi_value FileAccessHelperInit(napi_env env, napi_value exports) static FileAccessHelper *GetFileAccessHelper(napi_env env, napi_value thisVar) { if (thisVar == nullptr) { - NError(EINVAL).ThrowErr(env, "thisVar is nullper"); + NapiError(ERR_PARAM_FORMAT).ThrowErr(env); return nullptr; } FileAccessHelper *fileAccessHelper = nullptr; napi_unwrap(env, thisVar, (void **)&fileAccessHelper); if (fileAccessHelper == nullptr) { - NError(EINVAL).ThrowErr(env, "fileAccessHelper is nullper"); + NapiError(ERR_GET_FILEACCESS_HELPER).ThrowErr(env); return nullptr; } return fileAccessHelper; @@ -265,13 +266,13 @@ static std::tuple, std::unique_ptr> GetRea std::unique_ptr name = nullptr; std::tie(succ, uri, std::ignore) = NVal(env, sourceFile).ToUTF8String(); if (!succ) { - NError(EINVAL).ThrowErr(env, "first parameter is Invalid"); + NapiError(ERR_PARAM_FORMAT).ThrowErr(env); return { false, std::move(uri), std::move(name) }; } std::tie(succ, name, std::ignore) = NVal(env, targetParent).ToUTF8String(); if (!succ) { - NError(EINVAL).ThrowErr(env, "second parameter is Invalid"); + NapiError(ERR_PARAM_FORMAT).ThrowErr(env); return { false, std::move(uri), std::move(name) }; } @@ -282,7 +283,7 @@ napi_value NAPI_OpenFile(napi_env env, napi_callback_info info) { NFuncArg funcArg(env, info); if (!funcArg.InitArgs(NARG_CNT::TWO, NARG_CNT::THREE)) { - NError(EINVAL).ThrowErr(env, "Number of arguments unmatched"); + NapiError(ERR_PARAM_NUMBER).ThrowErr(env); return nullptr; } @@ -290,14 +291,14 @@ napi_value NAPI_OpenFile(napi_env env, napi_callback_info info) std::unique_ptr uri; std::tie(succ, uri, std::ignore) = NVal(env, funcArg[NARG_POS::FIRST]).ToUTF8String(); if (!succ) { - NError(EINVAL).ThrowErr(env, "Invalid uri"); + NapiError(ERR_PARAM_FORMAT).ThrowErr(env); return nullptr; } int flags; std::tie(succ, flags) = NVal(env, funcArg[NARG_POS::SECOND]).ToInt32(); if (!succ) { - NError(EINVAL).ThrowErr(env, "Invalid flags"); + NapiError(ERR_PARAM_FORMAT).ThrowErr(env); return nullptr; } @@ -328,7 +329,7 @@ napi_value NAPI_OpenFile(napi_env env, napi_callback_info info) NVal cb(env, funcArg[NARG_POS::THIRD]); if (!cb.TypeIs(napi_function)) { - NError(EINVAL).ThrowErr(env, "not function type"); + NapiError(ERR_PARAM_FORMAT).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; @@ -338,7 +339,7 @@ napi_value NAPI_CreateFile(napi_env env, napi_callback_info info) { NFuncArg funcArg(env, info); if (!funcArg.InitArgs(NARG_CNT::TWO, NARG_CNT::THREE)) { - NError(EINVAL).ThrowErr(env, "Number of arguments unmatched"); + NapiError(ERR_PARAM_NUMBER).ThrowErr(env); return nullptr; } @@ -380,7 +381,7 @@ napi_value NAPI_CreateFile(napi_env env, napi_callback_info info) NVal cb(env, funcArg[NARG_POS::THIRD]); if (!cb.TypeIs(napi_function)) { - NError(EINVAL).ThrowErr(env, "not function type"); + NapiError(ERR_PARAM_FORMAT).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; @@ -390,7 +391,7 @@ napi_value NAPI_Mkdir(napi_env env, napi_callback_info info) { NFuncArg funcArg(env, info); if (!funcArg.InitArgs(NARG_CNT::TWO, NARG_CNT::THREE)) { - NError(EINVAL).ThrowErr(env, "Number of arguments unmatched"); + NapiError(ERR_PARAM_NUMBER).ThrowErr(env); return nullptr; } @@ -432,7 +433,7 @@ napi_value NAPI_Mkdir(napi_env env, napi_callback_info info) NVal cb(env, funcArg[NARG_POS::THIRD]); if (!cb.TypeIs(napi_function)) { - NError(EINVAL).ThrowErr(env, "not function type"); + NapiError(ERR_PARAM_FORMAT).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; @@ -442,7 +443,7 @@ napi_value NAPI_Delete(napi_env env, napi_callback_info info) { NFuncArg funcArg(env, info); if (!funcArg.InitArgs(NARG_CNT::ONE, NARG_CNT::TWO)) { - NError(EINVAL).ThrowErr(env, "Number of arguments unmatched"); + NapiError(ERR_PARAM_NUMBER).ThrowErr(env); return nullptr; } @@ -450,7 +451,7 @@ napi_value NAPI_Delete(napi_env env, napi_callback_info info) std::unique_ptr uri; std::tie(succ, uri, std::ignore) = NVal(env, funcArg[NARG_POS::FIRST]).ToUTF8String(); if (!succ) { - NError(EINVAL).ThrowErr(env, "Invalid uri"); + NapiError(ERR_PARAM_FORMAT).ThrowErr(env); return nullptr; } @@ -481,7 +482,7 @@ napi_value NAPI_Delete(napi_env env, napi_callback_info info) NVal cb(env, funcArg[NARG_POS::SECOND]); if (!cb.TypeIs(napi_function)) { - NError(EINVAL).ThrowErr(env, "not function type"); + NapiError(ERR_PARAM_FORMAT).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; @@ -491,7 +492,7 @@ napi_value NAPI_Move(napi_env env, napi_callback_info info) { NFuncArg funcArg(env, info); if (!funcArg.InitArgs(NARG_CNT::TWO, NARG_CNT::THREE)) { - NError(EINVAL).ThrowErr(env, "Number of arguments unmatched"); + NapiError(ERR_PARAM_NUMBER).ThrowErr(env); return nullptr; } @@ -534,7 +535,7 @@ napi_value NAPI_Move(napi_env env, napi_callback_info info) NVal cb(env, funcArg[NARG_POS::THIRD]); if (!cb.TypeIs(napi_function)) { - NError(EINVAL).ThrowErr(env, "not function type"); + NapiError(ERR_PARAM_FORMAT).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; @@ -544,7 +545,7 @@ napi_value NAPI_Rename(napi_env env, napi_callback_info info) { NFuncArg funcArg(env, info); if (!funcArg.InitArgs(NARG_CNT::TWO, NARG_CNT::THREE)) { - NError(EINVAL).ThrowErr(env, "Number of arguments unmatched"); + NapiError(ERR_PARAM_NUMBER).ThrowErr(env); return nullptr; } @@ -586,7 +587,7 @@ napi_value NAPI_Rename(napi_env env, napi_callback_info info) NVal cb(env, funcArg[NARG_POS::THIRD]); if (!cb.TypeIs(napi_function)) { - NError(EINVAL).ThrowErr(env, "not function type"); + NapiError(ERR_PARAM_FORMAT).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; @@ -596,7 +597,7 @@ napi_value NAPI_ListFile(napi_env env, napi_callback_info info) { NFuncArg funcArg(env, info); if (!funcArg.InitArgs(NARG_CNT::ONE, NARG_CNT::TWO)) { - NError(EINVAL).ThrowErr(env, "Number of arguments unmatched"); + NapiError(ERR_PARAM_NUMBER).ThrowErr(env); return nullptr; } @@ -604,7 +605,7 @@ napi_value NAPI_ListFile(napi_env env, napi_callback_info info) std::unique_ptr uri; std::tie(succ, uri, std::ignore) = NVal(env, funcArg[NARG_POS::FIRST]).ToUTF8String(); if (!succ) { - NError(EINVAL).ThrowErr(env, "Invalid uri"); + NapiError(ERR_PARAM_FORMAT).ThrowErr(env); return nullptr; } @@ -636,7 +637,7 @@ napi_value NAPI_ListFile(napi_env env, napi_callback_info info) NVal cb(env, funcArg[NARG_POS::SECOND]); if (!cb.TypeIs(napi_function)) { - NError(EINVAL).ThrowErr(env, "not function type"); + NapiError(ERR_PARAM_FORMAT).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; @@ -646,7 +647,7 @@ napi_value NAPI_GetRoots(napi_env env, napi_callback_info info) { NFuncArg funcArg(env, info); if (!funcArg.InitArgs(NARG_CNT::ZERO, NARG_CNT::ONE)) { - NError(EINVAL).ThrowErr(env, "Number of arguments unmatched"); + NapiError(ERR_PARAM_NUMBER).ThrowErr(env); return nullptr; } @@ -677,7 +678,7 @@ napi_value NAPI_GetRoots(napi_env env, napi_callback_info info) NVal cb(env, funcArg[NARG_POS::FIRST]); if (!cb.TypeIs(napi_function)) { - NError(EINVAL).ThrowErr(env, "not function type"); + NapiError(ERR_PARAM_FORMAT).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; @@ -687,7 +688,7 @@ napi_value NAPI_IsFileExist(napi_env env, napi_callback_info info) { NFuncArg funcArg(env, info); if (!funcArg.InitArgs(NARG_CNT::ONE, NARG_CNT::TWO)) { - NError(EINVAL).ThrowErr(env, "Number of arguments unmatched"); + NapiError(ERR_PARAM_NUMBER).ThrowErr(env); return nullptr; } @@ -695,7 +696,7 @@ napi_value NAPI_IsFileExist(napi_env env, napi_callback_info info) std::unique_ptr uri; std::tie(succ, uri, std::ignore) = NVal(env, funcArg[NARG_POS::FIRST]).ToUTF8String(); if (!succ) { - NError(EINVAL).ThrowErr(env, "Invalid uri"); + NapiError(ERR_PARAM_FORMAT).ThrowErr(env); return nullptr; } @@ -727,7 +728,7 @@ napi_value NAPI_IsFileExist(napi_env env, napi_callback_info info) } NVal cb(env, funcArg[NARG_POS::SECOND]); if (!cb.TypeIs(napi_function)) { - NError(EINVAL).ThrowErr(env, "not function type"); + NapiError(ERR_PARAM_FORMAT).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; diff --git a/utils/file_access_framework_errno.h b/utils/file_access_framework_errno.h index e4f7b755..fef00472 100644 --- a/utils/file_access_framework_errno.h +++ b/utils/file_access_framework_errno.h @@ -23,7 +23,7 @@ namespace FileAccessFwk { enum { MODULE_FILE_ACCESS_FRAMEWORK = 0x01 }; -constexpr ErrCode BASE_OFFSET = ErrCodeOffset(SUBSYS_FILEMANAGEMENT, MODULE_FILE_ACCESS_FRAMEWORK); +constexpr ErrCode BASE_OFFSET = -ErrCodeOffset(SUBSYS_FILEMANAGEMENT, MODULE_FILE_ACCESS_FRAMEWORK); enum { ERR_OK = 0, ERR_ERROR = -1, @@ -33,9 +33,11 @@ enum { ERR_INVALID_URI, // invalid uri ERR_URI_CHECK, // check uri head fail ERR_FILEIO_FAIL, // fileio fail - ERR_INVALID_PARAM, // invalid parameter + ERR_PARAM_FORMAT, // Parameter format erroe + ERR_PARAM_NUMBER, // Parameter number is abnormal ERR_PARSER_FAIL, // parser js result error - ERR_OPERATION_NOT_PERMITTED // Operation not permitted + ERR_OPERATION_NOT_PERMITTED, // Operation not permitted + ERR_GET_FILEACCESS_HELPER // get fileAccessHelper fail }; } // namespace FileAccessFwk } // namespace OHOS diff --git a/utils/napi_error.h b/utils/napi_error.h new file mode 100644 index 00000000..57ccea3b --- /dev/null +++ b/utils/napi_error.h @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef NAPI_ERROR_H +#define NAPI_ERROR_H + +#include "hilog_wrapper.h" +#include "n_napi.h" +#include "n_error.h" + +namespace OHOS { +namespace FileAccessFwk { +namespace { + constexpr int ERRNO_NOERR = 0; +} +class NapiError : public OHOS::FileManagement::LibN::NError { +public: + NapiError(int ePosix) : errno_(ePosix) {} + ~NapiError() = default; + void ThrowErr(napi_env env) + { + napi_value tmp = nullptr; + std::string errMsg = ""; + napi_get_and_clear_last_exception(env, &tmp); + // Note that ace engine cannot thow errors created by napi_create_error so far + napi_status throwStatus = napi_throw_error(env, std::to_string(errno_).c_str(), errMsg.c_str()); + if (throwStatus != napi_ok) { + HILOG_WARN("Failed to throw an exception, %{public}d, code = %{public}s", throwStatus, std::to_string(errno_).c_str()); + } + } +private: + int errno_ = ERRNO_NOERR; +}; +} +} +#endif \ No newline at end of file -- Gitee From 8b3211ffab6df4a56141867fc1a62ca91641bf31 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Mon, 8 Aug 2022 14:27:17 +0800 Subject: [PATCH 003/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9FileExtensionAbility.?= =?UTF-8?q?ts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../FileExtensionAbility.ts | 152 ++++++++++++++---- 1 file changed, 121 insertions(+), 31 deletions(-) diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index b69ba78a..221f73ba 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -146,17 +146,26 @@ export default class FileExtAbility extends Extension { openFile(sourceFileUri, flags) { if (!this.checkUri(sourceFileUri)) { - return -1; + return { + fd: -1, + code: -1, + }; } let fd = 0; try { let path = this.getPath(sourceFileUri); fd = fileio.openSync(path, flags, DEFAULT_MODE); + return { + fd: fd, + code: 0, + }; } catch (e) { hilog.error(DOMAIN_CODE, TAG, 'openFile error ' + e.message); - fd = -1; + return { + fd: -1, + code: -1, + }; } - return fd; } closeFile(fd) { @@ -171,40 +180,64 @@ export default class FileExtAbility extends Extension { createFile(parentUri, displayName) { if (!this.checkUri(parentUri)) { - return ''; + return { + uri: '', + code: -1, + }; } try { let newFileUri = this.genNewFileUri(parentUri, displayName); - if (this.isFileExist(newFileUri)) { - return ''; + if (this.isFileExist(newFileUri).isExist) { + return { + uri: '', + code: -1, + }; } let path = this.getPath(newFileUri); fileio.openSync(path, CREATE_FILE_FLAGS, DEFAULT_MODE); - return newFileUri; + return { + uri: newFileUri, + code: 0, + }; } catch (e) { hilog.error(DOMAIN_CODE, TAG, 'createFile error ' + e.message); - return ''; + return { + uri: '', + code: -1, + }; } } mkdir(parentUri, displayName) { if (!this.checkUri(parentUri)) { - return ''; + return { + uri: '', + code: -1, + }; } try { let newFileUri = this.genNewFileUri(parentUri, displayName); let path = this.getPath(newFileUri); fileio.mkdirSync(path); - return newFileUri; + return { + uri: newFileUri, + code: 0, + }; } catch (e) { hilog.error(DOMAIN_CODE, TAG, 'mkdir error ' + e.message); - return ''; + return { + uri: '', + code: -1, + }; } } delete(selectFileUri) { if (!this.checkUri(selectFileUri)) { - return -1; + return { + index: -1, + code: -1, + }; } let path = this.getPath(selectFileUri); let code = 0; @@ -222,12 +255,18 @@ export default class FileExtAbility extends Extension { code = -1; } }); - return code; + return { + index: code, + code: code, + }; } move(sourceFileUri, targetParentUri) { if (!this.checkUri(sourceFileUri) || !this.checkUri(targetParentUri)) { - return ''; + return { + uri: '', + code: -1, + }; } let displayName = this.getFileName(sourceFileUri); let newFileUri = this.genNewFileUri(targetParentUri, displayName); @@ -235,26 +274,41 @@ export default class FileExtAbility extends Extension { let newPath = this.getPath(newFileUri); if (oldPath == newPath) { // move to the same directory - return newFileUri; + return { + uri: newFileUri, + code: 0, + }; } else if (newPath.indexOf(oldPath) == 0) { // move to a subdirectory of the source directory - return ''; + return { + uri: '', + code: -1, + }; } try { // The source file does not exist or the destination is not a directory fileio.accessSync(oldPath); let stat = fileio.statSync(this.getPath(targetParentUri)); if (!stat || !stat.isDirectory()) { - return ''; + return { + uri: '', + code: -1, + }; } // If not across devices, use fileio.renameSync to move if (!this.isCrossDeviceLink(sourceFileUri, targetParentUri)) { fileio.renameSync(oldPath, newPath); - return newFileUri; + return { + uri: newFileUri, + code: 0, + }; } } catch (e) { hilog.error(DOMAIN_CODE, TAG, 'move error ' + e.message); - return ''; + return { + uri: '', + code: -1, + }; } let hasError = false; /** @@ -287,24 +341,39 @@ export default class FileExtAbility extends Extension { } }); if (hasError) { - return ''; + return { + uri: '', + code: -1, + }; } - return newFileUri; + return { + uri: newFileUri, + code: 0, + }; } rename(sourceFileUri, displayName) { if (!this.checkUri(sourceFileUri)) { - return ''; + return { + uri: '', + code: -1, + }; } try { let newFileUri = this.renameUri(sourceFileUri, displayName); let oldPath = this.getPath(sourceFileUri); let newPath = this.getPath(newFileUri); fileio.renameSync(oldPath, newPath); - return newFileUri; + return { + uri: newFileUri, + code: 0, + }; } catch (e) { hilog.error(DOMAIN_CODE, TAG, 'rename error ' + e.message); - return ''; + return { + uri: '', + code: -1, + }; } } @@ -332,21 +401,33 @@ export default class FileExtAbility extends Extension { isFileExist(sourceFileUri) { if (!this.checkUri(sourceFileUri)) { hilog.error(DOMAIN_CODE, TAG, 'isFileExist checkUri fail'); - return false; + return { + isExist: false, + code: -1, + }; } try { let path = this.getPath(sourceFileUri); fileio.accessSync(path); } catch (e) { hilog.error(DOMAIN_CODE, TAG, 'isFileExist error ' + e.message); - return false; + return { + isExist: false, + code: -1, + }; } - return true; + return { + isExist: true, + code: 0, + }; } listFile(sourceFileUri) { if (!this.checkUri(sourceFileUri)) { - return []; + return { + infos: [], + code: -1, + }; } let infos = []; try { @@ -371,9 +452,15 @@ export default class FileExtAbility extends Extension { } } catch (e) { hilog.error(DOMAIN_CODE, TAG, 'listFile error ' + e.message); - infos = []; + return { + infos: [], + code: -1, + }; } - return infos; + return { + infos: infos, + code: 0, + }; } getRoots() { @@ -391,6 +478,9 @@ export default class FileExtAbility extends Extension { FLAG.DIR_SUPPORTS_CREATE | FLAG.DIR_PREFERS_LAST_MODIFIED, }); - return roots; + return { + roots: roots, + code: 0, + }; } }; \ No newline at end of file -- Gitee From e2aef1e65c7c0550d6668e6ce04f5c33a532dfe9 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Mon, 8 Aug 2022 14:35:03 +0800 Subject: [PATCH 004/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9codecheck?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../innerkits/file_access/src/js_file_access_ext_ability.cpp | 2 +- utils/napi_error.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index fdcb8295..7bcf0d65 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -554,7 +554,7 @@ int JsFileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &dis std::vector JsFileAccessExtAbility::ListFile(const Uri &sourceFile) { - StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); + StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); auto value = std::make_shared>>(); auto argParser = [sourceFile](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *uri = engine.CreateString(sourceFile.ToString().c_str(), sourceFile.ToString().length()); diff --git a/utils/napi_error.h b/utils/napi_error.h index 57ccea3b..9d81b6a3 100644 --- a/utils/napi_error.h +++ b/utils/napi_error.h @@ -37,7 +37,8 @@ public: // Note that ace engine cannot thow errors created by napi_create_error so far napi_status throwStatus = napi_throw_error(env, std::to_string(errno_).c_str(), errMsg.c_str()); if (throwStatus != napi_ok) { - HILOG_WARN("Failed to throw an exception, %{public}d, code = %{public}s", throwStatus, std::to_string(errno_).c_str()); + HILOG_WARN("Failed to throw an exception, %{public}d, code = %{public}s", + throwStatus, std::to_string(errno_).c_str()); } } private: -- Gitee From ddc81578469bbdf0e7845ed43a9c59536a4d6a03 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Mon, 8 Aug 2022 15:23:07 +0800 Subject: [PATCH 005/122] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=AB=AF=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../src/js_file_access_ext_ability.cpp | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index 7bcf0d65..1d2dd197 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -323,6 +323,12 @@ int JsFileAccessExtAbility::OpenFile(const Uri &uri, int flags) FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errCode; } + + if (value->code != ERR_OK) { + HILOG_ERROR("fileio fail."); + return ERR_FILEIO_FAIL; + } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return value->data; } @@ -364,11 +370,17 @@ int JsFileAccessExtAbility::CreateFile(const Uri &parent, const std::string &dis return errCode; } + if (value->code != ERR_OK) { + HILOG_ERROR("fileio fail."); + return ERR_FILEIO_FAIL; + } + if ((value->data).empty()) { HILOG_ERROR("call CreateFile with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_ERROR; } + newFile = Uri(value->data); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errCode; @@ -411,6 +423,11 @@ int JsFileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayN return errCode; } + if (value->code != ERR_OK) { + HILOG_ERROR("fileio fail."); + return ERR_FILEIO_FAIL; + } + if ((value->data).empty()) { HILOG_ERROR("call Mkdir with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -451,6 +468,12 @@ int JsFileAccessExtAbility::Delete(const Uri &sourceFile) FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errCode; } + + if (value->code != ERR_OK) { + HILOG_ERROR("fileio fail."); + return ERR_FILEIO_FAIL; + } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return value->data; } @@ -494,6 +517,11 @@ int JsFileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, return errCode; } + if (value->code != ERR_OK) { + HILOG_ERROR("fileio fail."); + return ERR_FILEIO_FAIL; + } + if ((value->data).empty()) { HILOG_ERROR("call move with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -542,6 +570,11 @@ int JsFileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &dis return errCode; } + if (value->code != ERR_OK) { + HILOG_ERROR("fileio fail."); + return ERR_FILEIO_FAIL; + } + if ((value->data).empty()) { HILOG_ERROR("call Rename with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -595,6 +628,11 @@ std::vector JsFileAccessExtAbility::ListFile(const Uri &sourceFile) if (errCode != ERR_OK) { HILOG_ERROR("CallJsMethod error, code:%{public}d.", errCode); } + + if (value->code != ERR_OK) { + HILOG_ERROR("fileio fail."); + } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return value->data; } @@ -635,6 +673,11 @@ std::vector JsFileAccessExtAbility::GetRoots() if (errCode != ERR_OK) { HILOG_ERROR("CallJsMethod error, code:%{public}d.", errCode); } + + if (value->code != ERR_OK) { + HILOG_ERROR("fileio fail."); + } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return value->data; } @@ -665,6 +708,12 @@ int JsFileAccessExtAbility::IsFileExist(const Uri &uri, bool &isExist) FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errCode; } + + if (value->code != ERR_OK) { + HILOG_ERROR("fileio fail."); + return ERR_FILEIO_FAIL; + } + isExist = value->data; FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errCode; -- Gitee From 788637882babbe47776117afd1f70e959cad925f Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Mon, 8 Aug 2022 16:41:56 +0800 Subject: [PATCH 006/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=A0=81=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../src/main/ets/FileExtensionAbility/FileExtensionAbility.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index 221f73ba..ee99cf1b 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -413,7 +413,7 @@ export default class FileExtAbility extends Extension { hilog.error(DOMAIN_CODE, TAG, 'isFileExist error ' + e.message); return { isExist: false, - code: -1, + code: 0, }; } return { -- Gitee From f16ce796898641dede00e827de5c4a53853fffcc Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Tue, 9 Aug 2022 17:55:20 +0800 Subject: [PATCH 007/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../file_access/src/file_access_ext_stub.cpp | 8 +-- .../src/file_access_ext_stub_impl.cpp | 14 ++-- .../file_access/src/file_access_helper.cpp | 14 ++-- .../src/js_file_access_ext_ability.cpp | 30 ++++---- .../napi_fileaccess_helper.cpp | 36 +++++----- .../FileExtensionAbility.ts | 70 ++++++++++--------- utils/file_access_framework_errno.h | 3 +- 7 files changed, 88 insertions(+), 87 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp index 9ae5a7bd..69d45960 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp @@ -97,7 +97,7 @@ ErrCode FileAccessExtStub::CmdOpenFile(MessageParcel &data, MessageParcel &reply if (flags < 0) { HILOG_ERROR("parameter OpenFile flags is invalid"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_ERROR; + return ERR_INVALID_PARAM; } int fd = OpenFile(*uri, flags); @@ -131,7 +131,7 @@ ErrCode FileAccessExtStub::CmdCreateFile(MessageParcel &data, MessageParcel &rep if (displayName.empty()) { HILOG_ERROR("parameter CreateFile displayName is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_PARAM_FORMAT; + return ERR_INVALID_PARAM; } std::shared_ptr fileNew(data.ReadParcelable()); @@ -178,7 +178,7 @@ ErrCode FileAccessExtStub::CmdMkdir(MessageParcel &data, MessageParcel &reply) if (displayName.empty()) { HILOG_ERROR("parameter Mkdir mode is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_PARAM_FORMAT; + return ERR_INVALID_PARAM; } std::shared_ptr fileNew(data.ReadParcelable()); @@ -299,7 +299,7 @@ ErrCode FileAccessExtStub::CmdRename(MessageParcel &data, MessageParcel &reply) if (displayName.empty()) { HILOG_ERROR("parameter Rename mode is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_PARAM_FORMAT; + return ERR_INVALID_PARAM; } std::shared_ptr fileNew(data.ReadParcelable()); diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp index e53e1024..a138f49b 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp @@ -32,7 +32,7 @@ int FileAccessExtStubImpl::OpenFile(const Uri &uri, const int flags) if (extension_ == nullptr) { HILOG_ERROR("OpenFile get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_FILEIO_FAIL; + return ERR_IPC_ERROR; } int ret = extension_->OpenFile(uri, flags); @@ -46,7 +46,7 @@ int FileAccessExtStubImpl::CreateFile(const Uri &parent, const std::string &disp if (extension_ == nullptr) { HILOG_ERROR("CreateFile get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_FILEIO_FAIL; + return ERR_IPC_ERROR; } int ret = extension_->CreateFile(parent, displayName, newFile); @@ -60,7 +60,7 @@ int FileAccessExtStubImpl::Mkdir(const Uri &parent, const std::string &displayNa if (extension_ == nullptr) { HILOG_ERROR("Mkdir get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_FILEIO_FAIL; + return ERR_IPC_ERROR; } int ret = extension_->Mkdir(parent, displayName, newFile); @@ -74,7 +74,7 @@ int FileAccessExtStubImpl::Delete(const Uri &sourceFile) if (extension_ == nullptr) { HILOG_ERROR("Delete get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_FILEIO_FAIL; + return ERR_IPC_ERROR; } int ret = extension_->Delete(sourceFile); @@ -88,7 +88,7 @@ int FileAccessExtStubImpl::Move(const Uri &sourceFile, const Uri &targetParent, if (extension_ == nullptr) { HILOG_ERROR("Move get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_FILEIO_FAIL; + return ERR_IPC_ERROR; } int ret = extension_->Move(sourceFile, targetParent, newFile); @@ -102,7 +102,7 @@ int FileAccessExtStubImpl::Rename(const Uri &sourceFile, const std::string &disp if (extension_ == nullptr) { HILOG_ERROR("Rename get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_FILEIO_FAIL; + return ERR_IPC_ERROR; } int ret = extension_->Rename(sourceFile, displayName, newFile); @@ -146,7 +146,7 @@ int FileAccessExtStubImpl::IsFileExist(const Uri &uri, bool &isExist) if (extension_ == nullptr) { HILOG_ERROR("IsFileExist get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_FILEIO_FAIL; + return ERR_IPC_ERROR; } int ret = extension_->IsFileExist(uri, isExist); diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index f9fef9fc..865201e3 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -367,7 +367,7 @@ int FileAccessHelper::OpenFile(Uri &uri, int flags) if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_FILEIO_FAIL; + return ERR_IPC_ERROR; } int fd = fileExtProxy->OpenFile(uri, flags); @@ -382,7 +382,7 @@ int FileAccessHelper::CreateFile(Uri &parent, const std::string &displayName, Ur if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_FILEIO_FAIL; + return ERR_IPC_ERROR; } int index = fileExtProxy->CreateFile(parent, displayName, newFile); @@ -397,7 +397,7 @@ int FileAccessHelper::Mkdir(Uri &parent, const std::string &displayName, Uri &ne if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_FILEIO_FAIL; + return ERR_IPC_ERROR; } int index = fileExtProxy->Mkdir(parent, displayName, newDir); @@ -412,7 +412,7 @@ int FileAccessHelper::Delete(Uri &selectFile) if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_FILEIO_FAIL; + return ERR_IPC_ERROR; } int index = fileExtProxy->Delete(selectFile); @@ -434,7 +434,7 @@ int FileAccessHelper::Move(Uri &sourceFile, Uri &targetParent, Uri &newFile) if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_FILEIO_FAIL; + return ERR_IPC_ERROR; } int index = fileExtProxy->Move(sourceFile, targetParent, newFile); @@ -449,7 +449,7 @@ int FileAccessHelper::Rename(Uri &sourceFile, const std::string &displayName, Ur if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_FILEIO_FAIL; + return ERR_IPC_ERROR; } int index = fileExtProxy->Rename(sourceFile, displayName, newFile); @@ -527,7 +527,7 @@ int FileAccessHelper::IsFileExist(Uri &uri, bool &isExist) if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_FILEIO_FAIL; + return ERR_IPC_ERROR; } int ret = fileExtProxy->IsFileExist(uri, isExist); diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index 1d2dd197..c4fcf6c8 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -162,7 +162,7 @@ static int DoCallJsMethod(CallJsParam *param) if (jsRuntime == nullptr) { HILOG_ERROR("failed to get jsRuntime."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_PARAM_FORMAT; + return ERR_INVALID_PARAM; } HandleScope handleScope(*jsRuntime); auto& nativeEngine = jsRuntime->GetNativeEngine(); @@ -172,31 +172,31 @@ static int DoCallJsMethod(CallJsParam *param) if (!param->argParser(nativeEngine, argv, argc)) { HILOG_ERROR("failed to get params."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_PARAM_FORMAT; + return ERR_INVALID_PARAM; } } NativeValue *value = param->jsObj->Get(); if (value == nullptr) { HILOG_ERROR("failed to get native value object."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_ERROR; + return ERR_INVALID_PARAM; } NativeObject *obj = ConvertNativeValueTo(value); if (obj == nullptr) { HILOG_ERROR("failed to get FileExtAbility object."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_ERROR; + return ERR_INVALID_PARAM; } NativeValue *method = obj->GetProperty(param->funcName.c_str()); if (method == nullptr) { HILOG_ERROR("failed to get %{public}s from FileExtAbility object.", param->funcName.c_str()); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_ERROR; + return ERR_INVALID_PARAM; } if (param->retParser == nullptr) { HILOG_ERROR("ResultValueParser must not null."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_PARAM_FORMAT; + return ERR_INVALID_PARAM; } if (!param->retParser(nativeEngine, handleScope.Escape(nativeEngine.CallFunction(value, method, argv, argc)))) { HILOG_INFO("Parser js result fail."); @@ -215,19 +215,19 @@ int JsFileAccessExtAbility::CallJsMethod(const std::string &funcName, JsRuntime if (status != napi_ok) { FinishTrace(HITRACE_TAG_FILEMANAGEMENT); HILOG_ERROR("failed to get uv event loop."); - return ERR_ERROR; + return ERR_INVALID_PARAM; } auto param = std::make_shared(funcName, &jsRuntime, jsObj, argParser, retParser); if (param == nullptr) { FinishTrace(HITRACE_TAG_FILEMANAGEMENT); HILOG_ERROR("failed to new param."); - return ERR_ERROR; + return ERR_INVALID_PARAM; } auto work = std::make_shared(); if (work == nullptr) { FinishTrace(HITRACE_TAG_FILEMANAGEMENT); HILOG_ERROR("failed to new uv_work_t."); - return ERR_ERROR; + return ERR_INVALID_PARAM; } work->data = reinterpret_cast(param.get()); int ret = uv_queue_work(loop, work.get(), [](uv_work_t *work) {}, [](uv_work_t *work, int status) { @@ -248,7 +248,7 @@ int JsFileAccessExtAbility::CallJsMethod(const std::string &funcName, JsRuntime if (ret != 0) { FinishTrace(HITRACE_TAG_FILEMANAGEMENT); HILOG_ERROR("failed to exec uv_queue_work."); - return ERR_ERROR; + return ERR_INVALID_PARAM; } std::unique_lock lock(param->fileOperateMutex); param->fileOperateCondition.wait(lock, [param]() { return param->isReady; }); @@ -284,7 +284,7 @@ void JsFileAccessExtAbility::GetSrcPath(std::string &srcPath) template struct Value { T data; - int code {0}; + int code {ERR_OK}; }; int JsFileAccessExtAbility::OpenFile(const Uri &uri, int flags) @@ -378,7 +378,7 @@ int JsFileAccessExtAbility::CreateFile(const Uri &parent, const std::string &dis if ((value->data).empty()) { HILOG_ERROR("call CreateFile with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_ERROR; + return ERR_INVALID_PARAM; } newFile = Uri(value->data); @@ -431,7 +431,7 @@ int JsFileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayN if ((value->data).empty()) { HILOG_ERROR("call Mkdir with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_ERROR; + return ERR_INVALID_PARAM; } newFile = Uri(value->data); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -525,7 +525,7 @@ int JsFileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, if ((value->data).empty()) { HILOG_ERROR("call move with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_ERROR; + return ERR_INVALID_PARAM; } newFile = Uri(value->data); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -578,7 +578,7 @@ int JsFileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &dis if ((value->data).empty()) { HILOG_ERROR("call Rename with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_ERROR; + return ERR_INVALID_PARAM; } newFile = Uri(value->data); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index 282d3d89..bb67bc0d 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -199,7 +199,7 @@ napi_value NAPI_GetRegisterFileAccessExtAbilityInfo(napi_env env, napi_callback_ } NVal cb(env, funcArg[NARG_POS::FIRST]); if (!cb.TypeIs(napi_function)) { - NapiError(ERR_PARAM_FORMAT).ThrowErr(env); + NapiError(ERR_INVALID_PARAM).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; @@ -244,7 +244,7 @@ napi_value FileAccessHelperInit(napi_env env, napi_value exports) static FileAccessHelper *GetFileAccessHelper(napi_env env, napi_value thisVar) { if (thisVar == nullptr) { - NapiError(ERR_PARAM_FORMAT).ThrowErr(env); + NapiError(ERR_INVALID_PARAM).ThrowErr(env); return nullptr; } @@ -266,13 +266,13 @@ static std::tuple, std::unique_ptr> GetRea std::unique_ptr name = nullptr; std::tie(succ, uri, std::ignore) = NVal(env, sourceFile).ToUTF8String(); if (!succ) { - NapiError(ERR_PARAM_FORMAT).ThrowErr(env); + NapiError(ERR_INVALID_PARAM).ThrowErr(env); return { false, std::move(uri), std::move(name) }; } std::tie(succ, name, std::ignore) = NVal(env, targetParent).ToUTF8String(); if (!succ) { - NapiError(ERR_PARAM_FORMAT).ThrowErr(env); + NapiError(ERR_INVALID_PARAM).ThrowErr(env); return { false, std::move(uri), std::move(name) }; } @@ -291,14 +291,14 @@ napi_value NAPI_OpenFile(napi_env env, napi_callback_info info) std::unique_ptr uri; std::tie(succ, uri, std::ignore) = NVal(env, funcArg[NARG_POS::FIRST]).ToUTF8String(); if (!succ) { - NapiError(ERR_PARAM_FORMAT).ThrowErr(env); + NapiError(ERR_INVALID_PARAM).ThrowErr(env); return nullptr; } int flags; std::tie(succ, flags) = NVal(env, funcArg[NARG_POS::SECOND]).ToInt32(); if (!succ) { - NapiError(ERR_PARAM_FORMAT).ThrowErr(env); + NapiError(ERR_INVALID_PARAM).ThrowErr(env); return nullptr; } @@ -329,7 +329,7 @@ napi_value NAPI_OpenFile(napi_env env, napi_callback_info info) NVal cb(env, funcArg[NARG_POS::THIRD]); if (!cb.TypeIs(napi_function)) { - NapiError(ERR_PARAM_FORMAT).ThrowErr(env); + NapiError(ERR_INVALID_PARAM).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; @@ -381,7 +381,7 @@ napi_value NAPI_CreateFile(napi_env env, napi_callback_info info) NVal cb(env, funcArg[NARG_POS::THIRD]); if (!cb.TypeIs(napi_function)) { - NapiError(ERR_PARAM_FORMAT).ThrowErr(env); + NapiError(ERR_INVALID_PARAM).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; @@ -433,7 +433,7 @@ napi_value NAPI_Mkdir(napi_env env, napi_callback_info info) NVal cb(env, funcArg[NARG_POS::THIRD]); if (!cb.TypeIs(napi_function)) { - NapiError(ERR_PARAM_FORMAT).ThrowErr(env); + NapiError(ERR_INVALID_PARAM).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; @@ -451,7 +451,7 @@ napi_value NAPI_Delete(napi_env env, napi_callback_info info) std::unique_ptr uri; std::tie(succ, uri, std::ignore) = NVal(env, funcArg[NARG_POS::FIRST]).ToUTF8String(); if (!succ) { - NapiError(ERR_PARAM_FORMAT).ThrowErr(env); + NapiError(ERR_INVALID_PARAM).ThrowErr(env); return nullptr; } @@ -482,7 +482,7 @@ napi_value NAPI_Delete(napi_env env, napi_callback_info info) NVal cb(env, funcArg[NARG_POS::SECOND]); if (!cb.TypeIs(napi_function)) { - NapiError(ERR_PARAM_FORMAT).ThrowErr(env); + NapiError(ERR_INVALID_PARAM).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; @@ -535,7 +535,7 @@ napi_value NAPI_Move(napi_env env, napi_callback_info info) NVal cb(env, funcArg[NARG_POS::THIRD]); if (!cb.TypeIs(napi_function)) { - NapiError(ERR_PARAM_FORMAT).ThrowErr(env); + NapiError(ERR_INVALID_PARAM).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; @@ -587,7 +587,7 @@ napi_value NAPI_Rename(napi_env env, napi_callback_info info) NVal cb(env, funcArg[NARG_POS::THIRD]); if (!cb.TypeIs(napi_function)) { - NapiError(ERR_PARAM_FORMAT).ThrowErr(env); + NapiError(ERR_INVALID_PARAM).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; @@ -605,7 +605,7 @@ napi_value NAPI_ListFile(napi_env env, napi_callback_info info) std::unique_ptr uri; std::tie(succ, uri, std::ignore) = NVal(env, funcArg[NARG_POS::FIRST]).ToUTF8String(); if (!succ) { - NapiError(ERR_PARAM_FORMAT).ThrowErr(env); + NapiError(ERR_INVALID_PARAM).ThrowErr(env); return nullptr; } @@ -637,7 +637,7 @@ napi_value NAPI_ListFile(napi_env env, napi_callback_info info) NVal cb(env, funcArg[NARG_POS::SECOND]); if (!cb.TypeIs(napi_function)) { - NapiError(ERR_PARAM_FORMAT).ThrowErr(env); + NapiError(ERR_INVALID_PARAM).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; @@ -678,7 +678,7 @@ napi_value NAPI_GetRoots(napi_env env, napi_callback_info info) NVal cb(env, funcArg[NARG_POS::FIRST]); if (!cb.TypeIs(napi_function)) { - NapiError(ERR_PARAM_FORMAT).ThrowErr(env); + NapiError(ERR_INVALID_PARAM).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; @@ -696,7 +696,7 @@ napi_value NAPI_IsFileExist(napi_env env, napi_callback_info info) std::unique_ptr uri; std::tie(succ, uri, std::ignore) = NVal(env, funcArg[NARG_POS::FIRST]).ToUTF8String(); if (!succ) { - NapiError(ERR_PARAM_FORMAT).ThrowErr(env); + NapiError(ERR_INVALID_PARAM).ThrowErr(env); return nullptr; } @@ -728,7 +728,7 @@ napi_value NAPI_IsFileExist(napi_env env, napi_callback_info info) } NVal cb(env, funcArg[NARG_POS::SECOND]); if (!cb.TypeIs(napi_function)) { - NapiError(ERR_PARAM_FORMAT).ThrowErr(env); + NapiError(ERR_INVALID_PARAM).ThrowErr(env); return nullptr; } return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index ee99cf1b..58912f49 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -29,6 +29,8 @@ const CREATE_FILE_FLAGS = 0o100; const FILE_ACCESS = 'fileAccess://'; const DOMAIN_CODE = 0x0001; const TAG = 'js_server'; +const ERR_OK = 0; +const ERR_ERROR = -1; export default class FileExtAbility extends Extension { onCreate(want) { @@ -147,8 +149,8 @@ export default class FileExtAbility extends Extension { openFile(sourceFileUri, flags) { if (!this.checkUri(sourceFileUri)) { return { - fd: -1, - code: -1, + fd: ERR_ERROR, + code: ERR_ERROR, }; } let fd = 0; @@ -157,13 +159,13 @@ export default class FileExtAbility extends Extension { fd = fileio.openSync(path, flags, DEFAULT_MODE); return { fd: fd, - code: 0, + code: ERR_OK, }; } catch (e) { hilog.error(DOMAIN_CODE, TAG, 'openFile error ' + e.message); return { - fd: -1, - code: -1, + fd: ERR_ERROR, + code: ERR_ERROR, }; } } @@ -182,7 +184,7 @@ export default class FileExtAbility extends Extension { if (!this.checkUri(parentUri)) { return { uri: '', - code: -1, + code: ERR_ERROR, }; } try { @@ -190,20 +192,20 @@ export default class FileExtAbility extends Extension { if (this.isFileExist(newFileUri).isExist) { return { uri: '', - code: -1, + code: ERR_ERROR, }; } let path = this.getPath(newFileUri); fileio.openSync(path, CREATE_FILE_FLAGS, DEFAULT_MODE); return { uri: newFileUri, - code: 0, + code: ERR_OK, }; } catch (e) { hilog.error(DOMAIN_CODE, TAG, 'createFile error ' + e.message); return { uri: '', - code: -1, + code: ERR_ERROR, }; } } @@ -212,7 +214,7 @@ export default class FileExtAbility extends Extension { if (!this.checkUri(parentUri)) { return { uri: '', - code: -1, + code: ERR_ERROR, }; } try { @@ -221,13 +223,13 @@ export default class FileExtAbility extends Extension { fileio.mkdirSync(path); return { uri: newFileUri, - code: 0, + code: ERR_OK, }; } catch (e) { hilog.error(DOMAIN_CODE, TAG, 'mkdir error ' + e.message); return { uri: '', - code: -1, + code: ERR_ERROR, }; } } @@ -235,12 +237,12 @@ export default class FileExtAbility extends Extension { delete(selectFileUri) { if (!this.checkUri(selectFileUri)) { return { - index: -1, - code: -1, + index: ERR_ERROR, + code: ERR_ERROR, }; } let path = this.getPath(selectFileUri); - let code = 0; + let code = ERR_OK; this.recurseDir(path, function (filePath, isDirectory, hasNextFile) { try { if (isDirectory) { @@ -252,7 +254,7 @@ export default class FileExtAbility extends Extension { } } catch (e) { hilog.error(DOMAIN_CODE, TAG, 'delete error ' + e.message); - code = -1; + code = ERR_ERROR; } }); return { @@ -265,7 +267,7 @@ export default class FileExtAbility extends Extension { if (!this.checkUri(sourceFileUri) || !this.checkUri(targetParentUri)) { return { uri: '', - code: -1, + code: ERR_ERROR, }; } let displayName = this.getFileName(sourceFileUri); @@ -276,13 +278,13 @@ export default class FileExtAbility extends Extension { // move to the same directory return { uri: newFileUri, - code: 0, + code: ERR_OK, }; } else if (newPath.indexOf(oldPath) == 0) { // move to a subdirectory of the source directory return { uri: '', - code: -1, + code: ERR_ERROR, }; } try { @@ -292,7 +294,7 @@ export default class FileExtAbility extends Extension { if (!stat || !stat.isDirectory()) { return { uri: '', - code: -1, + code: ERR_ERROR, }; } // If not across devices, use fileio.renameSync to move @@ -300,14 +302,14 @@ export default class FileExtAbility extends Extension { fileio.renameSync(oldPath, newPath); return { uri: newFileUri, - code: 0, + code: ERR_OK, }; } } catch (e) { hilog.error(DOMAIN_CODE, TAG, 'move error ' + e.message); return { uri: '', - code: -1, + code: ERR_ERROR, }; } let hasError = false; @@ -343,12 +345,12 @@ export default class FileExtAbility extends Extension { if (hasError) { return { uri: '', - code: -1, + code: ERR_ERROR, }; } return { uri: newFileUri, - code: 0, + code: ERR_OK, }; } @@ -356,7 +358,7 @@ export default class FileExtAbility extends Extension { if (!this.checkUri(sourceFileUri)) { return { uri: '', - code: -1, + code: ERR_ERROR, }; } try { @@ -366,13 +368,13 @@ export default class FileExtAbility extends Extension { fileio.renameSync(oldPath, newPath); return { uri: newFileUri, - code: 0, + code: ERR_OK, }; } catch (e) { hilog.error(DOMAIN_CODE, TAG, 'rename error ' + e.message); return { uri: '', - code: -1, + code: ERR_ERROR, }; } } @@ -403,7 +405,7 @@ export default class FileExtAbility extends Extension { hilog.error(DOMAIN_CODE, TAG, 'isFileExist checkUri fail'); return { isExist: false, - code: -1, + code: ERR_ERROR, }; } try { @@ -413,12 +415,12 @@ export default class FileExtAbility extends Extension { hilog.error(DOMAIN_CODE, TAG, 'isFileExist error ' + e.message); return { isExist: false, - code: 0, + code: ERR_OK, }; } return { isExist: true, - code: 0, + code: ERR_OK, }; } @@ -426,7 +428,7 @@ export default class FileExtAbility extends Extension { if (!this.checkUri(sourceFileUri)) { return { infos: [], - code: -1, + code: ERR_ERROR, }; } let infos = []; @@ -454,12 +456,12 @@ export default class FileExtAbility extends Extension { hilog.error(DOMAIN_CODE, TAG, 'listFile error ' + e.message); return { infos: [], - code: -1, + code: ERR_ERROR, }; } return { infos: infos, - code: 0, + code: ERR_OK, }; } @@ -480,7 +482,7 @@ export default class FileExtAbility extends Extension { }); return { roots: roots, - code: 0, + code: ERR_OK, }; } }; \ No newline at end of file diff --git a/utils/file_access_framework_errno.h b/utils/file_access_framework_errno.h index fef00472..7263f2b1 100644 --- a/utils/file_access_framework_errno.h +++ b/utils/file_access_framework_errno.h @@ -26,15 +26,14 @@ enum { constexpr ErrCode BASE_OFFSET = -ErrCodeOffset(SUBSYS_FILEMANAGEMENT, MODULE_FILE_ACCESS_FRAMEWORK); enum { ERR_OK = 0, - ERR_ERROR = -1, ERR_IPC_ERROR = BASE_OFFSET, // ipc error ERR_PERMISSION_DENIED, // no permission ERR_INVALID_FD, // invalid fd ERR_INVALID_URI, // invalid uri ERR_URI_CHECK, // check uri head fail ERR_FILEIO_FAIL, // fileio fail - ERR_PARAM_FORMAT, // Parameter format erroe ERR_PARAM_NUMBER, // Parameter number is abnormal + ERR_INVALID_PARAM, // invalid parameter ERR_PARSER_FAIL, // parser js result error ERR_OPERATION_NOT_PERMITTED, // Operation not permitted ERR_GET_FILEACCESS_HELPER // get fileAccessHelper fail -- Gitee From 3cc60a1af31a696b6ec91494dce8371832050a05 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Tue, 9 Aug 2022 18:04:42 +0800 Subject: [PATCH 008/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 52799ff3..92743c31 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -56,7 +56,7 @@ int FileAccessExtProxy::OpenFile(const Uri &uri, const int flags) } int fd = reply.ReadFileDescriptor(); - if (fd <= ERR_ERROR) { + if (fd < ERR_OK) { HILOG_ERROR("fail to ReadFileDescriptor fd"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_FD; -- Gitee From a4ab7f4c3e6c5650b5751ac11e3df43c204c36c4 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Wed, 10 Aug 2022 10:25:14 +0800 Subject: [PATCH 009/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../src/js_file_access_ext_ability.cpp | 16 +++++++--------- .../FileExtensionAbility/FileExtensionAbility.ts | 10 ++-------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index c4fcf6c8..3d1e7e0e 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -441,7 +441,7 @@ int JsFileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayN int JsFileAccessExtAbility::Delete(const Uri &sourceFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Delete"); - auto value = std::make_shared>(); + auto ret = std::make_shared(); auto argParser = [uri = sourceFile](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *nativeUri = engine.CreateString(uri.ToString().c_str(), uri.ToString().length()); if (nativeUri == nullptr) { @@ -452,14 +452,12 @@ int JsFileAccessExtAbility::Delete(const Uri &sourceFile) argc = ARGC_ONE; return true; }; - auto retParser = [value](NativeEngine &engine, NativeValue *result) -> bool { - NativeObject *obj = ConvertNativeValueTo(result); - bool ret = ConvertFromJsValue(engine, obj->GetProperty("index"), value->data); - ret = ret && ConvertFromJsValue(engine, obj->GetProperty("code"), value->code); - if (!ret) { + auto retParser = [ret](NativeEngine &engine, NativeValue *result) -> bool { + bool res = ConvertFromJsValue(engine, result, *ret); + if (!res) { HILOG_ERROR("Convert js value fail."); } - return ret; + return res; }; auto errCode = CallJsMethod("delete", jsRuntime_, jsObj_.get(), argParser, retParser); @@ -469,13 +467,13 @@ int JsFileAccessExtAbility::Delete(const Uri &sourceFile) return errCode; } - if (value->code != ERR_OK) { + if (*ret != ERR_OK) { HILOG_ERROR("fileio fail."); return ERR_FILEIO_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return value->data; + return *ret; } int JsFileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index 58912f49..a777cbae 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -236,10 +236,7 @@ export default class FileExtAbility extends Extension { delete(selectFileUri) { if (!this.checkUri(selectFileUri)) { - return { - index: ERR_ERROR, - code: ERR_ERROR, - }; + return ERR_ERROR; } let path = this.getPath(selectFileUri); let code = ERR_OK; @@ -257,10 +254,7 @@ export default class FileExtAbility extends Extension { code = ERR_ERROR; } }); - return { - index: code, - code: code, - }; + return code; } move(sourceFileUri, targetParentUri) { -- Gitee From 0d2d2614f39a1ff002c7efda3cf3daf8a98517b2 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Fri, 12 Aug 2022 10:19:17 +0800 Subject: [PATCH 010/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- utils/file_access_framework_errno.h | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/file_access_framework_errno.h b/utils/file_access_framework_errno.h index 7263f2b1..6f2f19da 100644 --- a/utils/file_access_framework_errno.h +++ b/utils/file_access_framework_errno.h @@ -30,7 +30,6 @@ enum { ERR_PERMISSION_DENIED, // no permission ERR_INVALID_FD, // invalid fd ERR_INVALID_URI, // invalid uri - ERR_URI_CHECK, // check uri head fail ERR_FILEIO_FAIL, // fileio fail ERR_PARAM_NUMBER, // Parameter number is abnormal ERR_INVALID_PARAM, // invalid parameter -- Gitee From e2c795c204a29e467cf4f9f90d99de81127f563e Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Fri, 12 Aug 2022 16:43:37 +0800 Subject: [PATCH 011/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- frameworks/innerkits/file_access/src/file_access_helper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 865201e3..9d29375f 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -530,9 +530,9 @@ int FileAccessHelper::IsFileExist(Uri &uri, bool &isExist) return ERR_IPC_ERROR; } - int ret = fileExtProxy->IsFileExist(uri, isExist); + int index = fileExtProxy->IsFileExist(uri, isExist); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return index; } void FileAccessDeathRecipient::OnRemoteDied(const wptr &remote) -- Gitee From 1491bea47ec1c0ef8987fcf014cfdfc7304128d1 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Fri, 12 Aug 2022 17:43:48 +0800 Subject: [PATCH 012/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../ets/FileExtensionAbility/FileExtensionAbility.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index a777cbae..0d5081a0 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -407,10 +407,16 @@ export default class FileExtAbility extends Extension { fileio.accessSync(path); } catch (e) { hilog.error(DOMAIN_CODE, TAG, 'isFileExist error ' + e.message); + if (e.message == 'No such file or directory') { + return { + isExist: false, + code: ERR_OK, + }; + } return { isExist: false, - code: ERR_OK, - }; + code: ERR_ERROR, + } } return { isExist: true, -- Gitee From 43c745aeafd2e8cf52b12aaf9d27b526e2421e30 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Sat, 13 Aug 2022 02:44:56 +0000 Subject: [PATCH 013/122] =?UTF-8?q?update=20utils/file=5Faccess=5Fframewor?= =?UTF-8?q?k=5Ferrno.h.=20=E4=BF=AE=E6=94=B9=E6=A0=BC=E5=BC=8F=E8=A7=84?= =?UTF-8?q?=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- utils/file_access_framework_errno.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/file_access_framework_errno.h b/utils/file_access_framework_errno.h index 036cd114..c27f780c 100644 --- a/utils/file_access_framework_errno.h +++ b/utils/file_access_framework_errno.h @@ -35,7 +35,7 @@ enum { ERR_INVALID_PARAM, // invalid parameter ERR_PARSER_FAIL, // parser js result error ERR_OPERATION_NOT_PERMITTED, // Operation not permitted - ERR_GET_FILEACCESS_HELPER, // get fileAccessHelper fail + ERR_GET_FILEACCESS_HELPER, // get fileAccessHelper fail ERR_INVALID_NOTIFY, // invalid notify ERR_REMOVE_NOTIFY_FAIL, // remove notify fail ERR_NOTIFY_NOT_EXIST, // the notify is not exist -- Gitee From 0b8cab93ad160ac86470484aa478581d8849db23 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Sat, 13 Aug 2022 06:37:56 +0000 Subject: [PATCH 014/122] =?UTF-8?q?update=20frameworks/innerkits/file=5Fac?= =?UTF-8?q?cess/src/file=5Faccess=5Fhelper.cpp.=20=E4=BF=AE=E6=94=B9GetPro?= =?UTF-8?q?xyByUri=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../file_access/src/file_access_helper.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index c434f8e0..51f08a75 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -363,7 +363,7 @@ bool FileAccessHelper::GetProxy() int FileAccessHelper::OpenFile(Uri &uri, int flags) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "OpenFile"); - sptr fileExtProxy = GetProxy(uri); + sptr fileExtProxy = GetProxyByUri(uri); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -378,7 +378,7 @@ int FileAccessHelper::OpenFile(Uri &uri, int flags) int FileAccessHelper::CreateFile(Uri &parent, const std::string &displayName, Uri &newFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CreateFile"); - sptr fileExtProxy = GetProxy(parent); + sptr fileExtProxy = GetProxyByUri(parent); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -393,7 +393,7 @@ int FileAccessHelper::CreateFile(Uri &parent, const std::string &displayName, Ur int FileAccessHelper::Mkdir(Uri &parent, const std::string &displayName, Uri &newDir) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Mkdir"); - sptr fileExtProxy = GetProxy(parent); + sptr fileExtProxy = GetProxyByUri(parent); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -408,7 +408,7 @@ int FileAccessHelper::Mkdir(Uri &parent, const std::string &displayName, Uri &ne int FileAccessHelper::Delete(Uri &selectFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Delete"); - sptr fileExtProxy = GetProxy(selectFile); + sptr fileExtProxy = GetProxyByUri(selectFile); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -430,7 +430,7 @@ int FileAccessHelper::Move(Uri &sourceFile, Uri &targetParent, Uri &newFile) return ERR_OPERATION_NOT_PERMITTED; } - sptr fileExtProxy = GetProxy(sourceFile); + sptr fileExtProxy = GetProxyByUri(sourceFile); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -445,7 +445,7 @@ int FileAccessHelper::Move(Uri &sourceFile, Uri &targetParent, Uri &newFile) int FileAccessHelper::Rename(Uri &sourceFile, const std::string &displayName, Uri &newFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Rename"); - sptr fileExtProxy = GetProxy(sourceFile); + sptr fileExtProxy = GetProxyByUri(sourceFile); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -523,7 +523,7 @@ std::vector FileAccessHelper::GetRegisterFileAccessExtAbilityInfo() int FileAccessHelper::IsFileExist(Uri &uri, bool &isExist) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "IsFileExist"); - sptr fileExtProxy = GetProxy(uri); + sptr fileExtProxy = GetProxyByUri(uri); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); -- Gitee From 5e22b920d4b1825f498e6f9f8711995afb1c7b74 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Sat, 13 Aug 2022 06:39:12 +0000 Subject: [PATCH 015/122] =?UTF-8?q?update=20utils/file=5Faccess=5Fframewor?= =?UTF-8?q?k=5Ferrno.h.=20=E4=BF=AE=E6=94=B9codecheck?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- utils/file_access_framework_errno.h | 1 - 1 file changed, 1 deletion(-) diff --git a/utils/file_access_framework_errno.h b/utils/file_access_framework_errno.h index c27f780c..e6384178 100644 --- a/utils/file_access_framework_errno.h +++ b/utils/file_access_framework_errno.h @@ -40,7 +40,6 @@ enum { ERR_REMOVE_NOTIFY_FAIL, // remove notify fail ERR_NOTIFY_NOT_EXIST, // the notify is not exist ERR_NOTIFY_FAIL // notify client fail - }; } // namespace FileAccessFwk } // namespace OHOS -- Gitee From a7123e8a4b60263ab3235e3abaea48261fd50367 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Sat, 13 Aug 2022 06:40:55 +0000 Subject: [PATCH 016/122] =?UTF-8?q?update=20frameworks/innerkits/file=5Fac?= =?UTF-8?q?cess/src/file=5Faccess=5Fhelper.cpp.=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- frameworks/innerkits/file_access/src/file_access_helper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 51f08a75..0f11430f 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -549,7 +549,7 @@ int FileAccessHelper::On(std::shared_ptr &callback) if (callback == nullptr) { HILOG_ERROR("failed with invalid callback"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_ERROR; + return ERR_INVALID_PARAM; } if (notifyAgent_ != nullptr) { @@ -565,7 +565,7 @@ int FileAccessHelper::On(std::shared_ptr &callback) if (notifyAgent_ == nullptr) { HILOG_INFO("new FileAccessNotifyAgent fail"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_ERROR; + return ERR_INVALID_PARAM; } auto ret = fileExtProxy->RegisterNotify(notifyAgent_); -- Gitee From f06523e1298135286911581ca56cc0fe734f16ac Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Sat, 13 Aug 2022 07:06:04 +0000 Subject: [PATCH 017/122] =?UTF-8?q?update=20frameworks/innerkits/file=5Fac?= =?UTF-8?q?cess/src/file=5Faccess=5Fext=5Fability.cpp.=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=94=99=E8=AF=AF=E7=A0=81=E8=BF=94=E5=9B=9E=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../innerkits/file_access/src/file_access_ext_ability.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp index 58baf36d..cc674d2b 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp @@ -125,7 +125,7 @@ int FileAccessExtAbility::RegisterNotify(sptr ¬ify) if (!GetNotifyManager()) { HILOG_ERROR("GetNotifyManager fail."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_ERROR; + return ERR_INVALID_PARAM; } int ret = notifyManager_->RegisterNotify(notify); if (ret != ERR_OK) { @@ -141,7 +141,7 @@ int FileAccessExtAbility::UnregisterNotify(sptr ¬ify) if (!GetNotifyManager()) { HILOG_ERROR("GetNotifyManager fail."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_ERROR; + return ERR_INVALID_PARAM; } int ret = notifyManager_->UnregisterNotify(notify); if (ret != ERR_OK) { @@ -157,7 +157,7 @@ int FileAccessExtAbility::Notify(const NotifyMessage& message) if (!GetNotifyManager()) { HILOG_ERROR("GetNotifyManager fail."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_ERROR; + return ERR_INVALID_PARAM; } int ret = notifyManager_->Notify(message); if (ret != ERR_OK) { -- Gitee From 57179b41434858319e208bc2f71b7e06adb5c247 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Sat, 13 Aug 2022 07:30:22 +0000 Subject: [PATCH 018/122] =?UTF-8?q?update=20frameworks/innerkits/file=5Fac?= =?UTF-8?q?cess/src/file=5Faccess=5Fext=5Fstub=5Fimpl.cpp.=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=94=99=E8=AF=AF=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../innerkits/file_access/src/file_access_ext_stub_impl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp index b090bb2d..473747d3 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp @@ -161,7 +161,7 @@ int FileAccessExtStubImpl::RegisterNotify(sptr ¬ify) if (extension == nullptr) { HILOG_ERROR("get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_ERROR; + return ERR_IPC_ERROR; } int ret = extension->RegisterNotify(notify); @@ -179,7 +179,7 @@ int FileAccessExtStubImpl::UnregisterNotify(sptr ¬ify) if (extension == nullptr) { HILOG_ERROR("get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_ERROR; + return ERR_IPC_ERROR; } int ret = extension->UnregisterNotify(notify); -- Gitee From 2c61d6cfc6a5d47ee4bcda5c79608f7433b2c483 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Sat, 13 Aug 2022 07:43:44 +0000 Subject: [PATCH 019/122] =?UTF-8?q?update=20frameworks/innerkits/file=5Fac?= =?UTF-8?q?cess/src/notify/file=5Faccess=5Fnotify=5Fstub.cpp.=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=94=99=E8=AF=AF=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../file_access/src/notify/file_access_notify_stub.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/innerkits/file_access/src/notify/file_access_notify_stub.cpp b/frameworks/innerkits/file_access/src/notify/file_access_notify_stub.cpp index 22e5978a..0330b37b 100644 --- a/frameworks/innerkits/file_access/src/notify/file_access_notify_stub.cpp +++ b/frameworks/innerkits/file_access/src/notify/file_access_notify_stub.cpp @@ -28,7 +28,7 @@ int32_t FileAccessNotifyStub::OnRemoteRequest(uint32_t code, MessageParcel &data auto remoteDescriptor = data.ReadInterfaceToken(); if (descriptor != remoteDescriptor) { HILOG_ERROR("local descriptor is not equal to remote"); - return ERR_ERROR; + return ERR_INVALID_PARAM; } HILOG_INFO("FileAccessNotifyStub::OnRemoteRequest, code:%{public}u", code); switch (code) { -- Gitee From c163a812b34e5f15ff297cfcc3c0f42b87fd51d8 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Mon, 15 Aug 2022 10:22:45 +0800 Subject: [PATCH 020/122] format uri Signed-off-by: linjun9528 --- .../file_access/include/file_access_helper.h | 2 + .../file_access/src/file_access_helper.cpp | 142 +++++++++++++----- .../napi_fileaccess_helper.cpp | 41 ++--- .../FileExtensionAbility.ts | 9 +- .../ets/FileExtensionAbility/VolumeManager.ts | 2 +- .../entry/src/main/module.json | 2 +- 6 files changed, 124 insertions(+), 74 deletions(-) diff --git a/frameworks/innerkits/file_access/include/file_access_helper.h b/frameworks/innerkits/file_access/include/file_access_helper.h index f872fbb8..cf3a8c48 100644 --- a/frameworks/innerkits/file_access/include/file_access_helper.h +++ b/frameworks/innerkits/file_access/include/file_access_helper.h @@ -96,6 +96,8 @@ private: static std::string GetKeyOfWantsMap(const AAFwk::Want &want); sptr callerDeathRecipient_ = nullptr; + + std::mutex notifyAgentMutex_; sptr notifyAgent_ = nullptr; }; diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 94a413fb..6703a49c 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -26,9 +26,51 @@ namespace OHOS { namespace FileAccessFwk { -const int32_t DEFAULT_USERID = 100; +namespace { + const int32_t DEFAULT_USERID = 100; + const std::string SCHEME_NAME = "datashare"; + const std::string MEDIA_BNUDLE_NAME = "media"; +} std::unordered_map FileAccessHelper::wantsMap_; +static bool GetBundleNameFromPath(const std::string &path, std::string &bundleName) +{ + if (path.size() == 0) { + return false; + } + + if (path.front() != '/') { + return false; + } + + auto tmpPath = path.substr(1); + auto index = tmpPath.find_first_of("/"); + bundleName = tmpPath.substr(0, index); + return true; +} + +static bool CheckUri(Uri &uri, std::string &bundleName) +{ + std::string schemeStr = std::string(uri.GetScheme()); + if (schemeStr.compare(SCHEME_NAME) != 0) { + HILOG_ERROR("Uri scheme error."); + return false; + } + + std::string pathStr = std::string(uri.GetPath()); + std::string bundleNameStr; + if (!GetBundleNameFromPath(pathStr, bundleNameStr)) { + HILOG_ERROR("get bundleName error."); + return false; + } + + if (bundleNameStr.compare(bundleName) != 0 && bundleNameStr.compare(MEDIA_BNUDLE_NAME) != 0) { + HILOG_ERROR("Uri bundleName error."); + return false; + } + return true; +} + sptr FileAccessHelper::GetBundleMgrProxy() { sptr systemAbilityManager = @@ -94,7 +136,16 @@ std::shared_ptr FileAccessHelper::GetConnectInfo(Uri &uri) for (auto iter = cMap_.begin(); iter != cMap_.end(); ++iter) { Uri key(iter->first); if (key.GetScheme().compare(uri.GetScheme()) == 0) { - return iter->second; + auto path = std::string(key.GetPath()); + std::string bundleName; + if (!GetBundleNameFromPath(path, bundleName)) { + HILOG_ERROR("get bundleName error."); + return nullptr; + } + + if (CheckUri(uri, bundleName)) { + return iter->second; + } } } @@ -333,6 +384,12 @@ sptr FileAccessHelper::GetProxyByUri(Uri &uri) return nullptr; } + std::string bundleName = connectInfo->want.GetElement().GetBundleName(); + if (!CheckUri(uri, bundleName)) { + HILOG_ERROR("Check uri error."); + return nullptr; + } + if (!connectInfo->fileAccessExtConnection->IsExtAbilityConnected()) { connectInfo->fileAccessExtConnection->ConnectFileExtAbility(connectInfo->want, token_); } @@ -558,68 +615,81 @@ int FileAccessHelper::IsFileExist(Uri &uri, bool &isExist) int FileAccessHelper::On(std::shared_ptr &callback) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "On"); - Uri uri("fileAccess://"); - sptr fileExtProxy = GetProxyByUri(uri); - if (fileExtProxy == nullptr) { - HILOG_ERROR("failed with invalid fileExtProxy"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; - } - if (callback == nullptr) { HILOG_ERROR("failed with invalid callback"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_ERROR; } - if (notifyAgent_ != nullptr) { - HILOG_INFO("notifyAgent registered yet."); - int ret = fileExtProxy->UnregisterNotify(notifyAgent_); - if (ret != ERR_OK) { - HILOG_INFO("fileExtProxy unregisterNotify fail"); - } - notifyAgent_.clear(); + if (!GetProxy()) { + HILOG_ERROR("failed with invalid fileAccessExtProxy"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_IPC_ERROR; } - notifyAgent_ = new(std::nothrow) FileAccessNotifyAgent(callback); + std::lock_guard lock(notifyAgentMutex_); if (notifyAgent_ == nullptr) { - HILOG_INFO("new FileAccessNotifyAgent fail"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_ERROR; + notifyAgent_ = new(std::nothrow) FileAccessNotifyAgent(callback); + if (notifyAgent_ == nullptr) { + HILOG_ERROR("new FileAccessNotifyAgent fail"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_ERROR; + } } - auto ret = fileExtProxy->RegisterNotify(notifyAgent_); - if (ret != ERR_OK) { - HILOG_ERROR("fileExtProxy RegisterNotify fail"); + int errorCode = ERR_OK; + for (auto iter = cMap_.begin(); iter != cMap_.end(); ++iter) { + auto connectInfo = iter->second; + auto fileAccessExtProxy = connectInfo->fileAccessExtConnection->GetFileExtProxy(); + if (fileAccessExtProxy == nullptr) { + HILOG_ERROR("fileAccessExtProxy RegisterNotify fail"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_IPC_ERROR; + } + + auto ret = fileAccessExtProxy->RegisterNotify(notifyAgent_); + if (ret != ERR_OK) { + HILOG_ERROR("fileAccessExtProxy RegisterNotify fail, bundleName:%{public}s, ret:%{public}d.", + connectInfo->want.GetElement().GetBundleName().c_str(), ret); + errorCode = ret; + } } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return errorCode; } int FileAccessHelper::Off() { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Off"); + std::lock_guard lock(notifyAgentMutex_); if (notifyAgent_ == nullptr) { HILOG_ERROR("not registered notify"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_NOTIFY_NOT_EXIST; } - Uri uri("fileAccess://"); - sptr fileExtProxy = GetProxyByUri(uri); - if (fileExtProxy == nullptr) { - HILOG_ERROR("failed with invalid fileExtProxy"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; - } + int errorCode = ERR_OK; + for (auto iter = cMap_.begin(); iter != cMap_.end(); ++iter) { + auto connectInfo = iter->second; + auto fileAccessExtProxy = connectInfo->fileAccessExtConnection->GetFileExtProxy(); + if (fileAccessExtProxy == nullptr) { + HILOG_INFO("fileAccessExtProxy UnregisterNotify fail, bundleName:%{public}s", + connectInfo->want.GetElement().GetBundleName().c_str()); + continue; + } - auto ret = fileExtProxy->UnregisterNotify(notifyAgent_); - if (ret != ERR_OK) { - HILOG_ERROR("fileExtProxy unregisterNotify fail"); + auto ret = fileAccessExtProxy->UnregisterNotify(notifyAgent_); + if (ret != ERR_OK) { + HILOG_ERROR("fileAccessExtProxy UnregisterNotify fail, bundleName:%{public}s, ret:%{public}d.", + connectInfo->want.GetElement().GetBundleName().c_str(), ret); + errorCode = ret; + } } + notifyAgent_.clear(); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return errorCode; } void FileAccessDeathRecipient::OnRemoteDied(const wptr &remote) diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index 8164e031..1ad86808 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -730,7 +730,7 @@ napi_value NAPI_IsFileExist(napi_env env, napi_callback_info info) napi_value NAPI_On(napi_env env, napi_callback_info info) { NFuncArg funcArg(env, info); - if (!funcArg.InitArgs(NARG_CNT::ONE, NARG_CNT::ONE)) { + if (!funcArg.InitArgs(NARG_CNT::ONE)) { NError(EINVAL).ThrowErr(env, "Number of arguments unmatched"); return nullptr; } @@ -753,8 +753,9 @@ napi_value NAPI_On(napi_env env, napi_callback_info info) return nullptr; } - if (fileAccessHelper->On(callback) != ERR_OK) { - NError(EINVAL).ThrowErr(env, "FileAccessHelper::On fail."); + auto retCode = fileAccessHelper->On(callback); + if (retCode != ERR_OK) { + NError(retCode).ThrowErr(env, "FileAccessHelper::On fail."); return nullptr; } return NVal::CreateUndefined(env).val_; @@ -763,7 +764,7 @@ napi_value NAPI_On(napi_env env, napi_callback_info info) napi_value NAPI_Off(napi_env env, napi_callback_info info) { NFuncArg funcArg(env, info); - if (!funcArg.InitArgs(NARG_CNT::ZERO, NARG_CNT::ONE)) { + if (!funcArg.InitArgs(NARG_CNT::ZERO)) { NError(EINVAL).ThrowErr(env, "Number of arguments unmatched"); return nullptr; } @@ -774,34 +775,10 @@ napi_value NAPI_Off(napi_env env, napi_callback_info info) return nullptr; } - auto result = std::make_shared(); - auto cbExec = [result, fileAccessHelper]() -> NError { - *result = fileAccessHelper->Off(); - if (*result != ERR_OK) { - return NError([result]() -> std::tuple { - return { *result, "FileAccessHelper::Off fail." }; - }); - } - return NError(ERRNO_NOERR); - }; - auto cbComplete = [result](napi_env env, NError err) -> NVal { - if (err) { - return { env, err.GetNapiErr(env) }; - } - return NVal::CreateInt32(env, (int32_t)(*result)); - }; - - std::string procedureName = "Off"; - if (funcArg.GetArgc() == NARG_CNT::ZERO) { - return NAsyncWorkPromise(env, NVal(env, funcArg.GetThisVar())).Schedule(procedureName, cbExec, cbComplete).val_; - } else { - NVal cb(env, funcArg[NARG_POS::FIRST]); - if (!cb.TypeIs(napi_function)) { - NError(EINVAL).ThrowErr(env, "Argument must be function"); - return nullptr; - } - return NAsyncWorkCallback(env, NVal(env, funcArg.GetThisVar()), cb) - .Schedule(procedureName, cbExec, cbComplete).val_; + auto retCode = fileAccessHelper->Off(); + if (retCode != ERR_OK) { + NError(retCode).ThrowErr(env, "FileAccessHelper::Off fail."); + return nullptr; } return NVal::CreateUndefined(env).val_; } diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index 1f02bcea..dbadcf00 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -27,7 +27,7 @@ const DEVICE_TYPE = fileExtensionInfo.DeviceType; const BUNDLE_NAME = 'com.ohos.UserFile.ExternalFileManager'; const DEFAULT_MODE = 0o666; const CREATE_FILE_FLAGS = 0o100; -const FILE_ACCESS = 'fileAccess://'; +const URI_SCHEME = 'datashare://'; const DOMAIN_CODE = 0x0001; const TAG = 'js_server'; let callbackFun = null; @@ -63,8 +63,8 @@ export default class FileExtAbility extends Extension { } checkUri(uri) { - if (uri.indexOf(FILE_ACCESS) == 0) { - uri = uri.replace(FILE_ACCESS, ''); + if (uri.indexOf(URI_SCHEME) == 0) { + uri = uri.replace(URI_SCHEME, ''); return /^\/([^\/]+\/?)+$/.test(uri); } else { return false; @@ -81,6 +81,7 @@ export default class FileExtAbility extends Extension { if (arr[1].indexOf('/') > 0) { path = path.replace(arr[1].split('/')[0], ''); } + path = path.replace('/' + BUNDLE_NAME, ''); if (path.charAt(path.length - 1) == '/') { path = path.substr(0, path.length - 1); } @@ -398,7 +399,7 @@ export default class FileExtAbility extends Extension { getRoots() { let roots = getVolumeInfoList().concat({ - uri: 'fileAccess:///data/storage/el1/bundle/storage_daemon', + uri: 'datashare:///com.ohos.UserFile.ExternalFileManager/data/storage/el1/bundle/storage_daemon', displayName: 'storage_daemon', deviceId: '', type: DEVICE_TYPE.SHARED_DISK, diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts index dbc8b697..76e391d0 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts @@ -52,7 +52,7 @@ function addVolumeInfo(volumeInfo) { } function path2uri(id, path) { - return `fileAccess://${id}${path}`; + return `datashare://${id}/com.ohos.UserFile.ExternalFileManager${path}`; } function findVolumeInfo(volumeId) { diff --git a/services/file_extension_hap/entry/src/main/module.json b/services/file_extension_hap/entry/src/main/module.json index 2d0708d1..26dca4f3 100644 --- a/services/file_extension_hap/entry/src/main/module.json +++ b/services/file_extension_hap/entry/src/main/module.json @@ -18,7 +18,7 @@ "srcEntrance": "./ets/FileExtensionAbility/FileExtensionAbility.ts", "name": "FileExtensionAbility", "type": "fileAccess", - "uri": "fileAccess://fileAccess", + "uri": "datashare:///com.ohos.UserFile.ExternalFileManager/", "visible": true } ], -- Gitee From 9185957fe94004b6d48d2621633c0255a047dc8f Mon Sep 17 00:00:00 2001 From: zhaoshuai Date: Mon, 15 Aug 2022 17:58:03 +0800 Subject: [PATCH 021/122] =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=A0=81=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E7=94=A8=E4=BE=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaoshuai --- .../test/file_access_helper_test.cpp | 20 +++-- .../test/file_extension_helper_test.cpp | 76 +++++++++++++++---- 2 files changed, 70 insertions(+), 26 deletions(-) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 03027fd5..003d9cff 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -29,7 +29,7 @@ namespace { using namespace std; using namespace OHOS; using namespace FileAccessFwk; -int abilityId = 5003; +int uid = 5003; shared_ptr fah = nullptr; Uri newDirUri(""); @@ -40,7 +40,7 @@ public: cout << "FileAccessHelperTest code test" << endl; auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(abilityId); + auto remoteObj = saManager->GetSystemAbility(uid); AAFwk::Want want; want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); vector wants {want}; @@ -818,7 +818,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0002, testing::ext::TestS Uri testUri(""); Uri sourceFileUri(""); result = fah->Move(sourceFileUri, newDirUriTest, testUri); - EXPECT_EQ(result, ERR_OPERATION_NOT_PERMITTED); + EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0002 result:" << result << endl; result = fah->Delete(newDirUriTest); @@ -857,7 +857,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0003, testing::ext::TestS Uri testUri2(""); Uri sourceFileUri("storage/media/100/local/files/Download/test1/test.txt"); result = fah->Move(sourceFileUri, newDirUriTest2, testUri2); - EXPECT_EQ(result, ERR_OPERATION_NOT_PERMITTED); + EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0003 result:" << result << endl; result = fah->Delete(newDirUriTest1); @@ -891,7 +891,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0004, testing::ext::TestS Uri testUri(""); Uri sourceFileUri("~!@#$%^&*()_"); result = fah->Move(sourceFileUri, newDirUriTest, testUri); - EXPECT_EQ(result, ERR_OPERATION_NOT_PERMITTED); + EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0004 result:" << result << endl; result = fah->Delete(newDirUriTest); @@ -926,7 +926,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0005, testing::ext::TestS Uri testUri2(""); Uri targetParentUri(""); result = fah->Move(testUri, targetParentUri, testUri2); - EXPECT_EQ(result, ERR_OPERATION_NOT_PERMITTED); + EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0005 result:" << result << endl; result = fah->Delete(newDirUriTest); @@ -965,7 +965,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0006, testing::ext::TestS Uri testUri2(""); Uri targetParentUri("storage/media/100/local/files/Download/test2"); result = fah->Move(testUri, targetParentUri, testUri2); - EXPECT_EQ(result, ERR_OPERATION_NOT_PERMITTED); + EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0006 result:" << result << endl; result = fah->Delete(newDirUriTest1); @@ -1007,7 +1007,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0007, testing::ext::TestS Uri testUri2(""); Uri targetParentUri("~!@#$^%&*()_"); result = fah->Move(testUri, targetParentUri, testUri2); - EXPECT_EQ(result, ERR_OPERATION_NOT_PERMITTED); + EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0007 result:" << result << endl; result = fah->Delete(newDirUriTest1); @@ -1305,9 +1305,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0005, testing::ext::Tes Uri renameUri(""); result = fah->Rename(testUri, "", renameUri); - - int errorCode = 102825990; - EXPECT_EQ(result, errorCode); + EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0005 result:" << result << endl; result = fah->Delete(newDirUriTest); diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index 4b34b999..278d22c9 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -28,7 +28,7 @@ namespace { using namespace std; using namespace OHOS; using namespace FileAccessFwk; -int abilityId = 5003; +int uid = 5003; shared_ptr fah = nullptr; class FileExtensionHelperTest : public testing::Test { @@ -38,7 +38,7 @@ public: cout << "FileExtensionHelperTest code test" << endl; auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(abilityId); + auto remoteObj = saManager->GetSystemAbility(uid); AAFwk::Want want; want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); vector wants {want}; @@ -868,7 +868,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0002, testing::ext: Uri testUri(""); Uri sourceFileUri(""); result = fah->Move(sourceFileUri, newDirUriTest, testUri); - EXPECT_EQ(result, ERR_OPERATION_NOT_PERMITTED); + EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0002 result:" << result << endl; result = fah->Delete(newDirUriTest); @@ -911,7 +911,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0003, testing::ext: Uri testUri2(""); Uri sourceFileUri("storage/media/100/local/files/Download/test1/test.txt"); result = fah->Move(sourceFileUri, newDirUriTest2, testUri2); - EXPECT_EQ(result, ERR_OPERATION_NOT_PERMITTED); + EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0003 result:" << result << endl; result = fah->Delete(newDirUriTest1); @@ -949,7 +949,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0004, testing::ext: Uri testUri(""); Uri sourceFileUri("~!@#$%^&*()_"); result = fah->Move(sourceFileUri, newDirUriTest, testUri); - EXPECT_EQ(result, ERR_OPERATION_NOT_PERMITTED); + EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0004 result:" << result << endl; result = fah->Delete(newDirUriTest); @@ -988,7 +988,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0005, testing::ext: Uri testUri2(""); Uri targetParentUri(""); result = fah->Move(testUri, targetParentUri, testUri2); - EXPECT_EQ(result, ERR_OPERATION_NOT_PERMITTED); + EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0005 result:" << result << endl; result = fah->Delete(newDirUriTest); @@ -1031,7 +1031,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0006, testing::ext: Uri testUri2(""); Uri targetParentUri("storage/media/100/local/files/Download/test2"); result = fah->Move(testUri, targetParentUri, testUri2); - EXPECT_EQ(result, ERR_OPERATION_NOT_PERMITTED); + EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0006 result:" << result << endl; result = fah->Delete(newDirUriTest1); @@ -1077,7 +1077,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0007, testing::ext: Uri testUri2(""); Uri targetParentUri("~!@#$^%&*()_"); result = fah->Move(testUri, targetParentUri, testUri2); - EXPECT_EQ(result, ERR_OPERATION_NOT_PERMITTED); + EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0007 result:" << result << endl; result = fah->Delete(newDirUriTest1); @@ -1455,9 +1455,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0005, testing::ex Uri renameUri(""); result = fah->Rename(testUri, "", renameUri); - - int errorCode = 102825990; - EXPECT_EQ(result, errorCode); + EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0005 result:" << result << endl; result = fah->Delete(newDirUriTest); @@ -1645,10 +1643,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_allInterface_0000"; try { - uint64_t selfTokenId_ = GetSelfTokenID(); - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(abilityId); + auto remoteObj = saManager->GetSystemAbility(uid); vector wants = FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(); shared_ptr fahs = FileAccessHelper::Creator(remoteObj, wants); @@ -1692,11 +1688,61 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi result = fahs->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } + } catch (...) { + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_allInterface_0000"; +} + +/** + * @tc.number: SUB_user_file_service_file_extension_helper_IsFileExist_0000 + * @tc.name: file_extension_helper_IsFileExist_0000 + * @tc.desc: Test function of IsFileExist interface for SUCCESS. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileExtensionHelperTest, file_extension_helper_IsFileExist_0000, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_IsFileExist_0000"; + try { + uint64_t selfTokenId_ = GetSelfTokenID(); + + vector info = fah->GetRoots(); + for (size_t i = 0; i < info.size(); i++) { + Uri parentUri = info[i].uri; + GTEST_LOG_(INFO) << parentUri.ToString(); + + Uri newDirUriTest(""); + int result = fah->Mkdir(parentUri, "test1", newDirUriTest); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + Uri newFileUri(""); + result = fah->CreateFile(newDirUriTest, "file_extension_helper_IsFileExist_0000.txt", newFileUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + bool isExist = false; + result = fah->IsFileExist(newDirUriTest, isExist); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_TRUE(isExist); + + result = fah->IsFileExist(newFileUri, isExist); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_TRUE(isExist); + + result = fah->Delete(newDirUriTest); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + + result = fah->IsFileExist(newDirUriTest, isExist); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_FALSE(isExist); + } SetSelfTokenID(selfTokenId_); } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_allInterface_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_IsFileExist_0000"; } } // namespace \ No newline at end of file -- Gitee From 8f8b1f1e6063c13a717143d42dff5369df8d590e Mon Sep 17 00:00:00 2001 From: zhaoshuai Date: Mon, 15 Aug 2022 18:01:24 +0800 Subject: [PATCH 022/122] =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=A0=81=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E7=94=A8=E4=BE=8B=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaoshuai --- .../innerkits/file_access/test/file_access_helper_test.cpp | 4 ++-- .../file_access/test/file_extension_helper_test.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 003d9cff..02f17316 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -29,7 +29,7 @@ namespace { using namespace std; using namespace OHOS; using namespace FileAccessFwk; -int uid = 5003; +int abilityId = 5003; shared_ptr fah = nullptr; Uri newDirUri(""); @@ -40,7 +40,7 @@ public: cout << "FileAccessHelperTest code test" << endl; auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); + auto remoteObj = saManager->GetSystemAbility(abilityId); AAFwk::Want want; want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); vector wants {want}; diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index 278d22c9..44468270 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -28,7 +28,7 @@ namespace { using namespace std; using namespace OHOS; using namespace FileAccessFwk; -int uid = 5003; +int abilityId = 5003; shared_ptr fah = nullptr; class FileExtensionHelperTest : public testing::Test { @@ -38,7 +38,7 @@ public: cout << "FileExtensionHelperTest code test" << endl; auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); + auto remoteObj = saManager->GetSystemAbility(abilityId); AAFwk::Want want; want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); vector wants {want}; @@ -1644,7 +1644,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_allInterface_0000"; try { auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(uid); + auto remoteObj = saManager->GetSystemAbility(abilityId); vector wants = FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(); shared_ptr fahs = FileAccessHelper::Creator(remoteObj, wants); -- Gitee From 4bd23bf747934b2377f0457ed3e84c98bb27b814 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Tue, 16 Aug 2022 15:52:59 +0800 Subject: [PATCH 023/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E8=BF=94=E5=9B=9E=E7=9A=84=E9=94=99=E8=AF=AF=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../src/file_access_ext_ability.cpp | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp index 58baf36d..22fcf1ab 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp @@ -63,49 +63,58 @@ void FileAccessExtAbility::Init(const std::shared_ptr &recor int FileAccessExtAbility::OpenFile(const Uri &uri, const int flags) { - return ERR_OK; + HILOG_ERROR("FileAccessExtAbility::OpenFile Operation not permitted"); + return ERR_OPERATION_NOT_PERMITTED; } int FileAccessExtAbility::CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) { - return ERR_OK; + HILOG_ERROR("FileAccessExtAbility::CreateFile Operation not permitted"); + return ERR_OPERATION_NOT_PERMITTED; } int FileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) { - return ERR_OK; + HILOG_ERROR("FileAccessExtAbility::Mkdir Operation not permitted"); + return ERR_OPERATION_NOT_PERMITTED; } int FileAccessExtAbility::Delete(const Uri &sourceFile) { - return ERR_OK; + HILOG_ERROR("FileAccessExtAbility::Delete Operation not permitted"); + return ERR_OPERATION_NOT_PERMITTED; } int FileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) { - return ERR_OK; + HILOG_ERROR("FileAccessExtAbility::Move Operation not permitted"); + return ERR_OPERATION_NOT_PERMITTED; } int FileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) { - return ERR_OK; + HILOG_ERROR("FileAccessExtAbility::Rename Operation not permitted"); + return ERR_OPERATION_NOT_PERMITTED; } std::vector FileAccessExtAbility::ListFile(const Uri &sourceFile) { std::vector vec; + HILOG_ERROR("FileAccessExtAbility::ListFile Operation not permitted"); return vec; } std::vector FileAccessExtAbility::GetRoots() { std::vector vec; + HILOG_ERROR("FileAccessExtAbility::GetRoots Operation not permitted"); return vec; } int FileAccessExtAbility::IsFileExist(const Uri &uri, bool &isExist) { - return ERR_OK; + HILOG_ERROR("FileAccessExtAbility::IsFileExist Operation not permitted"); + return ERR_OPERATION_NOT_PERMITTED; } bool FileAccessExtAbility::GetNotifyManager() -- Gitee From fd921ae252e9e2f8fe2533dfe7d5646b18ae34e8 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Tue, 16 Aug 2022 16:30:06 +0800 Subject: [PATCH 024/122] check uri Signed-off-by: linjun9528 --- .../file_access/include/file_access_helper.h | 3 +- .../file_access/src/file_access_helper.cpp | 131 ++++++++++-------- .../entry/src/main/module.json | 2 +- 3 files changed, 78 insertions(+), 58 deletions(-) diff --git a/frameworks/innerkits/file_access/include/file_access_helper.h b/frameworks/innerkits/file_access/include/file_access_helper.h index cf3a8c48..436ea333 100644 --- a/frameworks/innerkits/file_access/include/file_access_helper.h +++ b/frameworks/innerkits/file_access/include/file_access_helper.h @@ -81,8 +81,7 @@ private: void AddFileAccessDeathRecipient(const sptr &token); void OnSchedulerDied(const wptr &remote); - std::shared_ptr GetConnectInfo(const std::string &key); - std::shared_ptr GetConnectInfo(Uri &uri); + std::shared_ptr GetConnectInfo(const std::string &bundleName); std::shared_ptr GetConnectInfo(const AAFwk::Want &want); void InsertConnectInfo(const std::string &key, const AAFwk::Want &want, diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 6703a49c..12e2f0a9 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -29,7 +29,8 @@ namespace FileAccessFwk { namespace { const int32_t DEFAULT_USERID = 100; const std::string SCHEME_NAME = "datashare"; - const std::string MEDIA_BNUDLE_NAME = "media"; + const std::string MEDIA_BNUDLE_NAME_ALIAS = "media"; + const std::string MEDIA_BNUDLE_NAME = "com.ohos.medialibrary.medialibrarydata"; } std::unordered_map FileAccessHelper::wantsMap_; @@ -46,28 +47,19 @@ static bool GetBundleNameFromPath(const std::string &path, std::string &bundleNa auto tmpPath = path.substr(1); auto index = tmpPath.find_first_of("/"); bundleName = tmpPath.substr(0, index); + if (bundleName.compare(MEDIA_BNUDLE_NAME_ALIAS) == 0) { + bundleName = MEDIA_BNUDLE_NAME; + } return true; } -static bool CheckUri(Uri &uri, std::string &bundleName) +static bool CheckUri(Uri &uri) { std::string schemeStr = std::string(uri.GetScheme()); if (schemeStr.compare(SCHEME_NAME) != 0) { HILOG_ERROR("Uri scheme error."); return false; } - - std::string pathStr = std::string(uri.GetPath()); - std::string bundleNameStr; - if (!GetBundleNameFromPath(pathStr, bundleNameStr)) { - HILOG_ERROR("get bundleName error."); - return false; - } - - if (bundleNameStr.compare(bundleName) != 0 && bundleNameStr.compare(MEDIA_BNUDLE_NAME) != 0) { - HILOG_ERROR("Uri bundleName error."); - return false; - } return true; } @@ -121,35 +113,13 @@ void FileAccessHelper::OnSchedulerDied(const wptr &remote) object = nullptr; } -std::shared_ptr FileAccessHelper::GetConnectInfo(const std::string &key) +std::shared_ptr FileAccessHelper::GetConnectInfo(const std::string &bundleName) { - auto iterator = cMap_.find(key); + auto iterator = cMap_.find(bundleName); if (iterator != cMap_.end()) { return iterator->second; } - HILOG_ERROR("GetConnectInfo called with key return nullptr"); - return nullptr; -} - -std::shared_ptr FileAccessHelper::GetConnectInfo(Uri &uri) -{ - for (auto iter = cMap_.begin(); iter != cMap_.end(); ++iter) { - Uri key(iter->first); - if (key.GetScheme().compare(uri.GetScheme()) == 0) { - auto path = std::string(key.GetPath()); - std::string bundleName; - if (!GetBundleNameFromPath(path, bundleName)) { - HILOG_ERROR("get bundleName error."); - return nullptr; - } - - if (CheckUri(uri, bundleName)) { - return iter->second; - } - } - } - - HILOG_ERROR("GetConnectInfo called with uri return nullptr"); + HILOG_ERROR("GetConnectInfo called with bundleName return nullptr"); return nullptr; } @@ -186,8 +156,7 @@ void FileAccessHelper::InsertConnectInfo(const std::string &key, const sptr &fileAccessExtProxy, sptr fileAccessExtConnection) { - Uri uri(key); - std::shared_ptr connectInfo = GetConnectInfo(uri); + std::shared_ptr connectInfo = GetConnectInfo(key); if (connectInfo == nullptr) { std::shared_ptr connectInfo = std::make_shared(); if (connectInfo == nullptr) { @@ -246,11 +215,11 @@ std::shared_ptr FileAccessHelper::Creator( HILOG_ERROR("Creator, connectInfo == nullptr"); return nullptr; } - FileAccessHelper::wantsMap_.insert(std::pair(extensionInfos[i].uri, wantTem)); + FileAccessHelper::wantsMap_.insert(std::pair(extensionInfos[i].bundleName, wantTem)); connectInfo->want = wantTem; connectInfo->fileAccessExtConnection = fileAccessExtConnection; - cMap.insert(std::pair>(extensionInfos[i].uri, connectInfo)); + cMap.insert(std::pair>(extensionInfos[i].bundleName, connectInfo)); } FileAccessHelper *ptrFileAccessHelper = new (std::nothrow) FileAccessHelper(context, cMap); if (ptrFileAccessHelper == nullptr) { @@ -300,8 +269,8 @@ std::shared_ptr FileAccessHelper::Creator( connectInfo->want = wants[i]; connectInfo->fileAccessExtConnection = fileAccessExtConnection; - string uriTmp = FileAccessHelper::GetKeyOfWantsMap(wants[i]); - cMap.insert(std::pair>(uriTmp, connectInfo)); + string bundleName = FileAccessHelper::GetKeyOfWantsMap(wants[i]); + cMap.insert(std::pair>(bundleName, connectInfo)); } FileAccessHelper *ptrFileAccessHelper = new (std::nothrow) FileAccessHelper(context, cMap); if (ptrFileAccessHelper == nullptr) { @@ -351,8 +320,8 @@ std::shared_ptr FileAccessHelper::Creator(const sptrwant = wants[i]; connectInfo->fileAccessExtConnection = fileAccessExtConnection; - string uriTmp = FileAccessHelper::GetKeyOfWantsMap(wants[i]); - cMap.insert(std::pair>(uriTmp, connectInfo)); + string bundleName = FileAccessHelper::GetKeyOfWantsMap(wants[i]); + cMap.insert(std::pair>(bundleName, connectInfo)); } FileAccessHelper *ptrFileAccessHelper = new (std::nothrow) FileAccessHelper(token, cMap); if (ptrFileAccessHelper == nullptr) { @@ -378,15 +347,15 @@ bool FileAccessHelper::Release() sptr FileAccessHelper::GetProxyByUri(Uri &uri) { - auto connectInfo = GetConnectInfo(uri); - if (connectInfo == nullptr) { - HILOG_ERROR("GetProxyByUri failed with invalid connectInfo"); + std::string bundleName; + if (!GetBundleNameFromPath(uri.GetPath(), bundleName)) { + HILOG_ERROR("Get BundleName failed."); return nullptr; } - std::string bundleName = connectInfo->want.GetElement().GetBundleName(); - if (!CheckUri(uri, bundleName)) { - HILOG_ERROR("Check uri error."); + auto connectInfo = GetConnectInfo(bundleName); + if (connectInfo == nullptr) { + HILOG_ERROR("GetProxyByUri failed with invalid connectInfo"); return nullptr; } @@ -411,7 +380,6 @@ bool FileAccessHelper::GetProxy() { for (auto iter = cMap_.begin(); iter != cMap_.end(); ++iter) { auto connectInfo = iter->second; - std::vector results; if (!connectInfo->fileAccessExtConnection->IsExtAbilityConnected()) { connectInfo->fileAccessExtConnection->ConnectFileExtAbility(connectInfo->want, token_); } @@ -433,6 +401,12 @@ int FileAccessHelper::OpenFile(Uri &uri, int flags) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "OpenFile"); int fd = ERR_ERROR; + if (!CheckUri(uri)) { + HILOG_ERROR("Uri format check error."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return fd; + } + sptr fileExtProxy = GetProxyByUri(uri); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); @@ -449,6 +423,12 @@ int FileAccessHelper::CreateFile(Uri &parent, const std::string &displayName, Ur { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CreateFile"); int index = ERR_ERROR; + if (!CheckUri(parent)) { + HILOG_ERROR("Uri format check error."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return index; + } + sptr fileExtProxy = GetProxyByUri(parent); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); @@ -465,6 +445,12 @@ int FileAccessHelper::Mkdir(Uri &parent, const std::string &displayName, Uri &ne { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Mkdir"); int index = ERR_ERROR; + if (!CheckUri(parent)) { + HILOG_ERROR("Uri format check error."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return index; + } + sptr fileExtProxy = GetProxyByUri(parent); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); @@ -481,6 +467,12 @@ int FileAccessHelper::Delete(Uri &selectFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Delete"); int index = ERR_ERROR; + if (!CheckUri(selectFile)) { + HILOG_ERROR("Uri format check error."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return index; + } + sptr fileExtProxy = GetProxyByUri(selectFile); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); @@ -498,6 +490,18 @@ int FileAccessHelper::Move(Uri &sourceFile, Uri &targetParent, Uri &newFile) StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Move"); Uri sourceFileUri(sourceFile.ToString()); Uri targetParentUri(targetParent.ToString()); + if (!CheckUri(sourceFile)) { + HILOG_ERROR("sourceFile format check error."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_INVALID_URI; + } + + if (!CheckUri(targetParent)) { + HILOG_ERROR("targetParent format check error."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_INVALID_URI; + } + if (sourceFileUri.GetScheme() != targetParentUri.GetScheme()) { HILOG_WARN("Operation failed, move not supported"); return ERR_OPERATION_NOT_PERMITTED; @@ -520,6 +524,12 @@ int FileAccessHelper::Rename(Uri &sourceFile, const std::string &displayName, Ur { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Rename"); int index = ERR_ERROR; + if (!CheckUri(sourceFile)) { + HILOG_ERROR("sourceFile format check error."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return index; + } + sptr fileExtProxy = GetProxyByUri(sourceFile); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); @@ -536,6 +546,12 @@ std::vector FileAccessHelper::ListFile(Uri &sourceFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); std::vector results; + if (!CheckUri(sourceFile)) { + HILOG_ERROR("sourceFile format check error."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return results; + } + sptr fileExtProxy = GetProxyByUri(sourceFile); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); @@ -588,7 +604,7 @@ std::vector FileAccessHelper::GetRegisterFileAccessExtAbilityInfo() for (size_t i = 0; i < extensionInfos.size(); i++) { AAFwk::Want want; want.SetElementName(extensionInfos[i].bundleName, extensionInfos[i].name); - FileAccessHelper::wantsMap_.insert(std::pair(extensionInfos[i].uri, want)); + FileAccessHelper::wantsMap_.insert(std::pair(extensionInfos[i].bundleName, want)); wants.push_back(want); } @@ -599,6 +615,11 @@ int FileAccessHelper::IsFileExist(Uri &uri, bool &isExist) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "IsFileExist"); int ret = ERR_ERROR; + if (!CheckUri(uri)) { + HILOG_ERROR("uri format check error."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; + } sptr fileExtProxy = GetProxyByUri(uri); if (fileExtProxy == nullptr) { diff --git a/services/file_extension_hap/entry/src/main/module.json b/services/file_extension_hap/entry/src/main/module.json index 26dca4f3..4173f4c2 100644 --- a/services/file_extension_hap/entry/src/main/module.json +++ b/services/file_extension_hap/entry/src/main/module.json @@ -18,7 +18,7 @@ "srcEntrance": "./ets/FileExtensionAbility/FileExtensionAbility.ts", "name": "FileExtensionAbility", "type": "fileAccess", - "uri": "datashare:///com.ohos.UserFile.ExternalFileManager/", + "uri": "fileAccess://com.ohos.UserFile.ExternalFileManager", "visible": true } ], -- Gitee From 1ed067c866ec311d243c40afd28326e30b12c145 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Wed, 17 Aug 2022 01:14:53 +0000 Subject: [PATCH 025/122] update frameworks/innerkits/file_access/src/file_access_helper.cpp. Signed-off-by: linjun9528 --- frameworks/innerkits/file_access/src/file_access_helper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 36631c6a..0a8cd76d 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -657,7 +657,7 @@ int FileAccessHelper::On(std::shared_ptr &callback) if (notifyAgent_ == nullptr) { HILOG_ERROR("new FileAccessNotifyAgent fail"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_ERROR; + return ERR_INVALID_PARAM; } } -- Gitee From d3443da0468b669337b26063be749dca0f758b21 Mon Sep 17 00:00:00 2001 From: chenkai008 Date: Wed, 17 Aug 2022 21:00:00 +0800 Subject: [PATCH 026/122] =?UTF-8?q?=E5=9B=9E=E9=80=80uid=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenkai008 --- .../file_access/include/file_access_helper.h | 1 - .../file_access/src/file_access_helper.cpp | 16 +++------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/frameworks/innerkits/file_access/include/file_access_helper.h b/frameworks/innerkits/file_access/include/file_access_helper.h index 39a51bba..f872fbb8 100644 --- a/frameworks/innerkits/file_access/include/file_access_helper.h +++ b/frameworks/innerkits/file_access/include/file_access_helper.h @@ -94,7 +94,6 @@ private: static std::unordered_map wantsMap_; static std::string GetKeyOfWantsMap(const AAFwk::Want &want); - static int getUserId(); sptr callerDeathRecipient_ = nullptr; sptr notifyAgent_ = nullptr; diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index c662d2ac..a85b68bc 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -21,13 +21,12 @@ #include "hitrace_meter.h" #include "if_system_ability_manager.h" #include "ifile_access_ext_base.h" -#include "ipc_skeleton.h" #include "iservice_registry.h" #include "system_ability_definition.h" namespace OHOS { namespace FileAccessFwk { -static const int32_t UID_TRANSFORM_DIVISOR = 200000; +const int32_t DEFAULT_USERID = 100; std::unordered_map FileAccessHelper::wantsMap_; sptr FileAccessHelper::GetBundleMgrProxy() @@ -117,13 +116,6 @@ std::shared_ptr FileAccessHelper::GetConnectInfo(const AAFwk::Want return nullptr; } -int FileAccessHelper::getUserId() -{ - int uid = IPCSkeleton::GetCallingUid(); - int userId = uid / UID_TRANSFORM_DIVISOR; - return userId; -} - std::string FileAccessHelper::GetKeyOfWantsMap(const AAFwk::Want &want) { for (auto iter = FileAccessHelper::wantsMap_.begin(); iter != FileAccessHelper::wantsMap_.end(); ++iter) { @@ -172,9 +164,8 @@ std::shared_ptr FileAccessHelper::Creator( FileAccessHelper::wantsMap_.clear(); std::unordered_map> cMap; std::vector extensionInfos; - int userId = FileAccessHelper::getUserId(); bool ret = bm->QueryExtensionAbilityInfos( - AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, userId, extensionInfos); + AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, DEFAULT_USERID, extensionInfos); if (!ret) { HILOG_ERROR("FileAccessHelper::Creator QueryExtensionAbilityInfos failed"); return nullptr; @@ -523,9 +514,8 @@ std::vector FileAccessHelper::GetRegisterFileAccessExtAbilityInfo() std::vector wants; std::vector extensionInfos; sptr bm = FileAccessHelper::GetBundleMgrProxy(); - int userId = FileAccessHelper::getUserId(); bool ret = bm->QueryExtensionAbilityInfos( - AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, userId, extensionInfos); + AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, DEFAULT_USERID, extensionInfos); if (!ret) { HILOG_ERROR("FileAccessHelper::GetRegisterFileAccessExtAbilityInfo QueryExtensionAbilityInfos error"); return wants; -- Gitee From e7d1febfcddddd0eed7f5e628f359a6a08e5472d Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Thu, 18 Aug 2022 11:34:20 +0800 Subject: [PATCH 027/122] fix code review Signed-off-by: linjun9528 --- frameworks/innerkits/file_access/src/file_access_helper.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 5ba841a9..214f7a73 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -37,10 +37,12 @@ std::unordered_map FileAccessHelper::wantsMap_; static bool GetBundleNameFromPath(const std::string &path, std::string &bundleName) { if (path.size() == 0) { + HILOG_ERROR("Uri path error."); return false; } if (path.front() != '/') { + HILOG_ERROR("Uri path format error."); return false; } @@ -426,7 +428,7 @@ int FileAccessHelper::CreateFile(Uri &parent, const std::string &displayName, Ur FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } - + sptr fileExtProxy = GetProxyByUri(parent); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); -- Gitee From 753cbe1ddd12eff34e012ee0f978e457a4f9916c Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Thu, 18 Aug 2022 18:33:16 +0800 Subject: [PATCH 028/122] fix code review Signed-off-by: linjun9528 --- .../innerkits/file_access/src/file_access_helper.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 214f7a73..3025fea5 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -663,11 +663,11 @@ int FileAccessHelper::On(std::shared_ptr &callback) return ERR_IPC_ERROR; } - auto ret = fileAccessExtProxy->RegisterNotify(notifyAgent_); - if (ret != ERR_OK) { + errorCode = fileAccessExtProxy->RegisterNotify(notifyAgent_); + if (errorCode != ERR_OK) { HILOG_ERROR("fileAccessExtProxy RegisterNotify fail, bundleName:%{public}s, ret:%{public}d.", connectInfo->want.GetElement().GetBundleName().c_str(), ret); - errorCode = ret; + return errorCode; } } @@ -695,11 +695,11 @@ int FileAccessHelper::Off() continue; } - auto ret = fileAccessExtProxy->UnregisterNotify(notifyAgent_); - if (ret != ERR_OK) { + errorCode = fileAccessExtProxy->UnregisterNotify(notifyAgent_); + if (errorCode != ERR_OK) { HILOG_ERROR("fileAccessExtProxy UnregisterNotify fail, bundleName:%{public}s, ret:%{public}d.", connectInfo->want.GetElement().GetBundleName().c_str(), ret); - errorCode = ret; + return errorCode; } } -- Gitee From fe4cc7bff11782934a570b078ecfc009a3f13fd9 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Thu, 18 Aug 2022 18:43:23 +0800 Subject: [PATCH 029/122] fix compile Signed-off-by: linjun9528 --- frameworks/innerkits/file_access/src/file_access_helper.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 3025fea5..392c53a8 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -666,7 +666,7 @@ int FileAccessHelper::On(std::shared_ptr &callback) errorCode = fileAccessExtProxy->RegisterNotify(notifyAgent_); if (errorCode != ERR_OK) { HILOG_ERROR("fileAccessExtProxy RegisterNotify fail, bundleName:%{public}s, ret:%{public}d.", - connectInfo->want.GetElement().GetBundleName().c_str(), ret); + connectInfo->want.GetElement().GetBundleName().c_str(), errorCode); return errorCode; } } @@ -698,7 +698,7 @@ int FileAccessHelper::Off() errorCode = fileAccessExtProxy->UnregisterNotify(notifyAgent_); if (errorCode != ERR_OK) { HILOG_ERROR("fileAccessExtProxy UnregisterNotify fail, bundleName:%{public}s, ret:%{public}d.", - connectInfo->want.GetElement().GetBundleName().c_str(), ret); + connectInfo->want.GetElement().GetBundleName().c_str(), errorCode); return errorCode; } } -- Gitee From 643f20e378cbb7e3940b3e65ef8e3dcd47a8a0d4 Mon Sep 17 00:00:00 2001 From: shuzhouhao Date: Fri, 19 Aug 2022 11:18:14 +0800 Subject: [PATCH 030/122] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E7=9A=84flag=EF=BC=8C=E5=AF=B9=E5=BA=94=E6=9B=B4=E6=94=B9TDD?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shuzhouhao --- .../test/file_access_helper_test.cpp | 8 +++++++ .../test/file_extension_helper_test.cpp | 21 ++++++------------- .../FileExtensionAbility.ts | 7 ++----- .../ets/FileExtensionAbility/VolumeManager.ts | 7 ++----- 4 files changed, 18 insertions(+), 25 deletions(-) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 02f17316..51fd10fe 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -1447,6 +1447,14 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_GetRoots_0000, testing::ext::T vector info = fah->GetRoots(); EXPECT_GT(info.size(), 0); + if (info.size() > 0) { + GTEST_LOG_(INFO) << info[0].uri.ToString(); + GTEST_LOG_(INFO) << info[0].displayName; + GTEST_LOG_(INFO) << info[0].deviceId; + GTEST_LOG_(INFO) << info[0].flags; + GTEST_LOG_(INFO) << info[0].type; + } + string uri = "datashare:///media/root"; string displayName = "LOCAL"; uint32_t flag = 0; diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index 44468270..8c8a876f 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -1487,9 +1487,12 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0000, testing:: int result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); - result = fah->CreateFile(newDirUriTest, "file_extension_helper_ListFile_0000.txt", testUri); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + for (size_t j = 0; j < 2000; j++) + { + Uri testUri(""); + string fileName = "test" + ToString(j) + ".txt"; + fah->CreateFile(newDirUriTest, fileName, testUri); + } std::vector fileInfo = fah->ListFile(newDirUriTest); EXPECT_GT(fileInfo.size(), 0); @@ -1611,18 +1614,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_GetRoots_0000, testing:: GTEST_LOG_(INFO) << info[i].deviceId; GTEST_LOG_(INFO) << info[i].flags; GTEST_LOG_(INFO) << info[i].type; - - string uri = info[i].uri.ToString(); - string findStr = "external"; - uint32_t flag = 58; - DeviceType type = DEVICE_LOCAL_DISK; - - if (uri.find(findStr) == string::npos) { - type = DEVICE_SHARED_DISK; - } - - EXPECT_EQ(info[i].flags, flag); - EXPECT_EQ(info[i].type, type); } } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index 3b05398e..721eb1fb 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -494,11 +494,8 @@ export default class FileExtAbility extends Extension { flags: FLAG.SUPPORTS_WRITE | FLAG.SUPPORTS_DELETE | FLAG.SUPPORTS_RENAME | - FLAG.SUPPORTS_COPY | - FLAG.SUPPORTS_MOVE | - FLAG.SUPPORTS_REMOVE | - FLAG.DIR_SUPPORTS_CREATE | - FLAG.DIR_PREFERS_LAST_MODIFIED, + FLAG.SUPPORTS_READ | + FLAG.SUPPORTS_MOVE, }); return { roots: roots, diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts index dbc8b697..859c2c9b 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts @@ -25,11 +25,8 @@ function init() { let flags = FLAG.SUPPORTS_WRITE | FLAG.SUPPORTS_DELETE | FLAG.SUPPORTS_RENAME | - FLAG.SUPPORTS_COPY | - FLAG.SUPPORTS_MOVE | - FLAG.SUPPORTS_REMOVE | - FLAG.DIR_SUPPORTS_CREATE | - FLAG.DIR_PREFERS_LAST_MODIFIED; + FLAG.SUPPORTS_READ | + FLAG.SUPPORTS_MOVE; for (let i = 0; i < volumes.length; i++) { let volume = volumes[i]; let volumeInfo = { -- Gitee From a05be417cf6805efc70d4a196a7696a08c9a6413 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Sat, 20 Aug 2022 18:00:03 +0800 Subject: [PATCH 031/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../napi/file_access_module/napi_notify_callback.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/interfaces/kits/napi/file_access_module/napi_notify_callback.cpp b/interfaces/kits/napi/file_access_module/napi_notify_callback.cpp index 9e79d0d8..b94015c5 100644 --- a/interfaces/kits/napi/file_access_module/napi_notify_callback.cpp +++ b/interfaces/kits/napi/file_access_module/napi_notify_callback.cpp @@ -42,16 +42,13 @@ NapiNotifyCallback::~NapiNotifyCallback() int NapiNotifyCallback::OnNotify(const NotifyMessage& message) { uv_work_t* work = new uv_work_t(); - if (work == nullptr) { - HILOG_ERROR("failed to new uv_work_t"); - return ERR_INVALID_PARAM; - } CallbackParam* param = new CallbackParam(this, message); - if (param == nullptr) { - HILOG_ERROR("failed to new param"); + if (work == nullptr || param == nullptr) { + HILOG_ERROR("failed to new uv_work_t or failed to new param"); delete work; return ERR_INVALID_PARAM; } + work->data = param; int ret = uv_queue_work(loop_, work, [](uv_work_t *work) {}, -- Gitee From 1b744027ba0a01fe3779e225bc8f29c405355262 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Mon, 22 Aug 2022 10:45:22 +0800 Subject: [PATCH 032/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../innerkits/file_access/test/file_access_helper_test.cpp | 4 ++-- .../file_access/test/file_extension_helper_test.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 02f17316..fa665f59 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -29,7 +29,7 @@ namespace { using namespace std; using namespace OHOS; using namespace FileAccessFwk; -int abilityId = 5003; +int ABILITY_ID = 5003; shared_ptr fah = nullptr; Uri newDirUri(""); @@ -40,7 +40,7 @@ public: cout << "FileAccessHelperTest code test" << endl; auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(abilityId); + auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); AAFwk::Want want; want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); vector wants {want}; diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index 44468270..6e68b04b 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -28,7 +28,7 @@ namespace { using namespace std; using namespace OHOS; using namespace FileAccessFwk; -int abilityId = 5003; +int ABILITY_ID = 5003; shared_ptr fah = nullptr; class FileExtensionHelperTest : public testing::Test { @@ -38,7 +38,7 @@ public: cout << "FileExtensionHelperTest code test" << endl; auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(abilityId); + auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); AAFwk::Want want; want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); vector wants {want}; @@ -1644,7 +1644,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_allInterface_0000"; try { auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - auto remoteObj = saManager->GetSystemAbility(abilityId); + auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); vector wants = FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(); shared_ptr fahs = FileAccessHelper::Creator(remoteObj, wants); -- Gitee From de7e158daac015875754884af698f4dc82cbd5fb Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Tue, 23 Aug 2022 10:50:33 +0800 Subject: [PATCH 033/122] fix code review Signed-off-by: linjun9528 --- frameworks/innerkits/file_access/src/file_access_helper.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 392c53a8..feb43064 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -221,7 +221,7 @@ std::shared_ptr FileAccessHelper::Creator( connectInfo->want = wantTem; connectInfo->fileAccessExtConnection = fileAccessExtConnection; - cMap.insert(std::pair>(extensionInfos[i].bundleName, connectInfo)); + cMap.emplace(extensionInfos[i].bundleName, connectInfo); } FileAccessHelper *ptrFileAccessHelper = new (std::nothrow) FileAccessHelper(context, cMap); if (ptrFileAccessHelper == nullptr) { @@ -686,8 +686,8 @@ int FileAccessHelper::Off() } int errorCode = ERR_OK; - for (auto iter = cMap_.begin(); iter != cMap_.end(); ++iter) { - auto connectInfo = iter->second; + for (auto [key, value] : cMap_) { + auto connectInfo = value; auto fileAccessExtProxy = connectInfo->fileAccessExtConnection->GetFileExtProxy(); if (fileAccessExtProxy == nullptr) { HILOG_INFO("fileAccessExtProxy UnregisterNotify fail, bundleName:%{public}s", -- Gitee From 7261c9b6f58b7d3b947d05bbfba440a7e4e366d3 Mon Sep 17 00:00:00 2001 From: dy_study Date: Tue, 23 Aug 2022 12:50:37 +0800 Subject: [PATCH 034/122] =?UTF-8?q?IssueNo:#I5825N:=E3=80=90=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=89=B9=E6=80=A7=E3=80=91=E4=B8=8D=E8=A7=A3=E5=8E=8B?= =?UTF-8?q?HAP=E5=8A=A0=E8=BD=BD=E5=BA=94=E7=94=A8=E4=BB=A3=E7=A0=81=20Des?= =?UTF-8?q?cription:=E4=B8=8D=E8=A7=A3=E5=8E=8BHAP=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=BB=A3=E7=A0=81=20Sig:SIG=5FApplicationFra?= =?UTF-8?q?mework=20Feature=20or=20Bugfix:Feature=20Binary=20Source:=20No?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dy_study Change-Id: I0d7ac1d2fe4d9b8741721e269f632f9b38703317 --- .../innerkits/file_access/src/js_file_access_ext_ability.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index c122c13a..0be8cdae 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -72,7 +72,7 @@ void JsFileAccessExtAbility::Init(const std::shared_ptr &rec moduleName.append("::").append(abilityInfo_->name); HandleScope handleScope(jsRuntime_); - jsObj_ = jsRuntime_.LoadModule(moduleName, srcPath); + jsObj_ = jsRuntime_.LoadModule(moduleName, srcPath, abilityInfo_->hapPath); if (jsObj_ == nullptr) { HILOG_ERROR("Failed to get jsObj_"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -703,4 +703,4 @@ int JsFileAccessExtAbility::IsFileExist(const Uri &uri, bool &isExist) return errCode; } } // namespace FileAccessFwk -} // namespace OHOS \ No newline at end of file +} // namespace OHOS -- Gitee From dacf394947a7c07c9d96cb4a5204e3b3de9b0a66 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Tue, 23 Aug 2022 12:06:23 +0000 Subject: [PATCH 035/122] =?UTF-8?q?update=20interfaces/kits/napi/file=5Fac?= =?UTF-8?q?cess=5Fmodule/napi=5Fnotify=5Fcallback.cpp.=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=9B=91=E8=A7=86=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- interfaces/kits/napi/file_access_module/napi_notify_callback.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/interfaces/kits/napi/file_access_module/napi_notify_callback.cpp b/interfaces/kits/napi/file_access_module/napi_notify_callback.cpp index b94015c5..acac32ba 100644 --- a/interfaces/kits/napi/file_access_module/napi_notify_callback.cpp +++ b/interfaces/kits/napi/file_access_module/napi_notify_callback.cpp @@ -46,6 +46,7 @@ int NapiNotifyCallback::OnNotify(const NotifyMessage& message) if (work == nullptr || param == nullptr) { HILOG_ERROR("failed to new uv_work_t or failed to new param"); delete work; + delete param; return ERR_INVALID_PARAM; } -- Gitee From 180deafa00e11ac190fc2bc92d84abe51a1dbb00 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Wed, 24 Aug 2022 16:07:23 +0800 Subject: [PATCH 036/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../src/file_access_ext_ability.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp index 22fcf1ab..4712d212 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp @@ -63,57 +63,57 @@ void FileAccessExtAbility::Init(const std::shared_ptr &recor int FileAccessExtAbility::OpenFile(const Uri &uri, const int flags) { - HILOG_ERROR("FileAccessExtAbility::OpenFile Operation not permitted"); + HILOG_ERROR("FileAccessExtAbility::OpenFile Undefined operation"); return ERR_OPERATION_NOT_PERMITTED; } int FileAccessExtAbility::CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) { - HILOG_ERROR("FileAccessExtAbility::CreateFile Operation not permitted"); + HILOG_ERROR("FileAccessExtAbility::CreateFile Undefined operation"); return ERR_OPERATION_NOT_PERMITTED; } int FileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) { - HILOG_ERROR("FileAccessExtAbility::Mkdir Operation not permitted"); + HILOG_ERROR("FileAccessExtAbility::Mkdir Undefined operation"); return ERR_OPERATION_NOT_PERMITTED; } int FileAccessExtAbility::Delete(const Uri &sourceFile) { - HILOG_ERROR("FileAccessExtAbility::Delete Operation not permitted"); + HILOG_ERROR("FileAccessExtAbility::Delete Undefined operation"); return ERR_OPERATION_NOT_PERMITTED; } int FileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) { - HILOG_ERROR("FileAccessExtAbility::Move Operation not permitted"); + HILOG_ERROR("FileAccessExtAbility::Move Undefined operation"); return ERR_OPERATION_NOT_PERMITTED; } int FileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) { - HILOG_ERROR("FileAccessExtAbility::Rename Operation not permitted"); + HILOG_ERROR("FileAccessExtAbility::Rename Undefined operation"); return ERR_OPERATION_NOT_PERMITTED; } std::vector FileAccessExtAbility::ListFile(const Uri &sourceFile) { std::vector vec; - HILOG_ERROR("FileAccessExtAbility::ListFile Operation not permitted"); + HILOG_ERROR("FileAccessExtAbility::ListFile Undefined operation"); return vec; } std::vector FileAccessExtAbility::GetRoots() { std::vector vec; - HILOG_ERROR("FileAccessExtAbility::GetRoots Operation not permitted"); + HILOG_ERROR("FileAccessExtAbility::GetRoots Undefined operation"); return vec; } int FileAccessExtAbility::IsFileExist(const Uri &uri, bool &isExist) { - HILOG_ERROR("FileAccessExtAbility::IsFileExist Operation not permitted"); + HILOG_ERROR("FileAccessExtAbility::IsFileExist Undefined operation"); return ERR_OPERATION_NOT_PERMITTED; } -- Gitee From 1af164ea9d624edf6476db1d1659a862789118b4 Mon Sep 17 00:00:00 2001 From: gf721 Date: Wed, 24 Aug 2022 19:38:59 +0800 Subject: [PATCH 037/122] resolve createfileaccesshelper crash Signed-off-by: gf721 --- frameworks/innerkits/file_access/src/file_access_helper.cpp | 2 +- .../kits/napi/file_access_module/napi_fileaccess_helper.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index feb43064..39e44c23 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -150,7 +150,7 @@ std::string FileAccessHelper::GetKeyOfWantsMap(const AAFwk::Want &want) } } HILOG_ERROR("GetKeyOfWantsMap called return nullptr"); - return nullptr; + return ""; } void FileAccessHelper::InsertConnectInfo(const std::string &key, diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index 8047c0da..3472ea9a 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -88,11 +88,11 @@ static napi_value FileAccessHelperConstructor(napi_env env, napi_callback_info i auto finalize = [](napi_env env, void *data, void *hint) { FileAccessHelper *objectInfo = static_cast(data); + objectInfo->Release(); g_fileAccessHelperList.remove_if([objectInfo](const std::shared_ptr &fileAccessHelper) { return objectInfo == fileAccessHelper.get(); }); if (objectInfo != nullptr) { - objectInfo->Release(); delete objectInfo; } }; -- Gitee From be92879645f76c927decca93dadd3d40f45fbb1b Mon Sep 17 00:00:00 2001 From: gf721 Date: Wed, 24 Aug 2022 20:18:54 +0800 Subject: [PATCH 038/122] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E9=87=8A=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gf721 --- .../kits/napi/file_access_module/napi_fileaccess_helper.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index 3472ea9a..1753678f 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -92,9 +92,6 @@ static napi_value FileAccessHelperConstructor(napi_env env, napi_callback_info i g_fileAccessHelperList.remove_if([objectInfo](const std::shared_ptr &fileAccessHelper) { return objectInfo == fileAccessHelper.get(); }); - if (objectInfo != nullptr) { - delete objectInfo; - } }; if (napi_wrap(env, thisVar, fileAccessHelper.get(), finalize, nullptr, nullptr) != napi_ok) { finalize(env, fileAccessHelper.get(), nullptr); -- Gitee From 10c57a717191f0b2f2ca1796f483d63f3b1eaf9b Mon Sep 17 00:00:00 2001 From: gf721 Date: Thu, 25 Aug 2022 09:34:36 +0800 Subject: [PATCH 039/122] =?UTF-8?q?=E5=A4=9A=E6=AC=A1createfileaccesshelpe?= =?UTF-8?q?r=E5=87=BA=E7=8E=B0crash?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gf721 --- .../file_access_module/napi_fileaccess_helper.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index 1753678f..dd5ae325 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -88,10 +88,13 @@ static napi_value FileAccessHelperConstructor(napi_env env, napi_callback_info i auto finalize = [](napi_env env, void *data, void *hint) { FileAccessHelper *objectInfo = static_cast(data); - objectInfo->Release(); - g_fileAccessHelperList.remove_if([objectInfo](const std::shared_ptr &fileAccessHelper) { - return objectInfo == fileAccessHelper.get(); - }); + if (objectInfo != nullptr) { + objectInfo->Release(); + g_fileAccessHelperList.remove_if([objectInfo](const std::shared_ptr &fileAccessHelper) { + return objectInfo == fileAccessHelper.get(); + }); + objectInfo = nullptr; + } }; if (napi_wrap(env, thisVar, fileAccessHelper.get(), finalize, nullptr, nullptr) != napi_ok) { finalize(env, fileAccessHelper.get(), nullptr); -- Gitee From db67fa5c7beb5dd89b367715623a878fb6a99c7c Mon Sep 17 00:00:00 2001 From: shuzhouhao Date: Thu, 25 Aug 2022 14:41:12 +0800 Subject: [PATCH 040/122] =?UTF-8?q?Uri=E6=9E=84=E5=BB=BA=E6=94=BE=E5=9C=A8?= =?UTF-8?q?=E5=BE=AA=E7=8E=AF=E5=A4=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shuzhouhao --- .../innerkits/file_access/test/file_extension_helper_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index 8c8a876f..ffd8f8e0 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -1487,9 +1487,9 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0000, testing:: int result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + Uri testUri(""); for (size_t j = 0; j < 2000; j++) { - Uri testUri(""); string fileName = "test" + ToString(j) + ".txt"; fah->CreateFile(newDirUriTest, fileName, testUri); } -- Gitee From 5cda697748ed9401c1757aeafaa77eeed9d16f5d Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Thu, 25 Aug 2022 16:43:53 +0800 Subject: [PATCH 041/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../napi_notify_callback.cpp | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/interfaces/kits/napi/file_access_module/napi_notify_callback.cpp b/interfaces/kits/napi/file_access_module/napi_notify_callback.cpp index b94015c5..312cd8b1 100644 --- a/interfaces/kits/napi/file_access_module/napi_notify_callback.cpp +++ b/interfaces/kits/napi/file_access_module/napi_notify_callback.cpp @@ -42,13 +42,16 @@ NapiNotifyCallback::~NapiNotifyCallback() int NapiNotifyCallback::OnNotify(const NotifyMessage& message) { uv_work_t* work = new uv_work_t(); + if (work == nullptr) { + HILOG_ERROR("failed to new uv_work_t"); + return ERR_INVALID_PARAM; + } CallbackParam* param = new CallbackParam(this, message); - if (work == nullptr || param == nullptr) { - HILOG_ERROR("failed to new uv_work_t or failed to new param"); + if (param == nullptr) { + HILOG_ERROR("failed to new param"); delete work; return ERR_INVALID_PARAM; } - work->data = param; int ret = uv_queue_work(loop_, work, [](uv_work_t *work) {}, @@ -78,14 +81,10 @@ int NapiNotifyCallback::OnNotify(const NotifyMessage& message) delete work; }); if (ret != 0) { - if (work->data != nullptr) { - delete (CallbackParam *)(work->data); - work->data = nullptr; - } - if (work != nullptr) { - delete work; - work = nullptr; - } + delete (CallbackParam *)(work->data); + work->data = nullptr; + delete work; + work = nullptr; return ERR_NOTIFY_FAIL; } return ERR_OK; -- Gitee From bc89df412dfb0da3b8e2c7f5649a12eafaf629c7 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Fri, 26 Aug 2022 10:35:33 +0800 Subject: [PATCH 042/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../file_access/src/file_access_ext_ability.cpp | 14 +++++++------- utils/file_access_framework_errno.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp index 4712d212..bab01419 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp @@ -64,37 +64,37 @@ void FileAccessExtAbility::Init(const std::shared_ptr &recor int FileAccessExtAbility::OpenFile(const Uri &uri, const int flags) { HILOG_ERROR("FileAccessExtAbility::OpenFile Undefined operation"); - return ERR_OPERATION_NOT_PERMITTED; + return ERR_OPERATION_NOT_SUPPORT; } int FileAccessExtAbility::CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) { HILOG_ERROR("FileAccessExtAbility::CreateFile Undefined operation"); - return ERR_OPERATION_NOT_PERMITTED; + return ERR_OPERATION_NOT_SUPPORT; } int FileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) { HILOG_ERROR("FileAccessExtAbility::Mkdir Undefined operation"); - return ERR_OPERATION_NOT_PERMITTED; + return ERR_OPERATION_NOT_SUPPORT; } int FileAccessExtAbility::Delete(const Uri &sourceFile) { HILOG_ERROR("FileAccessExtAbility::Delete Undefined operation"); - return ERR_OPERATION_NOT_PERMITTED; + return ERR_OPERATION_NOT_SUPPORT; } int FileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) { HILOG_ERROR("FileAccessExtAbility::Move Undefined operation"); - return ERR_OPERATION_NOT_PERMITTED; + return ERR_OPERATION_NOT_SUPPORT; } int FileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) { HILOG_ERROR("FileAccessExtAbility::Rename Undefined operation"); - return ERR_OPERATION_NOT_PERMITTED; + return ERR_OPERATION_NOT_SUPPORT; } std::vector FileAccessExtAbility::ListFile(const Uri &sourceFile) @@ -114,7 +114,7 @@ std::vector FileAccessExtAbility::GetRoots() int FileAccessExtAbility::IsFileExist(const Uri &uri, bool &isExist) { HILOG_ERROR("FileAccessExtAbility::IsFileExist Undefined operation"); - return ERR_OPERATION_NOT_PERMITTED; + return ERR_OPERATION_NOT_SUPPORT; } bool FileAccessExtAbility::GetNotifyManager() diff --git a/utils/file_access_framework_errno.h b/utils/file_access_framework_errno.h index 86978f08..eb17b493 100644 --- a/utils/file_access_framework_errno.h +++ b/utils/file_access_framework_errno.h @@ -39,7 +39,7 @@ enum { ERR_FILEIO_FAIL, // fileio fail ERR_INVALID_PARAM, // invalid parameter ERR_PARSER_FAIL, // parser js result error - ERR_OPERATION_NOT_PERMITTED // Operation not permitted + ERR_OPERATION_NOT_SUPPORT // Operation not support }; } // namespace FileAccessFwk } // namespace OHOS -- Gitee From 654660fc6c7f6eb67a0635d176022db5d388b1bf Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Fri, 26 Aug 2022 02:38:30 +0000 Subject: [PATCH 043/122] update utils/file_access_framework_errno.h. Signed-off-by: wangjianqiang --- utils/file_access_framework_errno.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/file_access_framework_errno.h b/utils/file_access_framework_errno.h index 47e2cc53..d45271e8 100644 --- a/utils/file_access_framework_errno.h +++ b/utils/file_access_framework_errno.h @@ -34,7 +34,7 @@ enum { ERR_PARAM_NUMBER, // Parameter number is abnormal ERR_INVALID_PARAM, // invalid parameter ERR_PARSER_FAIL, // parser js result error - ERR_OPERATION_NOT_SUPPORT, // Operation not support + ERR_OPERATION_NOT_SUPPORT, // Operation not support ERR_GET_FILEACCESS_HELPER, // get fileAccessHelper fail ERR_INVALID_NOTIFY, // invalid notify ERR_REMOVE_NOTIFY_FAIL, // remove notify fail -- Gitee From e1ca3f34db6d6d5f7055a6c2d9e2f49c81f14f70 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Fri, 26 Aug 2022 10:35:33 +0800 Subject: [PATCH 044/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../file_access/src/file_access_ext_ability.cpp | 14 +++++++------- .../file_access/src/file_access_helper.cpp | 2 +- utils/file_access_framework_errno.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp index 4712d212..bab01419 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp @@ -64,37 +64,37 @@ void FileAccessExtAbility::Init(const std::shared_ptr &recor int FileAccessExtAbility::OpenFile(const Uri &uri, const int flags) { HILOG_ERROR("FileAccessExtAbility::OpenFile Undefined operation"); - return ERR_OPERATION_NOT_PERMITTED; + return ERR_OPERATION_NOT_SUPPORT; } int FileAccessExtAbility::CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) { HILOG_ERROR("FileAccessExtAbility::CreateFile Undefined operation"); - return ERR_OPERATION_NOT_PERMITTED; + return ERR_OPERATION_NOT_SUPPORT; } int FileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) { HILOG_ERROR("FileAccessExtAbility::Mkdir Undefined operation"); - return ERR_OPERATION_NOT_PERMITTED; + return ERR_OPERATION_NOT_SUPPORT; } int FileAccessExtAbility::Delete(const Uri &sourceFile) { HILOG_ERROR("FileAccessExtAbility::Delete Undefined operation"); - return ERR_OPERATION_NOT_PERMITTED; + return ERR_OPERATION_NOT_SUPPORT; } int FileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) { HILOG_ERROR("FileAccessExtAbility::Move Undefined operation"); - return ERR_OPERATION_NOT_PERMITTED; + return ERR_OPERATION_NOT_SUPPORT; } int FileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) { HILOG_ERROR("FileAccessExtAbility::Rename Undefined operation"); - return ERR_OPERATION_NOT_PERMITTED; + return ERR_OPERATION_NOT_SUPPORT; } std::vector FileAccessExtAbility::ListFile(const Uri &sourceFile) @@ -114,7 +114,7 @@ std::vector FileAccessExtAbility::GetRoots() int FileAccessExtAbility::IsFileExist(const Uri &uri, bool &isExist) { HILOG_ERROR("FileAccessExtAbility::IsFileExist Undefined operation"); - return ERR_OPERATION_NOT_PERMITTED; + return ERR_OPERATION_NOT_SUPPORT; } bool FileAccessExtAbility::GetNotifyManager() diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 34979eb4..3f6f4244 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -452,7 +452,7 @@ int FileAccessHelper::Move(Uri &sourceFile, Uri &targetParent, Uri &newFile) Uri targetParentUri(targetParent.ToString()); if (sourceFileUri.GetScheme() != targetParentUri.GetScheme()) { HILOG_WARN("Operation failed, move not supported"); - return ERR_OPERATION_NOT_PERMITTED; + return ERR_OPERATION_NOT_SUPPORT; } int index = ERR_ERROR; diff --git a/utils/file_access_framework_errno.h b/utils/file_access_framework_errno.h index 86978f08..eb17b493 100644 --- a/utils/file_access_framework_errno.h +++ b/utils/file_access_framework_errno.h @@ -39,7 +39,7 @@ enum { ERR_FILEIO_FAIL, // fileio fail ERR_INVALID_PARAM, // invalid parameter ERR_PARSER_FAIL, // parser js result error - ERR_OPERATION_NOT_PERMITTED // Operation not permitted + ERR_OPERATION_NOT_SUPPORT // Operation not support }; } // namespace FileAccessFwk } // namespace OHOS -- Gitee From f7c15e03f3f0643b0b92463f805a32f5b5c26944 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Fri, 26 Aug 2022 03:14:05 +0000 Subject: [PATCH 045/122] update utils/file_access_framework_errno.h. Signed-off-by: wangjianqiang --- utils/file_access_framework_errno.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/utils/file_access_framework_errno.h b/utils/file_access_framework_errno.h index 1df87cd5..d45271e8 100644 --- a/utils/file_access_framework_errno.h +++ b/utils/file_access_framework_errno.h @@ -34,16 +34,12 @@ enum { ERR_PARAM_NUMBER, // Parameter number is abnormal ERR_INVALID_PARAM, // invalid parameter ERR_PARSER_FAIL, // parser js result error -<<<<<<< HEAD - ERR_OPERATION_NOT_SUPPORT // Operation not support -======= ERR_OPERATION_NOT_SUPPORT, // Operation not support ERR_GET_FILEACCESS_HELPER, // get fileAccessHelper fail ERR_INVALID_NOTIFY, // invalid notify ERR_REMOVE_NOTIFY_FAIL, // remove notify fail ERR_NOTIFY_NOT_EXIST, // the notify is not exist ERR_NOTIFY_FAIL // notify client fail ->>>>>>> 654660fc6c7f6eb67a0635d176022db5d388b1bf }; } // namespace FileAccessFwk } // namespace OHOS -- Gitee From e718100070cea399f226fd1b262d573d9db4af8d Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Fri, 26 Aug 2022 14:44:24 +0800 Subject: [PATCH 046/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../include/file_access_ext_ability.h | 2 +- .../file_access/include/file_access_ext_proxy.h | 2 +- .../file_access/include/file_access_ext_stub.h | 2 +- .../include/file_access_ext_stub_impl.h | 2 +- .../file_access/include/file_access_helper.h | 2 +- .../file_access/include/ifile_access_ext_base.h | 4 ++-- .../include/js_file_access_ext_ability.h | 2 +- .../file_access/src/file_access_ext_ability.cpp | 2 +- .../file_access/src/file_access_ext_proxy.cpp | 6 +++--- .../file_access/src/file_access_ext_stub.cpp | 16 ++++++++-------- .../src/file_access_ext_stub_impl.cpp | 8 ++++---- .../file_access/src/file_access_helper.cpp | 6 +++--- .../src/js_file_access_ext_ability.cpp | 6 +++--- .../napi_fileaccess_helper.cpp | 8 ++++---- .../file_access_module/napi_fileaccess_helper.h | 2 +- .../FileExtensionAbility/FileExtensionAbility.ts | 8 ++++---- 16 files changed, 39 insertions(+), 39 deletions(-) diff --git a/frameworks/innerkits/file_access/include/file_access_ext_ability.h b/frameworks/innerkits/file_access/include/file_access_ext_ability.h index ffc0b19d..8fc5f09a 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_ability.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_ability.h @@ -49,7 +49,7 @@ public: virtual std::vector ListFile(const Uri &sourceFile); virtual std::vector GetRoots(); - virtual int IsFileExist(const Uri &uri, bool &isExist); + virtual int Access(const Uri &uri, bool &isExist); virtual int RegisterNotify(sptr ¬ify); virtual int UnregisterNotify(sptr ¬ify); virtual int Notify(const NotifyMessage &message); diff --git a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h index ff4e0872..a79cc04c 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h @@ -45,7 +45,7 @@ public: virtual std::vector ListFile(const Uri &sourceFile) override; virtual std::vector GetRoots() override; - virtual int IsFileExist(const Uri &uri, bool &isExist) override; + virtual int Access(const Uri &uri, bool &isExist) override; virtual int RegisterNotify(sptr ¬ify) override; virtual int UnregisterNotify(sptr ¬ify) override; private: diff --git a/frameworks/innerkits/file_access/include/file_access_ext_stub.h b/frameworks/innerkits/file_access/include/file_access_ext_stub.h index 8893926e..e1ab83e2 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_stub.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_stub.h @@ -43,7 +43,7 @@ private: ErrCode CmdRename(MessageParcel &data, MessageParcel &reply); ErrCode CmdListFile(MessageParcel &data, MessageParcel &reply); ErrCode CmdGetRoots(MessageParcel &data, MessageParcel &reply); - ErrCode CmdIsFileExist(MessageParcel &data, MessageParcel &reply); + ErrCode CmdAccess(MessageParcel &data, MessageParcel &reply); ErrCode CmdRegisterNotify(MessageParcel &data, MessageParcel &reply); ErrCode CmdUnregisterNotify(MessageParcel &data, MessageParcel &reply); bool CheckCallingPermission(const std::string &permission); diff --git a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h index d72745dd..9815c174 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h @@ -42,7 +42,7 @@ public: int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) override; std::vector ListFile(const Uri &sourceFileUri) override; std::vector GetRoots() override; - int IsFileExist(const Uri &uri, bool &isExist) override; + int Access(const Uri &uri, bool &isExist) override; int RegisterNotify(sptr ¬ify) override; int UnregisterNotify(sptr ¬ify) override; diff --git a/frameworks/innerkits/file_access/include/file_access_helper.h b/frameworks/innerkits/file_access/include/file_access_helper.h index 436ea333..034e576b 100644 --- a/frameworks/innerkits/file_access/include/file_access_helper.h +++ b/frameworks/innerkits/file_access/include/file_access_helper.h @@ -58,7 +58,7 @@ public: const std::vector &wants); bool Release(); - int IsFileExist(Uri &uri, bool &isExist); + int Access(Uri &uri, bool &isExist); int OpenFile(Uri &uri, int flags); int CreateFile(Uri &parent, const std::string &displayName, Uri &newFile); int Mkdir(Uri &parent, const std::string &displayName, Uri &newDir); diff --git a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h index 63ab8bfd..8784b8fb 100644 --- a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h +++ b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h @@ -41,7 +41,7 @@ public: CMD_RENAME, CMD_LIST_FILE, CMD_GET_ROOTS, - CMD_IS_FILE_EXIST, + CMD_ACCESS, CMD_REGISTER_NOTIFY, CMD_UNREGISTER_NOTIFY }; @@ -55,7 +55,7 @@ public: virtual std::vector ListFile(const Uri &sourceFile) = 0; virtual std::vector GetRoots() = 0; - virtual int IsFileExist(const Uri &uri, bool &isExist) = 0; + virtual int Access(const Uri &uri, bool &isExist) = 0; virtual int RegisterNotify(sptr ¬ify) = 0; virtual int UnregisterNotify(sptr ¬ify) = 0; }; diff --git a/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h b/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h index 66d4a8f2..f4be2c20 100644 --- a/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h +++ b/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h @@ -68,7 +68,7 @@ public: int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) override; std::vector ListFile(const Uri &sourceFile) override; std::vector GetRoots() override; - int IsFileExist(const Uri &uri, bool &isExist) override; + int Access(const Uri &uri, bool &isExist) override; private: NativeValue* CallObjectMethod(const char *name, NativeValue * const *argv = nullptr, size_t argc = 0); diff --git a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp index cc674d2b..4fd049da 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp @@ -103,7 +103,7 @@ std::vector FileAccessExtAbility::GetRoots() return vec; } -int FileAccessExtAbility::IsFileExist(const Uri &uri, bool &isExist) +int FileAccessExtAbility::Access(const Uri &uri, bool &isExist) { return ERR_OK; } diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 1f5d7370..6e4386d0 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -399,9 +399,9 @@ std::vector FileAccessExtProxy::GetRoots() return vec; } -int FileAccessExtProxy::IsFileExist(const Uri &uri, bool &isExist) +int FileAccessExtProxy::Access(const Uri &uri, bool &isExist) { - StartTrace(HITRACE_TAG_FILEMANAGEMENT, "IsFileExist"); + StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Access"); MessageParcel data; if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); @@ -423,7 +423,7 @@ int FileAccessExtProxy::IsFileExist(const Uri &uri, bool &isExist) MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_IS_FILE_EXIST, data, reply, option); + int32_t err = Remote()->SendRequest(CMD_ACCESS, data, reply, option); if (err != NO_ERROR) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp index 2884e2e7..64115153 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp @@ -48,7 +48,7 @@ FileAccessExtStub::FileAccessExtStub() stubFuncMap_[CMD_RENAME] = &FileAccessExtStub::CmdRename; stubFuncMap_[CMD_LIST_FILE] = &FileAccessExtStub::CmdListFile; stubFuncMap_[CMD_GET_ROOTS] = &FileAccessExtStub::CmdGetRoots; - stubFuncMap_[CMD_IS_FILE_EXIST] = &FileAccessExtStub::CmdIsFileExist; + stubFuncMap_[CMD_ACCESS] = &FileAccessExtStub::CmdAccess; stubFuncMap_[CMD_REGISTER_NOTIFY] = &FileAccessExtStub::CmdRegisterNotify; stubFuncMap_[CMD_UNREGISTER_NOTIFY] = &FileAccessExtStub::CmdUnregisterNotify; } @@ -387,32 +387,32 @@ ErrCode FileAccessExtStub::CmdGetRoots(MessageParcel &data, MessageParcel &reply return ERR_OK; } -ErrCode FileAccessExtStub::CmdIsFileExist(MessageParcel &data, MessageParcel &reply) +ErrCode FileAccessExtStub::CmdAccess(MessageParcel &data, MessageParcel &reply) { - StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdIsFileExist"); + StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdAccess"); std::shared_ptr uri(data.ReadParcelable()); if (uri == nullptr) { - HILOG_ERROR("IsFIleExist uri is nullptr"); + HILOG_ERROR("Access uri is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } bool isExist = data.ReadBool(); - int ret = IsFileExist(*uri, isExist); + int ret = Access(*uri, isExist); if (ret < 0) { - HILOG_ERROR("parameter IsFileExist fail, ret is %{pubilc}d", ret); + HILOG_ERROR("parameter Access fail, ret is %{pubilc}d", ret); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } if (!reply.WriteInt32(ret)) { - HILOG_ERROR("parameter IsFileExist fail to WriteInt32 ret"); + HILOG_ERROR("parameter Access fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } if (!reply.WriteBool(isExist)) { - HILOG_ERROR("parameter IsFileExist fail to WriteBool type"); + HILOG_ERROR("parameter Access fail to WriteBool type"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp index 473747d3..f3a81ad4 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp @@ -140,16 +140,16 @@ std::vector FileAccessExtStubImpl::GetRoots() return vec; } -int FileAccessExtStubImpl::IsFileExist(const Uri &uri, bool &isExist) +int FileAccessExtStubImpl::Access(const Uri &uri, bool &isExist) { - StartTrace(HITRACE_TAG_FILEMANAGEMENT, "IsFileExist"); + StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Access"); if (extension_ == nullptr) { - HILOG_ERROR("IsFileExist get extension failed."); + HILOG_ERROR("Access get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } - int ret = extension_->IsFileExist(uri, isExist); + int ret = extension_->Access(uri, isExist); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index feb43064..8ff26ead 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -607,9 +607,9 @@ std::vector FileAccessHelper::GetRegisterFileAccessExtAbilityInfo() return wants; } -int FileAccessHelper::IsFileExist(Uri &uri, bool &isExist) +int FileAccessHelper::Access(Uri &uri, bool &isExist) { - StartTrace(HITRACE_TAG_FILEMANAGEMENT, "IsFileExist"); + StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Access"); if (!CheckUri(uri)) { HILOG_ERROR("uri format check error."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -623,7 +623,7 @@ int FileAccessHelper::IsFileExist(Uri &uri, bool &isExist) return ERR_IPC_ERROR; } - int index = fileExtProxy->IsFileExist(uri, isExist); + int index = fileExtProxy->Access(uri, isExist); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return index; } diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index a6e31e74..9b873484 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -732,9 +732,9 @@ std::vector JsFileAccessExtAbility::GetRoots() return value->data; } -int JsFileAccessExtAbility::IsFileExist(const Uri &uri, bool &isExist) +int JsFileAccessExtAbility::Access(const Uri &uri, bool &isExist) { - StartTrace(HITRACE_TAG_FILEMANAGEMENT, "IsFileExist"); + StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Access"); auto value = std::make_shared>(); auto argParser = [uri](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *nativeUri = engine.CreateString(uri.ToString().c_str(), uri.ToString().length()); @@ -752,7 +752,7 @@ int JsFileAccessExtAbility::IsFileExist(const Uri &uri, bool &isExist) return ret; }; - auto errCode = CallJsMethod("isFileExist", jsRuntime_, jsObj_.get(), argParser, retParser); + auto errCode = CallJsMethod("access", jsRuntime_, jsObj_.get(), argParser, retParser); if (errCode != ERR_OK) { HILOG_ERROR("CallJsMethod error, code:%{public}d.", errCode); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index 8047c0da..71e624d2 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -208,7 +208,7 @@ napi_value FileAccessHelperInit(napi_env env, napi_value exports) DECLARE_NAPI_FUNCTION("rename", NAPI_Rename), DECLARE_NAPI_FUNCTION("listFile", NAPI_ListFile), DECLARE_NAPI_FUNCTION("getRoots", NAPI_GetRoots), - DECLARE_NAPI_FUNCTION("isFileExist", NAPI_IsFileExist), + DECLARE_NAPI_FUNCTION("access", NAPI_Access), DECLARE_NAPI_FUNCTION("on", NAPI_On), DECLARE_NAPI_FUNCTION("off", NAPI_Off) }; @@ -678,7 +678,7 @@ napi_value NAPI_GetRoots(napi_env env, napi_callback_info info) return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; } -napi_value NAPI_IsFileExist(napi_env env, napi_callback_info info) +napi_value NAPI_Access(napi_env env, napi_callback_info info) { NFuncArg funcArg(env, info); if (!funcArg.InitArgs(NARG_CNT::ONE, NARG_CNT::TWO)) { @@ -704,7 +704,7 @@ napi_value NAPI_IsFileExist(napi_env env, napi_callback_info info) auto cbExec = [uriString, result, fileAccessHelper]() -> NError { OHOS::Uri uri(uriString); bool isExist = false; - int ret = fileAccessHelper->IsFileExist(uri, isExist); + int ret = fileAccessHelper->Access(uri, isExist); *result = isExist; return NError(ret); }; @@ -715,7 +715,7 @@ napi_value NAPI_IsFileExist(napi_env env, napi_callback_info info) return { NVal::CreateBool(env, *result) }; }; - const std::string procedureName = "isFileExist"; + const std::string procedureName = "access"; NVal thisVar(env, funcArg.GetThisVar()); if (funcArg.GetArgc() == NARG_CNT::ONE) { return NAsyncWorkPromise(env, thisVar).Schedule(procedureName, cbExec, cbComplete).val_; diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.h b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.h index b0ec4e81..d0a4dbff 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.h +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.h @@ -32,7 +32,7 @@ namespace FileAccessFwk { napi_value NAPI_Rename(napi_env env, napi_callback_info info); napi_value NAPI_ListFile(napi_env env, napi_callback_info info); napi_value NAPI_GetRoots(napi_env env, napi_callback_info info); - napi_value NAPI_IsFileExist(napi_env env, napi_callback_info info); + napi_value NAPI_Access(napi_env env, napi_callback_info info); napi_value NAPI_On(napi_env env, napi_callback_info info); napi_value NAPI_Off(napi_env env, napi_callback_info info); } diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index 96e5f951..1cff329c 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -210,7 +210,7 @@ export default class FileExtAbility extends Extension { } try { let newFileUri = this.genNewFileUri(parentUri, displayName); - if (this.isFileExist(newFileUri).isExist) { + if (this.access(newFileUri).isExist) { return { uri: '', code: ERR_ERROR, @@ -415,9 +415,9 @@ export default class FileExtAbility extends Extension { } } - isFileExist(sourceFileUri) { + access(sourceFileUri) { if (!this.checkUri(sourceFileUri)) { - hilog.error(DOMAIN_CODE, TAG, 'isFileExist checkUri fail'); + hilog.error(DOMAIN_CODE, TAG, 'access checkUri fail'); return { isExist: false, code: ERR_ERROR, @@ -427,7 +427,7 @@ export default class FileExtAbility extends Extension { let path = this.getPath(sourceFileUri); fileio.accessSync(path); } catch (e) { - hilog.error(DOMAIN_CODE, TAG, 'isFileExist error ' + e.message); + hilog.error(DOMAIN_CODE, TAG, 'access error ' + e.message); if (e.message == 'No such file or directory') { return { isExist: false, -- Gitee From 525725bcf724706ae773e8e2fb5c7538f8122203 Mon Sep 17 00:00:00 2001 From: chenkai008 Date: Fri, 26 Aug 2022 16:01:34 +0800 Subject: [PATCH 047/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9GetRegisterFileAccess?= =?UTF-8?q?ExtAbilityInfo=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenkai008 --- .../innerkits/file_access/include/file_access_helper.h | 2 +- .../innerkits/file_access/src/file_access_helper.cpp | 10 +++++----- .../napi/file_access_module/napi_fileaccess_helper.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frameworks/innerkits/file_access/include/file_access_helper.h b/frameworks/innerkits/file_access/include/file_access_helper.h index 436ea333..c325a7c5 100644 --- a/frameworks/innerkits/file_access/include/file_access_helper.h +++ b/frameworks/innerkits/file_access/include/file_access_helper.h @@ -48,7 +48,7 @@ class FileAccessHelper final : public std::enable_shared_from_this GetRegisterFileAccessExtAbilityInfo(); + static int GetRegisterFileAccessExtAbilityInfo(std::vector &wantVec); // create and connect all ability static std::shared_ptr Creator(const std::shared_ptr &context); // create and connect with want, if created, only connect with want diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index feb43064..1e720b97 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -584,27 +584,27 @@ std::vector FileAccessHelper::GetRoots() return rootsInfo; } -std::vector FileAccessHelper::GetRegisterFileAccessExtAbilityInfo() +int FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(std::vector &wantVec) { - std::vector wants; std::vector extensionInfos; sptr bm = FileAccessHelper::GetBundleMgrProxy(); bool ret = bm->QueryExtensionAbilityInfos( AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, DEFAULT_USERID, extensionInfos); if (!ret) { HILOG_ERROR("FileAccessHelper::GetRegisterFileAccessExtAbilityInfo QueryExtensionAbilityInfos error"); - return wants; + return ERR_INVALID_PARAM; } + wantVec.clear(); FileAccessHelper::wantsMap_.clear(); for (size_t i = 0; i < extensionInfos.size(); i++) { AAFwk::Want want; want.SetElementName(extensionInfos[i].bundleName, extensionInfos[i].name); FileAccessHelper::wantsMap_.insert(std::pair(extensionInfos[i].bundleName, want)); - wants.push_back(want); + wantVec.push_back(want); } - return wants; + return ERR_OK; } int FileAccessHelper::IsFileExist(Uri &uri, bool &isExist) diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index 8047c0da..25e4a69f 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -174,8 +174,8 @@ napi_value NAPI_GetRegisterFileAccessExtAbilityInfo(napi_env env, napi_callback_ auto result = std::make_shared>(); auto cbExec = [result]() -> NError { - *result = FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(); - return NError(ERRNO_NOERR); + int ret = FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(*result); + return NError(ret); }; auto cbComplete = [result](napi_env env, NError err) -> NVal { if (err) { -- Gitee From bd4f429535b076d7b19a4798787fdf7134a58e22 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Fri, 26 Aug 2022 16:04:32 +0800 Subject: [PATCH 048/122] =?UTF-8?q?syscap=E5=AE=9A=E4=B9=89=E4=B8=8E?= =?UTF-8?q?=E9=83=A8=E4=BB=B6=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- bundle.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundle.json b/bundle.json index ab54d4cc..d3a857cb 100644 --- a/bundle.json +++ b/bundle.json @@ -13,7 +13,7 @@ "name": "user_file_service", "subsystem": "filemanagement", "syscap": [ - "SystemCapability.FileManagement.FileManagerService" + "SystemCapability.FileManagement.UserFileService" ], "adapted_system_type": [ "standard" -- Gitee From b645d1f47b46005468cb7d011e08e6d985e8c613 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Fri, 26 Aug 2022 17:13:48 +0800 Subject: [PATCH 049/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9TDD=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../test/file_extension_helper_test.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index 95fd39c2..3d227c43 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -1686,17 +1686,17 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi } /** - * @tc.number: SUB_user_file_service_file_extension_helper_IsFileExist_0000 - * @tc.name: file_extension_helper_IsFileExist_0000 - * @tc.desc: Test function of IsFileExist interface for SUCCESS. + * @tc.number: SUB_user_file_service_file_extension_helper_Access_0000 + * @tc.name: file_extension_helper_Access_0000 + * @tc.desc: Test function of Access interface for SUCCESS. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_IsFileExist_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, file_extension_helper_Access_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_IsFileExist_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Access_0000"; try { uint64_t selfTokenId_ = GetSelfTokenID(); @@ -1710,22 +1710,22 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_IsFileExist_0000, testin EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); - result = fah->CreateFile(newDirUriTest, "file_extension_helper_IsFileExist_0000.txt", newFileUri); + result = fah->CreateFile(newDirUriTest, "file_extension_helper_Access_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); bool isExist = false; - result = fah->IsFileExist(newDirUriTest, isExist); + result = fah->Access(newDirUriTest, isExist); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_TRUE(isExist); - result = fah->IsFileExist(newFileUri, isExist); + result = fah->Access(newFileUri, isExist); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_TRUE(isExist); result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->IsFileExist(newDirUriTest, isExist); + result = fah->Access(newDirUriTest, isExist); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_FALSE(isExist); } @@ -1734,6 +1734,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_IsFileExist_0000, testin } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_IsFileExist_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Access_0000"; } } // namespace \ No newline at end of file -- Gitee From 5de14b63bbfc5acf538072f37257b6d165b48e5a Mon Sep 17 00:00:00 2001 From: chenkai008 Date: Fri, 26 Aug 2022 17:33:10 +0800 Subject: [PATCH 050/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9tdd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenkai008 --- .../innerkits/file_access/test/file_access_helper_test.cpp | 3 ++- .../file_access/test/file_extension_helper_test.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 7fd2b7d4..548b4a20 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -44,7 +44,8 @@ public: AAFwk::Want want; want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); vector wants {want}; - FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(); + vector wantVec; + FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(wantVec); fah = FileAccessHelper::Creator(remoteObj, wants); } static void TearDownTestCase() {}; diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index 95fd39c2..d87f61f1 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -42,7 +42,8 @@ public: AAFwk::Want want; want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); vector wants {want}; - FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(); + vector wantVec; + FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(wantVec); fah = FileAccessHelper::Creator(remoteObj, wants); } static void TearDownTestCase() {}; @@ -1636,7 +1637,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi try { auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); - vector wants = FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(); + vector wants; + FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(wants); shared_ptr fahs = FileAccessHelper::Creator(remoteObj, wants); vector info = fahs->GetRoots(); -- Gitee From 2a9e4bc788d9d3fc31d4c95a89b4bf11dbdd41bf Mon Sep 17 00:00:00 2001 From: chenkai008 Date: Fri, 26 Aug 2022 17:38:52 +0800 Subject: [PATCH 051/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9tdd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenkai008 --- .../file_access/test/file_access_helper_test.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 548b4a20..044271c7 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -1456,15 +1456,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_GetRoots_0000, testing::ext::T GTEST_LOG_(INFO) << info[0].type; } - string uri = "datashare:///media/root"; - string displayName = "LOCAL"; - uint32_t flag = 0; - - EXPECT_EQ(info[0].uri.ToString(), uri); - EXPECT_EQ(info[0].displayName, displayName); - EXPECT_EQ(info[0].flags, flag); - EXPECT_EQ(info[0].type, DEVICE_LOCAL_DISK); - SetSelfTokenID(selfTokenId_); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; -- Gitee From 13572dbc4017a435f20d38fdf80fadd2378e1253 Mon Sep 17 00:00:00 2001 From: chenkai008 Date: Sat, 27 Aug 2022 16:36:56 +0800 Subject: [PATCH 052/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenkai008 --- frameworks/innerkits/file_access/src/file_access_helper.cpp | 2 +- utils/file_access_framework_errno.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 1e720b97..8de13dc4 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -592,7 +592,7 @@ int FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(std::vector Date: Sat, 27 Aug 2022 17:24:51 +0800 Subject: [PATCH 053/122] alter RootInfo & DeviceFlag Signed-off-by: linjun9528 --- .../include/file_access_ext_ability.h | 2 +- .../include/file_access_ext_proxy.h | 3 +- .../include/file_access_ext_stub_impl.h | 2 +- .../include/file_access_extension_info.h | 55 ++++----- .../file_access/include/file_access_helper.h | 2 +- .../include/ifile_access_ext_base.h | 2 +- .../include/js_file_access_ext_ability.h | 2 +- .../include/napi_common_fileaccess.h | 8 +- .../src/file_access_ext_ability.cpp | 4 +- .../file_access/src/file_access_ext_proxy.cpp | 10 +- .../file_access/src/file_access_ext_stub.cpp | 2 +- .../src/file_access_ext_stub_impl.cpp | 4 +- .../file_access/src/file_access_helper.cpp | 6 +- .../src/js_file_access_ext_ability.cpp | 23 ++-- .../src/napi_common_fileaccess.cpp | 58 ++++----- .../test/file_access_helper_test.cpp | 49 ++++---- .../test/file_extension_helper_test.cpp | 111 +++++++++--------- .../napi/common/file_extension_info_napi.cpp | 33 +++--- .../napi/common/file_extension_info_napi.h | 4 +- .../napi_fileaccess_helper.cpp | 4 +- .../native_fileaccess_module.cpp | 4 +- .../module_export_napi.cpp | 4 +- .../FileExtensionAbility.ts | 13 +- .../ets/FileExtensionAbility/VolumeManager.ts | 15 +-- 24 files changed, 196 insertions(+), 224 deletions(-) diff --git a/frameworks/innerkits/file_access/include/file_access_ext_ability.h b/frameworks/innerkits/file_access/include/file_access_ext_ability.h index ffc0b19d..76e1b47a 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_ability.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_ability.h @@ -48,7 +48,7 @@ public: virtual int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile); virtual std::vector ListFile(const Uri &sourceFile); - virtual std::vector GetRoots(); + virtual std::vector GetRoots(); virtual int IsFileExist(const Uri &uri, bool &isExist); virtual int RegisterNotify(sptr ¬ify); virtual int UnregisterNotify(sptr ¬ify); diff --git a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h index ff4e0872..ec56c4a5 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h @@ -42,9 +42,8 @@ public: virtual int Delete(const Uri &sourceFile) override; virtual int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) override; virtual int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) override; - virtual std::vector ListFile(const Uri &sourceFile) override; - virtual std::vector GetRoots() override; + virtual std::vector GetRoots() override; virtual int IsFileExist(const Uri &uri, bool &isExist) override; virtual int RegisterNotify(sptr ¬ify) override; virtual int UnregisterNotify(sptr ¬ify) override; diff --git a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h index d72745dd..e100b4af 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h @@ -41,7 +41,7 @@ public: int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) override; int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) override; std::vector ListFile(const Uri &sourceFileUri) override; - std::vector GetRoots() override; + std::vector GetRoots() override; int IsFileExist(const Uri &uri, bool &isExist) override; int RegisterNotify(sptr ¬ify) override; int UnregisterNotify(sptr ¬ify) override; diff --git a/frameworks/innerkits/file_access/include/file_access_extension_info.h b/frameworks/innerkits/file_access/include/file_access_extension_info.h index ab4719db..cb8d46d3 100644 --- a/frameworks/innerkits/file_access/include/file_access_extension_info.h +++ b/frameworks/innerkits/file_access/include/file_access_extension_info.h @@ -97,52 +97,42 @@ public: } }; -struct DeviceInfo : public virtual OHOS::Parcelable { +struct RootInfo : public virtual OHOS::Parcelable { public: - Uri uri = Uri(""); + DeviceType deviceType; + std::string uri; std::string displayName; - std::string deviceId; - uint32_t flags {0}; - DeviceType type; + uint32_t deviceFlags {0}; bool ReadFromParcel(Parcel &parcel) { - std::unique_ptr uriInfo(parcel.ReadParcelable()); - if (uriInfo == nullptr) { - return false; - } - uri = *uriInfo; - + deviceType = (DeviceType)parcel.ReadInt32(); + uri = parcel.ReadString(); displayName = parcel.ReadString(); - deviceId = parcel.ReadString(); - flags = parcel.ReadUint32(); - type = (DeviceType)parcel.ReadInt32(); + deviceFlags = parcel.ReadUint32(); return true; } virtual bool Marshalling(Parcel &parcel) const override { - if (!parcel.WriteParcelable(&uri)) { + if (!parcel.WriteInt32((int32_t)deviceType)) { return false; } - if (!parcel.WriteString(displayName)) { - return false; - } - if (!parcel.WriteString(deviceId)) { + if (!parcel.WriteString(uri)) { return false; } - if (!parcel.WriteUint32(flags)) { + if (!parcel.WriteString(displayName)) { return false; } - if (!parcel.WriteInt32((int32_t)type)) { + if (!parcel.WriteUint32(deviceFlags)) { return false; } return true; } - static DeviceInfo *Unmarshalling(Parcel &parcel) + static RootInfo *Unmarshalling(Parcel &parcel) { - DeviceInfo *info = new (std::nothrow) DeviceInfo(); + RootInfo *info = new (std::nothrow) RootInfo(); if (info == nullptr) { return nullptr; } @@ -155,12 +145,19 @@ public: } }; -const uint32_t FLAG_SUPPORTS_THUMBNAIL = 1; -const uint32_t FLAG_SUPPORTS_WRITE = 1 << 1; -const uint32_t FLAG_SUPPORTS_READ = 1 << 2; -const uint32_t FLAG_SUPPORTS_DELETE = 1 << 3; -const uint32_t FLAG_SUPPORTS_RENAME = 1 << 4; -const uint32_t FLAG_SUPPORTS_MOVE = 1 << 5; +/** + * DeviceFlag Indicates the supported capabilities of the device. + */ +const uint32_t DEVICE_FLAG_SUPPORTS_READ = 1; +const uint32_t DEVICE_FLAG_SUPPORTS_WRITE = 1 << 1; + +/** + * DocumentFlag Indicates the supported capabilities of the file or directory. + */ +const uint32_t DOCUMENT_FLAG_REPRESENTS_FILE = 1; +const uint32_t DOCUMENT_FLAG_REPRESENTS_DIR = 1 << 1; +const uint32_t DOCUMENT_FLAG_SUPPORTS_READ = 1 << 2; +const uint32_t DOCUMENT_FLAG_SUPPORTS_WRITE = 1 << 3; } // namespace FileAccessFwk } // namespace OHOS #endif // FILE_ACCESS_EXTENSION_INFO_H \ No newline at end of file diff --git a/frameworks/innerkits/file_access/include/file_access_helper.h b/frameworks/innerkits/file_access/include/file_access_helper.h index 436ea333..8c25d15a 100644 --- a/frameworks/innerkits/file_access/include/file_access_helper.h +++ b/frameworks/innerkits/file_access/include/file_access_helper.h @@ -66,7 +66,7 @@ public: int Move(Uri &sourceFile, Uri &targetParent, Uri &newFile); int Rename(Uri &sourceFile, const std::string &displayName, Uri &newFile); std::vector ListFile(Uri &sourceFile); - std::vector GetRoots(); + std::vector GetRoots(); int On(std::shared_ptr &callback); int Off(); private: diff --git a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h index 63ab8bfd..81605b05 100644 --- a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h +++ b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h @@ -54,7 +54,7 @@ public: virtual int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) = 0; virtual std::vector ListFile(const Uri &sourceFile) = 0; - virtual std::vector GetRoots() = 0; + virtual std::vector GetRoots() = 0; virtual int IsFileExist(const Uri &uri, bool &isExist) = 0; virtual int RegisterNotify(sptr ¬ify) = 0; virtual int UnregisterNotify(sptr ¬ify) = 0; diff --git a/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h b/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h index 66d4a8f2..1564ff23 100644 --- a/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h +++ b/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h @@ -67,7 +67,7 @@ public: int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) override; int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) override; std::vector ListFile(const Uri &sourceFile) override; - std::vector GetRoots() override; + std::vector GetRoots() override; int IsFileExist(const Uri &uri, bool &isExist) override; private: diff --git a/frameworks/innerkits/file_access/include/napi_common_fileaccess.h b/frameworks/innerkits/file_access/include/napi_common_fileaccess.h index c01347e4..bd0dc4d6 100644 --- a/frameworks/innerkits/file_access/include/napi_common_fileaccess.h +++ b/frameworks/innerkits/file_access/include/napi_common_fileaccess.h @@ -45,11 +45,11 @@ bool UnwrapFileInfo(napi_env env, napi_value param, FileInfo &fileInfo); napi_value WrapArrayFileInfoToJS(napi_env env, const std::vector &fileInfoVec); bool UnwrapArrayFileInfoFromJS(napi_env env, napi_value param, std::vector &fileInfoVec); -napi_value WrapDeviceInfo(napi_env env, const DeviceInfo &deviceInfo); -bool UnwrapDeviceInfo(napi_env env, napi_value param, DeviceInfo &deviceInfo); +napi_value WrapRootInfo(napi_env env, const RootInfo &rootInfo); +bool UnwrapRootInfo(napi_env env, napi_value param, RootInfo &rootInfo); -napi_value WrapArrayDeviceInfoToJS(napi_env env, const std::vector &deviceInfoVec); -bool UnwrapArrayDeviceInfoFromJS(napi_env env, napi_value param, std::vector &deviceInfoVec); +napi_value WrapArrayRootInfoToJS(napi_env env, const std::vector &rootInfoVec); +bool UnwrapArrayRootInfoFromJS(napi_env env, napi_value param, std::vector &rootInfoVec); napi_value WrapArrayWantToJS(napi_env env, const std::vector &wantVec); bool UnwrapArrayWantFromJS(napi_env env, napi_value param, std::vector &wantVec); diff --git a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp index 638d2efc..4166f248 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp @@ -104,9 +104,9 @@ std::vector FileAccessExtAbility::ListFile(const Uri &sourceFile) return vec; } -std::vector FileAccessExtAbility::GetRoots() +std::vector FileAccessExtAbility::GetRoots() { - std::vector vec; + std::vector vec; HILOG_ERROR("FileAccessExtAbility::GetRoots Undefined operation"); return vec; } diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 1f5d7370..f2b1376c 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -366,10 +366,10 @@ std::vector FileAccessExtProxy::ListFile(const Uri &sourceFile) return vec; } -std::vector FileAccessExtProxy::GetRoots() +std::vector FileAccessExtProxy::GetRoots() { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); - std::vector vec; + std::vector vec; MessageParcel data; if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); @@ -389,9 +389,9 @@ std::vector FileAccessExtProxy::GetRoots() vec.clear(); uint64_t count = reply.ReadUint64(); for (uint64_t i = 0; i < count; i++) { - std::unique_ptr deviceInfo(reply.ReadParcelable()); - if (deviceInfo != nullptr) { - vec.push_back(*deviceInfo); + std::unique_ptr rootInfo(reply.ReadParcelable()); + if (rootInfo != nullptr) { + vec.push_back(*rootInfo); } } diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp index 2884e2e7..1b82c240 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp @@ -367,7 +367,7 @@ ErrCode FileAccessExtStub::CmdListFile(MessageParcel &data, MessageParcel &reply ErrCode FileAccessExtStub::CmdGetRoots(MessageParcel &data, MessageParcel &reply) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdGetRoots"); - std::vector vec = GetRoots(); + std::vector vec = GetRoots(); uint64_t count {vec.size()}; if (!reply.WriteUint64(count)) { HILOG_ERROR("parameter GetRoots fail to WriteInt32 count"); diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp index 473747d3..a4df828d 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp @@ -125,10 +125,10 @@ std::vector FileAccessExtStubImpl::ListFile(const Uri &sourceFile) return vec; } -std::vector FileAccessExtStubImpl::GetRoots() +std::vector FileAccessExtStubImpl::GetRoots() { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); - std::vector vec; + std::vector vec; if (extension_ == nullptr) { HILOG_ERROR("GetRoots get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index f2758f31..a43ea1af 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -560,10 +560,10 @@ std::vector FileAccessHelper::ListFile(Uri &sourceFile) return results; } -std::vector FileAccessHelper::GetRoots() +std::vector FileAccessHelper::GetRoots() { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); - std::vector rootsInfo; + std::vector rootsInfo; if (!GetProxy()) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -573,7 +573,7 @@ std::vector FileAccessHelper::GetRoots() for (auto iter = cMap_.begin(); iter != cMap_.end(); ++iter) { auto connectInfo = iter->second; auto fileAccessExtProxy = connectInfo->fileAccessExtConnection->GetFileExtProxy(); - std::vector results; + std::vector results; if (fileAccessExtProxy) { AddFileAccessDeathRecipient(fileAccessExtProxy->AsObject()); } diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index 68e80061..e17d812b 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -687,10 +687,10 @@ std::vector JsFileAccessExtAbility::ListFile(const Uri &sourceFile) return value->data; } -std::vector JsFileAccessExtAbility::GetRoots() +std::vector JsFileAccessExtAbility::GetRoots() { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); - auto value = std::make_shared>>(); + auto value = std::make_shared>>(); auto argParser = [](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { argc = ARGC_ZERO; return true; @@ -700,21 +700,18 @@ std::vector JsFileAccessExtAbility::GetRoots() bool ret = ConvertFromJsValue(engine, obj->GetProperty("code"), value->code); NativeArray *nativeArray = ConvertNativeValueTo(obj->GetProperty("roots")); for (uint32_t i = 0; i < nativeArray->GetLength(); i++) { - NativeValue *nativeDeviceInfo = nativeArray->GetElement(i); - obj = ConvertNativeValueTo(nativeDeviceInfo); - DeviceInfo deviceInfo; - std::string uri; - ret = ret && ConvertFromJsValue(engine, obj->GetProperty("uri"), uri); - deviceInfo.uri = Uri(uri); - ret = ret && ConvertFromJsValue(engine, obj->GetProperty("displayName"), deviceInfo.displayName); - ret = ret && ConvertFromJsValue(engine, obj->GetProperty("deviceId"), deviceInfo.deviceId); - ret = ret && ConvertFromJsValue(engine, obj->GetProperty("flags"), deviceInfo.flags); - ret = ret && ConvertFromJsValue(engine, obj->GetProperty("type"), deviceInfo.type); + NativeValue *nativeRootInfo = nativeArray->GetElement(i); + obj = ConvertNativeValueTo(nativeRootInfo); + RootInfo rootInfo; + ret = ret && ConvertFromJsValue(engine, obj->GetProperty("deviceType"), rootInfo.deviceType); + ret = ret && ConvertFromJsValue(engine, obj->GetProperty("uri"), rootInfo.uri); + ret = ret && ConvertFromJsValue(engine, obj->GetProperty("displayName"), rootInfo.displayName); + ret = ret && ConvertFromJsValue(engine, obj->GetProperty("deviceFlags"), rootInfo.deviceFlags); if (!ret) { HILOG_ERROR("Convert js value fail."); return ret; } - (value->data).emplace_back(std::move(deviceInfo)); + (value->data).emplace_back(std::move(rootInfo)); } return true; }; diff --git a/frameworks/innerkits/file_access/src/napi_common_fileaccess.cpp b/frameworks/innerkits/file_access/src/napi_common_fileaccess.cpp index b34865aa..b50874a9 100644 --- a/frameworks/innerkits/file_access/src/napi_common_fileaccess.cpp +++ b/frameworks/innerkits/file_access/src/napi_common_fileaccess.cpp @@ -210,71 +210,65 @@ bool UnwrapArrayFileInfoFromJS(napi_env env, napi_value param, std::vector &deviceInfoVec) +napi_value WrapArrayRootInfoToJS(napi_env env, const std::vector &rootInfoVec) { napi_value jsArray = nullptr; napi_value jsValue = nullptr; uint32_t index = ERR_OK; NAPI_CALL(env, napi_create_array(env, &jsArray)); - for (uint32_t i = 0; i < deviceInfoVec.size(); i++) { - jsValue = WrapDeviceInfo(env, deviceInfoVec[i]); + for (uint32_t i = 0; i < rootInfoVec.size(); i++) { + jsValue = WrapRootInfo(env, rootInfoVec[i]); if (napi_set_element(env, jsArray, index, jsValue) == napi_ok) { index++; } @@ -282,7 +276,7 @@ napi_value WrapArrayDeviceInfoToJS(napi_env env, const std::vector & return jsArray; } -bool UnwrapArrayDeviceInfoFromJS(napi_env env, napi_value param, std::vector &deviceInfoVec) +bool UnwrapArrayRootInfoFromJS(napi_env env, napi_value param, std::vector &rootInfoVec) { uint32_t arraySize = ERR_OK; napi_value jsValue = nullptr; @@ -291,19 +285,19 @@ bool UnwrapArrayDeviceInfoFromJS(napi_env env, napi_value param, std::vector info = fah->GetRoots(); + vector info = fah->GetRoots(); Uri parentUri(""); if (info.size() > 0) { parentUri = info[0].uri; GTEST_LOG_(INFO) << parentUri.ToString(); } - + int result = fah->Mkdir(parentUri, "Download", newDirUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - + Uri newDirUriTest(""); result = fah->Mkdir(newDirUri, "test1", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -168,7 +168,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0000, testing::ext::T EXPECT_GT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; - + result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { @@ -608,7 +608,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0000, testing::ext::Tes result = fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0000 result:" << result << endl; - + result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { @@ -633,7 +633,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0001, testing::ext::Tes Uri newDirUriTest(""); int result = fah->Mkdir(newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - + result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0001 result:" << result << endl; @@ -682,11 +682,11 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0003, testing::ext::Tes Uri newDirUriTest(""); int result = fah->Mkdir(newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - + Uri selectFileUri("storage/media/100/local/files/Download/test"); result = fah->Delete(selectFileUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); - + result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0003 result:" << result << endl; @@ -748,7 +748,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0000, testing::ext::TestS result = fah->Move(testUri, newDirUriTest2, testUri2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0000 result:" << result << endl; - + result = fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -820,7 +820,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0002, testing::ext::TestS result = fah->Move(sourceFileUri, newDirUriTest, testUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0002 result:" << result << endl; - + result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { @@ -859,7 +859,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0003, testing::ext::TestS result = fah->Move(sourceFileUri, newDirUriTest2, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0003 result:" << result << endl; - + result = fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -893,7 +893,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0004, testing::ext::TestS result = fah->Move(sourceFileUri, newDirUriTest, testUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0004 result:" << result << endl; - + result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { @@ -928,7 +928,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0005, testing::ext::TestS result = fah->Move(testUri, targetParentUri, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0005 result:" << result << endl; - + result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { @@ -967,7 +967,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0006, testing::ext::TestS result = fah->Move(testUri, targetParentUri, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0006 result:" << result << endl; - + result = fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1009,7 +1009,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0007, testing::ext::TestS result = fah->Move(testUri, targetParentUri, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0007 result:" << result << endl; - + result = fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1249,7 +1249,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0003, testing::ext::Tes result = fah->Rename(sourceFileUri, "testRename.txt", renameUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0003 result:" << result << endl; - + result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { @@ -1443,26 +1443,25 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_GetRoots_0000, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_GetRoots_0000"; try { uint64_t selfTokenId_ = GetSelfTokenID(); - - vector info = fah->GetRoots(); + + vector info = fah->GetRoots(); EXPECT_GT(info.size(), 0); if (info.size() > 0) { - GTEST_LOG_(INFO) << info[0].uri.ToString(); + GTEST_LOG_(INFO) << info[0].uri; GTEST_LOG_(INFO) << info[0].displayName; - GTEST_LOG_(INFO) << info[0].deviceId; - GTEST_LOG_(INFO) << info[0].flags; - GTEST_LOG_(INFO) << info[0].type; + GTEST_LOG_(INFO) << info[0].deviceType; + GTEST_LOG_(INFO) << info[0].deviceFlags; } string uri = "datashare:///media/root"; string displayName = "LOCAL"; uint32_t flag = 0; - EXPECT_EQ(info[0].uri.ToString(), uri); + EXPECT_EQ(info[0].uri, uri); EXPECT_EQ(info[0].displayName, displayName); - EXPECT_EQ(info[0].flags, flag); - EXPECT_EQ(info[0].type, DEVICE_LOCAL_DISK); + EXPECT_EQ(info[0].deviceFlags, flag); + EXPECT_EQ(info[0].deviceType, DEVICE_LOCAL_DISK); SetSelfTokenID(selfTokenId_); } catch (...) { diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index 95fd39c2..d8155588 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -144,11 +144,11 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0000, testing:: OHOS::Security::AccessToken::AccessTokenID tokenId = tokenIdEx.tokenIdExStruct.tokenID; SetSelfTokenID(tokenId); - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; GTEST_LOG_(INFO) << parentUri.ToString(); - + Uri newDirUriTest1(""); int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -161,7 +161,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0000, testing:: EXPECT_GT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; - + result = fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } @@ -207,7 +207,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0002, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0002"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newFileUri(""); @@ -264,7 +264,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0004, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0004"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newFileUri(""); @@ -297,7 +297,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0005, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0005"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newFileUri(""); @@ -330,7 +330,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0006, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0006"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newFileUri(""); @@ -363,7 +363,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0000, testing { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0000"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newFileUri(""); @@ -465,7 +465,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0004, testing { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0004"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newFileUri(""); @@ -493,7 +493,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0000, testing::ext { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0000"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest(""); @@ -595,7 +595,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0004, testing::ext { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0004"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest(""); @@ -623,7 +623,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0000, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0000"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest(""); @@ -637,7 +637,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0000, testing::ex result = fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0000 result:" << result << endl; - + result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } @@ -660,13 +660,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0001, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0001"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest(""); int result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - + result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0001 result:" << result << endl; @@ -713,22 +713,22 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0003, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0003"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest(""); int result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - + Uri selectFileUri("storage/media/100/local/files/Download/test"); result = fah->Delete(selectFileUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); - + result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0003 result:" << result << endl; } - + } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } @@ -771,7 +771,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0000, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0000"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest1(""); @@ -790,7 +790,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0000, testing::ext: result = fah->Move(testUri, newDirUriTest2, testUri2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0000 result:" << result << endl; - + result = fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -816,7 +816,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0001, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0001"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest1(""); @@ -858,7 +858,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0002, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0002"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest(""); @@ -870,7 +870,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0002, testing::ext: result = fah->Move(sourceFileUri, newDirUriTest, testUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0002 result:" << result << endl; - + result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } @@ -893,7 +893,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0003, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0003"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest1(""); @@ -913,7 +913,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0003, testing::ext: result = fah->Move(sourceFileUri, newDirUriTest2, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0003 result:" << result << endl; - + result = fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -939,7 +939,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0004, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0004"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest(""); @@ -951,7 +951,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0004, testing::ext: result = fah->Move(sourceFileUri, newDirUriTest, testUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0004 result:" << result << endl; - + result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } @@ -974,7 +974,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0005, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0005"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest(""); @@ -990,7 +990,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0005, testing::ext: result = fah->Move(testUri, targetParentUri, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0005 result:" << result << endl; - + result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } @@ -1013,7 +1013,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0006, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0006"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest1(""); @@ -1033,7 +1033,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0006, testing::ext: result = fah->Move(testUri, targetParentUri, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0006 result:" << result << endl; - + result = fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1059,7 +1059,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0007, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0007"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest1(""); @@ -1079,7 +1079,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0007, testing::ext: result = fah->Move(testUri, targetParentUri, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0007 result:" << result << endl; - + result = fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1105,7 +1105,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0008, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0008"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest1(""); @@ -1143,7 +1143,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0009, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0009"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest1(""); @@ -1188,7 +1188,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0010, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0010"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest1(""); @@ -1233,14 +1233,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0011, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0011"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest1(""); Uri newDirUriTest2(""); int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - + Uri testUri(""); fah->CreateFile(newDirUriTest1, "test.txt", testUri); @@ -1283,7 +1283,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0000, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0000"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest(""); @@ -1321,7 +1321,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0001, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0001"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest(""); @@ -1379,7 +1379,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0003, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0003"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest(""); @@ -1395,7 +1395,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0003, testing::ex result = fah->Rename(sourceFileUri, "testRename.txt", renameUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0003 result:" << result << endl; - + result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } @@ -1442,7 +1442,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0005, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0005"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest(""); @@ -1480,7 +1480,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0000, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0000"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest(""); @@ -1543,7 +1543,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0002, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0002"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; Uri newDirUriTest(""); @@ -1604,16 +1604,15 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_GetRoots_0000, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_GetRoots_0000"; try { - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); EXPECT_GT(info.size(), 0); GTEST_LOG_(INFO) << "GetRoots_0000 result:" << info.size() << endl; for (size_t i = 0; i < info.size(); i++) { - GTEST_LOG_(INFO) << info[i].uri.ToString(); + GTEST_LOG_(INFO) << info[i].uri; GTEST_LOG_(INFO) << info[i].displayName; - GTEST_LOG_(INFO) << info[i].deviceId; - GTEST_LOG_(INFO) << info[i].flags; - GTEST_LOG_(INFO) << info[i].type; + GTEST_LOG_(INFO) << info[i].deviceFlags; + GTEST_LOG_(INFO) << info[i].deviceType; } } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; @@ -1639,7 +1638,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi vector wants = FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(); shared_ptr fahs = FileAccessHelper::Creator(remoteObj, wants); - vector info = fahs->GetRoots(); + vector info = fahs->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; string uri = parentUri.ToString(); @@ -1672,7 +1671,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi EXPECT_GT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; - + result = fahs->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1700,11 +1699,11 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_IsFileExist_0000, testin try { uint64_t selfTokenId_ = GetSelfTokenID(); - vector info = fah->GetRoots(); + vector info = fah->GetRoots(); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; GTEST_LOG_(INFO) << parentUri.ToString(); - + Uri newDirUriTest(""); int result = fah->Mkdir(parentUri, "test1", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -1721,7 +1720,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_IsFileExist_0000, testin result = fah->IsFileExist(newFileUri, isExist); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_TRUE(isExist); - + result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); diff --git a/interfaces/kits/napi/common/file_extension_info_napi.cpp b/interfaces/kits/napi/common/file_extension_info_napi.cpp index c3557236..69d7e938 100644 --- a/interfaces/kits/napi/common/file_extension_info_napi.cpp +++ b/interfaces/kits/napi/common/file_extension_info_napi.cpp @@ -63,7 +63,7 @@ static napi_value FileInfoConstructor(napi_env env, napi_callback_info info) return res; } -static napi_value DeviceInfoConstructor(napi_env env, napi_callback_info info) +static napi_value RootInfoConstructor(napi_env env, napi_callback_info info) { size_t argc = 0; napi_value args[1] = {0}; @@ -72,23 +72,19 @@ static napi_value DeviceInfoConstructor(napi_env env, napi_callback_info info) napi_status status = napi_get_cb_info(env, info, &argc, args, &res, &data); if (status != napi_ok) { - HILOG_ERROR("DeviceInfoConstructor, status is not napi_ok"); + HILOG_ERROR("RootInfoConstructor, status is not napi_ok"); return nullptr; } return res; } -void InitFlag(napi_env env, napi_value exports) +void InitDeviceFlag(napi_env env, napi_value exports) { - char propertyName[] = "FLAG"; + char propertyName[] = "DeviceFlag"; napi_property_descriptor desc[] = { - DECLARE_NAPI_STATIC_PROPERTY("SUPPORTS_THUMBNAIL", CreateUint32(env, FLAG_SUPPORTS_THUMBNAIL)), - DECLARE_NAPI_STATIC_PROPERTY("SUPPORTS_WRITE", CreateUint32(env, FLAG_SUPPORTS_WRITE)), - DECLARE_NAPI_STATIC_PROPERTY("SUPPORTS_READ", CreateUint32(env, FLAG_SUPPORTS_READ)), - DECLARE_NAPI_STATIC_PROPERTY("SUPPORTS_DELETE", CreateUint32(env, FLAG_SUPPORTS_DELETE)), - DECLARE_NAPI_STATIC_PROPERTY("SUPPORTS_RENAME", CreateUint32(env, FLAG_SUPPORTS_RENAME)), - DECLARE_NAPI_STATIC_PROPERTY("SUPPORTS_MOVE", CreateUint32(env, FLAG_SUPPORTS_MOVE)) + DECLARE_NAPI_STATIC_PROPERTY("SUPPORTS_READ", CreateUint32(env, DEVICE_FLAG_SUPPORTS_READ)), + DECLARE_NAPI_STATIC_PROPERTY("SUPPORTS_WRITE", CreateUint32(env, DEVICE_FLAG_SUPPORTS_WRITE)) }; napi_value obj = nullptr; napi_create_object(env, &obj); @@ -144,19 +140,20 @@ void InitDeviceType(napi_env env, napi_value exports) napi_set_named_property(env, exports, propertyName, obj); } -void InitDeviceInfo(napi_env env, napi_value exports) +void InitRootInfo(napi_env env, napi_value exports) { - char className[] = "DeviceInfo"; + char className[] = "RootInfo"; napi_property_descriptor desc[] = { + { "deviceType", nullptr, nullptr, nullptr, nullptr, CreateStringUtf8(env, "deviceType"), + napi_writable, nullptr }, { "uri", nullptr, nullptr, nullptr, nullptr, CreateStringUtf8(env, "uri"), napi_writable, nullptr }, - { "displayName", nullptr, nullptr, nullptr, nullptr, - CreateStringUtf8(env, "displayName"), napi_writable, nullptr }, - { "deviceId", nullptr, nullptr, nullptr, nullptr, CreateStringUtf8(env, "deviceId"), napi_writable, nullptr }, - { "flags", nullptr, nullptr, nullptr, nullptr, CreateStringUtf8(env, "flags"), napi_writable, nullptr }, - { "type", nullptr, nullptr, nullptr, nullptr, CreateStringUtf8(env, "type"), napi_writable, nullptr } + { "displayName", nullptr, nullptr, nullptr, nullptr, CreateStringUtf8(env, "displayName"), + napi_writable, nullptr }, + { "deviceFlags", nullptr, nullptr, nullptr, nullptr, CreateStringUtf8(env, "deviceFlags"), + napi_writable, nullptr } }; napi_value obj = nullptr; - napi_define_class(env, className, NAPI_AUTO_LENGTH, DeviceInfoConstructor, nullptr, + napi_define_class(env, className, NAPI_AUTO_LENGTH, RootInfoConstructor, nullptr, sizeof(desc) / sizeof(*desc), desc, &obj); napi_set_named_property(env, exports, className, obj); } diff --git a/interfaces/kits/napi/common/file_extension_info_napi.h b/interfaces/kits/napi/common/file_extension_info_napi.h index 6fc9c0de..0a0c894f 100644 --- a/interfaces/kits/napi/common/file_extension_info_napi.h +++ b/interfaces/kits/napi/common/file_extension_info_napi.h @@ -20,11 +20,11 @@ namespace OHOS { namespace FileAccessFwk { -void InitFlag(napi_env env, napi_value exports); +void InitDeviceFlag(napi_env env, napi_value exports); void InitNotifyType(napi_env env, napi_value exports); void InitDeviceType(napi_env env, napi_value exports); void InitFileInfo(napi_env env, napi_value exports); -void InitDeviceInfo(napi_env env, napi_value exports); +void InitRootInfo(napi_env env, napi_value exports); } // namespace FileAccessFwk } // namespace OHOS #endif // FILE_EXTENSION_INFO_NAPI_H \ No newline at end of file diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index dd5ae325..bc5e7e32 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -650,7 +650,7 @@ napi_value NAPI_GetRoots(napi_env env, napi_callback_info info) return nullptr; } - auto result = std::make_shared>(); + auto result = std::make_shared>(); auto cbExec = [result, fileAccessHelper]() -> NError { *result = fileAccessHelper->GetRoots(); return NError(ERRNO_NOERR); @@ -659,7 +659,7 @@ napi_value NAPI_GetRoots(napi_env env, napi_callback_info info) if (err) { return { env, err.GetNapiErr(env) }; } - napi_value jsArray = WrapArrayDeviceInfoToJS(env, *result); + napi_value jsArray = WrapArrayRootInfoToJS(env, *result); return {env, jsArray}; }; diff --git a/interfaces/kits/napi/file_access_module/native_fileaccess_module.cpp b/interfaces/kits/napi/file_access_module/native_fileaccess_module.cpp index 19127d0a..767ab80d 100644 --- a/interfaces/kits/napi/file_access_module/native_fileaccess_module.cpp +++ b/interfaces/kits/napi/file_access_module/native_fileaccess_module.cpp @@ -28,11 +28,11 @@ EXTERN_C_START static napi_value Init(napi_env env, napi_value exports) { FileAccessHelperInit(env, exports); - InitFlag(env, exports); + InitDeviceFlag(env, exports); InitNotifyType(env, exports); InitDeviceType(env, exports); InitFileInfo(env, exports); - InitDeviceInfo(env, exports); + InitRootInfo(env, exports); return exports; } EXTERN_C_END diff --git a/interfaces/kits/napi/file_extension_info_module/module_export_napi.cpp b/interfaces/kits/napi/file_extension_info_module/module_export_napi.cpp index 1f34d443..b236eac7 100644 --- a/interfaces/kits/napi/file_extension_info_module/module_export_napi.cpp +++ b/interfaces/kits/napi/file_extension_info_module/module_export_napi.cpp @@ -23,11 +23,11 @@ namespace OHOS { namespace FileAccessFwk { napi_value FileExtensionInfoExport(napi_env env, napi_value exports) { - InitFlag(env, exports); + InitDeviceFlag(env, exports); InitNotifyType(env, exports); InitDeviceType(env, exports); InitFileInfo(env, exports); - InitDeviceInfo(env, exports); + InitRootInfo(env, exports); return exports; } diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index 96e5f951..72e2a88c 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -21,9 +21,9 @@ import fileExtensionInfo from "@ohos.fileExtensionInfo" import hilog from '@ohos.hilog' import process from '@ohos.process'; -const FLAG = fileExtensionInfo.FLAG; +const DeviceFlag = fileExtensionInfo.DeviceFlag; const NotifyType = fileExtensionInfo.NotifyType; -const DEVICE_TYPE = fileExtensionInfo.DeviceType; +const DeviceType = fileExtensionInfo.DeviceType; const BUNDLE_NAME = 'com.ohos.UserFile.ExternalFileManager'; const DEFAULT_MODE = 0o666; const CREATE_FILE_FLAGS = 0o100; @@ -490,13 +490,8 @@ export default class FileExtAbility extends Extension { let roots = getVolumeInfoList().concat({ uri: 'datashare:///com.ohos.UserFile.ExternalFileManager/data/storage/el1/bundle/storage_daemon', displayName: 'storage_daemon', - deviceId: '', - type: DEVICE_TYPE.SHARED_DISK, - flags: FLAG.SUPPORTS_WRITE | - FLAG.SUPPORTS_DELETE | - FLAG.SUPPORTS_RENAME | - FLAG.SUPPORTS_READ | - FLAG.SUPPORTS_MOVE, + deviceType: DeviceType.SHARED_DISK, + deviceFlags: DeviceFlag.SUPPORTS_READ | DeviceFlag.SUPPORTS_WRITE, }); return { roots: roots, diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts index 410381b6..610e5a55 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts @@ -18,15 +18,11 @@ import fileExtensionInfo from "@ohos.fileExtensionInfo" if (!globalThis.volumeInfoList) { globalThis.volumeInfoList = []; } -const FLAG = fileExtensionInfo.FLAG; -const DEVICE_TYPE = fileExtensionInfo.DeviceType; +const DeviceFlag = fileExtensionInfo.DeviceFlag; +const DeviceType = fileExtensionInfo.DeviceType; function init() { volumeManager.getAllVolumes().then((volumes) => { - let flags = FLAG.SUPPORTS_WRITE | - FLAG.SUPPORTS_DELETE | - FLAG.SUPPORTS_RENAME | - FLAG.SUPPORTS_READ | - FLAG.SUPPORTS_MOVE; + let flags = DeviceFlag.SUPPORTS_READ | DeviceFlag.SUPPORTS_WRITE; for (let i = 0; i < volumes.length; i++) { let volume = volumes[i]; let volumeInfo = { @@ -35,9 +31,8 @@ function init() { 'path': volume.path, 'uri': path2uri('', volume.path), 'displayName': volume.id, - 'deviceId': '', - 'flags': flags, - 'type': DEVICE_TYPE.EXTERNAL_USB + 'deviceFlags': flags, + 'deviceType': DeviceType.EXTERNAL_USB } globalThis.volumeInfoList.push(volumeInfo); } -- Gitee From deabc081c6cef734a8905ad881a86cbe57c18975 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Sat, 27 Aug 2022 18:19:53 +0800 Subject: [PATCH 054/122] 123 Signed-off-by: onexiaomin --- 1.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 1.txt diff --git a/1.txt b/1.txt new file mode 100644 index 00000000..e69de29b -- Gitee From dd7461bb3d6acccabbd0fa60f2b1adb6127c443a Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Sat, 27 Aug 2022 18:33:27 +0800 Subject: [PATCH 055/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- 1.txt | 0 .../include/file_access_ext_ability.h | 6 +- .../include/file_access_ext_proxy.h | 8 +- .../include/file_access_ext_stub_impl.h | 6 +- .../file_access/include/file_access_helper.h | 6 +- .../include/ifile_access_ext_base.h | 6 +- .../include/js_file_access_ext_ability.h | 6 +- .../src/file_access_ext_ability.cpp | 12 +- .../file_access/src/file_access_ext_proxy.cpp | 214 +++++++-------- .../file_access/src/file_access_ext_stub.cpp | 188 +++++-------- .../src/file_access_ext_stub_impl.cpp | 22 +- .../file_access/src/file_access_helper.cpp | 69 +++-- .../src/js_file_access_ext_ability.cpp | 39 +-- .../test/file_access_helper_test.cpp | 51 ++-- .../test/file_extension_helper_test.cpp | 253 +++++++++++------- utils/file_access_framework_errno.h | 4 +- 16 files changed, 469 insertions(+), 421 deletions(-) delete mode 100644 1.txt diff --git a/1.txt b/1.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/frameworks/innerkits/file_access/include/file_access_ext_ability.h b/frameworks/innerkits/file_access/include/file_access_ext_ability.h index 8fc5f09a..fb518d41 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_ability.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_ability.h @@ -40,15 +40,15 @@ public: static FileAccessExtAbility* Create(const std::unique_ptr& runtime); - virtual int OpenFile(const Uri &uri, const int flags); + virtual int OpenFile(const Uri &uri, const int flags, int &fd); virtual int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile); virtual int Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile); virtual int Delete(const Uri &sourceFile); virtual int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile); virtual int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile); - virtual std::vector ListFile(const Uri &sourceFile); - virtual std::vector GetRoots(); + virtual int ListFile(const Uri &sourceFile, std::vector &fileInfo); + virtual int GetRoots(std::vector &deviceInfo); virtual int Access(const Uri &uri, bool &isExist); virtual int RegisterNotify(sptr ¬ify); virtual int UnregisterNotify(sptr ¬ify); diff --git a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h index a79cc04c..79b8b1b4 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h @@ -36,15 +36,15 @@ public: virtual ~FileAccessExtProxy() {} - virtual int OpenFile(const Uri &uri, const int flags) override; - virtual int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) override; + virtual int OpenFile(const Uri &uri, const int flags, int &fd) override; + virtual int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) override; virtual int Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) override; virtual int Delete(const Uri &sourceFile) override; virtual int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) override; virtual int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) override; - virtual std::vector ListFile(const Uri &sourceFile) override; - virtual std::vector GetRoots() override; + virtual int ListFile(const Uri &sourceFile, std::vector &fileInfo) override; + virtual int GetRoots(std::vector &deviceInfo) override; virtual int Access(const Uri &uri, bool &isExist) override; virtual int RegisterNotify(sptr ¬ify) override; virtual int UnregisterNotify(sptr ¬ify) override; diff --git a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h index 9815c174..0c363328 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h @@ -34,14 +34,14 @@ public: virtual ~FileAccessExtStubImpl() {} - int OpenFile(const Uri &uri, const int flags) override; + int OpenFile(const Uri &uri, const int flags, int &fd) override; int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) override; int Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) override; int Delete(const Uri &sourceFile) override; int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) override; int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) override; - std::vector ListFile(const Uri &sourceFileUri) override; - std::vector GetRoots() override; + int ListFile(const Uri &sourceFileUri, std::vector &fileInfo) override; + int GetRoots(std::vector &deviceInfo) override; int Access(const Uri &uri, bool &isExist) override; int RegisterNotify(sptr ¬ify) override; int UnregisterNotify(sptr ¬ify) override; diff --git a/frameworks/innerkits/file_access/include/file_access_helper.h b/frameworks/innerkits/file_access/include/file_access_helper.h index 034e576b..3bdbff26 100644 --- a/frameworks/innerkits/file_access/include/file_access_helper.h +++ b/frameworks/innerkits/file_access/include/file_access_helper.h @@ -59,14 +59,14 @@ public: bool Release(); int Access(Uri &uri, bool &isExist); - int OpenFile(Uri &uri, int flags); + int OpenFile(Uri &uri, const int flags, int &fd); int CreateFile(Uri &parent, const std::string &displayName, Uri &newFile); int Mkdir(Uri &parent, const std::string &displayName, Uri &newDir); int Delete(Uri &selectFile); int Move(Uri &sourceFile, Uri &targetParent, Uri &newFile); int Rename(Uri &sourceFile, const std::string &displayName, Uri &newFile); - std::vector ListFile(Uri &sourceFile); - std::vector GetRoots(); + int ListFile(Uri &sourceFile, std::vector &fileInfo); + int GetRoots(std::vector &deviceInfo); int On(std::shared_ptr &callback); int Off(); private: diff --git a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h index 8784b8fb..d0180177 100644 --- a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h +++ b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h @@ -46,15 +46,15 @@ public: CMD_UNREGISTER_NOTIFY }; - virtual int OpenFile(const Uri &uri, const int flags) = 0; + virtual int OpenFile(const Uri &uri, const int flags, int &fd) = 0; virtual int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) = 0; virtual int Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) = 0; virtual int Delete(const Uri &sourceFile) = 0; virtual int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) = 0; virtual int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) = 0; - virtual std::vector ListFile(const Uri &sourceFile) = 0; - virtual std::vector GetRoots() = 0; + virtual int ListFile(const Uri &sourceFile, std::vector &fileInfo) = 0; + virtual int GetRoots(std::vector &deviceInfo) = 0; virtual int Access(const Uri &uri, bool &isExist) = 0; virtual int RegisterNotify(sptr ¬ify) = 0; virtual int UnregisterNotify(sptr ¬ify) = 0; diff --git a/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h b/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h index f4be2c20..4a97273d 100644 --- a/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h +++ b/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h @@ -60,14 +60,14 @@ public: const sptr &token) override; void OnStart(const AAFwk::Want &want) override; sptr OnConnect(const AAFwk::Want &want) override; - int OpenFile(const Uri &uri, const int flags) override; + int OpenFile(const Uri &uri, const int flags, int &fd) override; int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) override; int Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) override; int Delete(const Uri &sourceFile) override; int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) override; int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) override; - std::vector ListFile(const Uri &sourceFile) override; - std::vector GetRoots() override; + int ListFile(const Uri &sourceFile, std::vector &fileInfo) override; + int GetRoots(std::vector &deviceInfo) override; int Access(const Uri &uri, bool &isExist) override; private: diff --git a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp index d7e7893c..4bb973e7 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp @@ -61,7 +61,7 @@ void FileAccessExtAbility::Init(const std::shared_ptr &recor ExtensionBase<>::Init(record, application, handler, token); } -int FileAccessExtAbility::OpenFile(const Uri &uri, const int flags) +int FileAccessExtAbility::OpenFile(const Uri &uri, const int flags, int &fd) { HILOG_ERROR("FileAccessExtAbility::OpenFile Undefined operation"); return ERR_OPERATION_NOT_SUPPORT; @@ -97,18 +97,16 @@ int FileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &displ return ERR_OPERATION_NOT_SUPPORT; } -std::vector FileAccessExtAbility::ListFile(const Uri &sourceFile) +int FileAccessExtAbility::ListFile(const Uri &sourceFile, std::vector &fileInfo) { - std::vector vec; HILOG_ERROR("FileAccessExtAbility::ListFile Undefined operation"); - return vec; + return ERR_OPERATION_NOT_SUPPORT; } -std::vector FileAccessExtAbility::GetRoots() +int FileAccessExtAbility::GetRoots(std::vector &deviceInfo) { - std::vector vec; HILOG_ERROR("FileAccessExtAbility::GetRoots Undefined operation"); - return vec; + return ERR_OPERATION_NOT_SUPPORT; } int FileAccessExtAbility::Access(const Uri &uri, bool &isExist) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 6e4386d0..46ac1cb3 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -24,102 +24,103 @@ namespace OHOS { namespace FileAccessFwk { -int FileAccessExtProxy::OpenFile(const Uri &uri, const int flags) +int FileAccessExtProxy::OpenFile(const Uri &uri, const int flags, int &fd) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "OpenFile"); MessageParcel data; if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteParcelable(&uri)) { HILOG_ERROR("fail to WriteParcelable uri"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } - if (!data.WriteInt32(flags)) { + if (!data.WriteUint32(flags)) { HILOG_ERROR("fail to WriteString mode"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } MessageParcel reply; MessageOption option; int32_t err = Remote()->SendRequest(CMD_OPEN_FILE, data, reply, option); - if (err != NO_ERROR) { + if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } - int fd = reply.ReadFileDescriptor(); + int ret = reply.ReadInt32(); + if (ret != ERR_OK) { + HILOG_ERROR("fail to ReadInt32 ret"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; + } + + fd = reply.ReadFileDescriptor(); if (fd < ERR_OK) { HILOG_ERROR("fail to ReadFileDescriptor fd"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_FD; + return ERR_PARCEL_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return fd; + return ERR_OK; } -int FileAccessExtProxy::CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) +int FileAccessExtProxy::CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CreateFile"); MessageParcel data; if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteParcelable(&parent)) { HILOG_ERROR("fail to WriteParcelable parent"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteString(displayName)) { HILOG_ERROR("fail to WriteString mode"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; - } - - if (!data.WriteParcelable(&newFile)) { - HILOG_ERROR("fail to WriteParcelable newFile"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } MessageParcel reply; MessageOption option; int32_t err = Remote()->SendRequest(CMD_CREATE_FILE, data, reply, option); - if (err != NO_ERROR) { + if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } int ret = reply.ReadInt32(); - if (ret < ERR_OK) { + if (ret != ERR_OK) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } std::unique_ptr tempUri(reply.ReadParcelable()); - if (!tempUri) { + if (tempUri == nullptr) { HILOG_ERROR("ReadParcelable value is nullptr."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } newFile = Uri(*tempUri); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessExtProxy::Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) @@ -129,54 +130,48 @@ int FileAccessExtProxy::Mkdir(const Uri &parent, const std::string &displayName, if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteParcelable(&parent)) { HILOG_ERROR("fail to WriteParcelable parent"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteString(displayName)) { HILOG_ERROR("fail to WriteString displayName"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; - } - - if (!data.WriteParcelable(&newFile)) { - HILOG_ERROR("fail to WriteParcelable newFile"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } MessageParcel reply; MessageOption option; int32_t err = Remote()->SendRequest(CMD_MKDIR, data, reply, option); - if (err != NO_ERROR) { + if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } int ret = reply.ReadInt32(); - if (ret < ERR_OK) { + if (ret != ERR_OK) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } std::unique_ptr tempUri(reply.ReadParcelable()); - if (!tempUri) { + if (tempUri == nullptr) { HILOG_ERROR("ReadParcelable value is nullptr."); ret = ERR_IPC_ERROR; FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_PARCEL_FAIL; } newFile = Uri(*tempUri); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessExtProxy::Delete(const Uri &sourceFile) @@ -186,13 +181,13 @@ int FileAccessExtProxy::Delete(const Uri &sourceFile) if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteParcelable(&sourceFile)) { HILOG_ERROR("fail to WriteParcelable sourceFile"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } MessageParcel reply; @@ -205,14 +200,14 @@ int FileAccessExtProxy::Delete(const Uri &sourceFile) } int ret = reply.ReadInt32(); - if (ret < ERR_OK) { + if (ret != ERR_OK) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessExtProxy::Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) @@ -222,53 +217,47 @@ int FileAccessExtProxy::Move(const Uri &sourceFile, const Uri &targetParent, Uri if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteParcelable(&sourceFile)) { HILOG_ERROR("fail to WriteParcelable sourceFile"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteParcelable(&targetParent)) { HILOG_ERROR("fail to WriteParcelable targetParent"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; - } - - if (!data.WriteParcelable(&newFile)) { - HILOG_ERROR("fail to WriteParcelable newFile"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } MessageParcel reply; MessageOption option; int32_t err = Remote()->SendRequest(CMD_MOVE, data, reply, option); - if (err != NO_ERROR) { + if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } int ret = reply.ReadInt32(); - if (ret < ERR_OK) { + if (ret != ERR_OK) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } std::unique_ptr tempUri(reply.ReadParcelable()); - if (!tempUri) { + if (tempUri == nullptr) { HILOG_ERROR("ReadParcelable value is nullptr."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } newFile = Uri(*tempUri); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessExtProxy::Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) @@ -278,125 +267,130 @@ int FileAccessExtProxy::Rename(const Uri &sourceFile, const std::string &display if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteParcelable(&sourceFile)) { HILOG_ERROR("fail to WriteParcelable sourceFile"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteString(displayName)) { HILOG_ERROR("fail to WriteString displayName"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; - } - - if (!data.WriteParcelable(&newFile)) { - HILOG_ERROR("fail to WriteParcelable newFile"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } MessageParcel reply; MessageOption option; int32_t err = Remote()->SendRequest(CMD_RENAME, data, reply, option); - if (err != NO_ERROR) { + if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } int ret = reply.ReadInt32(); - if (ret < ERR_OK) { + if (ret != ERR_OK) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } std::unique_ptr tempUri(reply.ReadParcelable()); - if (!tempUri) { + if (tempUri == nullptr) { HILOG_ERROR("ReadParcelable value is nullptr."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } newFile = Uri(*tempUri); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } -std::vector FileAccessExtProxy::ListFile(const Uri &sourceFile) +int FileAccessExtProxy::ListFile(const Uri &sourceFile, std::vector &fileInfo) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); - std::vector vec; MessageParcel data; if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ERR_PARCEL_FAIL; } if (!data.WriteParcelable(&sourceFile)) { HILOG_ERROR("fail to WriteParcelable sourceFileUri"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ERR_PARCEL_FAIL; } MessageParcel reply; MessageOption option; int32_t err = Remote()->SendRequest(CMD_LIST_FILE, data, reply, option); - if (err != NO_ERROR) { + if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ERR_IPC_ERROR; } - vec.clear(); - int64_t count = reply.ReadInt64(); - for (int32_t i = 0; i < count; i++) { - std::unique_ptr fileInfo(reply.ReadParcelable()); - if (fileInfo != nullptr) { - vec.push_back(*fileInfo); - } + int ret = reply.ReadInt32(); + if (ret != ERR_OK) { + HILOG_ERROR("fail to ReadInt32 ret"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; } + fileInfo.clear(); + uint64_t count = reply.ReadUint64(); + for (uint64_t i = 0; i < count; i++) { + std::unique_ptr fileInfoPtr(reply.ReadParcelable()); + if (fileInfoPtr != nullptr) { + fileInfo.push_back(*fileInfoPtr); + } + } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ERR_OK; } -std::vector FileAccessExtProxy::GetRoots() +int FileAccessExtProxy::GetRoots(std::vector &deviceInfo) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); - std::vector vec; MessageParcel data; if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ERR_PARCEL_FAIL; } MessageParcel reply; MessageOption option; int32_t err = Remote()->SendRequest(CMD_GET_ROOTS, data, reply, option); - if (err != NO_ERROR) { + if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ERR_IPC_ERROR; } - vec.clear(); + int ret = reply.ReadInt32(); + if (ret != ERR_OK) { + HILOG_ERROR("fail to ReadInt32 ret"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; + } + + deviceInfo.clear(); uint64_t count = reply.ReadUint64(); for (uint64_t i = 0; i < count; i++) { - std::unique_ptr deviceInfo(reply.ReadParcelable()); - if (deviceInfo != nullptr) { - vec.push_back(*deviceInfo); + std::unique_ptr deviceInfoPtr(reply.ReadParcelable()); + if (deviceInfoPtr != nullptr) { + deviceInfo.push_back(*deviceInfoPtr); } } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ERR_OK; } int FileAccessExtProxy::Access(const Uri &uri, bool &isExist) @@ -406,32 +400,26 @@ int FileAccessExtProxy::Access(const Uri &uri, bool &isExist) if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteParcelable(&uri)) { HILOG_ERROR("fail to WriteParcelable uri"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; - } - - if (!data.WriteBool(isExist)) { - HILOG_ERROR("fail to WriteBool isExist"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } MessageParcel reply; MessageOption option; int32_t err = Remote()->SendRequest(CMD_ACCESS, data, reply, option); - if (err != NO_ERROR) { + if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } int ret = reply.ReadInt32(); - if (ret < ERR_OK) { + if (ret != ERR_OK) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; @@ -439,7 +427,7 @@ int FileAccessExtProxy::Access(const Uri &uri, bool &isExist) isExist = reply.ReadBool(); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessExtProxy::RegisterNotify(sptr ¬ify) @@ -449,13 +437,13 @@ int FileAccessExtProxy::RegisterNotify(sptr ¬ify) if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteRemoteObject(notify->AsObject())) { HILOG_ERROR("write subscribe type or parcel failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } MessageParcel reply; @@ -464,7 +452,7 @@ int FileAccessExtProxy::RegisterNotify(sptr ¬ify) if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return err; + return ERR_IPC_ERROR; } err = reply.ReadInt32(); @@ -474,7 +462,7 @@ int FileAccessExtProxy::RegisterNotify(sptr ¬ify) return err; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return err; + return ERR_OK; } int FileAccessExtProxy::UnregisterNotify(sptr ¬ify) @@ -484,13 +472,13 @@ int FileAccessExtProxy::UnregisterNotify(sptr ¬ify) if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteRemoteObject(notify->AsObject())) { HILOG_ERROR("write subscribe type or parcel failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } MessageParcel reply; @@ -499,7 +487,7 @@ int FileAccessExtProxy::UnregisterNotify(sptr ¬ify) if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return err; + return ERR_IPC_ERROR; } err = reply.ReadInt32(); @@ -509,7 +497,7 @@ int FileAccessExtProxy::UnregisterNotify(sptr ¬ify) return err; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return err; + return ERR_OK; } } // namespace FileAccessFwk } // namespace OHOS diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp index 64115153..2a644147 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp @@ -92,27 +92,28 @@ ErrCode FileAccessExtStub::CmdOpenFile(MessageParcel &data, MessageParcel &reply if (uri == nullptr) { HILOG_ERROR("parameter-uri is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; + return ERR_PARCEL_FAIL; } int flags = data.ReadInt32(); if (flags < 0) { HILOG_ERROR("parameter OpenFile flags is invalid"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; + return ERR_PARCEL_FAIL; } - int fd = OpenFile(*uri, flags); - if (fd < 0) { - HILOG_ERROR("parameter OpenFile fail, fd is %{pubilc}d", fd); + int fd; + int ret = OpenFile(*uri, flags, fd); + if (!reply.WriteInt32(ret)) { + HILOG_ERROR("parameter OpenFile fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_FD; + return ERR_PARCEL_FAIL; } if (!reply.WriteFileDescriptor(fd)) { HILOG_ERROR("OpenFile fail to WriteFileDescriptor fd"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -126,40 +127,29 @@ ErrCode FileAccessExtStub::CmdCreateFile(MessageParcel &data, MessageParcel &rep if (parent == nullptr) { HILOG_ERROR("parameter-parent is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; + return ERR_PARCEL_FAIL; } std::string displayName = data.ReadString(); if (displayName.empty()) { HILOG_ERROR("parameter CreateFile displayName is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; - } - - std::shared_ptr fileNew(data.ReadParcelable()); - if (fileNew == nullptr) { - HILOG_ERROR("parameter-fileNew is nullptr"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; - } - - int ret = CreateFile(*parent, displayName, *fileNew); - if (ret < 0) { - HILOG_ERROR("parameter CreateFile fail, ret is %{pubilc}d", ret); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_PARCEL_FAIL; } + std::string newFile = ""; + OHOS::Uri newFileUri(newFile); + int ret = CreateFile(*parent, displayName, newFileUri); if (!reply.WriteInt32(ret)) { HILOG_ERROR("parameter CreateFile fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } - if (!reply.WriteParcelable(&(*fileNew))) { + if (!reply.WriteParcelable(&newFileUri)) { HILOG_ERROR("parameter CreateFile fail to WriteParcelable type"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -173,40 +163,29 @@ ErrCode FileAccessExtStub::CmdMkdir(MessageParcel &data, MessageParcel &reply) if (parent == nullptr) { HILOG_ERROR("parameter Mkdir parent is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; + return ERR_PARCEL_FAIL; } std::string displayName = data.ReadString(); if (displayName.empty()) { HILOG_ERROR("parameter Mkdir mode is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; - } - - std::shared_ptr fileNew(data.ReadParcelable()); - if (fileNew == nullptr) { - HILOG_ERROR("parameter Mkdir fileNew is nullptr"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; - } - - int ret = Mkdir(*parent, displayName, *fileNew); - if (ret < 0) { - HILOG_ERROR("parameter Mkdir fail, ret is %{pubilc}d", ret); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_PARCEL_FAIL; } + std::string newFile = ""; + OHOS::Uri newFileUri(newFile); + int ret = Mkdir(*parent, displayName, newFileUri); if (!reply.WriteInt32(ret)) { HILOG_ERROR("parameter Mkdir fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } - if (!reply.WriteParcelable(&(*fileNew))) { + if (!reply.WriteParcelable(&newFileUri)) { HILOG_ERROR("parameter Mkdir fail to WriteParcelable type"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -220,20 +199,14 @@ ErrCode FileAccessExtStub::CmdDelete(MessageParcel &data, MessageParcel &reply) if (uri == nullptr) { HILOG_ERROR("parameter Delete uri is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; + return ERR_PARCEL_FAIL; } int ret = Delete(*uri); - if (ret < 0) { - HILOG_ERROR("parameter Delete fail, ret is %{pubilc}d", ret); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; - } - if (!reply.WriteInt32(ret)) { - HILOG_ERROR("parameter Delete fail to WriteFileDescriptor ret"); + HILOG_ERROR("parameter Delete fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -247,40 +220,29 @@ ErrCode FileAccessExtStub::CmdMove(MessageParcel &data, MessageParcel &reply) if (sourceFile == nullptr) { HILOG_ERROR("parameter Move sourceFile is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; + return ERR_PARCEL_FAIL; } std::shared_ptr targetParent(data.ReadParcelable()); if (targetParent == nullptr) { HILOG_ERROR("parameter Move targetParent is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; - } - - std::shared_ptr fileNew(data.ReadParcelable()); - if (fileNew == nullptr) { - HILOG_ERROR("parameter Move fileNew is nullptr"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; - } - - int ret = Move(*sourceFile, *targetParent, *fileNew); - if (ret < 0) { - HILOG_ERROR("parameter Move fail, ret is %{pubilc}d", ret); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_PARCEL_FAIL; } + std::string newFile = ""; + OHOS::Uri newFileUri(newFile); + int ret = Move(*sourceFile, *targetParent, newFileUri); if (!reply.WriteInt32(ret)) { HILOG_ERROR("parameter Move fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } - if (!reply.WriteParcelable(&(*fileNew))) { + if (!reply.WriteParcelable(&newFileUri)) { HILOG_ERROR("parameter Move fail to WriteParcelable type"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -294,40 +256,29 @@ ErrCode FileAccessExtStub::CmdRename(MessageParcel &data, MessageParcel &reply) if (sourceFile == nullptr) { HILOG_ERROR("parameter Rename sourceFileUri is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; + return ERR_PARCEL_FAIL; } std::string displayName = data.ReadString(); if (displayName.empty()) { HILOG_ERROR("parameter Rename mode is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; - } - - std::shared_ptr fileNew(data.ReadParcelable()); - if (fileNew == nullptr) { - HILOG_ERROR("parameter Rename fileUriNew is nullptr"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; - } - - int ret = Rename(*sourceFile, displayName, *fileNew); - if (ret < 0) { - HILOG_ERROR("parameter Rename fail, ret is %{pubilc}d", ret); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_PARCEL_FAIL; } + std::string newFile = ""; + OHOS::Uri newFileUri(newFile); + int ret = Rename(*sourceFile, displayName, newFileUri); if (!reply.WriteInt32(ret)) { HILOG_ERROR("parameter Rename fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } - if (!reply.WriteParcelable(&(*fileNew))) { + if (!reply.WriteParcelable(&newFileUri)) { HILOG_ERROR("parameter Rename fail to WriteParcelable type"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -339,24 +290,31 @@ ErrCode FileAccessExtStub::CmdListFile(MessageParcel &data, MessageParcel &reply StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdListFile"); std::shared_ptr uri(data.ReadParcelable()); if (uri == nullptr) { - HILOG_ERROR("parameter ListFile uri is nullptr"); + HILOG_ERROR("parameter CmdListFile uri is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; + return ERR_PARCEL_FAIL; + } + + std::vector fileInfo; + int ret = ListFile(*uri, fileInfo); + if (!reply.WriteInt32(ret)) { + HILOG_ERROR("parameter CmdListFile fail to WriteInt32 ret"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; } - std::vector vec = ListFile(*uri); - uint64_t count {vec.size()}; + uint64_t count = fileInfo.size(); if (!reply.WriteUint64(count)) { - HILOG_ERROR("parameter ListFile fail to WriteInt32 count"); + HILOG_ERROR("parameter CmdListFile fail to WriteUint64 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } for (uint64_t i = 0; i < count; i++) { - if (!reply.WriteParcelable(&vec[i])) { - HILOG_ERROR("parameter ListFile fail to WriteParcelable vec"); + if (!reply.WriteParcelable(&fileInfo[i])) { + HILOG_ERROR("parameter CmdListFile fail to WriteParcelable vec"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } } @@ -367,19 +325,27 @@ ErrCode FileAccessExtStub::CmdListFile(MessageParcel &data, MessageParcel &reply ErrCode FileAccessExtStub::CmdGetRoots(MessageParcel &data, MessageParcel &reply) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdGetRoots"); - std::vector vec = GetRoots(); - uint64_t count {vec.size()}; + + std::vector deviceInfo; + int ret = GetRoots(deviceInfo); + if (!reply.WriteInt32(ret)) { + HILOG_ERROR("parameter CmdGetRoots fail to WriteInt32 ret"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + uint64_t count = deviceInfo.size(); if (!reply.WriteUint64(count)) { - HILOG_ERROR("parameter GetRoots fail to WriteInt32 count"); + HILOG_ERROR("parameter CmdGetRoots fail to WriteUint64 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } for (uint64_t i = 0; i < count; i++) { - if (!reply.WriteParcelable(&vec[i])) { - HILOG_ERROR("parameter GetRoots fail to WriteParcelable ret"); + if (!reply.WriteParcelable(&deviceInfo[i])) { + HILOG_ERROR("parameter CmdGetRoots fail to WriteParcelable vec"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } } @@ -399,12 +365,6 @@ ErrCode FileAccessExtStub::CmdAccess(MessageParcel &data, MessageParcel &reply) bool isExist = data.ReadBool(); int ret = Access(*uri, isExist); - if (ret < 0) { - HILOG_ERROR("parameter Access fail, ret is %{pubilc}d", ret); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; - } - if (!reply.WriteInt32(ret)) { HILOG_ERROR("parameter Access fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp index f3a81ad4..ac026bfd 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp @@ -26,7 +26,7 @@ std::shared_ptr FileAccessExtStubImpl::GetOwner() return extension_; } -int FileAccessExtStubImpl::OpenFile(const Uri &uri, const int flags) +int FileAccessExtStubImpl::OpenFile(const Uri &uri, const int flags, int &fd) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "OpenFile"); if (extension_ == nullptr) { @@ -35,7 +35,7 @@ int FileAccessExtStubImpl::OpenFile(const Uri &uri, const int flags) return ERR_IPC_ERROR; } - int ret = extension_->OpenFile(uri, flags); + int ret = extension_->OpenFile(uri, flags, fd); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -110,34 +110,32 @@ int FileAccessExtStubImpl::Rename(const Uri &sourceFile, const std::string &disp return ret; } -std::vector FileAccessExtStubImpl::ListFile(const Uri &sourceFile) +int FileAccessExtStubImpl::ListFile(const Uri &sourceFile, std::vector &fileInfo) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); - std::vector vec; if (extension_ == nullptr) { HILOG_ERROR("ListFile get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ERR_IPC_ERROR; } - vec = extension_->ListFile(sourceFile); + int ret = extension_->ListFile(sourceFile, fileInfo); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ret; } -std::vector FileAccessExtStubImpl::GetRoots() +int FileAccessExtStubImpl::GetRoots(std::vector &deviceInfo) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); - std::vector vec; if (extension_ == nullptr) { HILOG_ERROR("GetRoots get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ERR_IPC_ERROR; } - vec = extension_->GetRoots(); + int ret = extension_->GetRoots(deviceInfo); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ret; } int FileAccessExtStubImpl::Access(const Uri &uri, bool &isExist) diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 3440c4f7..526a4752 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -31,6 +31,9 @@ namespace { static const std::string SCHEME_NAME = "datashare"; static const std::string MEDIA_BNUDLE_NAME_ALIAS = "media"; static const std::string MEDIA_BNUDLE_NAME = "com.ohos.medialibrary.medialibrarydata"; + static const int32_t READ = 0; + static const int32_t WRITE = 1; + static const int32_t WRITE_READ = 2; } std::unordered_map FileAccessHelper::wantsMap_; @@ -47,8 +50,8 @@ static bool GetBundleNameFromPath(const std::string &path, std::string &bundleNa } auto tmpPath = path.substr(1); - auto index = tmpPath.find_first_of("/"); - bundleName = tmpPath.substr(0, index); + auto ret = tmpPath.find_first_of("/"); + bundleName = tmpPath.substr(0, ret); if (bundleName.compare(MEDIA_BNUDLE_NAME_ALIAS) == 0) { bundleName = MEDIA_BNUDLE_NAME; } @@ -399,7 +402,7 @@ bool FileAccessHelper::GetProxy() return true; } -int FileAccessHelper::OpenFile(Uri &uri, int flags) +int FileAccessHelper::OpenFile(Uri &uri, int flags, int &fd) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "OpenFile"); if (!CheckUri(uri)) { @@ -408,6 +411,11 @@ int FileAccessHelper::OpenFile(Uri &uri, int flags) return ERR_INVALID_URI; } + if (flags != READ && flags != WRITE && flags != WRITE_READ) { + HILOG_ERROR("flags type error."); + return ERR_INVALID_PARAM; + } + sptr fileExtProxy = GetProxyByUri(uri); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); @@ -415,9 +423,9 @@ int FileAccessHelper::OpenFile(Uri &uri, int flags) return ERR_IPC_ERROR; } - int fd = fileExtProxy->OpenFile(uri, flags); + int ret = fileExtProxy->OpenFile(uri, flags, fd); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return fd; + return ret; } int FileAccessHelper::CreateFile(Uri &parent, const std::string &displayName, Uri &newFile) @@ -436,9 +444,9 @@ int FileAccessHelper::CreateFile(Uri &parent, const std::string &displayName, Ur return ERR_IPC_ERROR; } - int index = fileExtProxy->CreateFile(parent, displayName, newFile); + int ret = fileExtProxy->CreateFile(parent, displayName, newFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return index; + return ret; } int FileAccessHelper::Mkdir(Uri &parent, const std::string &displayName, Uri &newDir) @@ -457,9 +465,9 @@ int FileAccessHelper::Mkdir(Uri &parent, const std::string &displayName, Uri &ne return ERR_IPC_ERROR; } - int index = fileExtProxy->Mkdir(parent, displayName, newDir); + int ret = fileExtProxy->Mkdir(parent, displayName, newDir); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return index; + return ret; } int FileAccessHelper::Delete(Uri &selectFile) @@ -478,9 +486,9 @@ int FileAccessHelper::Delete(Uri &selectFile) return ERR_IPC_ERROR; } - int index = fileExtProxy->Delete(selectFile); + int ret = fileExtProxy->Delete(selectFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return index; + return ret; } int FileAccessHelper::Move(Uri &sourceFile, Uri &targetParent, Uri &newFile) @@ -512,9 +520,9 @@ int FileAccessHelper::Move(Uri &sourceFile, Uri &targetParent, Uri &newFile) return ERR_IPC_ERROR; } - int index = fileExtProxy->Move(sourceFile, targetParent, newFile); + int ret = fileExtProxy->Move(sourceFile, targetParent, newFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return index; + return ret; } int FileAccessHelper::Rename(Uri &sourceFile, const std::string &displayName, Uri &newFile) @@ -533,43 +541,42 @@ int FileAccessHelper::Rename(Uri &sourceFile, const std::string &displayName, Ur return ERR_IPC_ERROR; } - int index = fileExtProxy->Rename(sourceFile, displayName, newFile); + int ret = fileExtProxy->Rename(sourceFile, displayName, newFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return index; + return ret; } -std::vector FileAccessHelper::ListFile(Uri &sourceFile) +int FileAccessHelper::ListFile(Uri &sourceFile, std::vector &fileInfo) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); - std::vector results; if (!CheckUri(sourceFile)) { HILOG_ERROR("sourceFile format check error."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return results; + return ERR_INVALID_URI; } sptr fileExtProxy = GetProxyByUri(sourceFile); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return results; + return ERR_IPC_ERROR; } - results = fileExtProxy->ListFile(sourceFile); + int ret = fileExtProxy->ListFile(sourceFile, fileInfo); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return results; + return ret; } -std::vector FileAccessHelper::GetRoots() +int FileAccessHelper::GetRoots(std::vector &deviceInfo) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); - std::vector rootsInfo; if (!GetProxy()) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return rootsInfo; + return ERR_IPC_ERROR; } + int ret = ERR_OK; for (auto iter = cMap_.begin(); iter != cMap_.end(); ++iter) { auto connectInfo = iter->second; auto fileAccessExtProxy = connectInfo->fileAccessExtConnection->GetFileExtProxy(); @@ -577,11 +584,15 @@ std::vector FileAccessHelper::GetRoots() if (fileAccessExtProxy) { AddFileAccessDeathRecipient(fileAccessExtProxy->AsObject()); } - results = fileAccessExtProxy->GetRoots(); - rootsInfo.insert(rootsInfo.end(), results.begin(), results.end()); + ret = fileAccessExtProxy->GetRoots(results); + if (ret != ERR_OK) { + HILOG_ERROR("getRoots Failed to get value"); + return ret; + } + deviceInfo.insert(deviceInfo.end(), results.begin(), results.end()); } - return rootsInfo; + return ret; } std::vector FileAccessHelper::GetRegisterFileAccessExtAbilityInfo() @@ -623,9 +634,9 @@ int FileAccessHelper::Access(Uri &uri, bool &isExist) return ERR_IPC_ERROR; } - int index = fileExtProxy->Access(uri, isExist); + int ret = fileExtProxy->Access(uri, isExist); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return index; + return ret; } int FileAccessHelper::On(std::shared_ptr &callback) diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index 7eee2234..01191957 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -339,7 +339,7 @@ struct Value { int code {ERR_OK}; }; -int JsFileAccessExtAbility::OpenFile(const Uri &uri, int flags) +int JsFileAccessExtAbility::OpenFile(const Uri &uri, int flags, int &fd) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "OpenFile"); auto value = std::make_shared>(); @@ -381,8 +381,9 @@ int JsFileAccessExtAbility::OpenFile(const Uri &uri, int flags) return ERR_FILEIO_FAIL; } + fd = value->data; FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return value->data; + return ERR_OK; } int JsFileAccessExtAbility::CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) @@ -430,12 +431,12 @@ int JsFileAccessExtAbility::CreateFile(const Uri &parent, const std::string &dis if ((value->data).empty()) { HILOG_ERROR("call CreateFile with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; + return ERR_PARSER_FAIL; } newFile = Uri(value->data); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return errCode; + return ERR_OK; } int JsFileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) @@ -483,11 +484,11 @@ int JsFileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayN if ((value->data).empty()) { HILOG_ERROR("call Mkdir with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; + return ERR_PARSER_FAIL; } newFile = Uri(value->data); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return errCode; + return ERR_OK; } int JsFileAccessExtAbility::Delete(const Uri &sourceFile) @@ -525,7 +526,7 @@ int JsFileAccessExtAbility::Delete(const Uri &sourceFile) } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return *ret; + return ERR_OK; } int JsFileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) @@ -575,11 +576,11 @@ int JsFileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, if ((value->data).empty()) { HILOG_ERROR("call move with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; + return ERR_PARSER_FAIL; } newFile = Uri(value->data); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return errCode; + return ERR_OK; } int JsFileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) @@ -628,14 +629,14 @@ int JsFileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &dis if ((value->data).empty()) { HILOG_ERROR("call Rename with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; + return ERR_PARSER_FAIL; } newFile = Uri(value->data); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return errCode; + return ERR_OK; } -std::vector JsFileAccessExtAbility::ListFile(const Uri &sourceFile) +int JsFileAccessExtAbility::ListFile(const Uri &sourceFile, std::vector &fileInfo) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); auto value = std::make_shared>>(); @@ -677,17 +678,20 @@ std::vector JsFileAccessExtAbility::ListFile(const Uri &sourceFile) auto errCode = CallJsMethod("listFile", jsRuntime_, jsObj_.get(), argParser, retParser); if (errCode != ERR_OK) { HILOG_ERROR("CallJsMethod error, code:%{public}d.", errCode); + return errCode; } if (value->code != ERR_OK) { HILOG_ERROR("fileio fail."); + return ERR_FILEIO_FAIL; } + fileInfo = value->data; FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return value->data; + return ERR_OK; } -std::vector JsFileAccessExtAbility::GetRoots() +int JsFileAccessExtAbility::GetRoots(std::vector &deviceInfo) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); auto value = std::make_shared>>(); @@ -722,14 +726,17 @@ std::vector JsFileAccessExtAbility::GetRoots() auto errCode = CallJsMethod("getRoots", jsRuntime_, jsObj_.get(), argParser, retParser); if (errCode != ERR_OK) { HILOG_ERROR("CallJsMethod error, code:%{public}d.", errCode); + return errCode; } if (value->code != ERR_OK) { HILOG_ERROR("fileio fail."); + return ERR_FILEIO_FAIL; } + deviceInfo = value->data; FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return value->data; + return ERR_OK; } int JsFileAccessExtAbility::Access(const Uri &uri, bool &isExist) @@ -766,7 +773,7 @@ int JsFileAccessExtAbility::Access(const Uri &uri, bool &isExist) isExist = value->data; FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return errCode; + return ERR_OK; } } // namespace FileAccessFwk } // namespace OHOS diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 7fd2b7d4..c455125e 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -146,14 +146,16 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0000, testing::ext::T OHOS::Security::AccessToken::AccessTokenID tokenId = tokenIdEx.tokenIdExStruct.tokenID; SetSelfTokenID(tokenId); - vector info = fah->GetRoots(); + vector info; + int result = fah->GetRoots(info); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(""); if (info.size() > 0) { parentUri = info[0].uri; GTEST_LOG_(INFO) << parentUri.ToString(); } - int result = fah->Mkdir(parentUri, "Download", newDirUri); + result = fah->Mkdir(parentUri, "Download", newDirUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newDirUriTest(""); @@ -164,8 +166,9 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0000, testing::ext::T result = fah->CreateFile(newDirUriTest, "file_access_helper_OpenFile_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->OpenFile(newFileUri, 0); - EXPECT_GT(result, OHOS::FileAccessFwk::ERR_OK); + int fd; + result = fah->OpenFile(newFileUri, 0, fd); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; @@ -191,7 +194,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0001, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0001"; try { Uri uri(""); - int result = fah->OpenFile(uri, 0); + int fd; + int result = fah->OpenFile(newFileUri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0001 result:" << result << endl; } catch (...) { @@ -218,7 +222,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0002, testing::ext::T EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri uri("storage/media/100/local/files/Download/file_access_helper_OpenFile_0002.txt"); - result = fah->OpenFile(uri, 0); + int fd; + result = fah->OpenFile(uri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0002 result:" << result << endl; @@ -244,7 +249,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0003, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0003"; try { Uri uri("~!@#$%^&*()_"); - int result = fah->OpenFile(uri, 0); + int fd; + int result = fah->OpenFile(uri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0003 result:" << result << endl; } catch (...) { @@ -270,7 +276,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0004, testing::ext::T int result = fah->CreateFile(newDirUri, "file_access_helper_OpenFile_0004.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->OpenFile(newFileUri, -1); + int fd; + result = fah->OpenFile(newFileUri, -1, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0004 result:" << result << endl; @@ -299,8 +306,9 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0005, testing::ext::T int result = fah->CreateFile(newDirUri, "file_access_helper_OpenFile_0005.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->OpenFile(newFileUri, 1); - EXPECT_GT(result, OHOS::FileAccessFwk::ERR_OK); + int fd; + result = fah->OpenFile(newFileUri, 1, fd); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0005 result:" << result << endl; result = fah->Delete(newFileUri); @@ -328,8 +336,9 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0006, testing::ext::T int result = fah->CreateFile(newDirUri, "file_access_helper_OpenFile_0006.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->OpenFile(newFileUri, 2); - EXPECT_GT(result, OHOS::FileAccessFwk::ERR_OK); + int fd; + result = fah->OpenFile(newFileUri, 2, fd); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0006 result:" << result << endl; result = fah->Delete(newFileUri); @@ -1076,8 +1085,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0009, testing::ext::TestS result = fah->Mkdir(newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + Uri testUri(""); for (size_t i = 0; i < 2000; i++) { - Uri testUri(""); string fileName = "test" + ToString(i) + ".txt"; fah->CreateFile(newDirUriTest1, fileName, testUri); } @@ -1337,7 +1346,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0000, testing::ext::T result = fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::vector fileInfo = fah->ListFile(newDirUriTest); + std::vector fileInfo; + fah->ListFile(newDirUriTest, fileInfo); EXPECT_GT(fileInfo.size(), 0); GTEST_LOG_(INFO) << "ListFile_0000 result:" << fileInfo.size() << endl; @@ -1363,7 +1373,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0001, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0001"; try { Uri sourceFileUri(""); - std::vector fileInfo = fah->ListFile(sourceFileUri); + std::vector fileInfo; + fah->ListFile(sourceFileUri, fileInfo); EXPECT_EQ(fileInfo.size(), 0); GTEST_LOG_(INFO) << "ListFile_0001 result:" << fileInfo.size() << endl; } catch (...) { @@ -1394,7 +1405,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0002, testing::ext::T EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); - std::vector fileInfo = fah->ListFile(sourceFileUri); + std::vector fileInfo; + fah->ListFile(sourceFileUri, fileInfo); EXPECT_EQ(fileInfo.size(), 0); GTEST_LOG_(INFO) << "ListFile_0002 result:" << fileInfo.size() << endl; @@ -1420,7 +1432,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0003, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0003"; try { Uri sourceFileUri("~!@#$%^&*()_"); - std::vector fileInfo = fah->ListFile(sourceFileUri); + std::vector fileInfo; + fah->ListFile(sourceFileUri, fileInfo); EXPECT_EQ(fileInfo.size(), 0); GTEST_LOG_(INFO) << "ListFile_0003 result:" << fileInfo.size() << endl; } catch (...) { @@ -1444,7 +1457,9 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_GetRoots_0000, testing::ext::T try { uint64_t selfTokenId_ = GetSelfTokenID(); - vector info = fah->GetRoots(); + vector info; + int result = fah->GetRoots(info); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_GT(info.size(), 0); if (info.size() > 0) { diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index 3d227c43..4a7d20a2 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -144,21 +144,24 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0000, testing:: OHOS::Security::AccessToken::AccessTokenID tokenId = tokenIdEx.tokenIdExStruct.tokenID; SetSelfTokenID(tokenId); - vector info = fah->GetRoots(); + vector info; + int result = fah->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(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); result = fah->CreateFile(newDirUriTest1, "file_extension_helper_OpenFile_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->OpenFile(newFileUri, 0); - EXPECT_GT(result, OHOS::FileAccessFwk::ERR_OK); + int fd; + result = fah->OpenFile(newFileUri, 0, fd); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; @@ -185,7 +188,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0001, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0001"; try { Uri uri(""); - int result = fah->OpenFile(uri, 0); + int fd; + int result = fah->OpenFile(uri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0001 result:" << result << endl; } catch (...) { @@ -207,15 +211,18 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0002, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0002"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newFileUri(""); - int result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0002.txt", newFileUri); + result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0002.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri uri("storage/media/100/local/files/Download/file_extension_helper_OpenFile_0002.txt"); - result = fah->OpenFile(uri, 0); + int fd; + result = fah->OpenFile(uri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0002 result:" << result << endl; @@ -242,7 +249,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0003, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0003"; try { Uri uri("~!@#$%^&*()_"); - int result = fah->OpenFile(uri, 0); + int fd; + int result = fah->OpenFile(uri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0003 result:" << result << endl; } catch (...) { @@ -264,14 +272,17 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0004, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0004"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newFileUri(""); - int result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0004.txt", newFileUri); + result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0004.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->OpenFile(newFileUri, -1); + int fd; + result = fah->OpenFile(newFileUri, -1, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0004 result:" << result << endl; @@ -297,15 +308,18 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0005, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0005"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newFileUri(""); - int result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0005.txt", newFileUri); + result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0005.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->OpenFile(newFileUri, 1); - EXPECT_GT(result, OHOS::FileAccessFwk::ERR_OK); + int fd; + result = fah->OpenFile(newFileUri, 1, fd); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0005 result:" << result << endl; result = fah->Delete(newFileUri); @@ -330,15 +344,18 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0006, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0006"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newFileUri(""); - int result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0006.txt", newFileUri); + result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0006.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->OpenFile(newFileUri, 2); - EXPECT_GT(result, OHOS::FileAccessFwk::ERR_OK); + int fd; + result = fah->OpenFile(newFileUri, 2, fd); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0006 result:" << result << endl; result = fah->Delete(newFileUri); @@ -363,11 +380,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0000, testing { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0000"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newFileUri(""); - int result = fah->CreateFile(parentUri, "file_extension_helper_CreateFile_0000.txt", newFileUri); + result = fah->CreateFile(parentUri, "file_extension_helper_CreateFile_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0000 result:" << result << endl; @@ -465,12 +484,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0004, testing { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0004"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newFileUri(""); string displayName = ""; - int result = fah->CreateFile(parentUri, displayName, newFileUri); + result = fah->CreateFile(parentUri, displayName, newFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0004 result:" << result << endl; } @@ -493,11 +514,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0000, testing::ext { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0000"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "file_extension_helper_Mkdir_0000", newDirUriTest); + result = fah->Mkdir(parentUri, "file_extension_helper_Mkdir_0000", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0000 result:" << result << endl; @@ -595,12 +618,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0004, testing::ext { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0004"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); string displayName = ""; - int result = fah->Mkdir(parentUri, displayName, newDirUriTest); + result = fah->Mkdir(parentUri, displayName, newDirUriTest); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0004 result:" << result << endl; } @@ -623,11 +648,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0000, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0000"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); @@ -660,11 +687,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0001, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0001"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->Delete(newDirUriTest); @@ -713,11 +742,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0003, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0003"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri selectFileUri("storage/media/100/local/files/Download/test"); @@ -771,12 +802,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0000, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0000"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newDirUriTest2(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->Mkdir(parentUri, "test2", newDirUriTest2); @@ -816,12 +849,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0001, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0001"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newDirUriTest2(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->Mkdir(parentUri, "test2", newDirUriTest2); @@ -858,11 +893,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0002, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0002"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -893,12 +930,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0003, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0003"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newDirUriTest2(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->Mkdir(parentUri, "test2", newDirUriTest2); @@ -939,11 +978,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0004, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0004"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -974,11 +1015,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0005, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0005"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest); + result = fah->Mkdir(parentUri, "test1", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1013,12 +1056,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0006, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0006"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newDirUriTest2(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->Mkdir(parentUri, "test2", newDirUriTest2); @@ -1059,12 +1104,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0007, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0007"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newDirUriTest2(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->Mkdir(parentUri, "test2", newDirUriTest2); @@ -1105,12 +1152,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0008, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0008"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newDirUriTest2(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->Mkdir(parentUri, "test2", newDirUriTest2); @@ -1143,20 +1192,22 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0009, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0009"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newDirUriTest2(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + Uri testUri(""); for (size_t j = 0; j < 2000; j++) { - Uri testUri(""); string fileName = "test" + ToString(j) + ".txt"; fah->CreateFile(newDirUriTest1, fileName, testUri); } @@ -1188,12 +1239,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0010, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0010"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newDirUriTest2(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->Mkdir(parentUri, "test2", newDirUriTest2); @@ -1233,12 +1286,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0011, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0011"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newDirUriTest2(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1283,11 +1338,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0000, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0000"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1321,11 +1378,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0001, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0001"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri renameUri(""); @@ -1379,11 +1438,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0003, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0003"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1442,11 +1503,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0005, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0005"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1480,23 +1543,22 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0000, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0000"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - for (size_t j = 0; j < 2000; j++) - { - string fileName = "test" + ToString(j) + ".txt"; - fah->CreateFile(newDirUriTest, fileName, testUri); - } + result = fah->CreateFile(newDirUriTest, "file_extension_helper_ListFile_0000.txt", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::vector fileInfo = fah->ListFile(newDirUriTest); + std::vector fileInfo; + fah->ListFile(newDirUriTest, fileInfo); EXPECT_GT(fileInfo.size(), 0); - GTEST_LOG_(INFO) << "ListFile_0000 result:" << fileInfo.size() << endl; result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1521,9 +1583,9 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0001, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0001"; try { Uri sourceFileUri(""); - std::vector fileInfo = fah->ListFile(sourceFileUri); + std::vector fileInfo; + fah->ListFile(sourceFileUri, fileInfo); EXPECT_EQ(fileInfo.size(), 0); - GTEST_LOG_(INFO) << "ListFile_0001 result:" << fileInfo.size() << endl; } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } @@ -1543,11 +1605,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0002, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0002"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1555,9 +1619,9 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0002, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); - std::vector fileInfo = fah->ListFile(sourceFileUri); + std::vector fileInfo; + fah->ListFile(sourceFileUri, fileInfo); EXPECT_EQ(fileInfo.size(), 0); - GTEST_LOG_(INFO) << "ListFile_0002 result:" << fileInfo.size() << endl; result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1582,9 +1646,9 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0003, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0003"; try { Uri sourceFileUri("~!@#$%^&*()_"); - std::vector fileInfo = fah->ListFile(sourceFileUri); + std::vector fileInfo; + fah->ListFile(sourceFileUri, fileInfo); EXPECT_EQ(fileInfo.size(), 0); - GTEST_LOG_(INFO) << "ListFile_0003 result:" << fileInfo.size() << endl; } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } @@ -1604,7 +1668,9 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_GetRoots_0000, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_GetRoots_0000"; try { - vector info = fah->GetRoots(); + vector info; + int result = fah->GetRoots(info); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_GT(info.size(), 0); GTEST_LOG_(INFO) << "GetRoots_0000 result:" << info.size() << endl; @@ -1639,14 +1705,16 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi vector wants = FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(); shared_ptr fahs = FileAccessHelper::Creator(remoteObj, wants); - vector info = fahs->GetRoots(); + vector info; + int result = fah->GetRoots(info); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; string uri = parentUri.ToString(); GTEST_LOG_(INFO) << uri; Uri documentUri(""); - int result = fahs->Mkdir(parentUri, "Documents", documentUri); + result = fahs->Mkdir(parentUri, "Documents", documentUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newDirUriTest1(""); @@ -1668,11 +1736,12 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi result = fahs->Move(newFileUri, newDirUriTest2, moveUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fahs->OpenFile(moveUri, 0); + int fd; + result = fah->OpenFile(moveUri, 0, fd); EXPECT_GT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; - + result = fahs->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1700,13 +1769,15 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Access_0000, testing::ex try { uint64_t selfTokenId_ = GetSelfTokenID(); - vector info = fah->GetRoots(); + vector info; + int result = fah->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 newDirUriTest(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest); + result = fah->Mkdir(parentUri, "test1", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); diff --git a/utils/file_access_framework_errno.h b/utils/file_access_framework_errno.h index d45271e8..25eab067 100644 --- a/utils/file_access_framework_errno.h +++ b/utils/file_access_framework_errno.h @@ -28,7 +28,6 @@ enum { ERR_OK = 0, ERR_IPC_ERROR = BASE_OFFSET, // ipc error ERR_PERMISSION_DENIED, // no permission - ERR_INVALID_FD, // invalid fd ERR_INVALID_URI, // invalid uri ERR_FILEIO_FAIL, // fileio fail ERR_PARAM_NUMBER, // Parameter number is abnormal @@ -39,7 +38,8 @@ enum { ERR_INVALID_NOTIFY, // invalid notify ERR_REMOVE_NOTIFY_FAIL, // remove notify fail ERR_NOTIFY_NOT_EXIST, // the notify is not exist - ERR_NOTIFY_FAIL // notify client fail + ERR_NOTIFY_FAIL, // notify client fail + ERR_PARCEL_FAIL // parcel fail }; } // namespace FileAccessFwk } // namespace OHOS -- Gitee From f3022de54279f410428bf0cd1f2791f5a6cd61ba Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Sat, 27 Aug 2022 18:33:27 +0800 Subject: [PATCH 056/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- 1.txt | 0 .../include/file_access_ext_ability.h | 6 +- .../include/file_access_ext_proxy.h | 8 +- .../include/file_access_ext_stub_impl.h | 6 +- .../file_access/include/file_access_helper.h | 6 +- .../include/ifile_access_ext_base.h | 6 +- .../include/js_file_access_ext_ability.h | 6 +- .../src/file_access_ext_ability.cpp | 12 +- .../file_access/src/file_access_ext_proxy.cpp | 214 +++++++-------- .../file_access/src/file_access_ext_stub.cpp | 188 +++++-------- .../src/file_access_ext_stub_impl.cpp | 22 +- .../file_access/src/file_access_helper.cpp | 69 +++-- .../src/js_file_access_ext_ability.cpp | 39 +-- .../test/file_access_helper_test.cpp | 51 ++-- .../test/file_extension_helper_test.cpp | 253 +++++++++++------- .../napi_fileaccess_helper.cpp | 12 +- utils/file_access_framework_errno.h | 4 +- 17 files changed, 475 insertions(+), 427 deletions(-) delete mode 100644 1.txt diff --git a/1.txt b/1.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/frameworks/innerkits/file_access/include/file_access_ext_ability.h b/frameworks/innerkits/file_access/include/file_access_ext_ability.h index 8fc5f09a..fb518d41 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_ability.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_ability.h @@ -40,15 +40,15 @@ public: static FileAccessExtAbility* Create(const std::unique_ptr& runtime); - virtual int OpenFile(const Uri &uri, const int flags); + virtual int OpenFile(const Uri &uri, const int flags, int &fd); virtual int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile); virtual int Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile); virtual int Delete(const Uri &sourceFile); virtual int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile); virtual int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile); - virtual std::vector ListFile(const Uri &sourceFile); - virtual std::vector GetRoots(); + virtual int ListFile(const Uri &sourceFile, std::vector &fileInfo); + virtual int GetRoots(std::vector &deviceInfo); virtual int Access(const Uri &uri, bool &isExist); virtual int RegisterNotify(sptr ¬ify); virtual int UnregisterNotify(sptr ¬ify); diff --git a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h index a79cc04c..79b8b1b4 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h @@ -36,15 +36,15 @@ public: virtual ~FileAccessExtProxy() {} - virtual int OpenFile(const Uri &uri, const int flags) override; - virtual int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) override; + virtual int OpenFile(const Uri &uri, const int flags, int &fd) override; + virtual int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) override; virtual int Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) override; virtual int Delete(const Uri &sourceFile) override; virtual int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) override; virtual int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) override; - virtual std::vector ListFile(const Uri &sourceFile) override; - virtual std::vector GetRoots() override; + virtual int ListFile(const Uri &sourceFile, std::vector &fileInfo) override; + virtual int GetRoots(std::vector &deviceInfo) override; virtual int Access(const Uri &uri, bool &isExist) override; virtual int RegisterNotify(sptr ¬ify) override; virtual int UnregisterNotify(sptr ¬ify) override; diff --git a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h index 9815c174..0c363328 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h @@ -34,14 +34,14 @@ public: virtual ~FileAccessExtStubImpl() {} - int OpenFile(const Uri &uri, const int flags) override; + int OpenFile(const Uri &uri, const int flags, int &fd) override; int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) override; int Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) override; int Delete(const Uri &sourceFile) override; int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) override; int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) override; - std::vector ListFile(const Uri &sourceFileUri) override; - std::vector GetRoots() override; + int ListFile(const Uri &sourceFileUri, std::vector &fileInfo) override; + int GetRoots(std::vector &deviceInfo) override; int Access(const Uri &uri, bool &isExist) override; int RegisterNotify(sptr ¬ify) override; int UnregisterNotify(sptr ¬ify) override; diff --git a/frameworks/innerkits/file_access/include/file_access_helper.h b/frameworks/innerkits/file_access/include/file_access_helper.h index 034e576b..3bdbff26 100644 --- a/frameworks/innerkits/file_access/include/file_access_helper.h +++ b/frameworks/innerkits/file_access/include/file_access_helper.h @@ -59,14 +59,14 @@ public: bool Release(); int Access(Uri &uri, bool &isExist); - int OpenFile(Uri &uri, int flags); + int OpenFile(Uri &uri, const int flags, int &fd); int CreateFile(Uri &parent, const std::string &displayName, Uri &newFile); int Mkdir(Uri &parent, const std::string &displayName, Uri &newDir); int Delete(Uri &selectFile); int Move(Uri &sourceFile, Uri &targetParent, Uri &newFile); int Rename(Uri &sourceFile, const std::string &displayName, Uri &newFile); - std::vector ListFile(Uri &sourceFile); - std::vector GetRoots(); + int ListFile(Uri &sourceFile, std::vector &fileInfo); + int GetRoots(std::vector &deviceInfo); int On(std::shared_ptr &callback); int Off(); private: diff --git a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h index 8784b8fb..d0180177 100644 --- a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h +++ b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h @@ -46,15 +46,15 @@ public: CMD_UNREGISTER_NOTIFY }; - virtual int OpenFile(const Uri &uri, const int flags) = 0; + virtual int OpenFile(const Uri &uri, const int flags, int &fd) = 0; virtual int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) = 0; virtual int Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) = 0; virtual int Delete(const Uri &sourceFile) = 0; virtual int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) = 0; virtual int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) = 0; - virtual std::vector ListFile(const Uri &sourceFile) = 0; - virtual std::vector GetRoots() = 0; + virtual int ListFile(const Uri &sourceFile, std::vector &fileInfo) = 0; + virtual int GetRoots(std::vector &deviceInfo) = 0; virtual int Access(const Uri &uri, bool &isExist) = 0; virtual int RegisterNotify(sptr ¬ify) = 0; virtual int UnregisterNotify(sptr ¬ify) = 0; diff --git a/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h b/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h index f4be2c20..4a97273d 100644 --- a/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h +++ b/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h @@ -60,14 +60,14 @@ public: const sptr &token) override; void OnStart(const AAFwk::Want &want) override; sptr OnConnect(const AAFwk::Want &want) override; - int OpenFile(const Uri &uri, const int flags) override; + int OpenFile(const Uri &uri, const int flags, int &fd) override; int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) override; int Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) override; int Delete(const Uri &sourceFile) override; int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) override; int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) override; - std::vector ListFile(const Uri &sourceFile) override; - std::vector GetRoots() override; + int ListFile(const Uri &sourceFile, std::vector &fileInfo) override; + int GetRoots(std::vector &deviceInfo) override; int Access(const Uri &uri, bool &isExist) override; private: diff --git a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp index d7e7893c..4bb973e7 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp @@ -61,7 +61,7 @@ void FileAccessExtAbility::Init(const std::shared_ptr &recor ExtensionBase<>::Init(record, application, handler, token); } -int FileAccessExtAbility::OpenFile(const Uri &uri, const int flags) +int FileAccessExtAbility::OpenFile(const Uri &uri, const int flags, int &fd) { HILOG_ERROR("FileAccessExtAbility::OpenFile Undefined operation"); return ERR_OPERATION_NOT_SUPPORT; @@ -97,18 +97,16 @@ int FileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &displ return ERR_OPERATION_NOT_SUPPORT; } -std::vector FileAccessExtAbility::ListFile(const Uri &sourceFile) +int FileAccessExtAbility::ListFile(const Uri &sourceFile, std::vector &fileInfo) { - std::vector vec; HILOG_ERROR("FileAccessExtAbility::ListFile Undefined operation"); - return vec; + return ERR_OPERATION_NOT_SUPPORT; } -std::vector FileAccessExtAbility::GetRoots() +int FileAccessExtAbility::GetRoots(std::vector &deviceInfo) { - std::vector vec; HILOG_ERROR("FileAccessExtAbility::GetRoots Undefined operation"); - return vec; + return ERR_OPERATION_NOT_SUPPORT; } int FileAccessExtAbility::Access(const Uri &uri, bool &isExist) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 6e4386d0..46ac1cb3 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -24,102 +24,103 @@ namespace OHOS { namespace FileAccessFwk { -int FileAccessExtProxy::OpenFile(const Uri &uri, const int flags) +int FileAccessExtProxy::OpenFile(const Uri &uri, const int flags, int &fd) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "OpenFile"); MessageParcel data; if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteParcelable(&uri)) { HILOG_ERROR("fail to WriteParcelable uri"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } - if (!data.WriteInt32(flags)) { + if (!data.WriteUint32(flags)) { HILOG_ERROR("fail to WriteString mode"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } MessageParcel reply; MessageOption option; int32_t err = Remote()->SendRequest(CMD_OPEN_FILE, data, reply, option); - if (err != NO_ERROR) { + if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } - int fd = reply.ReadFileDescriptor(); + int ret = reply.ReadInt32(); + if (ret != ERR_OK) { + HILOG_ERROR("fail to ReadInt32 ret"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; + } + + fd = reply.ReadFileDescriptor(); if (fd < ERR_OK) { HILOG_ERROR("fail to ReadFileDescriptor fd"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_FD; + return ERR_PARCEL_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return fd; + return ERR_OK; } -int FileAccessExtProxy::CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) +int FileAccessExtProxy::CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CreateFile"); MessageParcel data; if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteParcelable(&parent)) { HILOG_ERROR("fail to WriteParcelable parent"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteString(displayName)) { HILOG_ERROR("fail to WriteString mode"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; - } - - if (!data.WriteParcelable(&newFile)) { - HILOG_ERROR("fail to WriteParcelable newFile"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } MessageParcel reply; MessageOption option; int32_t err = Remote()->SendRequest(CMD_CREATE_FILE, data, reply, option); - if (err != NO_ERROR) { + if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } int ret = reply.ReadInt32(); - if (ret < ERR_OK) { + if (ret != ERR_OK) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } std::unique_ptr tempUri(reply.ReadParcelable()); - if (!tempUri) { + if (tempUri == nullptr) { HILOG_ERROR("ReadParcelable value is nullptr."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } newFile = Uri(*tempUri); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessExtProxy::Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) @@ -129,54 +130,48 @@ int FileAccessExtProxy::Mkdir(const Uri &parent, const std::string &displayName, if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteParcelable(&parent)) { HILOG_ERROR("fail to WriteParcelable parent"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteString(displayName)) { HILOG_ERROR("fail to WriteString displayName"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; - } - - if (!data.WriteParcelable(&newFile)) { - HILOG_ERROR("fail to WriteParcelable newFile"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } MessageParcel reply; MessageOption option; int32_t err = Remote()->SendRequest(CMD_MKDIR, data, reply, option); - if (err != NO_ERROR) { + if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } int ret = reply.ReadInt32(); - if (ret < ERR_OK) { + if (ret != ERR_OK) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } std::unique_ptr tempUri(reply.ReadParcelable()); - if (!tempUri) { + if (tempUri == nullptr) { HILOG_ERROR("ReadParcelable value is nullptr."); ret = ERR_IPC_ERROR; FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_PARCEL_FAIL; } newFile = Uri(*tempUri); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessExtProxy::Delete(const Uri &sourceFile) @@ -186,13 +181,13 @@ int FileAccessExtProxy::Delete(const Uri &sourceFile) if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteParcelable(&sourceFile)) { HILOG_ERROR("fail to WriteParcelable sourceFile"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } MessageParcel reply; @@ -205,14 +200,14 @@ int FileAccessExtProxy::Delete(const Uri &sourceFile) } int ret = reply.ReadInt32(); - if (ret < ERR_OK) { + if (ret != ERR_OK) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessExtProxy::Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) @@ -222,53 +217,47 @@ int FileAccessExtProxy::Move(const Uri &sourceFile, const Uri &targetParent, Uri if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteParcelable(&sourceFile)) { HILOG_ERROR("fail to WriteParcelable sourceFile"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteParcelable(&targetParent)) { HILOG_ERROR("fail to WriteParcelable targetParent"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; - } - - if (!data.WriteParcelable(&newFile)) { - HILOG_ERROR("fail to WriteParcelable newFile"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } MessageParcel reply; MessageOption option; int32_t err = Remote()->SendRequest(CMD_MOVE, data, reply, option); - if (err != NO_ERROR) { + if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } int ret = reply.ReadInt32(); - if (ret < ERR_OK) { + if (ret != ERR_OK) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } std::unique_ptr tempUri(reply.ReadParcelable()); - if (!tempUri) { + if (tempUri == nullptr) { HILOG_ERROR("ReadParcelable value is nullptr."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } newFile = Uri(*tempUri); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessExtProxy::Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) @@ -278,125 +267,130 @@ int FileAccessExtProxy::Rename(const Uri &sourceFile, const std::string &display if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteParcelable(&sourceFile)) { HILOG_ERROR("fail to WriteParcelable sourceFile"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteString(displayName)) { HILOG_ERROR("fail to WriteString displayName"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; - } - - if (!data.WriteParcelable(&newFile)) { - HILOG_ERROR("fail to WriteParcelable newFile"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } MessageParcel reply; MessageOption option; int32_t err = Remote()->SendRequest(CMD_RENAME, data, reply, option); - if (err != NO_ERROR) { + if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } int ret = reply.ReadInt32(); - if (ret < ERR_OK) { + if (ret != ERR_OK) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } std::unique_ptr tempUri(reply.ReadParcelable()); - if (!tempUri) { + if (tempUri == nullptr) { HILOG_ERROR("ReadParcelable value is nullptr."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } newFile = Uri(*tempUri); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } -std::vector FileAccessExtProxy::ListFile(const Uri &sourceFile) +int FileAccessExtProxy::ListFile(const Uri &sourceFile, std::vector &fileInfo) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); - std::vector vec; MessageParcel data; if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ERR_PARCEL_FAIL; } if (!data.WriteParcelable(&sourceFile)) { HILOG_ERROR("fail to WriteParcelable sourceFileUri"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ERR_PARCEL_FAIL; } MessageParcel reply; MessageOption option; int32_t err = Remote()->SendRequest(CMD_LIST_FILE, data, reply, option); - if (err != NO_ERROR) { + if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ERR_IPC_ERROR; } - vec.clear(); - int64_t count = reply.ReadInt64(); - for (int32_t i = 0; i < count; i++) { - std::unique_ptr fileInfo(reply.ReadParcelable()); - if (fileInfo != nullptr) { - vec.push_back(*fileInfo); - } + int ret = reply.ReadInt32(); + if (ret != ERR_OK) { + HILOG_ERROR("fail to ReadInt32 ret"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; } + fileInfo.clear(); + uint64_t count = reply.ReadUint64(); + for (uint64_t i = 0; i < count; i++) { + std::unique_ptr fileInfoPtr(reply.ReadParcelable()); + if (fileInfoPtr != nullptr) { + fileInfo.push_back(*fileInfoPtr); + } + } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ERR_OK; } -std::vector FileAccessExtProxy::GetRoots() +int FileAccessExtProxy::GetRoots(std::vector &deviceInfo) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); - std::vector vec; MessageParcel data; if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ERR_PARCEL_FAIL; } MessageParcel reply; MessageOption option; int32_t err = Remote()->SendRequest(CMD_GET_ROOTS, data, reply, option); - if (err != NO_ERROR) { + if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ERR_IPC_ERROR; } - vec.clear(); + int ret = reply.ReadInt32(); + if (ret != ERR_OK) { + HILOG_ERROR("fail to ReadInt32 ret"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; + } + + deviceInfo.clear(); uint64_t count = reply.ReadUint64(); for (uint64_t i = 0; i < count; i++) { - std::unique_ptr deviceInfo(reply.ReadParcelable()); - if (deviceInfo != nullptr) { - vec.push_back(*deviceInfo); + std::unique_ptr deviceInfoPtr(reply.ReadParcelable()); + if (deviceInfoPtr != nullptr) { + deviceInfo.push_back(*deviceInfoPtr); } } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ERR_OK; } int FileAccessExtProxy::Access(const Uri &uri, bool &isExist) @@ -406,32 +400,26 @@ int FileAccessExtProxy::Access(const Uri &uri, bool &isExist) if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteParcelable(&uri)) { HILOG_ERROR("fail to WriteParcelable uri"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; - } - - if (!data.WriteBool(isExist)) { - HILOG_ERROR("fail to WriteBool isExist"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } MessageParcel reply; MessageOption option; int32_t err = Remote()->SendRequest(CMD_ACCESS, data, reply, option); - if (err != NO_ERROR) { + if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } int ret = reply.ReadInt32(); - if (ret < ERR_OK) { + if (ret != ERR_OK) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; @@ -439,7 +427,7 @@ int FileAccessExtProxy::Access(const Uri &uri, bool &isExist) isExist = reply.ReadBool(); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessExtProxy::RegisterNotify(sptr ¬ify) @@ -449,13 +437,13 @@ int FileAccessExtProxy::RegisterNotify(sptr ¬ify) if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteRemoteObject(notify->AsObject())) { HILOG_ERROR("write subscribe type or parcel failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } MessageParcel reply; @@ -464,7 +452,7 @@ int FileAccessExtProxy::RegisterNotify(sptr ¬ify) if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return err; + return ERR_IPC_ERROR; } err = reply.ReadInt32(); @@ -474,7 +462,7 @@ int FileAccessExtProxy::RegisterNotify(sptr ¬ify) return err; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return err; + return ERR_OK; } int FileAccessExtProxy::UnregisterNotify(sptr ¬ify) @@ -484,13 +472,13 @@ int FileAccessExtProxy::UnregisterNotify(sptr ¬ify) if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { HILOG_ERROR("WriteInterfaceToken failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!data.WriteRemoteObject(notify->AsObject())) { HILOG_ERROR("write subscribe type or parcel failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } MessageParcel reply; @@ -499,7 +487,7 @@ int FileAccessExtProxy::UnregisterNotify(sptr ¬ify) if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return err; + return ERR_IPC_ERROR; } err = reply.ReadInt32(); @@ -509,7 +497,7 @@ int FileAccessExtProxy::UnregisterNotify(sptr ¬ify) return err; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return err; + return ERR_OK; } } // namespace FileAccessFwk } // namespace OHOS diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp index 64115153..2a644147 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp @@ -92,27 +92,28 @@ ErrCode FileAccessExtStub::CmdOpenFile(MessageParcel &data, MessageParcel &reply if (uri == nullptr) { HILOG_ERROR("parameter-uri is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; + return ERR_PARCEL_FAIL; } int flags = data.ReadInt32(); if (flags < 0) { HILOG_ERROR("parameter OpenFile flags is invalid"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; + return ERR_PARCEL_FAIL; } - int fd = OpenFile(*uri, flags); - if (fd < 0) { - HILOG_ERROR("parameter OpenFile fail, fd is %{pubilc}d", fd); + int fd; + int ret = OpenFile(*uri, flags, fd); + if (!reply.WriteInt32(ret)) { + HILOG_ERROR("parameter OpenFile fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_FD; + return ERR_PARCEL_FAIL; } if (!reply.WriteFileDescriptor(fd)) { HILOG_ERROR("OpenFile fail to WriteFileDescriptor fd"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -126,40 +127,29 @@ ErrCode FileAccessExtStub::CmdCreateFile(MessageParcel &data, MessageParcel &rep if (parent == nullptr) { HILOG_ERROR("parameter-parent is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; + return ERR_PARCEL_FAIL; } std::string displayName = data.ReadString(); if (displayName.empty()) { HILOG_ERROR("parameter CreateFile displayName is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; - } - - std::shared_ptr fileNew(data.ReadParcelable()); - if (fileNew == nullptr) { - HILOG_ERROR("parameter-fileNew is nullptr"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; - } - - int ret = CreateFile(*parent, displayName, *fileNew); - if (ret < 0) { - HILOG_ERROR("parameter CreateFile fail, ret is %{pubilc}d", ret); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_PARCEL_FAIL; } + std::string newFile = ""; + OHOS::Uri newFileUri(newFile); + int ret = CreateFile(*parent, displayName, newFileUri); if (!reply.WriteInt32(ret)) { HILOG_ERROR("parameter CreateFile fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } - if (!reply.WriteParcelable(&(*fileNew))) { + if (!reply.WriteParcelable(&newFileUri)) { HILOG_ERROR("parameter CreateFile fail to WriteParcelable type"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -173,40 +163,29 @@ ErrCode FileAccessExtStub::CmdMkdir(MessageParcel &data, MessageParcel &reply) if (parent == nullptr) { HILOG_ERROR("parameter Mkdir parent is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; + return ERR_PARCEL_FAIL; } std::string displayName = data.ReadString(); if (displayName.empty()) { HILOG_ERROR("parameter Mkdir mode is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; - } - - std::shared_ptr fileNew(data.ReadParcelable()); - if (fileNew == nullptr) { - HILOG_ERROR("parameter Mkdir fileNew is nullptr"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; - } - - int ret = Mkdir(*parent, displayName, *fileNew); - if (ret < 0) { - HILOG_ERROR("parameter Mkdir fail, ret is %{pubilc}d", ret); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_PARCEL_FAIL; } + std::string newFile = ""; + OHOS::Uri newFileUri(newFile); + int ret = Mkdir(*parent, displayName, newFileUri); if (!reply.WriteInt32(ret)) { HILOG_ERROR("parameter Mkdir fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } - if (!reply.WriteParcelable(&(*fileNew))) { + if (!reply.WriteParcelable(&newFileUri)) { HILOG_ERROR("parameter Mkdir fail to WriteParcelable type"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -220,20 +199,14 @@ ErrCode FileAccessExtStub::CmdDelete(MessageParcel &data, MessageParcel &reply) if (uri == nullptr) { HILOG_ERROR("parameter Delete uri is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; + return ERR_PARCEL_FAIL; } int ret = Delete(*uri); - if (ret < 0) { - HILOG_ERROR("parameter Delete fail, ret is %{pubilc}d", ret); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; - } - if (!reply.WriteInt32(ret)) { - HILOG_ERROR("parameter Delete fail to WriteFileDescriptor ret"); + HILOG_ERROR("parameter Delete fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -247,40 +220,29 @@ ErrCode FileAccessExtStub::CmdMove(MessageParcel &data, MessageParcel &reply) if (sourceFile == nullptr) { HILOG_ERROR("parameter Move sourceFile is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; + return ERR_PARCEL_FAIL; } std::shared_ptr targetParent(data.ReadParcelable()); if (targetParent == nullptr) { HILOG_ERROR("parameter Move targetParent is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; - } - - std::shared_ptr fileNew(data.ReadParcelable()); - if (fileNew == nullptr) { - HILOG_ERROR("parameter Move fileNew is nullptr"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; - } - - int ret = Move(*sourceFile, *targetParent, *fileNew); - if (ret < 0) { - HILOG_ERROR("parameter Move fail, ret is %{pubilc}d", ret); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_PARCEL_FAIL; } + std::string newFile = ""; + OHOS::Uri newFileUri(newFile); + int ret = Move(*sourceFile, *targetParent, newFileUri); if (!reply.WriteInt32(ret)) { HILOG_ERROR("parameter Move fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } - if (!reply.WriteParcelable(&(*fileNew))) { + if (!reply.WriteParcelable(&newFileUri)) { HILOG_ERROR("parameter Move fail to WriteParcelable type"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -294,40 +256,29 @@ ErrCode FileAccessExtStub::CmdRename(MessageParcel &data, MessageParcel &reply) if (sourceFile == nullptr) { HILOG_ERROR("parameter Rename sourceFileUri is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; + return ERR_PARCEL_FAIL; } std::string displayName = data.ReadString(); if (displayName.empty()) { HILOG_ERROR("parameter Rename mode is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; - } - - std::shared_ptr fileNew(data.ReadParcelable()); - if (fileNew == nullptr) { - HILOG_ERROR("parameter Rename fileUriNew is nullptr"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; - } - - int ret = Rename(*sourceFile, displayName, *fileNew); - if (ret < 0) { - HILOG_ERROR("parameter Rename fail, ret is %{pubilc}d", ret); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_PARCEL_FAIL; } + std::string newFile = ""; + OHOS::Uri newFileUri(newFile); + int ret = Rename(*sourceFile, displayName, newFileUri); if (!reply.WriteInt32(ret)) { HILOG_ERROR("parameter Rename fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } - if (!reply.WriteParcelable(&(*fileNew))) { + if (!reply.WriteParcelable(&newFileUri)) { HILOG_ERROR("parameter Rename fail to WriteParcelable type"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -339,24 +290,31 @@ ErrCode FileAccessExtStub::CmdListFile(MessageParcel &data, MessageParcel &reply StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdListFile"); std::shared_ptr uri(data.ReadParcelable()); if (uri == nullptr) { - HILOG_ERROR("parameter ListFile uri is nullptr"); + HILOG_ERROR("parameter CmdListFile uri is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_URI; + return ERR_PARCEL_FAIL; + } + + std::vector fileInfo; + int ret = ListFile(*uri, fileInfo); + if (!reply.WriteInt32(ret)) { + HILOG_ERROR("parameter CmdListFile fail to WriteInt32 ret"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; } - std::vector vec = ListFile(*uri); - uint64_t count {vec.size()}; + uint64_t count = fileInfo.size(); if (!reply.WriteUint64(count)) { - HILOG_ERROR("parameter ListFile fail to WriteInt32 count"); + HILOG_ERROR("parameter CmdListFile fail to WriteUint64 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } for (uint64_t i = 0; i < count; i++) { - if (!reply.WriteParcelable(&vec[i])) { - HILOG_ERROR("parameter ListFile fail to WriteParcelable vec"); + if (!reply.WriteParcelable(&fileInfo[i])) { + HILOG_ERROR("parameter CmdListFile fail to WriteParcelable vec"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } } @@ -367,19 +325,27 @@ ErrCode FileAccessExtStub::CmdListFile(MessageParcel &data, MessageParcel &reply ErrCode FileAccessExtStub::CmdGetRoots(MessageParcel &data, MessageParcel &reply) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdGetRoots"); - std::vector vec = GetRoots(); - uint64_t count {vec.size()}; + + std::vector deviceInfo; + int ret = GetRoots(deviceInfo); + if (!reply.WriteInt32(ret)) { + HILOG_ERROR("parameter CmdGetRoots fail to WriteInt32 ret"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + uint64_t count = deviceInfo.size(); if (!reply.WriteUint64(count)) { - HILOG_ERROR("parameter GetRoots fail to WriteInt32 count"); + HILOG_ERROR("parameter CmdGetRoots fail to WriteUint64 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } for (uint64_t i = 0; i < count; i++) { - if (!reply.WriteParcelable(&vec[i])) { - HILOG_ERROR("parameter GetRoots fail to WriteParcelable ret"); + if (!reply.WriteParcelable(&deviceInfo[i])) { + HILOG_ERROR("parameter CmdGetRoots fail to WriteParcelable vec"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } } @@ -399,12 +365,6 @@ ErrCode FileAccessExtStub::CmdAccess(MessageParcel &data, MessageParcel &reply) bool isExist = data.ReadBool(); int ret = Access(*uri, isExist); - if (ret < 0) { - HILOG_ERROR("parameter Access fail, ret is %{pubilc}d", ret); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; - } - if (!reply.WriteInt32(ret)) { HILOG_ERROR("parameter Access fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp index f3a81ad4..ac026bfd 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp @@ -26,7 +26,7 @@ std::shared_ptr FileAccessExtStubImpl::GetOwner() return extension_; } -int FileAccessExtStubImpl::OpenFile(const Uri &uri, const int flags) +int FileAccessExtStubImpl::OpenFile(const Uri &uri, const int flags, int &fd) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "OpenFile"); if (extension_ == nullptr) { @@ -35,7 +35,7 @@ int FileAccessExtStubImpl::OpenFile(const Uri &uri, const int flags) return ERR_IPC_ERROR; } - int ret = extension_->OpenFile(uri, flags); + int ret = extension_->OpenFile(uri, flags, fd); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -110,34 +110,32 @@ int FileAccessExtStubImpl::Rename(const Uri &sourceFile, const std::string &disp return ret; } -std::vector FileAccessExtStubImpl::ListFile(const Uri &sourceFile) +int FileAccessExtStubImpl::ListFile(const Uri &sourceFile, std::vector &fileInfo) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); - std::vector vec; if (extension_ == nullptr) { HILOG_ERROR("ListFile get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ERR_IPC_ERROR; } - vec = extension_->ListFile(sourceFile); + int ret = extension_->ListFile(sourceFile, fileInfo); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ret; } -std::vector FileAccessExtStubImpl::GetRoots() +int FileAccessExtStubImpl::GetRoots(std::vector &deviceInfo) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); - std::vector vec; if (extension_ == nullptr) { HILOG_ERROR("GetRoots get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ERR_IPC_ERROR; } - vec = extension_->GetRoots(); + int ret = extension_->GetRoots(deviceInfo); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; + return ret; } int FileAccessExtStubImpl::Access(const Uri &uri, bool &isExist) diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 3440c4f7..526a4752 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -31,6 +31,9 @@ namespace { static const std::string SCHEME_NAME = "datashare"; static const std::string MEDIA_BNUDLE_NAME_ALIAS = "media"; static const std::string MEDIA_BNUDLE_NAME = "com.ohos.medialibrary.medialibrarydata"; + static const int32_t READ = 0; + static const int32_t WRITE = 1; + static const int32_t WRITE_READ = 2; } std::unordered_map FileAccessHelper::wantsMap_; @@ -47,8 +50,8 @@ static bool GetBundleNameFromPath(const std::string &path, std::string &bundleNa } auto tmpPath = path.substr(1); - auto index = tmpPath.find_first_of("/"); - bundleName = tmpPath.substr(0, index); + auto ret = tmpPath.find_first_of("/"); + bundleName = tmpPath.substr(0, ret); if (bundleName.compare(MEDIA_BNUDLE_NAME_ALIAS) == 0) { bundleName = MEDIA_BNUDLE_NAME; } @@ -399,7 +402,7 @@ bool FileAccessHelper::GetProxy() return true; } -int FileAccessHelper::OpenFile(Uri &uri, int flags) +int FileAccessHelper::OpenFile(Uri &uri, int flags, int &fd) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "OpenFile"); if (!CheckUri(uri)) { @@ -408,6 +411,11 @@ int FileAccessHelper::OpenFile(Uri &uri, int flags) return ERR_INVALID_URI; } + if (flags != READ && flags != WRITE && flags != WRITE_READ) { + HILOG_ERROR("flags type error."); + return ERR_INVALID_PARAM; + } + sptr fileExtProxy = GetProxyByUri(uri); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); @@ -415,9 +423,9 @@ int FileAccessHelper::OpenFile(Uri &uri, int flags) return ERR_IPC_ERROR; } - int fd = fileExtProxy->OpenFile(uri, flags); + int ret = fileExtProxy->OpenFile(uri, flags, fd); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return fd; + return ret; } int FileAccessHelper::CreateFile(Uri &parent, const std::string &displayName, Uri &newFile) @@ -436,9 +444,9 @@ int FileAccessHelper::CreateFile(Uri &parent, const std::string &displayName, Ur return ERR_IPC_ERROR; } - int index = fileExtProxy->CreateFile(parent, displayName, newFile); + int ret = fileExtProxy->CreateFile(parent, displayName, newFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return index; + return ret; } int FileAccessHelper::Mkdir(Uri &parent, const std::string &displayName, Uri &newDir) @@ -457,9 +465,9 @@ int FileAccessHelper::Mkdir(Uri &parent, const std::string &displayName, Uri &ne return ERR_IPC_ERROR; } - int index = fileExtProxy->Mkdir(parent, displayName, newDir); + int ret = fileExtProxy->Mkdir(parent, displayName, newDir); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return index; + return ret; } int FileAccessHelper::Delete(Uri &selectFile) @@ -478,9 +486,9 @@ int FileAccessHelper::Delete(Uri &selectFile) return ERR_IPC_ERROR; } - int index = fileExtProxy->Delete(selectFile); + int ret = fileExtProxy->Delete(selectFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return index; + return ret; } int FileAccessHelper::Move(Uri &sourceFile, Uri &targetParent, Uri &newFile) @@ -512,9 +520,9 @@ int FileAccessHelper::Move(Uri &sourceFile, Uri &targetParent, Uri &newFile) return ERR_IPC_ERROR; } - int index = fileExtProxy->Move(sourceFile, targetParent, newFile); + int ret = fileExtProxy->Move(sourceFile, targetParent, newFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return index; + return ret; } int FileAccessHelper::Rename(Uri &sourceFile, const std::string &displayName, Uri &newFile) @@ -533,43 +541,42 @@ int FileAccessHelper::Rename(Uri &sourceFile, const std::string &displayName, Ur return ERR_IPC_ERROR; } - int index = fileExtProxy->Rename(sourceFile, displayName, newFile); + int ret = fileExtProxy->Rename(sourceFile, displayName, newFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return index; + return ret; } -std::vector FileAccessHelper::ListFile(Uri &sourceFile) +int FileAccessHelper::ListFile(Uri &sourceFile, std::vector &fileInfo) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); - std::vector results; if (!CheckUri(sourceFile)) { HILOG_ERROR("sourceFile format check error."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return results; + return ERR_INVALID_URI; } sptr fileExtProxy = GetProxyByUri(sourceFile); if (fileExtProxy == nullptr) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return results; + return ERR_IPC_ERROR; } - results = fileExtProxy->ListFile(sourceFile); + int ret = fileExtProxy->ListFile(sourceFile, fileInfo); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return results; + return ret; } -std::vector FileAccessHelper::GetRoots() +int FileAccessHelper::GetRoots(std::vector &deviceInfo) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); - std::vector rootsInfo; if (!GetProxy()) { HILOG_ERROR("failed with invalid fileAccessExtProxy"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return rootsInfo; + return ERR_IPC_ERROR; } + int ret = ERR_OK; for (auto iter = cMap_.begin(); iter != cMap_.end(); ++iter) { auto connectInfo = iter->second; auto fileAccessExtProxy = connectInfo->fileAccessExtConnection->GetFileExtProxy(); @@ -577,11 +584,15 @@ std::vector FileAccessHelper::GetRoots() if (fileAccessExtProxy) { AddFileAccessDeathRecipient(fileAccessExtProxy->AsObject()); } - results = fileAccessExtProxy->GetRoots(); - rootsInfo.insert(rootsInfo.end(), results.begin(), results.end()); + ret = fileAccessExtProxy->GetRoots(results); + if (ret != ERR_OK) { + HILOG_ERROR("getRoots Failed to get value"); + return ret; + } + deviceInfo.insert(deviceInfo.end(), results.begin(), results.end()); } - return rootsInfo; + return ret; } std::vector FileAccessHelper::GetRegisterFileAccessExtAbilityInfo() @@ -623,9 +634,9 @@ int FileAccessHelper::Access(Uri &uri, bool &isExist) return ERR_IPC_ERROR; } - int index = fileExtProxy->Access(uri, isExist); + int ret = fileExtProxy->Access(uri, isExist); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return index; + return ret; } int FileAccessHelper::On(std::shared_ptr &callback) diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index 7eee2234..01191957 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -339,7 +339,7 @@ struct Value { int code {ERR_OK}; }; -int JsFileAccessExtAbility::OpenFile(const Uri &uri, int flags) +int JsFileAccessExtAbility::OpenFile(const Uri &uri, int flags, int &fd) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "OpenFile"); auto value = std::make_shared>(); @@ -381,8 +381,9 @@ int JsFileAccessExtAbility::OpenFile(const Uri &uri, int flags) return ERR_FILEIO_FAIL; } + fd = value->data; FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return value->data; + return ERR_OK; } int JsFileAccessExtAbility::CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) @@ -430,12 +431,12 @@ int JsFileAccessExtAbility::CreateFile(const Uri &parent, const std::string &dis if ((value->data).empty()) { HILOG_ERROR("call CreateFile with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; + return ERR_PARSER_FAIL; } newFile = Uri(value->data); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return errCode; + return ERR_OK; } int JsFileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) @@ -483,11 +484,11 @@ int JsFileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayN if ((value->data).empty()) { HILOG_ERROR("call Mkdir with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; + return ERR_PARSER_FAIL; } newFile = Uri(value->data); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return errCode; + return ERR_OK; } int JsFileAccessExtAbility::Delete(const Uri &sourceFile) @@ -525,7 +526,7 @@ int JsFileAccessExtAbility::Delete(const Uri &sourceFile) } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return *ret; + return ERR_OK; } int JsFileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) @@ -575,11 +576,11 @@ int JsFileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, if ((value->data).empty()) { HILOG_ERROR("call move with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; + return ERR_PARSER_FAIL; } newFile = Uri(value->data); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return errCode; + return ERR_OK; } int JsFileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) @@ -628,14 +629,14 @@ int JsFileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &dis if ((value->data).empty()) { HILOG_ERROR("call Rename with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_PARAM; + return ERR_PARSER_FAIL; } newFile = Uri(value->data); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return errCode; + return ERR_OK; } -std::vector JsFileAccessExtAbility::ListFile(const Uri &sourceFile) +int JsFileAccessExtAbility::ListFile(const Uri &sourceFile, std::vector &fileInfo) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); auto value = std::make_shared>>(); @@ -677,17 +678,20 @@ std::vector JsFileAccessExtAbility::ListFile(const Uri &sourceFile) auto errCode = CallJsMethod("listFile", jsRuntime_, jsObj_.get(), argParser, retParser); if (errCode != ERR_OK) { HILOG_ERROR("CallJsMethod error, code:%{public}d.", errCode); + return errCode; } if (value->code != ERR_OK) { HILOG_ERROR("fileio fail."); + return ERR_FILEIO_FAIL; } + fileInfo = value->data; FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return value->data; + return ERR_OK; } -std::vector JsFileAccessExtAbility::GetRoots() +int JsFileAccessExtAbility::GetRoots(std::vector &deviceInfo) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); auto value = std::make_shared>>(); @@ -722,14 +726,17 @@ std::vector JsFileAccessExtAbility::GetRoots() auto errCode = CallJsMethod("getRoots", jsRuntime_, jsObj_.get(), argParser, retParser); if (errCode != ERR_OK) { HILOG_ERROR("CallJsMethod error, code:%{public}d.", errCode); + return errCode; } if (value->code != ERR_OK) { HILOG_ERROR("fileio fail."); + return ERR_FILEIO_FAIL; } + deviceInfo = value->data; FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return value->data; + return ERR_OK; } int JsFileAccessExtAbility::Access(const Uri &uri, bool &isExist) @@ -766,7 +773,7 @@ int JsFileAccessExtAbility::Access(const Uri &uri, bool &isExist) isExist = value->data; FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return errCode; + return ERR_OK; } } // namespace FileAccessFwk } // namespace OHOS diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 7fd2b7d4..c455125e 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -146,14 +146,16 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0000, testing::ext::T OHOS::Security::AccessToken::AccessTokenID tokenId = tokenIdEx.tokenIdExStruct.tokenID; SetSelfTokenID(tokenId); - vector info = fah->GetRoots(); + vector info; + int result = fah->GetRoots(info); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(""); if (info.size() > 0) { parentUri = info[0].uri; GTEST_LOG_(INFO) << parentUri.ToString(); } - int result = fah->Mkdir(parentUri, "Download", newDirUri); + result = fah->Mkdir(parentUri, "Download", newDirUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newDirUriTest(""); @@ -164,8 +166,9 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0000, testing::ext::T result = fah->CreateFile(newDirUriTest, "file_access_helper_OpenFile_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->OpenFile(newFileUri, 0); - EXPECT_GT(result, OHOS::FileAccessFwk::ERR_OK); + int fd; + result = fah->OpenFile(newFileUri, 0, fd); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; @@ -191,7 +194,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0001, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0001"; try { Uri uri(""); - int result = fah->OpenFile(uri, 0); + int fd; + int result = fah->OpenFile(newFileUri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0001 result:" << result << endl; } catch (...) { @@ -218,7 +222,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0002, testing::ext::T EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri uri("storage/media/100/local/files/Download/file_access_helper_OpenFile_0002.txt"); - result = fah->OpenFile(uri, 0); + int fd; + result = fah->OpenFile(uri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0002 result:" << result << endl; @@ -244,7 +249,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0003, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0003"; try { Uri uri("~!@#$%^&*()_"); - int result = fah->OpenFile(uri, 0); + int fd; + int result = fah->OpenFile(uri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0003 result:" << result << endl; } catch (...) { @@ -270,7 +276,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0004, testing::ext::T int result = fah->CreateFile(newDirUri, "file_access_helper_OpenFile_0004.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->OpenFile(newFileUri, -1); + int fd; + result = fah->OpenFile(newFileUri, -1, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0004 result:" << result << endl; @@ -299,8 +306,9 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0005, testing::ext::T int result = fah->CreateFile(newDirUri, "file_access_helper_OpenFile_0005.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->OpenFile(newFileUri, 1); - EXPECT_GT(result, OHOS::FileAccessFwk::ERR_OK); + int fd; + result = fah->OpenFile(newFileUri, 1, fd); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0005 result:" << result << endl; result = fah->Delete(newFileUri); @@ -328,8 +336,9 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0006, testing::ext::T int result = fah->CreateFile(newDirUri, "file_access_helper_OpenFile_0006.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->OpenFile(newFileUri, 2); - EXPECT_GT(result, OHOS::FileAccessFwk::ERR_OK); + int fd; + result = fah->OpenFile(newFileUri, 2, fd); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0006 result:" << result << endl; result = fah->Delete(newFileUri); @@ -1076,8 +1085,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0009, testing::ext::TestS result = fah->Mkdir(newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + Uri testUri(""); for (size_t i = 0; i < 2000; i++) { - Uri testUri(""); string fileName = "test" + ToString(i) + ".txt"; fah->CreateFile(newDirUriTest1, fileName, testUri); } @@ -1337,7 +1346,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0000, testing::ext::T result = fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::vector fileInfo = fah->ListFile(newDirUriTest); + std::vector fileInfo; + fah->ListFile(newDirUriTest, fileInfo); EXPECT_GT(fileInfo.size(), 0); GTEST_LOG_(INFO) << "ListFile_0000 result:" << fileInfo.size() << endl; @@ -1363,7 +1373,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0001, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0001"; try { Uri sourceFileUri(""); - std::vector fileInfo = fah->ListFile(sourceFileUri); + std::vector fileInfo; + fah->ListFile(sourceFileUri, fileInfo); EXPECT_EQ(fileInfo.size(), 0); GTEST_LOG_(INFO) << "ListFile_0001 result:" << fileInfo.size() << endl; } catch (...) { @@ -1394,7 +1405,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0002, testing::ext::T EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); - std::vector fileInfo = fah->ListFile(sourceFileUri); + std::vector fileInfo; + fah->ListFile(sourceFileUri, fileInfo); EXPECT_EQ(fileInfo.size(), 0); GTEST_LOG_(INFO) << "ListFile_0002 result:" << fileInfo.size() << endl; @@ -1420,7 +1432,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0003, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0003"; try { Uri sourceFileUri("~!@#$%^&*()_"); - std::vector fileInfo = fah->ListFile(sourceFileUri); + std::vector fileInfo; + fah->ListFile(sourceFileUri, fileInfo); EXPECT_EQ(fileInfo.size(), 0); GTEST_LOG_(INFO) << "ListFile_0003 result:" << fileInfo.size() << endl; } catch (...) { @@ -1444,7 +1457,9 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_GetRoots_0000, testing::ext::T try { uint64_t selfTokenId_ = GetSelfTokenID(); - vector info = fah->GetRoots(); + vector info; + int result = fah->GetRoots(info); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_GT(info.size(), 0); if (info.size() > 0) { diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index 3d227c43..4a7d20a2 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -144,21 +144,24 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0000, testing:: OHOS::Security::AccessToken::AccessTokenID tokenId = tokenIdEx.tokenIdExStruct.tokenID; SetSelfTokenID(tokenId); - vector info = fah->GetRoots(); + vector info; + int result = fah->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(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); result = fah->CreateFile(newDirUriTest1, "file_extension_helper_OpenFile_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->OpenFile(newFileUri, 0); - EXPECT_GT(result, OHOS::FileAccessFwk::ERR_OK); + int fd; + result = fah->OpenFile(newFileUri, 0, fd); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; @@ -185,7 +188,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0001, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0001"; try { Uri uri(""); - int result = fah->OpenFile(uri, 0); + int fd; + int result = fah->OpenFile(uri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0001 result:" << result << endl; } catch (...) { @@ -207,15 +211,18 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0002, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0002"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newFileUri(""); - int result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0002.txt", newFileUri); + result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0002.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri uri("storage/media/100/local/files/Download/file_extension_helper_OpenFile_0002.txt"); - result = fah->OpenFile(uri, 0); + int fd; + result = fah->OpenFile(uri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0002 result:" << result << endl; @@ -242,7 +249,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0003, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0003"; try { Uri uri("~!@#$%^&*()_"); - int result = fah->OpenFile(uri, 0); + int fd; + int result = fah->OpenFile(uri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0003 result:" << result << endl; } catch (...) { @@ -264,14 +272,17 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0004, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0004"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newFileUri(""); - int result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0004.txt", newFileUri); + result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0004.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->OpenFile(newFileUri, -1); + int fd; + result = fah->OpenFile(newFileUri, -1, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0004 result:" << result << endl; @@ -297,15 +308,18 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0005, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0005"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newFileUri(""); - int result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0005.txt", newFileUri); + result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0005.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->OpenFile(newFileUri, 1); - EXPECT_GT(result, OHOS::FileAccessFwk::ERR_OK); + int fd; + result = fah->OpenFile(newFileUri, 1, fd); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0005 result:" << result << endl; result = fah->Delete(newFileUri); @@ -330,15 +344,18 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0006, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0006"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newFileUri(""); - int result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0006.txt", newFileUri); + result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0006.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->OpenFile(newFileUri, 2); - EXPECT_GT(result, OHOS::FileAccessFwk::ERR_OK); + int fd; + result = fah->OpenFile(newFileUri, 2, fd); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0006 result:" << result << endl; result = fah->Delete(newFileUri); @@ -363,11 +380,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0000, testing { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0000"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newFileUri(""); - int result = fah->CreateFile(parentUri, "file_extension_helper_CreateFile_0000.txt", newFileUri); + result = fah->CreateFile(parentUri, "file_extension_helper_CreateFile_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0000 result:" << result << endl; @@ -465,12 +484,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0004, testing { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0004"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newFileUri(""); string displayName = ""; - int result = fah->CreateFile(parentUri, displayName, newFileUri); + result = fah->CreateFile(parentUri, displayName, newFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0004 result:" << result << endl; } @@ -493,11 +514,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0000, testing::ext { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0000"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "file_extension_helper_Mkdir_0000", newDirUriTest); + result = fah->Mkdir(parentUri, "file_extension_helper_Mkdir_0000", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0000 result:" << result << endl; @@ -595,12 +618,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0004, testing::ext { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0004"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); string displayName = ""; - int result = fah->Mkdir(parentUri, displayName, newDirUriTest); + result = fah->Mkdir(parentUri, displayName, newDirUriTest); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0004 result:" << result << endl; } @@ -623,11 +648,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0000, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0000"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); @@ -660,11 +687,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0001, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0001"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->Delete(newDirUriTest); @@ -713,11 +742,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0003, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0003"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri selectFileUri("storage/media/100/local/files/Download/test"); @@ -771,12 +802,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0000, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0000"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newDirUriTest2(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->Mkdir(parentUri, "test2", newDirUriTest2); @@ -816,12 +849,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0001, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0001"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newDirUriTest2(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->Mkdir(parentUri, "test2", newDirUriTest2); @@ -858,11 +893,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0002, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0002"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -893,12 +930,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0003, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0003"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newDirUriTest2(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->Mkdir(parentUri, "test2", newDirUriTest2); @@ -939,11 +978,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0004, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0004"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -974,11 +1015,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0005, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0005"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest); + result = fah->Mkdir(parentUri, "test1", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1013,12 +1056,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0006, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0006"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newDirUriTest2(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->Mkdir(parentUri, "test2", newDirUriTest2); @@ -1059,12 +1104,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0007, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0007"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newDirUriTest2(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->Mkdir(parentUri, "test2", newDirUriTest2); @@ -1105,12 +1152,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0008, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0008"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newDirUriTest2(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->Mkdir(parentUri, "test2", newDirUriTest2); @@ -1143,20 +1192,22 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0009, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0009"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newDirUriTest2(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + Uri testUri(""); for (size_t j = 0; j < 2000; j++) { - Uri testUri(""); string fileName = "test" + ToString(j) + ".txt"; fah->CreateFile(newDirUriTest1, fileName, testUri); } @@ -1188,12 +1239,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0010, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0010"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newDirUriTest2(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->Mkdir(parentUri, "test2", newDirUriTest2); @@ -1233,12 +1286,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0011, testing::ext: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0011"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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 newDirUriTest2(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1283,11 +1338,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0000, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0000"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1321,11 +1378,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0001, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0001"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri renameUri(""); @@ -1379,11 +1438,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0003, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0003"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1442,11 +1503,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0005, testing::ex { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0005"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1480,23 +1543,22 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0000, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0000"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - for (size_t j = 0; j < 2000; j++) - { - string fileName = "test" + ToString(j) + ".txt"; - fah->CreateFile(newDirUriTest, fileName, testUri); - } + result = fah->CreateFile(newDirUriTest, "file_extension_helper_ListFile_0000.txt", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::vector fileInfo = fah->ListFile(newDirUriTest); + std::vector fileInfo; + fah->ListFile(newDirUriTest, fileInfo); EXPECT_GT(fileInfo.size(), 0); - GTEST_LOG_(INFO) << "ListFile_0000 result:" << fileInfo.size() << endl; result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1521,9 +1583,9 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0001, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0001"; try { Uri sourceFileUri(""); - std::vector fileInfo = fah->ListFile(sourceFileUri); + std::vector fileInfo; + fah->ListFile(sourceFileUri, fileInfo); EXPECT_EQ(fileInfo.size(), 0); - GTEST_LOG_(INFO) << "ListFile_0001 result:" << fileInfo.size() << endl; } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } @@ -1543,11 +1605,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0002, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0002"; try { - vector info = fah->GetRoots(); + vector info; + int result = 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(""); - int result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1555,9 +1619,9 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0002, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); - std::vector fileInfo = fah->ListFile(sourceFileUri); + std::vector fileInfo; + fah->ListFile(sourceFileUri, fileInfo); EXPECT_EQ(fileInfo.size(), 0); - GTEST_LOG_(INFO) << "ListFile_0002 result:" << fileInfo.size() << endl; result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1582,9 +1646,9 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0003, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0003"; try { Uri sourceFileUri("~!@#$%^&*()_"); - std::vector fileInfo = fah->ListFile(sourceFileUri); + std::vector fileInfo; + fah->ListFile(sourceFileUri, fileInfo); EXPECT_EQ(fileInfo.size(), 0); - GTEST_LOG_(INFO) << "ListFile_0003 result:" << fileInfo.size() << endl; } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } @@ -1604,7 +1668,9 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_GetRoots_0000, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_GetRoots_0000"; try { - vector info = fah->GetRoots(); + vector info; + int result = fah->GetRoots(info); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_GT(info.size(), 0); GTEST_LOG_(INFO) << "GetRoots_0000 result:" << info.size() << endl; @@ -1639,14 +1705,16 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi vector wants = FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(); shared_ptr fahs = FileAccessHelper::Creator(remoteObj, wants); - vector info = fahs->GetRoots(); + vector info; + int result = fah->GetRoots(info); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { Uri parentUri = info[i].uri; string uri = parentUri.ToString(); GTEST_LOG_(INFO) << uri; Uri documentUri(""); - int result = fahs->Mkdir(parentUri, "Documents", documentUri); + result = fahs->Mkdir(parentUri, "Documents", documentUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newDirUriTest1(""); @@ -1668,11 +1736,12 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi result = fahs->Move(newFileUri, newDirUriTest2, moveUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fahs->OpenFile(moveUri, 0); + int fd; + result = fah->OpenFile(moveUri, 0, fd); EXPECT_GT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; - + result = fahs->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1700,13 +1769,15 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Access_0000, testing::ex try { uint64_t selfTokenId_ = GetSelfTokenID(); - vector info = fah->GetRoots(); + vector info; + int result = fah->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 newDirUriTest(""); - int result = fah->Mkdir(parentUri, "test1", newDirUriTest); + result = fah->Mkdir(parentUri, "test1", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index 2017724c..45b4eb91 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -305,8 +305,8 @@ napi_value NAPI_OpenFile(napi_env env, napi_callback_info info) string uriString(uri.get()); auto cbExec = [uriString, flags, result, fileAccessHelper]() -> NError { OHOS::Uri uri(uriString); - *result = fileAccessHelper->OpenFile(uri, flags); - return NError(ERRNO_NOERR); + int ret = fileAccessHelper->OpenFile(uri, flags, *result); + return NError(ret); }; auto cbComplete = [result](napi_env env, NError err) -> NVal { if (err) { @@ -612,8 +612,8 @@ napi_value NAPI_ListFile(napi_env env, napi_callback_info info) string uriString(uri.get()); auto cbExec = [uriString, result, fileAccessHelper]() -> NError { OHOS::Uri uri(uriString); - *result = fileAccessHelper->ListFile(uri); - return NError(ERRNO_NOERR); + int ret = fileAccessHelper->ListFile(uri, *result); + return NError(ret); }; auto cbComplete = [result](napi_env env, NError err) -> NVal { if (err) { @@ -652,8 +652,8 @@ napi_value NAPI_GetRoots(napi_env env, napi_callback_info info) auto result = std::make_shared>(); auto cbExec = [result, fileAccessHelper]() -> NError { - *result = fileAccessHelper->GetRoots(); - return NError(ERRNO_NOERR); + int ret = fileAccessHelper->GetRoots(*result); + return NError(ret); }; auto cbComplete = [result](napi_env env, NError err) -> NVal { if (err) { diff --git a/utils/file_access_framework_errno.h b/utils/file_access_framework_errno.h index d45271e8..25eab067 100644 --- a/utils/file_access_framework_errno.h +++ b/utils/file_access_framework_errno.h @@ -28,7 +28,6 @@ enum { ERR_OK = 0, ERR_IPC_ERROR = BASE_OFFSET, // ipc error ERR_PERMISSION_DENIED, // no permission - ERR_INVALID_FD, // invalid fd ERR_INVALID_URI, // invalid uri ERR_FILEIO_FAIL, // fileio fail ERR_PARAM_NUMBER, // Parameter number is abnormal @@ -39,7 +38,8 @@ enum { ERR_INVALID_NOTIFY, // invalid notify ERR_REMOVE_NOTIFY_FAIL, // remove notify fail ERR_NOTIFY_NOT_EXIST, // the notify is not exist - ERR_NOTIFY_FAIL // notify client fail + ERR_NOTIFY_FAIL, // notify client fail + ERR_PARCEL_FAIL // parcel fail }; } // namespace FileAccessFwk } // namespace OHOS -- Gitee From de265e2348cd777c89a0be607eef6663d07a1238 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Sat, 27 Aug 2022 18:39:03 +0800 Subject: [PATCH 057/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../file_access_module/napi_fileaccess_helper.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index 45b4eb91..2017724c 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -305,8 +305,8 @@ napi_value NAPI_OpenFile(napi_env env, napi_callback_info info) string uriString(uri.get()); auto cbExec = [uriString, flags, result, fileAccessHelper]() -> NError { OHOS::Uri uri(uriString); - int ret = fileAccessHelper->OpenFile(uri, flags, *result); - return NError(ret); + *result = fileAccessHelper->OpenFile(uri, flags); + return NError(ERRNO_NOERR); }; auto cbComplete = [result](napi_env env, NError err) -> NVal { if (err) { @@ -612,8 +612,8 @@ napi_value NAPI_ListFile(napi_env env, napi_callback_info info) string uriString(uri.get()); auto cbExec = [uriString, result, fileAccessHelper]() -> NError { OHOS::Uri uri(uriString); - int ret = fileAccessHelper->ListFile(uri, *result); - return NError(ret); + *result = fileAccessHelper->ListFile(uri); + return NError(ERRNO_NOERR); }; auto cbComplete = [result](napi_env env, NError err) -> NVal { if (err) { @@ -652,8 +652,8 @@ napi_value NAPI_GetRoots(napi_env env, napi_callback_info info) auto result = std::make_shared>(); auto cbExec = [result, fileAccessHelper]() -> NError { - int ret = fileAccessHelper->GetRoots(*result); - return NError(ret); + *result = fileAccessHelper->GetRoots(); + return NError(ERRNO_NOERR); }; auto cbComplete = [result](napi_env env, NError err) -> NVal { if (err) { -- Gitee From baa2e9ba7ecc958af60ad280afdabb1e93ca9829 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Sat, 27 Aug 2022 18:40:36 +0800 Subject: [PATCH 058/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../file_access_module/napi_fileaccess_helper.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index 2017724c..45b4eb91 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -305,8 +305,8 @@ napi_value NAPI_OpenFile(napi_env env, napi_callback_info info) string uriString(uri.get()); auto cbExec = [uriString, flags, result, fileAccessHelper]() -> NError { OHOS::Uri uri(uriString); - *result = fileAccessHelper->OpenFile(uri, flags); - return NError(ERRNO_NOERR); + int ret = fileAccessHelper->OpenFile(uri, flags, *result); + return NError(ret); }; auto cbComplete = [result](napi_env env, NError err) -> NVal { if (err) { @@ -612,8 +612,8 @@ napi_value NAPI_ListFile(napi_env env, napi_callback_info info) string uriString(uri.get()); auto cbExec = [uriString, result, fileAccessHelper]() -> NError { OHOS::Uri uri(uriString); - *result = fileAccessHelper->ListFile(uri); - return NError(ERRNO_NOERR); + int ret = fileAccessHelper->ListFile(uri, *result); + return NError(ret); }; auto cbComplete = [result](napi_env env, NError err) -> NVal { if (err) { @@ -652,8 +652,8 @@ napi_value NAPI_GetRoots(napi_env env, napi_callback_info info) auto result = std::make_shared>(); auto cbExec = [result, fileAccessHelper]() -> NError { - *result = fileAccessHelper->GetRoots(); - return NError(ERRNO_NOERR); + int ret = fileAccessHelper->GetRoots(*result); + return NError(ret); }; auto cbComplete = [result](napi_env env, NError err) -> NVal { if (err) { -- Gitee From 58c69f31285e8441e4bdb036b6f89473a26ea9ed Mon Sep 17 00:00:00 2001 From: chenkai008 Date: Mon, 29 Aug 2022 10:17:08 +0800 Subject: [PATCH 059/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9tdd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenkai008 --- .../file_access/test/file_access_helper_test.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 044271c7..02350763 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -1456,6 +1456,14 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_GetRoots_0000, testing::ext::T GTEST_LOG_(INFO) << info[0].type; } + string uri = "datashare:///media/root"; + string displayName = "LOCAL"; + uint32_t flag = 0; + + EXPECT_EQ(info[0].uri.ToString(), uri); + EXPECT_EQ(info[0].displayName, displayName); + EXPECT_EQ(info[0].type, DEVICE_LOCAL_DISK); + SetSelfTokenID(selfTokenId_); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; -- Gitee From a0f7d0d526f97a2d19a370ae93ac07cd42a8e7b0 Mon Sep 17 00:00:00 2001 From: chenkai008 Date: Mon, 29 Aug 2022 11:25:06 +0800 Subject: [PATCH 060/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9tdd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenkai008 --- .../innerkits/file_access/test/file_access_helper_test.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 02350763..f44359b5 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -1458,7 +1458,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_GetRoots_0000, testing::ext::T string uri = "datashare:///media/root"; string displayName = "LOCAL"; - uint32_t flag = 0; EXPECT_EQ(info[0].uri.ToString(), uri); EXPECT_EQ(info[0].displayName, displayName); -- Gitee From 59fe3fb3068d9cd719e88f127ce2ecf1445acb3f Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Mon, 29 Aug 2022 11:34:25 +0800 Subject: [PATCH 061/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../innerkits/file_access/test/file_access_helper_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index c455125e..faf8c18e 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -195,7 +195,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0001, testing::ext::T try { Uri uri(""); int fd; - int result = fah->OpenFile(newFileUri, 0, fd); + int result = fah->OpenFile(uri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0001 result:" << result << endl; } catch (...) { -- Gitee From 852446c24e883e7e5868405c81f6d979fbee0f77 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Mon, 29 Aug 2022 15:59:34 +0800 Subject: [PATCH 062/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../file_access/src/file_access_ext_proxy.cpp | 82 +++++++++++++++---- .../file_access/src/file_access_helper.cpp | 4 +- .../src/js_file_access_ext_ability.cpp | 12 +++ 3 files changed, 79 insertions(+), 19 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 46ac1cb3..66bccc49 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -55,16 +55,22 @@ int FileAccessExtProxy::OpenFile(const Uri &uri, const int flags, int &fd) return ERR_IPC_ERROR; } - int ret = reply.ReadInt32(); - if (ret != ERR_OK) { + int ret = ERR_OK; + if(!reply.ReadInt32(ret)){ HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + if (ret != ERR_OK) { + HILOG_ERROR("OpenFile operation failed ret : %{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } fd = reply.ReadFileDescriptor(); if (fd < ERR_OK) { - HILOG_ERROR("fail to ReadFileDescriptor fd"); + HILOG_ERROR("fail to ReadFileDescriptor fd: %{public}d", fd); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -104,10 +110,16 @@ int FileAccessExtProxy::CreateFile(const Uri &parent, const std::string &display return ERR_IPC_ERROR; } - int ret = reply.ReadInt32(); - if (ret != ERR_OK) { + int ret = ERR_OK; + if(!reply.ReadInt32(ret)){ HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + if (ret != ERR_OK) { + HILOG_ERROR("CreateFile operation failed ret : %{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -154,10 +166,16 @@ int FileAccessExtProxy::Mkdir(const Uri &parent, const std::string &displayName, return ERR_IPC_ERROR; } - int ret = reply.ReadInt32(); - if (ret != ERR_OK) { + int ret = ERR_OK; + if(!reply.ReadInt32(ret)){ HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + if (ret != ERR_OK) { + HILOG_ERROR("Mkdir operation failed ret : %{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -199,10 +217,16 @@ int FileAccessExtProxy::Delete(const Uri &sourceFile) return ERR_IPC_ERROR; } - int ret = reply.ReadInt32(); - if (ret != ERR_OK) { + int ret = ERR_OK; + if(!reply.ReadInt32(ret)){ HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + if (ret != ERR_OK) { + HILOG_ERROR("Delete operation failed ret : %{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -241,10 +265,16 @@ int FileAccessExtProxy::Move(const Uri &sourceFile, const Uri &targetParent, Uri return ERR_IPC_ERROR; } - int ret = reply.ReadInt32(); - if (ret != ERR_OK) { + int ret = ERR_OK; + if(!reply.ReadInt32(ret)){ HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + if (ret != ERR_OK) { + HILOG_ERROR("Move operation failed ret : %{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -291,10 +321,16 @@ int FileAccessExtProxy::Rename(const Uri &sourceFile, const std::string &display return ERR_IPC_ERROR; } - int ret = reply.ReadInt32(); - if (ret != ERR_OK) { + int ret = ERR_OK; + if(!reply.ReadInt32(ret)){ HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + if (ret != ERR_OK) { + HILOG_ERROR("Rename operation failed ret : %{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -335,10 +371,16 @@ int FileAccessExtProxy::ListFile(const Uri &sourceFile, std::vector &f return ERR_IPC_ERROR; } - int ret = reply.ReadInt32(); - if (ret != ERR_OK) { + int ret = ERR_OK; + if(!reply.ReadInt32(ret)){ HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + if (ret != ERR_OK) { + HILOG_ERROR("ListFile operation failed ret : %{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -373,10 +415,16 @@ int FileAccessExtProxy::GetRoots(std::vector &deviceInfo) return ERR_IPC_ERROR; } - int ret = reply.ReadInt32(); - if (ret != ERR_OK) { + int ret = ERR_OK; + if(!reply.ReadInt32(ret)){ HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + if (ret != ERR_OK) { + HILOG_ERROR("GetRoots operation failed ret : %{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 526a4752..951745d9 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -50,8 +50,8 @@ static bool GetBundleNameFromPath(const std::string &path, std::string &bundleNa } auto tmpPath = path.substr(1); - auto ret = tmpPath.find_first_of("/"); - bundleName = tmpPath.substr(0, ret); + auto index = tmpPath.find_first_of("/"); + bundleName = tmpPath.substr(0, index); if (bundleName.compare(MEDIA_BNUDLE_NAME_ALIAS) == 0) { bundleName = MEDIA_BNUDLE_NAME; } diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index 01191957..3e0d277c 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -382,6 +382,10 @@ int JsFileAccessExtAbility::OpenFile(const Uri &uri, int flags, int &fd) } fd = value->data; + if (fd <= ERR_OK) { + HILOG_ERROR("Failed to get file descriptor."); + return ERR_PARSER_FAIL; + } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; } @@ -687,6 +691,10 @@ int JsFileAccessExtAbility::ListFile(const Uri &sourceFile, std::vectordata; + if (fileInfo.size() == 0) { + HILOG_ERROR("Failed to get fileInfo."); + return ERR_PARSER_FAIL; + } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; } @@ -735,6 +743,10 @@ int JsFileAccessExtAbility::GetRoots(std::vector &deviceInfo) } deviceInfo = value->data; + if (deviceInfo.size() == 0) { + HILOG_ERROR("Failed to get deviceInfo."); + return ERR_PARSER_FAIL; + } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; } -- Gitee From 395a708638ace61d058dd9310b7fd5f1a9cf7283 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Mon, 29 Aug 2022 16:12:49 +0800 Subject: [PATCH 063/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../file_access/src/file_access_ext_proxy.cpp | 54 ++++++++++++------- .../src/js_file_access_ext_ability.cpp | 6 +-- 2 files changed, 37 insertions(+), 23 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 66bccc49..43525b21 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -56,7 +56,7 @@ int FileAccessExtProxy::OpenFile(const Uri &uri, const int flags, int &fd) } int ret = ERR_OK; - if(!reply.ReadInt32(ret)){ + if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; @@ -111,7 +111,7 @@ int FileAccessExtProxy::CreateFile(const Uri &parent, const std::string &display } int ret = ERR_OK; - if(!reply.ReadInt32(ret)){ + if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; @@ -167,7 +167,7 @@ int FileAccessExtProxy::Mkdir(const Uri &parent, const std::string &displayName, } int ret = ERR_OK; - if(!reply.ReadInt32(ret)){ + if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; @@ -218,7 +218,7 @@ int FileAccessExtProxy::Delete(const Uri &sourceFile) } int ret = ERR_OK; - if(!reply.ReadInt32(ret)){ + if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; @@ -266,7 +266,7 @@ int FileAccessExtProxy::Move(const Uri &sourceFile, const Uri &targetParent, Uri } int ret = ERR_OK; - if(!reply.ReadInt32(ret)){ + if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; @@ -322,7 +322,7 @@ int FileAccessExtProxy::Rename(const Uri &sourceFile, const std::string &display } int ret = ERR_OK; - if(!reply.ReadInt32(ret)){ + if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; @@ -372,7 +372,7 @@ int FileAccessExtProxy::ListFile(const Uri &sourceFile, std::vector &f } int ret = ERR_OK; - if(!reply.ReadInt32(ret)){ + if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; @@ -416,7 +416,7 @@ int FileAccessExtProxy::GetRoots(std::vector &deviceInfo) } int ret = ERR_OK; - if(!reply.ReadInt32(ret)){ + if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; @@ -466,10 +466,16 @@ int FileAccessExtProxy::Access(const Uri &uri, bool &isExist) return ERR_IPC_ERROR; } - int ret = reply.ReadInt32(); - if (ret != ERR_OK) { + int ret = ERR_OK; + if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + if (ret != ERR_OK) { + HILOG_ERROR("Access operation failed ret : %{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -503,11 +509,17 @@ int FileAccessExtProxy::RegisterNotify(sptr ¬ify) return ERR_IPC_ERROR; } - err = reply.ReadInt32(); - if (err != ERR_OK) { - HILOG_ERROR("fail to RegisterNotify. err: %{public}d", err); + int ret = ERR_OK; + if (!reply.ReadInt32(ret)) { + HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return err; + return ERR_PARCEL_FAIL; + } + + if (ret != ERR_OK) { + HILOG_ERROR("RegisterNotify operation failed ret : %{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; @@ -538,11 +550,17 @@ int FileAccessExtProxy::UnregisterNotify(sptr ¬ify) return ERR_IPC_ERROR; } - err = reply.ReadInt32(); - if (err != ERR_OK) { - HILOG_ERROR("fail to UnregisterNotify. err: %{public}d", err); + int ret = ERR_OK; + if (!reply.ReadInt32(ret)) { + HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return err; + return ERR_PARCEL_FAIL; + } + + if (ret != ERR_OK) { + HILOG_ERROR("UnregisterNotify operation failed ret : %{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index 3e0d277c..95eeec74 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -685,16 +685,12 @@ int JsFileAccessExtAbility::ListFile(const Uri &sourceFile, std::vectorcode != ERR_OK) { + if (value->code != ERR_OK || value->data.size() == 0) { HILOG_ERROR("fileio fail."); return ERR_FILEIO_FAIL; } fileInfo = value->data; - if (fileInfo.size() == 0) { - HILOG_ERROR("Failed to get fileInfo."); - return ERR_PARSER_FAIL; - } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; } -- Gitee From 6c3823409b47558481a58e63b4ffc9aa818976c3 Mon Sep 17 00:00:00 2001 From: chenkai008 Date: Mon, 29 Aug 2022 19:10:34 +0800 Subject: [PATCH 064/122] =?UTF-8?q?=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenkai008 --- .../file_access/include/file_access_helper.h | 2 +- .../file_access/src/file_access_helper.cpp | 4 ++-- .../test/file_access_helper_test.cpp | 16 +++++++++++++--- .../test/file_extension_helper_test.cpp | 19 +++++++++++++++---- .../napi_fileaccess_helper.cpp | 8 ++++---- 5 files changed, 35 insertions(+), 14 deletions(-) diff --git a/frameworks/innerkits/file_access/include/file_access_helper.h b/frameworks/innerkits/file_access/include/file_access_helper.h index c325a7c5..77b80321 100644 --- a/frameworks/innerkits/file_access/include/file_access_helper.h +++ b/frameworks/innerkits/file_access/include/file_access_helper.h @@ -48,7 +48,7 @@ class FileAccessHelper final : public std::enable_shared_from_this &wantVec); + static int GetRegisteredFileAccessExtAbilityInfo(std::vector &wantVec); // create and connect all ability static std::shared_ptr Creator(const std::shared_ptr &context); // create and connect with want, if created, only connect with want diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 8de13dc4..084cfb62 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -584,14 +584,14 @@ std::vector FileAccessHelper::GetRoots() return rootsInfo; } -int FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(std::vector &wantVec) +int FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(std::vector &wantVec) { std::vector extensionInfos; sptr bm = FileAccessHelper::GetBundleMgrProxy(); bool ret = bm->QueryExtensionAbilityInfos( AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, DEFAULT_USERID, extensionInfos); if (!ret) { - HILOG_ERROR("FileAccessHelper::GetRegisterFileAccessExtAbilityInfo QueryExtensionAbilityInfos error"); + HILOG_ERROR("FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo QueryExtensionAbilityInfos error"); return ERR_QUERY_EXTENSIONINFOS_FAIL; } diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index f44359b5..7c81a9e5 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -42,10 +42,20 @@ public: auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); AAFwk::Want want; - want.SetElementName("com.ohos.medialibrary.medialibrarydata", "FileExtensionAbility"); - vector wants {want}; vector wantVec; - FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(wantVec); + int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(wantVec); + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); + bool sus =false; + for (size_t i = 0; i < wantVec.size(); i++) { + auto element = wantVec[i].GetElement(); + if (element.GetBundleName() == "com.ohos.medialibrary.medialibrarydata" && + element.GetAbilityName() == "FileExtensionAbility") { + want = wantVec[i]; + sus = true; + } + } + EXPECT_TRUE(sus); + vector wants {want}; fah = FileAccessHelper::Creator(remoteObj, wants); } static void TearDownTestCase() {}; diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index d87f61f1..28378cca 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -40,10 +40,20 @@ public: auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); AAFwk::Want want; - want.SetElementName("com.ohos.UserFile.ExternalFileManager", "FileExtensionAbility"); - vector wants {want}; vector wantVec; - FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(wantVec); + int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(wantVec); + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); + bool sus =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]; + sus = true; + } + } + EXPECT_TRUE(sus); + vector wants {want}; fah = FileAccessHelper::Creator(remoteObj, wants); } static void TearDownTestCase() {}; @@ -1638,7 +1648,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); vector wants; - FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(wants); + int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(wants); + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); shared_ptr fahs = FileAccessHelper::Creator(remoteObj, wants); vector info = fahs->GetRoots(); diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index 25e4a69f..2c370c5b 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -164,7 +164,7 @@ napi_value NAPI_CreateFileAccessHelper(napi_env env, napi_callback_info info) return ret; } -napi_value NAPI_GetRegisterFileAccessExtAbilityInfo(napi_env env, napi_callback_info info) +napi_value NAPI_GetFileAccessAbilityInfo(napi_env env, napi_callback_info info) { NFuncArg funcArg(env, info); if (!funcArg.InitArgs(NARG_CNT::ZERO, NARG_CNT::ONE)) { @@ -174,7 +174,7 @@ napi_value NAPI_GetRegisterFileAccessExtAbilityInfo(napi_env env, napi_callback_ auto result = std::make_shared>(); auto cbExec = [result]() -> NError { - int ret = FileAccessHelper::GetRegisterFileAccessExtAbilityInfo(*result); + int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(*result); return NError(ret); }; auto cbComplete = [result](napi_env env, NError err) -> NVal { @@ -184,7 +184,7 @@ napi_value NAPI_GetRegisterFileAccessExtAbilityInfo(napi_env env, napi_callback_ napi_value jsArray = WrapArrayWantToJS(env, *result); return {env, jsArray}; }; - const std::string procedureName = "getRegisterFileAccessExtAbilityInfo"; + const std::string procedureName = "getFileAccessAbilityInfo"; NVal thisVar(env, funcArg.GetThisVar()); if (funcArg.GetArgc() == NARG_CNT::ZERO) { return NAsyncWorkPromise(env, thisVar).Schedule(procedureName, cbExec, cbComplete).val_; @@ -228,7 +228,7 @@ napi_value FileAccessHelperInit(napi_env env, napi_value exports) napi_property_descriptor export_properties[] = { DECLARE_NAPI_FUNCTION("createFileAccessHelper", NAPI_CreateFileAccessHelper), - DECLARE_NAPI_FUNCTION("getRegisterFileAccessExtAbilityInfo", NAPI_GetRegisterFileAccessExtAbilityInfo), + DECLARE_NAPI_FUNCTION("getFileAccessAbilityInfo", NAPI_GetFileAccessAbilityInfo), }; NAPI_CALL(env, napi_define_properties(env, exports, sizeof(export_properties) / sizeof(export_properties[0]), export_properties)); -- Gitee From e53a59ea5714d44711668ef7f6c98189095de550 Mon Sep 17 00:00:00 2001 From: chenkai008 Date: Mon, 29 Aug 2022 19:31:23 +0800 Subject: [PATCH 065/122] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenkai008 --- .../innerkits/file_access/test/file_access_helper_test.cpp | 2 +- .../innerkits/file_access/test/file_extension_helper_test.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 7c81a9e5..176c6e8e 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -45,7 +45,7 @@ public: vector wantVec; int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(wantVec); EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); - bool sus =false; + bool sus = false; for (size_t i = 0; i < wantVec.size(); i++) { auto element = wantVec[i].GetElement(); if (element.GetBundleName() == "com.ohos.medialibrary.medialibrarydata" && diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index 28378cca..bec715d2 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -43,7 +43,7 @@ public: vector wantVec; int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(wantVec); EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); - bool sus =false; + bool sus = false; for (size_t i = 0; i < wantVec.size(); i++) { auto element = wantVec[i].GetElement(); if (element.GetBundleName() == "com.ohos.UserFile.ExternalFileManager" && -- Gitee From 969cecacb8e8b2bf5ad833d052e1ff30bb0a6dcd Mon Sep 17 00:00:00 2001 From: chenkai008 Date: Mon, 29 Aug 2022 21:48:45 +0800 Subject: [PATCH 066/122] add break Signed-off-by: chenkai008 --- .../innerkits/file_access/test/file_access_helper_test.cpp | 1 + .../innerkits/file_access/test/file_extension_helper_test.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 176c6e8e..3f28b905 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -52,6 +52,7 @@ public: element.GetAbilityName() == "FileExtensionAbility") { want = wantVec[i]; sus = true; + break; } } EXPECT_TRUE(sus); diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index bec715d2..39886977 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -50,6 +50,7 @@ public: element.GetAbilityName() == "FileExtensionAbility") { want = wantVec[i]; sus = true; + break; } } EXPECT_TRUE(sus); -- Gitee From 5186040aeeefc50dd2286e03b92c0766ac436184 Mon Sep 17 00:00:00 2001 From: chenkai008 Date: Tue, 30 Aug 2022 12:45:00 +0800 Subject: [PATCH 067/122] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenkai008 --- .../innerkits/file_access/test/file_access_helper_test.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index e93d2dbe..03155167 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -1468,10 +1468,12 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_GetRoots_0000, testing::ext::T string uri = "datashare:///media/root"; string displayName = "LOCAL"; + uint32_t flag = 0; EXPECT_EQ(info[0].uri, uri); EXPECT_EQ(info[0].displayName, displayName); - EXPECT_EQ(info[0].type, DEVICE_LOCAL_DISK); + EXPECT_EQ(info[0].deviceFlags, flag); + EXPECT_EQ(info[0].deviceType, DEVICE_LOCAL_DISK); SetSelfTokenID(selfTokenId_); } catch (...) { -- Gitee From 17a4364e79ef148c25795a6288b8a5c85561cf8b Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Tue, 30 Aug 2022 21:12:00 +0800 Subject: [PATCH 068/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=A0=81=E8=BF=94=E5=9B=9E=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../file_access/src/file_access_ext_proxy.cpp | 39 +++++++++++++------ .../file_access/src/file_access_ext_stub.cpp | 16 ++++---- .../src/js_file_access_ext_ability.cpp | 14 ++++--- utils/file_access_framework_errno.h | 3 +- 4 files changed, 46 insertions(+), 26 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 5966e19d..a9799a34 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -52,7 +52,7 @@ int FileAccessExtProxy::OpenFile(const Uri &uri, const int flags, int &fd) if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return err; } int ret = ERR_OK; @@ -107,7 +107,7 @@ int FileAccessExtProxy::CreateFile(const Uri &parent, const std::string &display if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return err; } int ret = ERR_OK; @@ -131,6 +131,10 @@ int FileAccessExtProxy::CreateFile(const Uri &parent, const std::string &display } newFile = Uri(*tempUri); + if (newFile.ToString() == "") { + HILOG_ERROR("get uri is empty."); + return ERR_INVALID_RESULT; + } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; } @@ -163,7 +167,7 @@ int FileAccessExtProxy::Mkdir(const Uri &parent, const std::string &displayName, if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return err; } int ret = ERR_OK; @@ -182,12 +186,15 @@ int FileAccessExtProxy::Mkdir(const Uri &parent, const std::string &displayName, std::unique_ptr tempUri(reply.ReadParcelable()); if (tempUri == nullptr) { HILOG_ERROR("ReadParcelable value is nullptr."); - ret = ERR_IPC_ERROR; FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } newFile = Uri(*tempUri); + if (newFile.ToString() == "") { + HILOG_ERROR("get uri is empty."); + return ERR_INVALID_RESULT; + } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; } @@ -214,7 +221,7 @@ int FileAccessExtProxy::Delete(const Uri &sourceFile) if (err != NO_ERROR) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return err; } int ret = ERR_OK; @@ -262,7 +269,7 @@ int FileAccessExtProxy::Move(const Uri &sourceFile, const Uri &targetParent, Uri if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return err; } int ret = ERR_OK; @@ -286,6 +293,10 @@ int FileAccessExtProxy::Move(const Uri &sourceFile, const Uri &targetParent, Uri } newFile = Uri(*tempUri); + if (newFile.ToString() == "") { + HILOG_ERROR("get uri is empty."); + return ERR_INVALID_RESULT; + } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; } @@ -318,7 +329,7 @@ int FileAccessExtProxy::Rename(const Uri &sourceFile, const std::string &display if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return err; } int ret = ERR_OK; @@ -342,6 +353,10 @@ int FileAccessExtProxy::Rename(const Uri &sourceFile, const std::string &display } newFile = Uri(*tempUri); + if (newFile.ToString() == "") { + HILOG_ERROR("get uri is empty."); + return ERR_INVALID_RESULT; + } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; } @@ -368,7 +383,7 @@ int FileAccessExtProxy::ListFile(const Uri &sourceFile, std::vector &f if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return err; } int ret = ERR_OK; @@ -412,7 +427,7 @@ int FileAccessExtProxy::GetRoots(std::vector &rootInfo) if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return err; } int ret = ERR_OK; @@ -463,7 +478,7 @@ int FileAccessExtProxy::Access(const Uri &uri, bool &isExist) if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return err; } int ret = ERR_OK; @@ -506,7 +521,7 @@ int FileAccessExtProxy::RegisterNotify(sptr ¬ify) if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return err; } int ret = ERR_OK; @@ -547,7 +562,7 @@ int FileAccessExtProxy::UnregisterNotify(sptr ¬ify) if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return err; } int ret = ERR_OK; diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp index 40915ac7..b4ef701b 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp @@ -368,13 +368,13 @@ ErrCode FileAccessExtStub::CmdAccess(MessageParcel &data, MessageParcel &reply) if (!reply.WriteInt32(ret)) { HILOG_ERROR("parameter Access fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } if (!reply.WriteBool(isExist)) { HILOG_ERROR("parameter Access fail to WriteBool type"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -403,21 +403,21 @@ ErrCode FileAccessExtStub::CmdRegisterNotify(MessageParcel &data, MessageParcel if (remote == nullptr) { HILOG_INFO("get remote obj fail."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } auto notify = iface_cast(remote); if (notify == nullptr) { HILOG_INFO("get notify fail"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } int ret = RegisterNotify(notify); if (!reply.WriteInt32(ret)) { HILOG_ERROR("WriteInt32 failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; @@ -430,21 +430,21 @@ ErrCode FileAccessExtStub::CmdUnregisterNotify(MessageParcel &data, MessageParce if (remote == nullptr) { HILOG_INFO("get remote obj fail."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } auto notify = iface_cast(remote); if (notify == nullptr) { HILOG_INFO("get notify fail"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } int ret = UnregisterNotify(notify); if (!reply.WriteInt32(ret)) { HILOG_ERROR("WriteInt32 failed"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ERR_PARCEL_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index c0b5d539..ca9cf30f 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -681,6 +681,10 @@ static bool ParserListFileJsResult(NativeEngine &engine, NativeValue *nativeValu bool ret = ConvertFromJsValue(engine, obj->GetProperty("code"), result->code); NativeArray *nativeArray = ConvertNativeValueTo(obj->GetProperty("infos")); + if (nativeArray == nullptr) { + HILOG_ERROR("nativeArray is nullptr"); + return false; + } for (uint32_t i = 0; i < nativeArray->GetLength(); i++) { NativeValue *nativeFileInfo = nativeArray->GetElement(i); if (nativeFileInfo == nullptr) { @@ -749,7 +753,7 @@ int JsFileAccessExtAbility::ListFile(const Uri &sourceFile, std::vectorcode != ERR_OK || value->data.size() == 0) { + if (value->code != ERR_OK) { HILOG_ERROR("fileio fail."); return ERR_FILEIO_FAIL; } @@ -776,6 +780,10 @@ int JsFileAccessExtAbility::GetRoots(std::vector &rootInfo) bool ret = ConvertFromJsValue(engine, obj->GetProperty("code"), value->code); NativeArray *nativeArray = ConvertNativeValueTo(obj->GetProperty("roots")); + if (nativeArray == nullptr) { + HILOG_ERROR("nativeArray is nullptr"); + return false; + } for (uint32_t i = 0; i < nativeArray->GetLength(); i++) { NativeValue *nativeRootInfo = nativeArray->GetElement(i); if (nativeRootInfo == nullptr) { @@ -815,10 +823,6 @@ int JsFileAccessExtAbility::GetRoots(std::vector &rootInfo) } rootInfo = value->data; - if (rootInfo.size() == 0) { - HILOG_ERROR("Failed to get rootInfo."); - return ERR_PARSER_FAIL; - } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; } diff --git a/utils/file_access_framework_errno.h b/utils/file_access_framework_errno.h index e5f73f31..cd4b15e8 100644 --- a/utils/file_access_framework_errno.h +++ b/utils/file_access_framework_errno.h @@ -40,7 +40,8 @@ enum { ERR_NOTIFY_NOT_EXIST, // the notify is not exist ERR_NOTIFY_FAIL, // notify client fail ERR_QUERY_EXTENSIONINFOS_FAIL, // QueryExtensionAbilityInfos fail - ERR_PARCEL_FAIL // parcel fail + ERR_PARCEL_FAIL, // parcel fail + ERR_INVALID_RESULT // code success result fail }; } // namespace FileAccessFwk } // namespace OHOS -- Gitee From 4872c1545371d60fae76a274b3ca98fcc9cb7c8f Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Tue, 30 Aug 2022 21:22:36 +0800 Subject: [PATCH 069/122] clean codecheck Signed-off-by: onexiaomin --- .../file_access/src/js_file_access_ext_ability.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index ca9cf30f..7cb5ec03 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -812,13 +812,8 @@ int JsFileAccessExtAbility::GetRoots(std::vector &rootInfo) }; auto errCode = CallJsMethod("getRoots", jsRuntime_, jsObj_.get(), argParser, retParser); - if (errCode != ERR_OK) { - HILOG_ERROR("CallJsMethod error, code:%{public}d.", errCode); - return errCode; - } - - if (value->code != ERR_OK) { - HILOG_ERROR("fileio fail."); + if (errCode != ERR_OK || value->code != ERR_OK) { + HILOG_ERROR("CallJsMethod error, code:%{public}d, or fileio fail.", errCode); return ERR_FILEIO_FAIL; } -- Gitee From 5f7ba92710688d03adb700f3a35d20d8795dd737 Mon Sep 17 00:00:00 2001 From: zhang-daiyue Date: Tue, 30 Aug 2022 21:44:24 +0800 Subject: [PATCH 070/122] Fix userfilemgr dependencies Signed-off-by: zhang-daiyue Change-Id: If142524ad7f2b481fe759d9666dcc3fa65833091 --- services/test/BUILD.gn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/test/BUILD.gn b/services/test/BUILD.gn index fe28dfeb..1ab8e2a5 100644 --- a/services/test/BUILD.gn +++ b/services/test/BUILD.gn @@ -26,6 +26,7 @@ ohos_unittest("file_manager_proxy_test") { "$FMS_BASE_DIR/src/server", "$FMS_BASE_DIR/src/fileoper", "//third_party/googletest/googlemock/include/gmock", + "//foundation/multimedia/media_library/frameworks/utils/include", "//foundation/multimedia/media_library/interfaces/inner_api/media_library_helper/include", ] @@ -59,6 +60,7 @@ ohos_unittest("oper_factory_test") { "$FMS_BASE_DIR/src/client", "$FMS_BASE_DIR/src/server", "$FMS_BASE_DIR/src/fileoper", + "//foundation/multimedia/media_library/frameworks/utils/include", "//foundation/multimedia/media_library/interfaces/inner_api/media_library_helper/include", ] @@ -92,6 +94,7 @@ ohos_unittest("file_manager_service_test") { "$FMS_BASE_DIR/src/client", "$FMS_BASE_DIR/src/server", "$FMS_BASE_DIR/src/fileoper", + "//foundation/multimedia/media_library/frameworks/utils/include", "//foundation/multimedia/media_library/interfaces/inner_api/media_library_helper/include", ] -- Gitee From e294a751bbfd214ec0784b12b7ca51187dd1cfe8 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Wed, 31 Aug 2022 09:18:30 +0800 Subject: [PATCH 071/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9TDD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../innerkits/file_access/test/file_access_helper_test.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 00dd8c2b..9911ab34 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -1483,7 +1483,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_GetRoots_0000, testing::ext::T string uri = "datashare:///media/root"; string displayName = "LOCAL"; - uint32_t flag = 0; EXPECT_EQ(info[0].uri, uri); EXPECT_EQ(info[0].displayName, displayName); -- Gitee From 125ec5e5df952c0cf264e2346786edc50e26d97f Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Wed, 31 Aug 2022 14:33:46 +0800 Subject: [PATCH 072/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../file_access/src/file_access_ext_proxy.cpp | 26 ++--- .../file_access/src/file_access_ext_stub.cpp | 102 +++++++++++------- 2 files changed, 74 insertions(+), 54 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index a9799a34..9daf231b 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -41,7 +41,7 @@ int FileAccessExtProxy::OpenFile(const Uri &uri, const int flags, int &fd) } if (!data.WriteUint32(flags)) { - HILOG_ERROR("fail to WriteString mode"); + HILOG_ERROR("fail to WriteUint32 flags"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -55,7 +55,7 @@ int FileAccessExtProxy::OpenFile(const Uri &uri, const int flags, int &fd) return err; } - int ret = ERR_OK; + int ret = ERR_PARCEL_FAIL; if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -96,7 +96,7 @@ int FileAccessExtProxy::CreateFile(const Uri &parent, const std::string &display } if (!data.WriteString(displayName)) { - HILOG_ERROR("fail to WriteString mode"); + HILOG_ERROR("fail to WriteString displayName"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -110,7 +110,7 @@ int FileAccessExtProxy::CreateFile(const Uri &parent, const std::string &display return err; } - int ret = ERR_OK; + int ret = ERR_PARCEL_FAIL; if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -170,7 +170,7 @@ int FileAccessExtProxy::Mkdir(const Uri &parent, const std::string &displayName, return err; } - int ret = ERR_OK; + int ret = ERR_PARCEL_FAIL; if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -224,7 +224,7 @@ int FileAccessExtProxy::Delete(const Uri &sourceFile) return err; } - int ret = ERR_OK; + int ret = ERR_PARCEL_FAIL; if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -272,7 +272,7 @@ int FileAccessExtProxy::Move(const Uri &sourceFile, const Uri &targetParent, Uri return err; } - int ret = ERR_OK; + int ret = ERR_PARCEL_FAIL; if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -332,7 +332,7 @@ int FileAccessExtProxy::Rename(const Uri &sourceFile, const std::string &display return err; } - int ret = ERR_OK; + int ret = ERR_PARCEL_FAIL; if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -386,7 +386,7 @@ int FileAccessExtProxy::ListFile(const Uri &sourceFile, std::vector &f return err; } - int ret = ERR_OK; + int ret = ERR_PARCEL_FAIL; if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -430,7 +430,7 @@ int FileAccessExtProxy::GetRoots(std::vector &rootInfo) return err; } - int ret = ERR_OK; + int ret = ERR_PARCEL_FAIL; if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -481,7 +481,7 @@ int FileAccessExtProxy::Access(const Uri &uri, bool &isExist) return err; } - int ret = ERR_OK; + int ret = ERR_PARCEL_FAIL; if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -524,7 +524,7 @@ int FileAccessExtProxy::RegisterNotify(sptr ¬ify) return err; } - int ret = ERR_OK; + int ret = ERR_PARCEL_FAIL; if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -565,7 +565,7 @@ int FileAccessExtProxy::UnregisterNotify(sptr ¬ify) return err; } - int ret = ERR_OK; + int ret = ERR_PARCEL_FAIL; if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp index b4ef701b..483ded8b 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp @@ -90,28 +90,33 @@ ErrCode FileAccessExtStub::CmdOpenFile(MessageParcel &data, MessageParcel &reply StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdOpenFile"); std::shared_ptr uri(data.ReadParcelable()); if (uri == nullptr) { - HILOG_ERROR("parameter-uri is nullptr"); + HILOG_ERROR("Parameter OpenFile fail to ReadParcelable uri"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } - int flags = data.ReadInt32(); + int flags = ERR_PARCEL_FAIL; + if (data.ReadInt32(flags)) { + HILOG_ERROR("Parameter OpenFile fail to ReadInt32 flags"); + return ERR_PARCEL_FAIL; + } + if (flags < 0) { - HILOG_ERROR("parameter OpenFile flags is invalid"); + HILOG_ERROR("Parameter OpenFile flags is invalid"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_PARCEL_FAIL; + return ERR_INVALID_PARAM; } int fd; int ret = OpenFile(*uri, flags, fd); if (!reply.WriteInt32(ret)) { - HILOG_ERROR("parameter OpenFile fail to WriteInt32 ret"); + HILOG_ERROR("Parameter OpenFile fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } if (!reply.WriteFileDescriptor(fd)) { - HILOG_ERROR("OpenFile fail to WriteFileDescriptor fd"); + HILOG_ERROR("Parameter OpenFile fail to WriteFileDescriptor fd"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -125,29 +130,34 @@ ErrCode FileAccessExtStub::CmdCreateFile(MessageParcel &data, MessageParcel &rep StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdCreateFile"); std::shared_ptr parent(data.ReadParcelable()); if (parent == nullptr) { - HILOG_ERROR("parameter-parent is nullptr"); + HILOG_ERROR("Parameter CreateFile fail to ReadParcelable parent"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } - std::string displayName = data.ReadString(); + std::string displayName = ""; + if (data.ReadString(displayName)) { + HILOG_ERROR("Parameter CreateFile fail to ReadString displayName"); + return ERR_PARCEL_FAIL; + } + if (displayName.empty()) { - HILOG_ERROR("parameter CreateFile displayName is nullptr"); + HILOG_ERROR("Parameter CreateFile displayName is empty"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_PARCEL_FAIL; + return ERR_INVALID_PARAM; } std::string newFile = ""; OHOS::Uri newFileUri(newFile); int ret = CreateFile(*parent, displayName, newFileUri); if (!reply.WriteInt32(ret)) { - HILOG_ERROR("parameter CreateFile fail to WriteInt32 ret"); + HILOG_ERROR("Parameter CreateFile fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } if (!reply.WriteParcelable(&newFileUri)) { - HILOG_ERROR("parameter CreateFile fail to WriteParcelable type"); + HILOG_ERROR("Parameter CreateFile fail to WriteParcelable newFileUri"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -161,29 +171,34 @@ ErrCode FileAccessExtStub::CmdMkdir(MessageParcel &data, MessageParcel &reply) StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdMkdir"); std::shared_ptr parent(data.ReadParcelable()); if (parent == nullptr) { - HILOG_ERROR("parameter Mkdir parent is nullptr"); + HILOG_ERROR("Parameter Mkdir fail to ReadParcelable parent"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } - std::string displayName = data.ReadString(); + std::string displayName = ""; + if (data.ReadString(displayName)) { + HILOG_ERROR("Parameter Mkdir fail to ReadString displayName"); + return ERR_PARCEL_FAIL; + } + if (displayName.empty()) { - HILOG_ERROR("parameter Mkdir mode is nullptr"); + HILOG_ERROR("Parameter Mkdir displayName is empty"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_PARCEL_FAIL; + return ERR_INVALID_PARAM; } std::string newFile = ""; OHOS::Uri newFileUri(newFile); int ret = Mkdir(*parent, displayName, newFileUri); if (!reply.WriteInt32(ret)) { - HILOG_ERROR("parameter Mkdir fail to WriteInt32 ret"); + HILOG_ERROR("Parameter Mkdir fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } if (!reply.WriteParcelable(&newFileUri)) { - HILOG_ERROR("parameter Mkdir fail to WriteParcelable type"); + HILOG_ERROR("Parameter Mkdir fail to WriteParcelable newFileUri"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -197,14 +212,14 @@ ErrCode FileAccessExtStub::CmdDelete(MessageParcel &data, MessageParcel &reply) StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdDelete"); std::shared_ptr uri(data.ReadParcelable()); if (uri == nullptr) { - HILOG_ERROR("parameter Delete uri is nullptr"); + HILOG_ERROR("Parameter Delete fail to ReadParcelable uri"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } int ret = Delete(*uri); if (!reply.WriteInt32(ret)) { - HILOG_ERROR("parameter Delete fail to WriteInt32 ret"); + HILOG_ERROR("Parameter Delete fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -218,14 +233,14 @@ ErrCode FileAccessExtStub::CmdMove(MessageParcel &data, MessageParcel &reply) StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdMove"); std::shared_ptr sourceFile(data.ReadParcelable()); if (sourceFile == nullptr) { - HILOG_ERROR("parameter Move sourceFile is nullptr"); + HILOG_ERROR("Parameter Move fail to ReadParcelable sourceFile"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } std::shared_ptr targetParent(data.ReadParcelable()); if (targetParent == nullptr) { - HILOG_ERROR("parameter Move targetParent is nullptr"); + HILOG_ERROR("Parameter Move fail to ReadParcelable targetParent"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -234,13 +249,13 @@ ErrCode FileAccessExtStub::CmdMove(MessageParcel &data, MessageParcel &reply) OHOS::Uri newFileUri(newFile); int ret = Move(*sourceFile, *targetParent, newFileUri); if (!reply.WriteInt32(ret)) { - HILOG_ERROR("parameter Move fail to WriteInt32 ret"); + HILOG_ERROR("Parameter Move fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } if (!reply.WriteParcelable(&newFileUri)) { - HILOG_ERROR("parameter Move fail to WriteParcelable type"); + HILOG_ERROR("Parameter Move fail to WriteParcelable newFileUri"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -254,29 +269,34 @@ ErrCode FileAccessExtStub::CmdRename(MessageParcel &data, MessageParcel &reply) StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdRename"); std::shared_ptr sourceFile(data.ReadParcelable()); if (sourceFile == nullptr) { - HILOG_ERROR("parameter Rename sourceFileUri is nullptr"); + HILOG_ERROR("Parameter Rename fail to ReadParcelable sourceFile"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } - std::string displayName = data.ReadString(); + std::string displayName = ""; + if (data.ReadString(displayName)) { + HILOG_ERROR("Parameter Rename fail to ReadString displayName"); + return ERR_PARCEL_FAIL; + } + if (displayName.empty()) { - HILOG_ERROR("parameter Rename mode is nullptr"); + HILOG_ERROR("Parameter Rename displayName is empty"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_PARCEL_FAIL; + return ERR_INVALID_PARAM; } std::string newFile = ""; OHOS::Uri newFileUri(newFile); int ret = Rename(*sourceFile, displayName, newFileUri); if (!reply.WriteInt32(ret)) { - HILOG_ERROR("parameter Rename fail to WriteInt32 ret"); + HILOG_ERROR("Parameter Rename fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } if (!reply.WriteParcelable(&newFileUri)) { - HILOG_ERROR("parameter Rename fail to WriteParcelable type"); + HILOG_ERROR("Parameter Rename fail to WriteParcelable newFileUri"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -290,7 +310,7 @@ ErrCode FileAccessExtStub::CmdListFile(MessageParcel &data, MessageParcel &reply StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdListFile"); std::shared_ptr uri(data.ReadParcelable()); if (uri == nullptr) { - HILOG_ERROR("parameter CmdListFile uri is nullptr"); + HILOG_ERROR("Parameter ListFile fail to ReadParcelable sourceFile"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -298,21 +318,21 @@ ErrCode FileAccessExtStub::CmdListFile(MessageParcel &data, MessageParcel &reply std::vector fileInfo; int ret = ListFile(*uri, fileInfo); if (!reply.WriteInt32(ret)) { - HILOG_ERROR("parameter CmdListFile fail to WriteInt32 ret"); + HILOG_ERROR("Parameter ListFile fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } uint64_t count = fileInfo.size(); if (!reply.WriteUint64(count)) { - HILOG_ERROR("parameter CmdListFile fail to WriteUint64 ret"); + HILOG_ERROR("Parameter ListFile fail to WriteUint64 count"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } for (uint64_t i = 0; i < count; i++) { if (!reply.WriteParcelable(&fileInfo[i])) { - HILOG_ERROR("parameter CmdListFile fail to WriteParcelable vec"); + HILOG_ERROR("Parameter ListFile fail to WriteParcelable fileInfo"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -329,21 +349,21 @@ ErrCode FileAccessExtStub::CmdGetRoots(MessageParcel &data, MessageParcel &reply std::vector rootInfo; int ret = GetRoots(rootInfo); if (!reply.WriteInt32(ret)) { - HILOG_ERROR("parameter CmdGetRoots fail to WriteInt32 ret"); + HILOG_ERROR("Parameter GetRoots fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } uint64_t count = rootInfo.size(); if (!reply.WriteUint64(count)) { - HILOG_ERROR("parameter CmdGetRoots fail to WriteUint64 ret"); + HILOG_ERROR("Parameter GetRoots fail to WriteUint64 count"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } for (uint64_t i = 0; i < count; i++) { if (!reply.WriteParcelable(&rootInfo[i])) { - HILOG_ERROR("parameter CmdGetRoots fail to WriteParcelable vec"); + HILOG_ERROR("Parameter GetRoots fail to WriteParcelable deviceInfo"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -366,13 +386,13 @@ ErrCode FileAccessExtStub::CmdAccess(MessageParcel &data, MessageParcel &reply) bool isExist = data.ReadBool(); int ret = Access(*uri, isExist); if (!reply.WriteInt32(ret)) { - HILOG_ERROR("parameter Access fail to WriteInt32 ret"); + HILOG_ERROR("Parameter Access fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } if (!reply.WriteBool(isExist)) { - HILOG_ERROR("parameter Access fail to WriteBool type"); + HILOG_ERROR("Parameter Access fail to WriteBool isExist"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -415,7 +435,7 @@ ErrCode FileAccessExtStub::CmdRegisterNotify(MessageParcel &data, MessageParcel int ret = RegisterNotify(notify); if (!reply.WriteInt32(ret)) { - HILOG_ERROR("WriteInt32 failed"); + HILOG_ERROR("Parameter RegisterNotify fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -442,7 +462,7 @@ ErrCode FileAccessExtStub::CmdUnregisterNotify(MessageParcel &data, MessageParce int ret = UnregisterNotify(notify); if (!reply.WriteInt32(ret)) { - HILOG_ERROR("WriteInt32 failed"); + HILOG_ERROR("Parameter UnregisterNotify fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } -- Gitee From c934a323645d158c6d5d56e61823a5d7ef4345b7 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Wed, 31 Aug 2022 15:22:32 +0800 Subject: [PATCH 073/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../innerkits/file_access/src/file_access_ext_proxy.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 9daf231b..c86b98c9 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -131,7 +131,7 @@ int FileAccessExtProxy::CreateFile(const Uri &parent, const std::string &display } newFile = Uri(*tempUri); - if (newFile.ToString() == "") { + if (newFile.ToString().empty()) { HILOG_ERROR("get uri is empty."); return ERR_INVALID_RESULT; } @@ -191,7 +191,7 @@ int FileAccessExtProxy::Mkdir(const Uri &parent, const std::string &displayName, } newFile = Uri(*tempUri); - if (newFile.ToString() == "") { + if (newFile.ToString().empty()) { HILOG_ERROR("get uri is empty."); return ERR_INVALID_RESULT; } @@ -293,7 +293,7 @@ int FileAccessExtProxy::Move(const Uri &sourceFile, const Uri &targetParent, Uri } newFile = Uri(*tempUri); - if (newFile.ToString() == "") { + if (newFile.ToString().empty()) { HILOG_ERROR("get uri is empty."); return ERR_INVALID_RESULT; } @@ -353,7 +353,7 @@ int FileAccessExtProxy::Rename(const Uri &sourceFile, const std::string &display } newFile = Uri(*tempUri); - if (newFile.ToString() == "") { + if (newFile.ToString().empty()) { HILOG_ERROR("get uri is empty."); return ERR_INVALID_RESULT; } -- Gitee From 8072c41d15cf44754fc71b5cc674b32f047cce59 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Wed, 31 Aug 2022 16:11:10 +0800 Subject: [PATCH 074/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../innerkits/file_access/src/file_access_ext_stub.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp index 483ded8b..dddb7186 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp @@ -96,7 +96,7 @@ ErrCode FileAccessExtStub::CmdOpenFile(MessageParcel &data, MessageParcel &reply } int flags = ERR_PARCEL_FAIL; - if (data.ReadInt32(flags)) { + if (!data.ReadInt32(flags)) { HILOG_ERROR("Parameter OpenFile fail to ReadInt32 flags"); return ERR_PARCEL_FAIL; } @@ -136,7 +136,7 @@ ErrCode FileAccessExtStub::CmdCreateFile(MessageParcel &data, MessageParcel &rep } std::string displayName = ""; - if (data.ReadString(displayName)) { + if (!data.ReadString(displayName)) { HILOG_ERROR("Parameter CreateFile fail to ReadString displayName"); return ERR_PARCEL_FAIL; } @@ -177,7 +177,7 @@ ErrCode FileAccessExtStub::CmdMkdir(MessageParcel &data, MessageParcel &reply) } std::string displayName = ""; - if (data.ReadString(displayName)) { + if (!data.ReadString(displayName)) { HILOG_ERROR("Parameter Mkdir fail to ReadString displayName"); return ERR_PARCEL_FAIL; } @@ -275,7 +275,7 @@ ErrCode FileAccessExtStub::CmdRename(MessageParcel &data, MessageParcel &reply) } std::string displayName = ""; - if (data.ReadString(displayName)) { + if (!data.ReadString(displayName)) { HILOG_ERROR("Parameter Rename fail to ReadString displayName"); return ERR_PARCEL_FAIL; } -- Gitee From 4d18873888c9006a8cddf0d906d58fccb134b6dd Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 1 Sep 2022 10:56:10 +0800 Subject: [PATCH 075/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../file_access/src/file_access_ext_proxy.cpp | 21 +++- .../src/js_file_access_ext_ability.cpp | 112 ++++++++++++++---- 2 files changed, 109 insertions(+), 24 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index c86b98c9..5b558975 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -400,7 +400,13 @@ int FileAccessExtProxy::ListFile(const Uri &sourceFile, std::vector &f } fileInfo.clear(); - uint64_t count = reply.ReadUint64(); + uint64_t count = 0; + if (!reply.ReadUint64(count)) { + HILOG_ERROR("ListFile operation failed count : %{public}d", count); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_INVALID_RESULT; + } + for (uint64_t i = 0; i < count; i++) { std::unique_ptr fileInfoPtr(reply.ReadParcelable()); if (fileInfoPtr != nullptr) { @@ -444,7 +450,13 @@ int FileAccessExtProxy::GetRoots(std::vector &rootInfo) } rootInfo.clear(); - uint64_t count = reply.ReadUint64(); + uint64_t count = 0; + if (!reply.ReadUint64(count)) { + HILOG_ERROR("ListFile operation failed count : %{public}d", count); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_INVALID_RESULT; + } + for (uint64_t i = 0; i < count; i++) { std::unique_ptr rootInfoPtr(reply.ReadParcelable()); if (rootInfoPtr != nullptr) { @@ -494,7 +506,10 @@ int FileAccessExtProxy::Access(const Uri &uri, bool &isExist) return ret; } - isExist = reply.ReadBool(); + if (!reply.ReadBool(isExist)) { + HILOG_ERROR("fail to ReadInt32 isExist"); + return ERR_PARCEL_FAIL; + } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; } diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index 7cb5ec03..959688e6 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -343,6 +343,11 @@ int JsFileAccessExtAbility::OpenFile(const Uri &uri, int flags, int &fd) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "OpenFile"); auto value = std::make_shared>(); + if (value == nullptr) { + HILOG_ERROR("OpenFile value is nullptr."); + return ERR_VALUE_IS_NULLPTR; + } + auto argParser = [uri, flags](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *nativeUri = engine.CreateString(uri.ToString().c_str(), uri.ToString().length()); if (nativeUri == nullptr) { @@ -399,6 +404,11 @@ int JsFileAccessExtAbility::CreateFile(const Uri &parent, const std::string &dis { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CreateFile"); auto value = std::make_shared>(); + if (value == nullptr) { + HILOG_ERROR("CreateFile value is nullptr."); + return ERR_VALUE_IS_NULLPTR; + } + auto argParser = [parent, displayName](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *nativeParent = engine.CreateString(parent.ToString().c_str(), parent.ToString().length()); if (nativeParent == nullptr) { @@ -457,6 +467,11 @@ int JsFileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayN { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Mkdir"); auto value = std::make_shared>(); + if (value == nullptr) { + HILOG_ERROR("Mkdir value is nullptr."); + return ERR_VALUE_IS_NULLPTR; + } + auto argParser = [parent, displayName](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *nativeParent = engine.CreateString(parent.ToString().c_str(), parent.ToString().length()); if (nativeParent == nullptr) { @@ -514,6 +529,11 @@ int JsFileAccessExtAbility::Delete(const Uri &sourceFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Delete"); auto ret = std::make_shared(); + if (value == nullptr) { + HILOG_ERROR("Delete value is nullptr."); + return ERR_VALUE_IS_NULLPTR; + } + auto argParser = [uri = sourceFile](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *nativeUri = engine.CreateString(uri.ToString().c_str(), uri.ToString().length()); if (nativeUri == nullptr) { @@ -552,6 +572,11 @@ int JsFileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Move"); auto value = std::make_shared>(); + if (value == nullptr) { + HILOG_ERROR("Move value is nullptr."); + return ERR_VALUE_IS_NULLPTR; + } + auto argParser = [sourceFile, targetParent](NativeEngine &engine, NativeValue* argv[], size_t &argc) -> bool { NativeValue *srcUri = engine.CreateString(sourceFile.ToString().c_str(), sourceFile.ToString().length()); @@ -610,6 +635,10 @@ int JsFileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &dis { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Rename"); auto value = std::make_shared>(); + if (value == nullptr) { + HILOG_ERROR("Rename value is nullptr."); + return ERR_VALUE_IS_NULLPTR; + } auto argParser = [sourceFile, displayName](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *nativeSourceFile = engine.CreateString(sourceFile.ToString().c_str(), sourceFile.ToString().length()); @@ -641,19 +670,16 @@ int JsFileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &dis } return ret; }; - auto errCode = CallJsMethod("rename", jsRuntime_, jsObj_.get(), argParser, retParser); if (errCode != ERR_OK) { HILOG_ERROR("CallJsMethod error, code:%{public}d.", errCode); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errCode; } - if (value->code != ERR_OK) { HILOG_ERROR("fileio fail."); return ERR_FILEIO_FAIL; } - if ((value->data).empty()) { HILOG_ERROR("call Rename with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -718,6 +744,11 @@ int JsFileAccessExtAbility::ListFile(const Uri &sourceFile, std::vector>>(); + if (value == nullptr) { + HILOG_ERROR("ListFile value is nullptr."); + return ERR_VALUE_IS_NULLPTR; + } + auto argParser = [sourceFile](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *uri = engine.CreateString(sourceFile.ToString().c_str(), sourceFile.ToString().length()); if (uri == nullptr) { @@ -763,22 +794,21 @@ int JsFileAccessExtAbility::ListFile(const Uri &sourceFile, std::vector &rootInfo) +static bool ParserGetRootsJsResult(NativeEngine &engine, NativeValue *nativeValue, + std::shared_ptr>> &result) { - StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); - auto value = std::make_shared>>(); - auto argParser = [](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { - argc = ARGC_ZERO; - return true; - }; - auto retParser = [value](NativeEngine &engine, NativeValue *result) -> bool { - NativeObject *obj = ConvertNativeValueTo(result); - if (obj == nullptr) { - HILOG_ERROR("Convert js object fail."); - return false; - } + if (result == nullptr) { + HILOG_ERROR("result is nullptr."); + return false; + } - bool ret = ConvertFromJsValue(engine, obj->GetProperty("code"), value->code); + NativeObject *obj = ConvertNativeValueTo(nativeValue); + if (obj == nullptr) { + HILOG_ERROR("Convert js object fail."); + return false; + } + + bool ret = ConvertFromJsValue(engine, obj->GetProperty("code"), result->code); NativeArray *nativeArray = ConvertNativeValueTo(obj->GetProperty("roots")); if (nativeArray == nullptr) { HILOG_ERROR("nativeArray is nullptr"); @@ -806,17 +836,52 @@ int JsFileAccessExtAbility::GetRoots(std::vector &rootInfo) HILOG_ERROR("Convert js value fail."); return ret; } - (value->data).emplace_back(std::move(rootInfo)); + (result->data).emplace_back(std::move(rootInfo)); + } + return true; +} + +int JsFileAccessExtAbility::GetRoots(std::vector &rootInfo) +{ + StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); + auto value = std::make_shared>>(); + if (value == nullptr) { + HILOG_ERROR("GetRoots value is nullptr."); + return ERR_VALUE_IS_NULLPTR; + } + + auto argParser = [](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { + argc = ARGC_ZERO; + return true; + }; + auto retParser = [value](NativeEngine &engine, NativeValue *result) -> bool { + std::shared_ptr>> rootInfo = std::make_shared>>(); + if (rootInfo == nullptr) { + HILOG_ERROR("new Value fail."); + return false; + } + + bool ret = ParserGetRootsJsResult(engine, result, rootInfo); + if (!ret) { + HILOG_ERROR("Parser js value fail."); + return ret; } + + value->code = rootInfo->code; + value->data = std::move(rootInfo->data); return true; }; auto errCode = CallJsMethod("getRoots", jsRuntime_, jsObj_.get(), argParser, retParser); - if (errCode != ERR_OK || value->code != ERR_OK) { - HILOG_ERROR("CallJsMethod error, code:%{public}d, or fileio fail.", errCode); - return ERR_FILEIO_FAIL; + if (errCode != ERR_OK) { + HILOG_ERROR("CallJsMethod error, code:%{public}d", errCode); + return errCode; } + if (value->code != ERR_OK) { + HILOG_ERROR("fileio fail."); + return ERR_FILEIO_FAIL; + } rootInfo = value->data; FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; @@ -826,6 +891,11 @@ int JsFileAccessExtAbility::Access(const Uri &uri, bool &isExist) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Access"); auto value = std::make_shared>(); + if (value == nullptr) { + HILOG_ERROR("Access value is nullptr."); + return ERR_VALUE_IS_NULLPTR; + } + auto argParser = [uri](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *nativeUri = engine.CreateString(uri.ToString().c_str(), uri.ToString().length()); argv[ARGC_ZERO] = nativeUri; -- Gitee From 67b2fa8e40c591fade726e241567df063bc9cf81 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 1 Sep 2022 11:16:29 +0800 Subject: [PATCH 076/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../src/js_file_access_ext_ability.cpp | 61 +++++++------------ utils/file_access_framework_errno.h | 3 +- 2 files changed, 24 insertions(+), 40 deletions(-) diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index 959688e6..431b9b1b 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -345,18 +345,14 @@ int JsFileAccessExtAbility::OpenFile(const Uri &uri, int flags, int &fd) auto value = std::make_shared>(); if (value == nullptr) { HILOG_ERROR("OpenFile value is nullptr."); - return ERR_VALUE_IS_NULLPTR; + return ERR_NULL_POINTER; } auto argParser = [uri, flags](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *nativeUri = engine.CreateString(uri.ToString().c_str(), uri.ToString().length()); - if (nativeUri == nullptr) { - HILOG_ERROR("create uri native js value fail."); - return false; - } NativeValue *nativeFlags = engine.CreateNumber((int32_t)flags); - if (nativeFlags == nullptr) { - HILOG_ERROR("create flags native js value fail."); + if (nativeUri == nullptr || nativeFlags == nullptr) { + HILOG_ERROR("create uri or flags native js value fail."); return false; } argv[ARGC_ZERO] = nativeUri; @@ -406,18 +402,14 @@ int JsFileAccessExtAbility::CreateFile(const Uri &parent, const std::string &dis auto value = std::make_shared>(); if (value == nullptr) { HILOG_ERROR("CreateFile value is nullptr."); - return ERR_VALUE_IS_NULLPTR; + return ERR_NULL_POINTER; } auto argParser = [parent, displayName](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *nativeParent = engine.CreateString(parent.ToString().c_str(), parent.ToString().length()); - if (nativeParent == nullptr) { - HILOG_ERROR("create parent uri native js value fail."); - return false; - } NativeValue *nativeDisplayName = engine.CreateString(displayName.c_str(), displayName.length()); - if (nativeDisplayName == nullptr) { - HILOG_ERROR("create displayName native js value fail."); + if (nativeParent == nullptr || nativeDisplayName == nullptr) { + HILOG_ERROR("create parent uri or displayName native js value fail."); return false; } argv[ARGC_ZERO] = nativeParent; @@ -469,18 +461,14 @@ int JsFileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayN auto value = std::make_shared>(); if (value == nullptr) { HILOG_ERROR("Mkdir value is nullptr."); - return ERR_VALUE_IS_NULLPTR; + return ERR_NULL_POINTER; } auto argParser = [parent, displayName](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *nativeParent = engine.CreateString(parent.ToString().c_str(), parent.ToString().length()); - if (nativeParent == nullptr) { - HILOG_ERROR("create parent uri native js value fail."); - return false; - } NativeValue *nativeDisplayName = engine.CreateString(displayName.c_str(), displayName.length()); - if (nativeDisplayName == nullptr) { - HILOG_ERROR("create displayName native js value fail."); + if (nativeParent == nullptr || nativeDisplayName == nullptr) { + HILOG_ERROR("create parent uri native js value fail."); return false; } argv[ARGC_ZERO] = nativeParent; @@ -531,7 +519,7 @@ int JsFileAccessExtAbility::Delete(const Uri &sourceFile) auto ret = std::make_shared(); if (value == nullptr) { HILOG_ERROR("Delete value is nullptr."); - return ERR_VALUE_IS_NULLPTR; + return ERR_NULL_POINTER; } auto argParser = [uri = sourceFile](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { @@ -574,19 +562,15 @@ int JsFileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, auto value = std::make_shared>(); if (value == nullptr) { HILOG_ERROR("Move value is nullptr."); - return ERR_VALUE_IS_NULLPTR; + return ERR_NULL_POINTER; } auto argParser = [sourceFile, targetParent](NativeEngine &engine, NativeValue* argv[], size_t &argc) -> bool { NativeValue *srcUri = engine.CreateString(sourceFile.ToString().c_str(), sourceFile.ToString().length()); - if (srcUri == nullptr) { - HILOG_ERROR("create sourceFile uri native js value fail."); - return false; - } NativeValue *dstUri = engine.CreateString(targetParent.ToString().c_str(), targetParent.ToString().length()); - if (dstUri == nullptr) { - HILOG_ERROR("create targetParent uri native js value fail."); + if (srcUri == nullptr || dstUri == nullptr) { + HILOG_ERROR("create sourceFile uri native js value fail."); return false; } argv[ARGC_ZERO] = srcUri; @@ -637,18 +621,14 @@ int JsFileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &dis auto value = std::make_shared>(); if (value == nullptr) { HILOG_ERROR("Rename value is nullptr."); - return ERR_VALUE_IS_NULLPTR; + return ERR_NULL_POINTER; } auto argParser = [sourceFile, displayName](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *nativeSourceFile = engine.CreateString(sourceFile.ToString().c_str(), sourceFile.ToString().length()); - if (nativeSourceFile == nullptr) { - HILOG_ERROR("create sourceFile uri native js value fail."); - return false; - } NativeValue *nativeDisplayName = engine.CreateString(displayName.c_str(), displayName.length()); - if (nativeDisplayName == nullptr) { - HILOG_ERROR("create displayName native js value fail."); + if (nativeSourceFile == nullptr || nativeDisplayName == nullptr) { + HILOG_ERROR("create sourceFile uri or displayName native js value fail."); return false; } argv[ARGC_ZERO] = nativeSourceFile; @@ -670,16 +650,19 @@ int JsFileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &dis } return ret; }; + auto errCode = CallJsMethod("rename", jsRuntime_, jsObj_.get(), argParser, retParser); if (errCode != ERR_OK) { HILOG_ERROR("CallJsMethod error, code:%{public}d.", errCode); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errCode; } + if (value->code != ERR_OK) { HILOG_ERROR("fileio fail."); return ERR_FILEIO_FAIL; } + if ((value->data).empty()) { HILOG_ERROR("call Rename with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -746,7 +729,7 @@ int JsFileAccessExtAbility::ListFile(const Uri &sourceFile, std::vector>>(); if (value == nullptr) { HILOG_ERROR("ListFile value is nullptr."); - return ERR_VALUE_IS_NULLPTR; + return ERR_NULL_POINTER; } auto argParser = [sourceFile](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { @@ -847,7 +830,7 @@ int JsFileAccessExtAbility::GetRoots(std::vector &rootInfo) auto value = std::make_shared>>(); if (value == nullptr) { HILOG_ERROR("GetRoots value is nullptr."); - return ERR_VALUE_IS_NULLPTR; + return ERR_NULL_POINTER; } auto argParser = [](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { @@ -893,7 +876,7 @@ int JsFileAccessExtAbility::Access(const Uri &uri, bool &isExist) auto value = std::make_shared>(); if (value == nullptr) { HILOG_ERROR("Access value is nullptr."); - return ERR_VALUE_IS_NULLPTR; + return ERR_NULL_POINTER; } auto argParser = [uri](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { diff --git a/utils/file_access_framework_errno.h b/utils/file_access_framework_errno.h index cd4b15e8..0fd9402b 100644 --- a/utils/file_access_framework_errno.h +++ b/utils/file_access_framework_errno.h @@ -41,7 +41,8 @@ enum { ERR_NOTIFY_FAIL, // notify client fail ERR_QUERY_EXTENSIONINFOS_FAIL, // QueryExtensionAbilityInfos fail ERR_PARCEL_FAIL, // parcel fail - ERR_INVALID_RESULT // code success result fail + ERR_INVALID_RESULT, // code success result fail + ERR_NULL_POINTER // get value is nullptr }; } // namespace FileAccessFwk } // namespace OHOS -- Gitee From aec97d8932a148153a902897a32f450dd0f782f8 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 1 Sep 2022 11:27:16 +0800 Subject: [PATCH 077/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../innerkits/file_access/src/js_file_access_ext_ability.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index 431b9b1b..c6df3f45 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -517,7 +517,7 @@ int JsFileAccessExtAbility::Delete(const Uri &sourceFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Delete"); auto ret = std::make_shared(); - if (value == nullptr) { + if (ret == nullptr) { HILOG_ERROR("Delete value is nullptr."); return ERR_NULL_POINTER; } -- Gitee From 55d3f10836ea8f1cd77f5c8f72177f2a0f78bfb6 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 1 Sep 2022 11:40:44 +0800 Subject: [PATCH 078/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../innerkits/file_access/src/file_access_ext_proxy.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 5b558975..a530e166 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -402,7 +402,7 @@ int FileAccessExtProxy::ListFile(const Uri &sourceFile, std::vector &f fileInfo.clear(); uint64_t count = 0; if (!reply.ReadUint64(count)) { - HILOG_ERROR("ListFile operation failed count : %{public}d", count); + HILOG_ERROR("ListFile operation failed count : %{public}llu", count); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_RESULT; } @@ -452,7 +452,7 @@ int FileAccessExtProxy::GetRoots(std::vector &rootInfo) rootInfo.clear(); uint64_t count = 0; if (!reply.ReadUint64(count)) { - HILOG_ERROR("ListFile operation failed count : %{public}d", count); + HILOG_ERROR("ListFile operation failed count : %{public}llu", count); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_RESULT; } -- Gitee From 6442be1bcc6f5cdb7188ab2ff9fb364023c43776 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 1 Sep 2022 14:05:02 +0800 Subject: [PATCH 079/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../innerkits/file_access/src/file_access_ext_proxy.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index a530e166..792ca3aa 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -40,8 +40,8 @@ int FileAccessExtProxy::OpenFile(const Uri &uri, const int flags, int &fd) return ERR_PARCEL_FAIL; } - if (!data.WriteUint32(flags)) { - HILOG_ERROR("fail to WriteUint32 flags"); + if (!data.WriteInt32(flags)) { + HILOG_ERROR("fail to WriteInt32 flags"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } -- Gitee From 9692019ef65c10fa198760689068b993e1b86b02 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 1 Sep 2022 14:24:59 +0800 Subject: [PATCH 080/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp | 2 +- frameworks/innerkits/file_access/src/file_access_helper.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 792ca3aa..70f821c4 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -218,7 +218,7 @@ int FileAccessExtProxy::Delete(const Uri &sourceFile) MessageParcel reply; MessageOption option; int32_t err = Remote()->SendRequest(CMD_DELETE, data, reply, option); - if (err != NO_ERROR) { + if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return err; diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 565b4dd4..86c007db 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -586,7 +586,7 @@ int FileAccessHelper::GetRoots(std::vector &rootInfo) } ret = fileAccessExtProxy->GetRoots(results); if (ret != ERR_OK) { - HILOG_ERROR("getRoots Failed to get value"); + HILOG_ERROR("getRoots get fail ret:%{public}d",ret); return ret; } rootInfo.insert(rootInfo.end(), results.begin(), results.end()); -- Gitee From b6b758cd7c2d76f1fc5e6bf59437b05dd087f332 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 1 Sep 2022 14:36:59 +0800 Subject: [PATCH 081/122] cleancodecheck Signed-off-by: onexiaomin --- frameworks/innerkits/file_access/src/file_access_helper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 86c007db..1cd50fd5 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -586,7 +586,7 @@ int FileAccessHelper::GetRoots(std::vector &rootInfo) } ret = fileAccessExtProxy->GetRoots(results); if (ret != ERR_OK) { - HILOG_ERROR("getRoots get fail ret:%{public}d",ret); + HILOG_ERROR("getRoots get fail ret:%{public}d", ret); return ret; } rootInfo.insert(rootInfo.end(), results.begin(), results.end()); -- Gitee From 672478a297a8e1a1f47f893ef9073e3a9cd2196d Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 1 Sep 2022 16:07:23 +0800 Subject: [PATCH 082/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../file_access/src/js_file_access_ext_ability.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index c6df3f45..e28506f0 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -388,9 +388,9 @@ int JsFileAccessExtAbility::OpenFile(const Uri &uri, int flags, int &fd) } fd = value->data; - if (fd <= ERR_OK) { - HILOG_ERROR("Failed to get file descriptor."); - return ERR_PARSER_FAIL; + if (fd < ERR_OK) { + HILOG_ERROR("Failed to get file descriptor fd: %{public}d", fd.); + return ERR_FILEIO_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; -- Gitee From 5e5899a545e1472d1c564b0deaaf9fd12e3bbc22 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 1 Sep 2022 16:47:54 +0800 Subject: [PATCH 083/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../innerkits/file_access/src/js_file_access_ext_ability.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index e28506f0..d8314f69 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -389,7 +389,7 @@ int JsFileAccessExtAbility::OpenFile(const Uri &uri, int flags, int &fd) fd = value->data; if (fd < ERR_OK) { - HILOG_ERROR("Failed to get file descriptor fd: %{public}d", fd.); + HILOG_ERROR("Failed to get file descriptor fd: %{public}d", fd); return ERR_FILEIO_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); -- Gitee From 5165b4b4a0423fe4ef7d5d5da1ca71e99470d836 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 1 Sep 2022 20:12:40 +0800 Subject: [PATCH 084/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9TDD=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../innerkits/file_access/test/file_extension_helper_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index 20cf1068..1d1dadbb 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -1751,7 +1751,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi int fd; result = fah->OpenFile(moveUri, 0, fd); - EXPECT_GT(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; -- Gitee From 2936491516f9b6bcce8e2737c35a0e7d96fd5c38 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Fri, 2 Sep 2022 13:38:18 +0800 Subject: [PATCH 085/122] add iterator code Signed-off-by: linjun9528 --- .../file_info/file_info_entity.h | 30 +++ .../file_info/file_iterator_entity.h | 38 ++++ .../file_info/napi_file_info_exporter.cpp | 215 ++++++++++++++++++ .../file_info/napi_file_info_exporter.h | 50 ++++ .../file_info/napi_file_iterator_exporter.cpp | 161 +++++++++++++ .../file_info/napi_file_iterator_exporter.h | 44 ++++ .../root_info/napi_root_info_exporter.cpp | 200 ++++++++++++++++ .../root_info/napi_root_info_exporter.h | 48 ++++ 8 files changed, 786 insertions(+) create mode 100644 interfaces/kits/napi/file_access_module/file_info/file_info_entity.h create mode 100644 interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h create mode 100644 interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp create mode 100644 interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.h create mode 100644 interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp create mode 100644 interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.h create mode 100644 interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp create mode 100644 interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.h diff --git a/interfaces/kits/napi/file_access_module/file_info/file_info_entity.h b/interfaces/kits/napi/file_access_module/file_info/file_info_entity.h new file mode 100644 index 00000000..e668b1f6 --- /dev/null +++ b/interfaces/kits/napi/file_access_module/file_info/file_info_entity.h @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef FILE_INFO_ENTITY_H +#define FILE_INFO_ENTITY_H + +#include "file_access_extension_info.h" +#include "file_access_helper.h" + +namespace OHOS { +namespace FileAccessFwk { +struct FileInfoEntity { + FileAccessHelper *fileAccessHelper { nullptr }; + FileInfo fileInfo {}; +}; +} // namespace FileAccessFwk +} // namespace OHOS +#endif // FILE_INFO_ENTITY_H \ No newline at end of file diff --git a/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h b/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h new file mode 100644 index 00000000..56d34b20 --- /dev/null +++ b/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef FILE_ITERATOR_ENTITY_H +#define FILE_ITERATOR_ENTITY_H + +#include + +#include "file_access_extension_info.h" +#include "file_access_helper.h" +#include "hilog_wrapper.h" + +namespace OHOS { +namespace FileAccessFwk { +struct FileIteratorEntity { + FileAccessHelper *fileAccessHelper { nullptr }; + std::mutex entityOperateMutex; + FileInfo fileInfo {}; + std::vector fileInfoVec {}; + int64_t maxCount { 1000 }; + int64_t offset { 0 }; + int64_t pos { 0 }; +}; +} // namespace FileAccessFwk +} // namespace OHOS +#endif // FILE_ITERATOR_ENTITY_H \ No newline at end of file diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp new file mode 100644 index 00000000..98ef55b9 --- /dev/null +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp @@ -0,0 +1,215 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "napi_file_info_exporter.h" + +#include "file_access_framework_errno.h" +#include "file_info_entity.h" +#include "file_iterator_entity.h" +#include "hilog_wrapper.h" +#include "napi_file_iterator_exporter.h" + +namespace OHOS { +namespace FileAccessFwk { +bool NapiFileInfoExporter::Export() +{ + std::vector props = { + NVal::DeclareNapiFunction("listFile", ListFile), + NVal::DeclareNapiGetter("uri", GetUri), + NVal::DeclareNapiGetter("fileName", GetFileName), + NVal::DeclareNapiGetter("mode", GetMode), + NVal::DeclareNapiGetter("size", GetSize), + NVal::DeclareNapiGetter("mtime", GetMtime), + NVal::DeclareNapiGetter("mimeType", GetMimeType), + }; + + std::string className = GetClassName(); + bool succ = false; + napi_value classValue = nullptr; + std::tie(succ, classValue) = NClass::DefineClass(exports_.env_, className, + NapiFileInfoExporter::Constructor, std::move(props)); + if (!succ) { + NError(ERR_NULL_POINTER).ThrowErr(exports_.env_, "INNER BUG. Failed to define class NapiFileInfoExporter"); + return false; + } + + succ = NClass::SaveClass(exports_.env_, className, classValue); + if (!succ) { + NError(ERR_NULL_POINTER).ThrowErr(exports_.env_, "INNER BUG. Failed to save class NapiFileInfoExporter"); + return false; + } + + return exports_.AddProp(className, classValue); +} + +napi_value NapiFileInfoExporter::Constructor(napi_env env, napi_callback_info info) +{ + NFuncArg funcArg(env, info); + if (!funcArg.InitArgs(NARG_CNT::ZERO)) { + NError(ERR_PARAM_NUMBER).ThrowErr(env, "Number of arguments unmatched"); + return nullptr; + } + + auto fileInfoEntity = std::make_unique(); + if (!NClass::SetEntityFor(env, funcArg.GetThisVar(), std::move(fileInfoEntity))) { + NError(ERR_NULL_POINTER).ThrowErr(env, "INNER BUG. Failed to wrap entity for obj FileInfoEntity"); + return nullptr; + } + + return funcArg.GetThisVar(); +} + +napi_value NapiFileInfoExporter::ListFile(napi_env env, napi_callback_info info) +{ + NFuncArg funcArg(env, info); + if (!funcArg.InitArgs(NARG_CNT::ZERO, NARG_CNT::ONE)) { + NError(ERR_PARAM_NUMBER).ThrowErr(env, "Number of arguments unmatched"); + return nullptr; + } + + auto fileInfoEntity = NClass::GetEntityOf(env, funcArg.GetThisVar()); + if (fileInfoEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of FileInfoEntity"); + return nullptr; + } + + if ((fileInfoEntity->fileInfo.mode & DOCUMENT_FLAG_REPRESENTS_DIR) != DOCUMENT_FLAG_REPRESENTS_DIR) { + HILOG_ERROR("current FileInfo is not dir."); + return NVal::CreateUndefined(env).val_; + } + + if (fileInfoEntity->fileAccessHelper == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "fileAccessHelper is null."); + return nullptr; + } + + auto objFileIteratorExporter = NClass::InstantiateClass(env, NapiFileIteratorExporter::className_, {}); + if (objFileIteratorExporter == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot instantiate class NapiFileIteratorExporter"); + return nullptr; + } + + auto fileIteratorEntity = NClass::GetEntityOf(env, objFileIteratorExporter); + if (fileIteratorEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get the entity of FileIteratorEntity"); + return nullptr; + } + + { + std::lock_guard lock(fileIteratorEntity->entityOperateMutex); + fileIteratorEntity->fileAccessHelper = fileInfoEntity->fileAccessHelper; + fileIteratorEntity->fileInfo = fileInfoEntity->fileInfo; + fileIteratorEntity->offset = 0; + fileIteratorEntity->pos = 0; + auto ret = fileInfoEntity->fileAccessHelper->ListFile(fileInfoEntity->fileInfo, fileIteratorEntity->offset, + fileIteratorEntity->maxCount, fileIteratorEntity->fileInfoVec); + if (ret != ERR_OK) { + NError(ret).ThrowErr(env, "exec ListFile fail"); + return nullptr; + } + } + + return NVal(env, objFileIteratorExporter).val_; +} + +static FileInfoEntity *GetFileInfoEntity(napi_env env, napi_callback_info info) +{ + NFuncArg funcArg(env, info); + if (!funcArg.InitArgs(NARG_CNT::ZERO)) { + NError(ERR_PARAM_NUMBER).ThrowErr(env, "Number of arguments unmatched"); + return nullptr; + } + + auto fileInfoEntity = NClass::GetEntityOf(env, funcArg.GetThisVar()); + if (fileInfoEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of FileInfoEntity"); + return nullptr; + } + + return fileInfoEntity; +} + +napi_value NapiFileInfoExporter::GetUri(napi_env env, napi_callback_info info) +{ + auto fileInfoEntity = GetFileInfoEntity(env, info); + if (fileInfoEntity == nullptr) { + HILOG_ERROR("Failed to get entity of FileInfoEntity"); + return NVal::CreateUndefined(env).val_; + } + + return NVal::CreateUTF8String(env, fileInfoEntity->fileInfo.uri).val_; +} + +napi_value NapiFileInfoExporter::GetFileName(napi_env env, napi_callback_info info) +{ + auto fileInfoEntity = GetFileInfoEntity(env, info); + if (fileInfoEntity == nullptr) { + HILOG_ERROR("Failed to get entity of FileInfoEntity"); + return NVal::CreateUndefined(env).val_; + } + + return NVal::CreateUTF8String(env, fileInfoEntity->fileInfo.fileName).val_; +} + +napi_value NapiFileInfoExporter::GetMode(napi_env env, napi_callback_info info) +{ + auto fileInfoEntity = GetFileInfoEntity(env, info); + if (fileInfoEntity == nullptr) { + HILOG_ERROR("Failed to get entity of FileInfoEntity"); + return NVal::CreateUndefined(env).val_; + } + + return NVal::CreateInt32(env, fileInfoEntity->fileInfo.mode).val_; +} + +napi_value NapiFileInfoExporter::GetSize(napi_env env, napi_callback_info info) +{ + auto fileInfoEntity = GetFileInfoEntity(env, info); + if (fileInfoEntity == nullptr) { + HILOG_ERROR("Failed to get entity of FileInfoEntity"); + return NVal::CreateUndefined(env).val_; + } + + return NVal::CreateInt64(env, fileInfoEntity->fileInfo.size).val_; +} + +napi_value NapiFileInfoExporter::GetMtime(napi_env env, napi_callback_info info) +{ + auto fileInfoEntity = GetFileInfoEntity(env, info); + if (fileInfoEntity == nullptr) { + HILOG_ERROR("Failed to get entity of FileInfoEntity"); + return NVal::CreateUndefined(env).val_; + } + + return NVal::CreateInt64(env, fileInfoEntity->fileInfo.mtime).val_; +} + +napi_value NapiFileInfoExporter::GetMimeType(napi_env env, napi_callback_info info) +{ + auto fileInfoEntity = GetFileInfoEntity(env, info); + if (fileInfoEntity == nullptr) { + HILOG_ERROR("Failed to get entity of FileInfoEntity"); + return NVal::CreateUndefined(env).val_; + } + + return NVal::CreateUTF8String(env, fileInfoEntity->fileInfo.mimeType).val_; +} + +std::string NapiFileInfoExporter::GetClassName() +{ + return NapiFileInfoExporter::className_; +} +} // namespace FileAccessFwk +} // namespace OHOS \ No newline at end of file diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.h b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.h new file mode 100644 index 00000000..57264e33 --- /dev/null +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef NAPI_FILE_INFO_EXPORTER_H +#define NAPI_FILE_INFO_EXPORTER_H + +#include + +#include "file_access_extension_info.h" +#include "file_access_helper.h" +#include "filemgmt_libn.h" + +namespace OHOS { +namespace FileAccessFwk { +using namespace FileManagement::LibN; + +class NapiFileInfoExporter final : public NExporter { +public: + inline static const std::string className_ = "NapiFileInfoExporter"; + + NapiFileInfoExporter(napi_env env, napi_value exports) : NExporter(env, exports) {}; + ~NapiFileInfoExporter() = default; + + static napi_value Constructor(napi_env env, napi_callback_info info); + static napi_value ListFile(napi_env env, napi_callback_info info); + static napi_value GetUri(napi_env env, napi_callback_info info); + static napi_value GetFileName(napi_env env, napi_callback_info info); + static napi_value GetMode(napi_env env, napi_callback_info info); + static napi_value GetSize(napi_env env, napi_callback_info info); + static napi_value GetMtime(napi_env env, napi_callback_info info); + static napi_value GetMimeType(napi_env env, napi_callback_info info); + + bool Export() override; + std::string GetClassName() override; +}; +} // namespace FileAccessFwk +} // namespace OHOS +#endif // NAPI_FILE_INFO_EXPORTER_H \ No newline at end of file diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp b/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp new file mode 100644 index 00000000..b1a47452 --- /dev/null +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp @@ -0,0 +1,161 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "napi_file_iterator_exporter.h" + +#include + +#include "file_info_entity.h" +#include "file_iterator_entity.h" +#include "hilog_wrapper.h" +#include "napi_file_info_exporter.h" + +namespace OHOS { +namespace FileAccessFwk { +bool NapiFileIteratorExporter::Export() +{ + std::vector props = { + NVal::DeclareNapiFunction("next", Next), + }; + + std::string className = GetClassName(); + bool succ = false; + napi_value classValue = nullptr; + std::tie(succ, classValue) = NClass::DefineClass(exports_.env_, className, + NapiFileIteratorExporter::Constructor, std::move(props)); + if (!succ) { + NError(ERR_NULL_POINTER).ThrowErr(exports_.env_, "INNER BUG. Failed to define class NapiFileIteratorExporter"); + return false; + } + + succ = NClass::SaveClass(exports_.env_, className, classValue); + if (!succ) { + NError(ERR_NULL_POINTER).ThrowErr(exports_.env_, "INNER BUG. Failed to save class NapiFileIteratorExporter"); + return false; + } + + return exports_.AddProp(className, classValue); +} + +napi_value NapiFileIteratorExporter::Constructor(napi_env env, napi_callback_info info) +{ + NFuncArg funcArg(env, info); + if (!funcArg.InitArgs(NARG_CNT::ZERO)) { + NError(ERR_PARAM_NUMBER).ThrowErr(env, "Number of arguments unmatched"); + return nullptr; + } + + auto fileIteratorEntity = std::make_unique(); + if (!NClass::SetEntityFor(env, funcArg.GetThisVar(), std::move(fileIteratorEntity))) { + NError(ERR_NULL_POINTER).ThrowErr(env, "INNER BUG. Failed to wrap entity for obj FileIteratorEntity"); + return nullptr; + } + + return funcArg.GetThisVar(); +} + +static int MakeResult(napi_value objFileInfoExporter, FileIteratorEntity *fileIteratorEntity, + FileInfoEntity *fileInfoEntity, napi_env env, NVal &nVal) +{ + std::lock_guard lock(fileIteratorEntity->entityOperateMutex); + bool done = true; + if (fileIteratorEntity->fileInfoVec.size() == 0) { + nVal.AddProp("value", NVal::CreateUndefined(env).val_); + nVal.AddProp("done", NVal::CreateBool(env, done).val_); + return ERR_OK; + } + + if (fileIteratorEntity->pos == fileIteratorEntity->fileInfoVec.size()) { + HILOG_ERROR("pos out of index."); + return ERR_INVALID_RESULT; + } + + fileInfoEntity->fileAccessHelper = fileIteratorEntity->fileAccessHelper; + fileInfoEntity->fileInfo = fileIteratorEntity->fileInfoVec[fileIteratorEntity->pos]; + fileIteratorEntity->pos++; + if (fileIteratorEntity->pos == fileIteratorEntity->maxCount) { + fileIteratorEntity->fileInfoVec.clear(); + fileIteratorEntity->offset += fileIteratorEntity->maxCount; + fileIteratorEntity->pos = 0; + int ret = fileIteratorEntity->fileAccessHelper->ListFile(fileIteratorEntity->fileInfo, + fileIteratorEntity->offset, fileIteratorEntity->maxCount, fileIteratorEntity->fileInfoVec); + if (ret != ERR_OK) { + HILOG_ERROR("exec ListFile fail, code:%{public}d", ret); + return ret; + } + } else if (fileIteratorEntity->pos == fileIteratorEntity->fileInfoVec.size()) { + fileIteratorEntity->fileInfoVec.clear(); + fileIteratorEntity->pos = 0; + fileIteratorEntity->offset = 0; + } + + done = (fileIteratorEntity->pos == fileIteratorEntity->fileInfoVec.size()); + nVal.AddProp("value", objFileInfoExporter); + nVal.AddProp("done", NVal::CreateBool(env, done).val_); + return ERR_OK; +} + +napi_value NapiFileIteratorExporter::Next(napi_env env, napi_callback_info info) +{ + NFuncArg funcArg(env, info); + if (!funcArg.InitArgs(NARG_CNT::ZERO)) { + NError(ERR_PARAM_NUMBER).ThrowErr(env, "Number of arguments unmatched"); + return nullptr; + } + + auto fileIteratorEntity = NClass::GetEntityOf(env, funcArg.GetThisVar()); + if (fileIteratorEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of FileIteratorEntity"); + return nullptr; + } + + if ((fileIteratorEntity->fileInfo.mode & DOCUMENT_FLAG_REPRESENTS_DIR) != DOCUMENT_FLAG_REPRESENTS_DIR) { + HILOG_ERROR("current FileInfo is not dir."); + return NVal::CreateUndefined(env).val_; + } + + auto objFileInfoExporter = NClass::InstantiateClass(env, NapiFileInfoExporter::className_, {}); + if (objFileInfoExporter == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot instantiate class NapiFileInfoExporter"); + return nullptr; + } + + auto fileInfoEntity = NClass::GetEntityOf(env, objFileInfoExporter); + if (fileInfoEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get the entity of FileInfoEntity"); + return nullptr; + } + + if (fileIteratorEntity->fileAccessHelper == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "fileAccessHelper is null."); + return nullptr; + } + + auto retNVal = NVal::CreateObject(env); + int ret = MakeResult(objFileInfoExporter, fileIteratorEntity, fileInfoEntity, env, retNVal); + if (ret != ERR_OK) { + NError(ret).ThrowErr(env, "MakeResult fail."); + return nullptr; + } + + return retNVal.val_; +} + +std::string NapiFileIteratorExporter::GetClassName() +{ + return NapiFileIteratorExporter::className_; +} +} // namespace FileAccessFwk +} // namespace OHOS \ No newline at end of file diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.h b/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.h new file mode 100644 index 00000000..e1b51314 --- /dev/null +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.h @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef NAPI_FILE_ITERATOR_EXPORTER_H +#define NAPI_FILE_ITERATOR_EXPORTER_H + +#include + +#include "file_access_extension_info.h" +#include "file_access_helper.h" +#include "filemgmt_libn.h" + +namespace OHOS { +namespace FileAccessFwk { +using namespace FileManagement::LibN; + +class NapiFileIteratorExporter final : public NExporter { +public: + inline static const std::string className_ = "NapiFileIteratorExporter"; + + NapiFileIteratorExporter(napi_env env, napi_value exports) : NExporter(env, exports) {}; + ~NapiFileIteratorExporter() = default; + + static napi_value Constructor(napi_env env, napi_callback_info info); + static napi_value Next(napi_env env, napi_callback_info info); + + bool Export() override; + std::string GetClassName() override; +}; +} // namespace FileAccessFwk +} // namespace OHOS +#endif // NAPI_FILE_ITERATOR_EXPORTER_H \ No newline at end of file diff --git a/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp b/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp new file mode 100644 index 00000000..5c680a53 --- /dev/null +++ b/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp @@ -0,0 +1,200 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef NAPI_FILEACCESS_HELPER_H +#define NAPI_FILEACCESS_HELPER_H + +#include "napi_root_info_exporter.h" + +#include "file_access_framework_errno.h" +#include "file_iterator_entity.h" +#include "hilog_wrapper.h" +#include "napi_file_iterator_exporter.h" +#include "root_info_entity.h" + +namespace OHOS { +namespace FileAccessFwk { +bool NapiRootInfoExporter::Export() +{ + std::vector props = { + NVal::DeclareNapiFunction("listFile", ListFile), + NVal::DeclareNapiGetter("deviceType", GetDeviceType), + NVal::DeclareNapiGetter("uri", GetUri), + NVal::DeclareNapiGetter("displayName", GetDisplayName), + NVal::DeclareNapiGetter("deviceFlags", GetDeviceFlags) + }; + + std::string className = GetClassName(); + bool succ = false; + napi_value classValue = nullptr; + std::tie(succ, classValue) = NClass::DefineClass(exports_.env_, className, + NapiRootInfoExporter::Constructor, std::move(props)); + if (!succ) { + NError(ERR_NULL_POINTER).ThrowErr(exports_.env_, "INNER BUG. Failed to define class NapiRootInfoExporter"); + return false; + } + + succ = NClass::SaveClass(exports_.env_, className, classValue); + if (!succ) { + NError(ERR_NULL_POINTER).ThrowErr(exports_.env_, "INNER BUG. Failed to save class NapiRootInfoExporter"); + return false; + } + + return exports_.AddProp(className, classValue); +} + +napi_value NapiRootInfoExporter::Constructor(napi_env env, napi_callback_info info) +{ + NFuncArg funcArg(env, info); + if (!funcArg.InitArgs(NARG_CNT::ZERO)) { + NError(ERR_PARAM_NUMBER).ThrowErr(env, "Number of arguments unmatched"); + return nullptr; + } + + auto rootInfoEntity = std::make_unique(); + if (!NClass::SetEntityFor(env, funcArg.GetThisVar(), std::move(rootInfoEntity))) { + NError(ERR_NULL_POINTER).ThrowErr(env, "INNER BUG. Failed to wrap entity for obj RootInfoEntity"); + return nullptr; + } + + return funcArg.GetThisVar(); +} + +napi_value NapiRootInfoExporter::ListFile(napi_env env, napi_callback_info info) +{ + NFuncArg funcArg(env, info); + if (!funcArg.InitArgs(NARG_CNT::ZERO, NARG_CNT::ONE)) { + NError(ERR_PARAM_NUMBER).ThrowErr(env, "Number of arguments unmatched"); + return nullptr; + } + + auto rootEntity = NClass::GetEntityOf(env, funcArg.GetThisVar()); + if (rootEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of FileInfoEntity"); + return nullptr; + } + + if (rootEntity->fileAccessHelper == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "fileAccessHelper is null."); + return nullptr; + } + + napi_value objFileIteratorExporter = NClass::InstantiateClass(env, NapiFileIteratorExporter::className_, {}); + if (objFileIteratorExporter == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot instantiate class NapiFileIteratorExporter"); + return nullptr; + } + + auto fileIteratorEntity = NClass::GetEntityOf(env, objFileIteratorExporter); + if (fileIteratorEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get the entity of FileIteratorEntity"); + return nullptr; + } + + FileInfo fileInfo; + fileInfo.uri = rootEntity->rootInfo.uri; + fileInfo.mode = DOCUMENT_FLAG_REPRESENTS_DIR | DOCUMENT_FLAG_SUPPORTS_READ | DOCUMENT_FLAG_SUPPORTS_WRITE; + { + std::lock_guard lock(fileIteratorEntity->entityOperateMutex); + fileIteratorEntity->fileAccessHelper = rootEntity->fileAccessHelper; + fileIteratorEntity->fileInfo = fileInfo; + fileIteratorEntity->offset = 0; + fileIteratorEntity->pos = 0; + auto ret = rootEntity->fileAccessHelper->ListFile(fileInfo, fileIteratorEntity->offset, + fileIteratorEntity->maxCount, fileIteratorEntity->fileInfoVec); + if (ret != ERR_OK) { + NError(ret).ThrowErr(env, "ListFile get result fail."); + return nullptr; + } + } + + return NVal(env, objFileIteratorExporter).val_; +} + +napi_value NapiRootInfoExporter::GetDeviceType(napi_env env, napi_callback_info info) +{ + NFuncArg funcArg(env, info); + if (!funcArg.InitArgs(NARG_CNT::ZERO)) { + NError(ERR_PARAM_NUMBER).ThrowErr(env, "Number of arguments unmatched"); + return nullptr; + } + + auto rootInfoEntity = NClass::GetEntityOf(env, funcArg.GetThisVar()); + if (rootInfoEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of RootInfoEntity"); + return nullptr; + } + + return NVal::CreateInt64(env, (int64_t)(rootInfoEntity->rootInfo.deviceType)).val_; +} + +napi_value NapiRootInfoExporter::GetUri(napi_env env, napi_callback_info info) +{ + NFuncArg funcArg(env, info); + if (!funcArg.InitArgs(NARG_CNT::ZERO)) { + NError(ERR_PARAM_NUMBER).ThrowErr(env, "Number of arguments unmatched"); + return nullptr; + } + + auto rootInfoEntity = NClass::GetEntityOf(env, funcArg.GetThisVar()); + if (rootInfoEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of RootInfoEntity"); + return nullptr; + } + + return NVal::CreateUTF8String(env, rootInfoEntity->rootInfo.uri).val_; +} + +napi_value NapiRootInfoExporter::GetDisplayName(napi_env env, napi_callback_info info) +{ + NFuncArg funcArg(env, info); + if (!funcArg.InitArgs(NARG_CNT::ZERO)) { + NError(ERR_PARAM_NUMBER).ThrowErr(env, "Number of arguments unmatched"); + return nullptr; + } + + auto rootInfoEntity = NClass::GetEntityOf(env, funcArg.GetThisVar()); + if (rootInfoEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of RootInfoEntity"); + return nullptr; + } + + return NVal::CreateUTF8String(env, rootInfoEntity->rootInfo.displayName).val_; +} + +napi_value NapiRootInfoExporter::GetDeviceFlags(napi_env env, napi_callback_info info) +{ + NFuncArg funcArg(env, info); + if (!funcArg.InitArgs(NARG_CNT::ZERO)) { + NError(ERR_PARAM_NUMBER).ThrowErr(env, "Number of arguments unmatched"); + return nullptr; + } + + auto rootInfoEntity = NClass::GetEntityOf(env, funcArg.GetThisVar()); + if (rootInfoEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of RootInfoEntity"); + return nullptr; + } + + return NVal::CreateInt64(env, rootInfoEntity->rootInfo.deviceFlags).val_; +} + +std::string NapiRootInfoExporter::GetClassName() +{ + return NapiRootInfoExporter::className_; +} +} // namespace FileAccessFwk +} // namespace OHOS +#endif // NAPI_FILEACCESS_HELPER_H \ No newline at end of file diff --git a/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.h b/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.h new file mode 100644 index 00000000..720a7c40 --- /dev/null +++ b/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.h @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef NAPI_ROOT_INFO_EXPORTER_H +#define NAPI_ROOT_INFO_EXPORTER_H + +#include + +#include "file_access_extension_info.h" +#include "file_access_helper.h" +#include "filemgmt_libn.h" + +namespace OHOS { +namespace FileAccessFwk { +using namespace FileManagement::LibN; + +class NapiRootInfoExporter final : public NExporter { +public: + inline static const std::string className_ = "NapiRootInfoExporter"; + + NapiRootInfoExporter(napi_env env, napi_value exports) : NExporter(env, exports) {}; + ~NapiRootInfoExporter() = default; + + static napi_value Constructor(napi_env env, napi_callback_info info); + static napi_value ListFile(napi_env env, napi_callback_info info); + static napi_value GetDeviceType(napi_env env, napi_callback_info info); + static napi_value GetUri(napi_env env, napi_callback_info info); + static napi_value GetDisplayName(napi_env env, napi_callback_info info); + static napi_value GetDeviceFlags(napi_env env, napi_callback_info info); + + bool Export() override; + std::string GetClassName() override; +}; +} // namespace FileAccessFwk +} // namespace OHOS +#endif // NAPI_ROOT_INFO_EXPORTER_H \ No newline at end of file -- Gitee From 81e633fd205adf9b72a890b502c61b4771a74d10 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Fri, 2 Sep 2022 19:29:46 +0800 Subject: [PATCH 086/122] add iterator code to FileAccess framework Signed-off-by: linjun9528 --- .../include/file_access_ext_ability.h | 6 +- .../include/file_access_ext_proxy.h | 6 +- .../include/file_access_ext_stub_impl.h | 5 +- .../include/file_access_extension_info.h | 22 +-- .../file_access/include/file_access_helper.h | 5 +- .../include/ifile_access_ext_base.h | 6 +- .../include/js_file_access_ext_ability.h | 5 +- .../src/file_access_ext_ability.cpp | 5 +- .../file_access/src/file_access_ext_proxy.cpp | 86 +++++++----- .../file_access/src/file_access_ext_stub.cpp | 52 ++++--- .../src/file_access_ext_stub_impl.cpp | 9 +- .../file_access/src/file_access_helper.cpp | 20 ++- .../src/js_file_access_ext_ability.cpp | 132 +++++++++--------- .../kits/napi/file_access_module/BUILD.gn | 8 +- .../file_info/file_iterator_entity.h | 3 +- .../file_info/napi_file_info_exporter.cpp | 22 ++- .../file_info/napi_file_info_exporter.h | 2 + .../file_info/napi_file_iterator_exporter.cpp | 15 +- .../napi_fileaccess_helper.cpp | 84 +++++------ .../napi_fileaccess_helper.h | 3 +- .../file_access_module/napi_notify_callback.h | 4 +- .../native_fileaccess_module.cpp | 27 +++- .../root_info/napi_root_info_exporter.cpp | 3 +- .../root_info/napi_root_iterator_exporter.cpp | 123 ++++++++++++++++ .../root_info/napi_root_iterator_exporter.h | 41 ++++++ .../root_info/root_info_entity.h | 30 ++++ .../root_info/root_iterator_entity.h | 35 +++++ .../FileExtensionAbility.ts | 15 +- 28 files changed, 555 insertions(+), 219 deletions(-) create mode 100644 interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp create mode 100644 interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.h create mode 100644 interfaces/kits/napi/file_access_module/root_info/root_info_entity.h create mode 100644 interfaces/kits/napi/file_access_module/root_info/root_iterator_entity.h diff --git a/frameworks/innerkits/file_access/include/file_access_ext_ability.h b/frameworks/innerkits/file_access/include/file_access_ext_ability.h index 7b9f1425..b5ccc8ee 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_ability.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_ability.h @@ -46,9 +46,9 @@ public: virtual int Delete(const Uri &sourceFile); virtual int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile); virtual int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile); - - virtual int ListFile(const Uri &sourceFile, std::vector &fileInfo); - virtual int GetRoots(std::vector &rootInfo); + virtual int ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + std::vector &fileInfoVec); + virtual int GetRoots(std::vector &rootInfoVec); virtual int Access(const Uri &uri, bool &isExist); virtual int RegisterNotify(sptr ¬ify); virtual int UnregisterNotify(sptr ¬ify); diff --git a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h index 41db3052..c543d8cf 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h @@ -42,9 +42,9 @@ public: virtual int Delete(const Uri &sourceFile) override; virtual int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) override; virtual int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) override; - - virtual int ListFile(const Uri &sourceFile, std::vector &fileInfo) override; - virtual int GetRoots(std::vector &rootInfo) override; + virtual int ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + std::vector &fileInfoVec) override; + virtual int GetRoots(std::vector &rootInfoVec) override; virtual int Access(const Uri &uri, bool &isExist) override; virtual int RegisterNotify(sptr ¬ify) override; virtual int UnregisterNotify(sptr ¬ify) override; diff --git a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h index 56d0c34d..e7daae40 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h @@ -40,8 +40,9 @@ public: int Delete(const Uri &sourceFile) override; int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) override; int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) override; - int ListFile(const Uri &sourceFileUri, std::vector &fileInfo) override; - int GetRoots(std::vector &rootInfo) override; + int ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + std::vector &fileInfoVec) override; + int GetRoots(std::vector &rootInfoVec) override; int Access(const Uri &uri, bool &isExist) override; int RegisterNotify(sptr ¬ify) override; int UnregisterNotify(sptr ¬ify) override; diff --git a/frameworks/innerkits/file_access/include/file_access_extension_info.h b/frameworks/innerkits/file_access/include/file_access_extension_info.h index 7254fd48..e4990cc7 100644 --- a/frameworks/innerkits/file_access/include/file_access_extension_info.h +++ b/frameworks/innerkits/file_access/include/file_access_extension_info.h @@ -53,10 +53,16 @@ struct FileInfo : public virtual OHOS::Parcelable { public: std::string uri { "" }; std::string fileName { "" }; - int32_t mode; - int64_t size {0}; - int64_t mtime {0}; - std::string mimeType; + int32_t mode { 0 }; + int64_t size { 0 }; + int64_t mtime { 0 }; + std::string mimeType { "" }; + + FileInfo() = default; + FileInfo(std::string uriIn, std::string fileNameIn, int32_t modeIn, std::string mimeTypeIn) + : uri(uriIn), fileName(fileNameIn), mode(modeIn), mimeType(mimeTypeIn) + { + } bool ReadFromParcel(Parcel &parcel) { @@ -109,10 +115,10 @@ public: struct RootInfo : public virtual OHOS::Parcelable { public: - int32_t deviceType; - std::string uri; - std::string displayName; - int32_t deviceFlags {0}; + int32_t deviceType { 0 }; + std::string uri { "" }; + std::string displayName { "" }; + int32_t deviceFlags { 0 }; bool ReadFromParcel(Parcel &parcel) { diff --git a/frameworks/innerkits/file_access/include/file_access_helper.h b/frameworks/innerkits/file_access/include/file_access_helper.h index bf3da630..07139b03 100644 --- a/frameworks/innerkits/file_access/include/file_access_helper.h +++ b/frameworks/innerkits/file_access/include/file_access_helper.h @@ -65,8 +65,9 @@ public: int Delete(Uri &selectFile); int Move(Uri &sourceFile, Uri &targetParent, Uri &newFile); int Rename(Uri &sourceFile, const std::string &displayName, Uri &newFile); - int ListFile(Uri &sourceFile, std::vector &fileInfo); - int GetRoots(std::vector &rootInfo); + int ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + std::vector &fileInfoVec); + int GetRoots(std::vector &rootInfoVec); int On(std::shared_ptr &callback); int Off(); private: diff --git a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h index f0b73772..465e94c4 100644 --- a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h +++ b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h @@ -52,9 +52,9 @@ public: virtual int Delete(const Uri &sourceFile) = 0; virtual int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) = 0; virtual int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) = 0; - - virtual int ListFile(const Uri &sourceFile, std::vector &fileInfo) = 0; - virtual int GetRoots(std::vector &rootInfo) = 0; + virtual int ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + std::vector &fileInfoVec) = 0; + virtual int GetRoots(std::vector &rootInfoVec) = 0; virtual int Access(const Uri &uri, bool &isExist) = 0; virtual int RegisterNotify(sptr ¬ify) = 0; virtual int UnregisterNotify(sptr ¬ify) = 0; diff --git a/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h b/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h index 486fc9a5..eab8e9b1 100644 --- a/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h +++ b/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h @@ -66,8 +66,9 @@ public: int Delete(const Uri &sourceFile) override; int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) override; int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) override; - int ListFile(const Uri &sourceFile, std::vector &fileInfo) override; - int GetRoots(std::vector &rootInfo) override; + int ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + std::vector &fileInfoVec) override; + int GetRoots(std::vector &rootInfoVec) override; int Access(const Uri &uri, bool &isExist) override; private: diff --git a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp index 63fd6541..a50988f8 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp @@ -97,13 +97,14 @@ int FileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &displ return ERR_OPERATION_NOT_SUPPORT; } -int FileAccessExtAbility::ListFile(const Uri &sourceFile, std::vector &fileInfo) +int FileAccessExtAbility::ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + std::vector &fileInfoVec) { HILOG_ERROR("FileAccessExtAbility::ListFile Undefined operation"); return ERR_OPERATION_NOT_SUPPORT; } -int FileAccessExtAbility::GetRoots(std::vector &rootInfo) +int FileAccessExtAbility::GetRoots(std::vector &rootInfoVec) { HILOG_ERROR("FileAccessExtAbility::GetRoots Undefined operation"); return ERR_OPERATION_NOT_SUPPORT; diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 70f821c4..c5f70613 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -361,7 +361,40 @@ int FileAccessExtProxy::Rename(const Uri &sourceFile, const std::string &display return ERR_OK; } -int FileAccessExtProxy::ListFile(const Uri &sourceFile, std::vector &fileInfo) +int GetListFileResult(MessageParcel &reply, std::vector &fileInfoVec) +{ + int ret = ERR_PARCEL_FAIL; + if (!reply.ReadInt32(ret)) { + HILOG_ERROR("fail to ReadInt32 ret"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + if (ret != ERR_OK) { + HILOG_ERROR("ListFile operation failed ret : %{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; + } + + int64_t count = 0; + if (!reply.ReadInt64(count)) { + HILOG_ERROR("ListFile operation failed to Read count"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_INVALID_RESULT; + } + + fileInfoVec.clear(); + for (int64_t i = 0; i < count; i++) { + std::unique_ptr fileInfoPtr(reply.ReadParcelable()); + if (fileInfoPtr != nullptr) { + fileInfoVec.push_back(*fileInfoPtr); + } + } + return ERR_OK; +} + +int FileAccessExtProxy::ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + std::vector &fileInfoVec) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); MessageParcel data; @@ -371,53 +404,38 @@ int FileAccessExtProxy::ListFile(const Uri &sourceFile, std::vector &f return ERR_PARCEL_FAIL; } - if (!data.WriteParcelable(&sourceFile)) { - HILOG_ERROR("fail to WriteParcelable sourceFileUri"); + if (!data.WriteParcelable(&fileInfo)) { + HILOG_ERROR("fail to WriteParcelable fileInfo"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } - MessageParcel reply; - MessageOption option; - int32_t err = Remote()->SendRequest(CMD_LIST_FILE, data, reply, option); - if (err != ERR_OK) { - HILOG_ERROR("fail to SendRequest. err: %{public}d", err); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return err; - } - - int ret = ERR_PARCEL_FAIL; - if (!reply.ReadInt32(ret)) { - HILOG_ERROR("fail to ReadInt32 ret"); + if (!data.WriteInt64(offset)) { + HILOG_ERROR("fail to WriteInt64 offset"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } - if (ret != ERR_OK) { - HILOG_ERROR("ListFile operation failed ret : %{public}d", ret); + if (!data.WriteInt64(maxCount)) { + HILOG_ERROR("fail to WriteInt64 maxCount"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_PARCEL_FAIL; } - fileInfo.clear(); - uint64_t count = 0; - if (!reply.ReadUint64(count)) { - HILOG_ERROR("ListFile operation failed count : %{public}llu", count); + MessageParcel reply; + MessageOption option; + int32_t err = Remote()->SendRequest(CMD_LIST_FILE, data, reply, option); + if (err != ERR_OK) { + HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_INVALID_RESULT; + return err; } - for (uint64_t i = 0; i < count; i++) { - std::unique_ptr fileInfoPtr(reply.ReadParcelable()); - if (fileInfoPtr != nullptr) { - fileInfo.push_back(*fileInfoPtr); - } - } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_OK; + return GetListFileResult(reply, fileInfoVec); } -int FileAccessExtProxy::GetRoots(std::vector &rootInfo) +int FileAccessExtProxy::GetRoots(std::vector &rootInfoVec) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); MessageParcel data; @@ -449,18 +467,18 @@ int FileAccessExtProxy::GetRoots(std::vector &rootInfo) return ret; } - rootInfo.clear(); uint64_t count = 0; if (!reply.ReadUint64(count)) { - HILOG_ERROR("ListFile operation failed count : %{public}llu", count); + HILOG_ERROR("GetRoots operation failed to Read count"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_RESULT; } + rootInfoVec.clear(); for (uint64_t i = 0; i < count; i++) { std::unique_ptr rootInfoPtr(reply.ReadParcelable()); if (rootInfoPtr != nullptr) { - rootInfo.push_back(*rootInfoPtr); + rootInfoVec.push_back(*rootInfoPtr); } } diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp index dddb7186..e7d58519 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp @@ -308,31 +308,45 @@ ErrCode FileAccessExtStub::CmdRename(MessageParcel &data, MessageParcel &reply) ErrCode FileAccessExtStub::CmdListFile(MessageParcel &data, MessageParcel &reply) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdListFile"); - std::shared_ptr uri(data.ReadParcelable()); - if (uri == nullptr) { - HILOG_ERROR("Parameter ListFile fail to ReadParcelable sourceFile"); + std::shared_ptr fileInfo(data.ReadParcelable()); + if (fileInfo == nullptr) { + HILOG_ERROR("Parameter ListFile fail to ReadParcelable fileInfo"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + int64_t offset = 0; + if (!data.ReadInt64(offset)) { + HILOG_ERROR("parameter ListFile offset is invalid"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + int64_t maxCount = 0; + if (!data.ReadInt64(maxCount)) { + HILOG_ERROR("parameter ListFile maxCount is invalid"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } - std::vector fileInfo; - int ret = ListFile(*uri, fileInfo); + std::vector vecFileInfo; + int ret = ListFile(*fileInfo, offset, maxCount, vecFileInfo); if (!reply.WriteInt32(ret)) { HILOG_ERROR("Parameter ListFile fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } - uint64_t count = fileInfo.size(); - if (!reply.WriteUint64(count)) { - HILOG_ERROR("Parameter ListFile fail to WriteUint64 count"); + int64_t count {vecFileInfo.size()}; + if (!reply.WriteInt64(count)) { + HILOG_ERROR("Parameter ListFile fail to WriteInt64 count"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } - for (uint64_t i = 0; i < count; i++) { - if (!reply.WriteParcelable(&fileInfo[i])) { - HILOG_ERROR("Parameter ListFile fail to WriteParcelable fileInfo"); + for (const auto &fileInfo : vecFileInfo) { + if (!reply.WriteParcelable(&fileInfo)) { + HILOG_ERROR("parameter ListFile fail to WriteParcelable vecFileInfo"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -346,24 +360,24 @@ ErrCode FileAccessExtStub::CmdGetRoots(MessageParcel &data, MessageParcel &reply { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdGetRoots"); - std::vector rootInfo; - int ret = GetRoots(rootInfo); + std::vector rootInfoVec; + int ret = GetRoots(rootInfoVec); if (!reply.WriteInt32(ret)) { HILOG_ERROR("Parameter GetRoots fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } - uint64_t count = rootInfo.size(); - if (!reply.WriteUint64(count)) { - HILOG_ERROR("Parameter GetRoots fail to WriteUint64 count"); + int64_t count {rootInfoVec.size()}; + if (!reply.WriteInt64(count)) { + HILOG_ERROR("Parameter GetRoots fail to WriteInt64 count"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } - for (uint64_t i = 0; i < count; i++) { - if (!reply.WriteParcelable(&rootInfo[i])) { - HILOG_ERROR("Parameter GetRoots fail to WriteParcelable deviceInfo"); + for (const auto &rootInfo : rootInfoVec) { + if (!reply.WriteParcelable(&rootInfo)) { + HILOG_ERROR("parameter ListFile fail to WriteParcelable rootInfo"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp index 16d8593e..201f66e5 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp @@ -110,7 +110,8 @@ int FileAccessExtStubImpl::Rename(const Uri &sourceFile, const std::string &disp return ret; } -int FileAccessExtStubImpl::ListFile(const Uri &sourceFile, std::vector &fileInfo) +int FileAccessExtStubImpl::ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + std::vector &fileInfoVec) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); if (extension_ == nullptr) { @@ -119,12 +120,12 @@ int FileAccessExtStubImpl::ListFile(const Uri &sourceFile, std::vector return ERR_IPC_ERROR; } - int ret = extension_->ListFile(sourceFile, fileInfo); + int ret = extension_->ListFile(fileInfo, offset, maxCount, fileInfoVec); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } -int FileAccessExtStubImpl::GetRoots(std::vector &rootInfo) +int FileAccessExtStubImpl::GetRoots(std::vector &rootInfoVec) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); if (extension_ == nullptr) { @@ -133,7 +134,7 @@ int FileAccessExtStubImpl::GetRoots(std::vector &rootInfo) return ERR_IPC_ERROR; } - int ret = extension_->GetRoots(rootInfo); + int ret = extension_->GetRoots(rootInfoVec); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 1cd50fd5..07e32420 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -546,9 +546,11 @@ int FileAccessHelper::Rename(Uri &sourceFile, const std::string &displayName, Ur return ret; } -int FileAccessHelper::ListFile(Uri &sourceFile, std::vector &fileInfo) +int FileAccessHelper::ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + std::vector &fileInfoVec) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); + Uri sourceFile(fileInfo.uri); if (!CheckUri(sourceFile)) { HILOG_ERROR("sourceFile format check error."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -562,12 +564,18 @@ int FileAccessHelper::ListFile(Uri &sourceFile, std::vector &fileInfo) return ERR_IPC_ERROR; } - int ret = fileExtProxy->ListFile(sourceFile, fileInfo); + int ret = fileExtProxy->ListFile(fileInfo, offset, maxCount, fileInfoVec); + if (ret != ERR_OK) { + HILOG_ERROR("ListFile get result error, code:%{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; + } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } -int FileAccessHelper::GetRoots(std::vector &rootInfo) +int FileAccessHelper::GetRoots(std::vector &rootInfoVec) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); if (!GetProxy()) { @@ -584,12 +592,14 @@ int FileAccessHelper::GetRoots(std::vector &rootInfo) if (fileAccessExtProxy) { AddFileAccessDeathRecipient(fileAccessExtProxy->AsObject()); } + ret = fileAccessExtProxy->GetRoots(results); if (ret != ERR_OK) { HILOG_ERROR("getRoots get fail ret:%{public}d", ret); return ret; } - rootInfo.insert(rootInfo.end(), results.begin(), results.end()); + + rootInfoVec.insert(rootInfoVec.end(), results.begin(), results.end()); } return ret; diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index d8314f69..eb319d08 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -674,26 +674,21 @@ int JsFileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &dis } -static bool ParserListFileJsResult(NativeEngine &engine, NativeValue *nativeValue, - std::shared_ptr>> &result) +static bool ParserListFileJsResult(NativeEngine &engine, NativeValue *nativeValue, Value> &result) { - if (result == nullptr) { - HILOG_ERROR("result is nullptr."); - return false; - } - NativeObject *obj = ConvertNativeValueTo(nativeValue); if (obj == nullptr) { HILOG_ERROR("Convert js object fail."); return false; } - bool ret = ConvertFromJsValue(engine, obj->GetProperty("code"), result->code); + bool ret = ConvertFromJsValue(engine, obj->GetProperty("code"), result.code); NativeArray *nativeArray = ConvertNativeValueTo(obj->GetProperty("infos")); if (nativeArray == nullptr) { - HILOG_ERROR("nativeArray is nullptr"); + HILOG_ERROR("Convert js array object fail."); return false; } + for (uint32_t i = 0; i < nativeArray->GetLength(); i++) { NativeValue *nativeFileInfo = nativeArray->GetElement(i); if (nativeFileInfo == nullptr) { @@ -718,12 +713,14 @@ static bool ParserListFileJsResult(NativeEngine &engine, NativeValue *nativeValu HILOG_ERROR("Convert js value fail."); return ret; } - (result->data).emplace_back(std::move(fileInfo)); + + result.data.emplace_back(std::move(fileInfo)); } return true; } -int JsFileAccessExtAbility::ListFile(const Uri &sourceFile, std::vector &fileInfo) +int JsFileAccessExtAbility::ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + std::vector &fileInfoVec) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); auto value = std::make_shared>>(); @@ -732,32 +729,40 @@ int JsFileAccessExtAbility::ListFile(const Uri &sourceFile, std::vector bool { - NativeValue *uri = engine.CreateString(sourceFile.ToString().c_str(), sourceFile.ToString().length()); + auto argParser = [fileInfo, offset, maxCount](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { + NativeValue *uri = engine.CreateString(fileInfo.uri.c_str(), fileInfo.uri.length()); if (uri == nullptr) { HILOG_ERROR("create sourceFile uri native js value fail."); return false; } + NativeValue *nativeOffset = engine.CreateNumber(offset); + if (nativeOffset == nullptr) { + HILOG_ERROR("create nativeMaxNum native js value fail."); + return false; + } + + NativeValue *nativeMaxCount = engine.CreateNumber(maxCount); + if (nativeMaxCount == nullptr) { + HILOG_ERROR("create nativeMaxNum native js value fail."); + return false; + } + argv[ARGC_ZERO] = uri; - argc = ARGC_ONE; + argv[ARGC_ONE] = nativeOffset; + argv[ARGC_TWO] = nativeMaxCount; + argc = ARGC_THREE; return true; }; auto retParser = [value](NativeEngine &engine, NativeValue *result) -> bool { - std::shared_ptr>> fileInfo = std::make_shared>>(); - if (fileInfo == nullptr) { - HILOG_ERROR("new Value fail."); - return false; - } - + Value> fileInfo; bool ret = ParserListFileJsResult(engine, result, fileInfo); if (!ret) { HILOG_ERROR("Parser js value fail."); return ret; } - value->code = fileInfo->code; - value->data = std::move(fileInfo->data); + *value = std::move(fileInfo); return true; }; @@ -772,59 +777,56 @@ int JsFileAccessExtAbility::ListFile(const Uri &sourceFile, std::vectordata; + fileInfoVec = std::move(value->data); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; } -static bool ParserGetRootsJsResult(NativeEngine &engine, NativeValue *nativeValue, - std::shared_ptr>> &result) +static bool ParserGetRootsJsResult(NativeEngine &engine, NativeValue *nativeValue, Value> &result) { - if (result == nullptr) { - HILOG_ERROR("result is nullptr."); - return false; - } - NativeObject *obj = ConvertNativeValueTo(nativeValue); if (obj == nullptr) { HILOG_ERROR("Convert js object fail."); return false; } - bool ret = ConvertFromJsValue(engine, obj->GetProperty("code"), result->code); - NativeArray *nativeArray = ConvertNativeValueTo(obj->GetProperty("roots")); - if (nativeArray == nullptr) { - HILOG_ERROR("nativeArray is nullptr"); + bool ret = ConvertFromJsValue(engine, obj->GetProperty("code"), result.code); + NativeArray *nativeArray = ConvertNativeValueTo(obj->GetProperty("roots")); + if (nativeArray == nullptr) { + HILOG_ERROR("nativeArray is nullptr"); + return false; + } + + for (uint32_t i = 0; i < nativeArray->GetLength(); i++) { + NativeValue *nativeRootInfo = nativeArray->GetElement(i); + if (nativeRootInfo == nullptr) { + HILOG_ERROR("get native FileInfo fail."); return false; } - for (uint32_t i = 0; i < nativeArray->GetLength(); i++) { - NativeValue *nativeRootInfo = nativeArray->GetElement(i); - if (nativeRootInfo == nullptr) { - HILOG_ERROR("get native FileInfo fail."); - return false; - } - obj = ConvertNativeValueTo(nativeRootInfo); - if (obj == nullptr) { - HILOG_ERROR("Convert js object fail."); - return false; - } + obj = ConvertNativeValueTo(nativeRootInfo); + if (obj == nullptr) { + HILOG_ERROR("Convert js object fail."); + return false; + } - RootInfo rootInfo; - ret = ret && ConvertFromJsValue(engine, obj->GetProperty("deviceType"), rootInfo.deviceType); - ret = ret && ConvertFromJsValue(engine, obj->GetProperty("uri"), rootInfo.uri); - ret = ret && ConvertFromJsValue(engine, obj->GetProperty("displayName"), rootInfo.displayName); - ret = ret && ConvertFromJsValue(engine, obj->GetProperty("deviceFlags"), rootInfo.deviceFlags); - if (!ret) { - HILOG_ERROR("Convert js value fail."); - return ret; - } - (result->data).emplace_back(std::move(rootInfo)); + RootInfo rootInfo; + ret = ret && ConvertFromJsValue(engine, obj->GetProperty("deviceType"), rootInfo.deviceType); + ret = ret && ConvertFromJsValue(engine, obj->GetProperty("uri"), rootInfo.uri); + ret = ret && ConvertFromJsValue(engine, obj->GetProperty("displayName"), rootInfo.displayName); + ret = ret && ConvertFromJsValue(engine, obj->GetProperty("deviceFlags"), rootInfo.deviceFlags); + if (!ret) { + HILOG_ERROR("Convert js value fail."); + return ret; } - return true; + + result.data.emplace_back(std::move(rootInfo)); + } + + return true; } -int JsFileAccessExtAbility::GetRoots(std::vector &rootInfo) +int JsFileAccessExtAbility::GetRoots(std::vector &rootInfoVec) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); auto value = std::make_shared>>(); @@ -838,20 +840,15 @@ int JsFileAccessExtAbility::GetRoots(std::vector &rootInfo) return true; }; auto retParser = [value](NativeEngine &engine, NativeValue *result) -> bool { - std::shared_ptr>> rootInfo = std::make_shared>>(); - if (rootInfo == nullptr) { - HILOG_ERROR("new Value fail."); - return false; - } - - bool ret = ParserGetRootsJsResult(engine, result, rootInfo); + Value> rootInfoVec; + bool ret = ParserGetRootsJsResult(engine, result, rootInfoVec); if (!ret) { HILOG_ERROR("Parser js value fail."); return ret; } - value->code = rootInfo->code; - value->data = std::move(rootInfo->data); + value->code = rootInfoVec.code; + value->data = std::move(rootInfoVec.data); return true; }; @@ -865,7 +862,8 @@ int JsFileAccessExtAbility::GetRoots(std::vector &rootInfo) HILOG_ERROR("fileio fail."); return ERR_FILEIO_FAIL; } - rootInfo = value->data; + + rootInfoVec = value->data; FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; } diff --git a/interfaces/kits/napi/file_access_module/BUILD.gn b/interfaces/kits/napi/file_access_module/BUILD.gn index 3e556e12..b0b76b08 100644 --- a/interfaces/kits/napi/file_access_module/BUILD.gn +++ b/interfaces/kits/napi/file_access_module/BUILD.gn @@ -22,16 +22,22 @@ ohos_shared_library("fileaccess") { include_dirs = [ "./", - "${BASE_DIR}/utils", "${BASE_DIR}/interfaces/kits/napi/common", + "${BASE_DIR}/interfaces/kits/napi/file_access_module/file_info", + "${BASE_DIR}/interfaces/kits/napi/file_access_module/root_info", + "${BASE_DIR}/utils", "//foundation/distributeddatamgr/distributedfile/utils/filemgmt_libn/include", ] sources = [ "${BASE_DIR}/interfaces/kits/napi/common/file_extension_info_napi.cpp", + "file_info/napi_file_info_exporter.cpp", + "file_info/napi_file_iterator_exporter.cpp", "napi_fileaccess_helper.cpp", "napi_notify_callback.cpp", "native_fileaccess_module.cpp", + "root_info/napi_root_info_exporter.cpp", + "root_info/napi_root_iterator_exporter.cpp", ] deps = [ diff --git a/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h b/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h index 56d34b20..3335b8a7 100644 --- a/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h +++ b/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h @@ -24,12 +24,13 @@ namespace OHOS { namespace FileAccessFwk { +constexpr int64_t MAX_COUNT = 1000; // ListFile get file's max count + struct FileIteratorEntity { FileAccessHelper *fileAccessHelper { nullptr }; std::mutex entityOperateMutex; FileInfo fileInfo {}; std::vector fileInfoVec {}; - int64_t maxCount { 1000 }; int64_t offset { 0 }; int64_t pos { 0 }; }; diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp index 98ef55b9..0e2a0b25 100644 --- a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp @@ -71,6 +71,21 @@ napi_value NapiFileInfoExporter::Constructor(napi_env env, napi_callback_info in return funcArg.GetThisVar(); } +int CheckFileMode(const int64_t mode) +{ + if ((mode & DOCUMENT_FLAG_REPRESENTS_DIR) != DOCUMENT_FLAG_REPRESENTS_DIR) { + HILOG_ERROR("current FileInfo is not dir"); + return ERR_INVALID_PARAM; + } + + if ((mode & DOCUMENT_FLAG_REPRESENTS_FILE) == DOCUMENT_FLAG_REPRESENTS_FILE) { + HILOG_ERROR("file mode is incorrect"); + return ERR_INVALID_PARAM; + } + + return ERR_OK; +} + napi_value NapiFileInfoExporter::ListFile(napi_env env, napi_callback_info info) { NFuncArg funcArg(env, info); @@ -85,8 +100,8 @@ napi_value NapiFileInfoExporter::ListFile(napi_env env, napi_callback_info info) return nullptr; } - if ((fileInfoEntity->fileInfo.mode & DOCUMENT_FLAG_REPRESENTS_DIR) != DOCUMENT_FLAG_REPRESENTS_DIR) { - HILOG_ERROR("current FileInfo is not dir."); + if (CheckFileMode(fileInfoEntity->fileInfo.mode) != ERR_OK) { + HILOG_ERROR("current FileInfo's mode error"); return NVal::CreateUndefined(env).val_; } @@ -111,10 +126,11 @@ napi_value NapiFileInfoExporter::ListFile(napi_env env, napi_callback_info info) std::lock_guard lock(fileIteratorEntity->entityOperateMutex); fileIteratorEntity->fileAccessHelper = fileInfoEntity->fileAccessHelper; fileIteratorEntity->fileInfo = fileInfoEntity->fileInfo; + fileIteratorEntity->fileInfoVec.clear(); fileIteratorEntity->offset = 0; fileIteratorEntity->pos = 0; auto ret = fileInfoEntity->fileAccessHelper->ListFile(fileInfoEntity->fileInfo, fileIteratorEntity->offset, - fileIteratorEntity->maxCount, fileIteratorEntity->fileInfoVec); + MAX_COUNT, fileIteratorEntity->fileInfoVec); if (ret != ERR_OK) { NError(ret).ThrowErr(env, "exec ListFile fail"); return nullptr; diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.h b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.h index 57264e33..318096c6 100644 --- a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.h +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.h @@ -26,6 +26,8 @@ namespace OHOS { namespace FileAccessFwk { using namespace FileManagement::LibN; +int CheckFileMode(const int64_t mode); + class NapiFileInfoExporter final : public NExporter { public: inline static const std::string className_ = "NapiFileInfoExporter"; diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp b/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp index b1a47452..13549085 100644 --- a/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp @@ -58,6 +58,11 @@ napi_value NapiFileIteratorExporter::Constructor(napi_env env, napi_callback_inf } auto fileIteratorEntity = std::make_unique(); + if (fileIteratorEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "New obj FileIteratorEntity fail"); + return nullptr; + } + if (!NClass::SetEntityFor(env, funcArg.GetThisVar(), std::move(fileIteratorEntity))) { NError(ERR_NULL_POINTER).ThrowErr(env, "INNER BUG. Failed to wrap entity for obj FileIteratorEntity"); return nullptr; @@ -85,12 +90,12 @@ static int MakeResult(napi_value objFileInfoExporter, FileIteratorEntity *fileIt fileInfoEntity->fileAccessHelper = fileIteratorEntity->fileAccessHelper; fileInfoEntity->fileInfo = fileIteratorEntity->fileInfoVec[fileIteratorEntity->pos]; fileIteratorEntity->pos++; - if (fileIteratorEntity->pos == fileIteratorEntity->maxCount) { + if (fileIteratorEntity->pos == MAX_COUNT) { fileIteratorEntity->fileInfoVec.clear(); - fileIteratorEntity->offset += fileIteratorEntity->maxCount; + fileIteratorEntity->offset += MAX_COUNT; fileIteratorEntity->pos = 0; int ret = fileIteratorEntity->fileAccessHelper->ListFile(fileIteratorEntity->fileInfo, - fileIteratorEntity->offset, fileIteratorEntity->maxCount, fileIteratorEntity->fileInfoVec); + fileIteratorEntity->offset, MAX_COUNT, fileIteratorEntity->fileInfoVec); if (ret != ERR_OK) { HILOG_ERROR("exec ListFile fail, code:%{public}d", ret); return ret; @@ -121,8 +126,8 @@ napi_value NapiFileIteratorExporter::Next(napi_env env, napi_callback_info info) return nullptr; } - if ((fileIteratorEntity->fileInfo.mode & DOCUMENT_FLAG_REPRESENTS_DIR) != DOCUMENT_FLAG_REPRESENTS_DIR) { - HILOG_ERROR("current FileInfo is not dir."); + if (CheckFileMode(fileIteratorEntity->fileInfo.mode) != ERR_OK) { + HILOG_ERROR("current FileInfo's mode error"); return NVal::CreateUndefined(env).val_; } diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index 15a28d2c..cbba5049 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -20,14 +20,17 @@ #include "file_access_framework_errno.h" #include "file_access_helper.h" +#include "file_info_entity.h" #include "filemgmt_libn.h" #include "hilog_wrapper.h" #include "ifile_access_notify.h" #include "napi_base_context.h" #include "napi_common_fileaccess.h" #include "napi_error.h" +#include "napi_file_info_exporter.h" #include "napi_notify_callback.h" -#include "n_val.h" +#include "napi_root_iterator_exporter.h" +#include "root_iterator_entity.h" #include "securec.h" #include "uri.h" @@ -206,7 +209,6 @@ napi_value FileAccessHelperInit(napi_env env, napi_value exports) DECLARE_NAPI_FUNCTION("delete", NAPI_Delete), DECLARE_NAPI_FUNCTION("move", NAPI_Move), DECLARE_NAPI_FUNCTION("rename", NAPI_Rename), - DECLARE_NAPI_FUNCTION("listFile", NAPI_ListFile), DECLARE_NAPI_FUNCTION("getRoots", NAPI_GetRoots), DECLARE_NAPI_FUNCTION("access", NAPI_Access), DECLARE_NAPI_FUNCTION("on", NAPI_On), @@ -587,54 +589,29 @@ napi_value NAPI_Rename(napi_env env, napi_callback_info info) return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; } -napi_value NAPI_ListFile(napi_env env, napi_callback_info info) +static int MakeGetRootsResult(napi_env &env, FileAccessHelper *helper, std::vector &rootInfoVec, NVal &nVal) { - NFuncArg funcArg(env, info); - if (!funcArg.InitArgs(NARG_CNT::ONE, NARG_CNT::TWO)) { - NapiError(ERR_PARAM_NUMBER).ThrowErr(env); - return nullptr; + auto objRootIterator = NClass::InstantiateClass(env, NapiRootIteratorExporter::className_, {}); + if (objRootIterator == nullptr) { + HILOG_INFO("Cannot instantiate class NapiRootIteratorExporter"); + return ERR_NULL_POINTER; } - bool succ = false; - std::unique_ptr uri; - std::tie(succ, uri, std::ignore) = NVal(env, funcArg[NARG_POS::FIRST]).ToUTF8String(); - if (!succ) { - NapiError(ERR_INVALID_PARAM).ThrowErr(env); - return nullptr; + auto rootIteratorEntity = NClass::GetEntityOf(env, objRootIterator); + if (rootIteratorEntity == nullptr) { + HILOG_INFO("Cannot get the entity of RootIteratorEntity"); + return ERR_NULL_POINTER; } - FileAccessHelper *fileAccessHelper = GetFileAccessHelper(env, funcArg.GetThisVar()); - if (fileAccessHelper == nullptr) { - return nullptr; + { + std::lock_guard lock(rootIteratorEntity->entityOperateMutex); + rootIteratorEntity->fileAccessHelper = helper; + rootIteratorEntity->devVec = std::move(rootInfoVec); + rootIteratorEntity->pos = 0; + nVal = { env, objRootIterator }; } - auto result = std::make_shared>(); - string uriString(uri.get()); - auto cbExec = [uriString, result, fileAccessHelper]() -> NError { - OHOS::Uri uri(uriString); - int ret = fileAccessHelper->ListFile(uri, *result); - return NError(ret); - }; - auto cbComplete = [result](napi_env env, NError err) -> NVal { - if (err) { - return { env, err.GetNapiErr(env) }; - } - napi_value jsArray = WrapArrayFileInfoToJS(env, *result); - return {env, jsArray}; - }; - - const std::string procedureName = "listFile"; - NVal thisVar(env, funcArg.GetThisVar()); - if (funcArg.GetArgc() == NARG_CNT::ONE) { - return NAsyncWorkPromise(env, thisVar).Schedule(procedureName, cbExec, cbComplete).val_; - } - - NVal cb(env, funcArg[NARG_POS::SECOND]); - if (!cb.TypeIs(napi_function)) { - NapiError(ERR_INVALID_PARAM).ThrowErr(env); - return nullptr; - } - return NAsyncWorkCallback(env, thisVar, cb).Schedule(procedureName, cbExec, cbComplete).val_; + return ERR_OK; } napi_value NAPI_GetRoots(napi_env env, napi_callback_info info) @@ -647,25 +624,38 @@ napi_value NAPI_GetRoots(napi_env env, napi_callback_info info) FileAccessHelper *fileAccessHelper = GetFileAccessHelper(env, funcArg.GetThisVar()); if (fileAccessHelper == nullptr) { + NapiError(ERR_NULL_POINTER).ThrowErr(env); return nullptr; } auto result = std::make_shared>(); + if (result == nullptr) { + NapiError(ERR_NULL_POINTER).ThrowErr(env); + return nullptr; + } + auto cbExec = [result, fileAccessHelper]() -> NError { int ret = fileAccessHelper->GetRoots(*result); return NError(ret); }; - auto cbComplete = [result](napi_env env, NError err) -> NVal { + auto cbComplete = [fileAccessHelper, result](napi_env env, NError err) -> NVal { if (err) { return { env, err.GetNapiErr(env) }; } - napi_value jsArray = WrapArrayRootInfoToJS(env, *result); - return {env, jsArray}; + + NVal nVal; + int ret = MakeGetRootsResult(env, fileAccessHelper, *result, nVal); + if (ret != ERR_OK) { + return { env, NError([ret]() -> std::tuple { + return { ret, "Make GetRoots Result fail" }; + }).GetNapiErr(env) }; + } + + return nVal; }; const std::string procedureName = "getRoots"; NVal thisVar(env, funcArg.GetThisVar()); - if (funcArg.GetArgc() == NARG_CNT::ZERO) { return NAsyncWorkPromise(env, thisVar).Schedule(procedureName, cbExec, cbComplete).val_; } diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.h b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.h index d0a4dbff..8c4f0fb6 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.h +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.h @@ -30,11 +30,10 @@ namespace FileAccessFwk { napi_value NAPI_Delete(napi_env env, napi_callback_info info); napi_value NAPI_Move(napi_env env, napi_callback_info info); napi_value NAPI_Rename(napi_env env, napi_callback_info info); - napi_value NAPI_ListFile(napi_env env, napi_callback_info info); napi_value NAPI_GetRoots(napi_env env, napi_callback_info info); napi_value NAPI_Access(napi_env env, napi_callback_info info); napi_value NAPI_On(napi_env env, napi_callback_info info); napi_value NAPI_Off(napi_env env, napi_callback_info info); -} } // namespace FileAccessFwk +} // namespace OHOS #endif // NAPI_FILEACCESS_HELPER_H \ No newline at end of file diff --git a/interfaces/kits/napi/file_access_module/napi_notify_callback.h b/interfaces/kits/napi/file_access_module/napi_notify_callback.h index 5dec5b4f..2f89b006 100644 --- a/interfaces/kits/napi/file_access_module/napi_notify_callback.h +++ b/interfaces/kits/napi/file_access_module/napi_notify_callback.h @@ -44,6 +44,6 @@ private: napi_env env_; uv_loop_s *loop_ = nullptr; }; -} // FileAccessFwk -} // OHOS +} // namespace FileAccessFwk +} // namespace OHOS #endif // NAPI_NOTIFY_CALLBACK_H \ No newline at end of file diff --git a/interfaces/kits/napi/file_access_module/native_fileaccess_module.cpp b/interfaces/kits/napi/file_access_module/native_fileaccess_module.cpp index e094d85c..8ccb330d 100644 --- a/interfaces/kits/napi/file_access_module/native_fileaccess_module.cpp +++ b/interfaces/kits/napi/file_access_module/native_fileaccess_module.cpp @@ -13,14 +13,22 @@ * limitations under the License. */ +#include +#include + +#include "filemgmt_libn.h" #include "file_extension_info_napi.h" #include "hilog_wrapper.h" #include "napi_fileaccess_helper.h" -#include "napi/native_api.h" -#include "napi/native_node_api.h" +#include "napi_file_info_exporter.h" +#include "napi_file_iterator_exporter.h" +#include "napi_root_info_exporter.h" +#include "napi_root_iterator_exporter.h" namespace OHOS { namespace FileAccessFwk { +using namespace FileManagement::LibN; + EXTERN_C_START /* * The module initialization. @@ -34,6 +42,21 @@ static napi_value Init(napi_env env, napi_value exports) InitDeviceType(env, exports); InitFileInfo(env, exports); InitRootInfo(env, exports); + + std::vector> products; + products.emplace_back(std::make_unique(env, exports)); + products.emplace_back(std::make_unique(env, exports)); + products.emplace_back(std::make_unique(env, exports)); + products.emplace_back(std::make_unique(env, exports)); + for (auto &&product : products) { + if (!product->Export()) { + HILOG_ERROR("INNER BUG. Failed to export class %{public}s", product->GetClassName().c_str()); + return nullptr; + } else { + HILOG_ERROR("Class %{public}s has been exported", product->GetClassName().c_str()); + } + } + return exports; } EXTERN_C_END diff --git a/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp b/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp index 5c680a53..2c0a6f47 100644 --- a/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp @@ -110,10 +110,11 @@ napi_value NapiRootInfoExporter::ListFile(napi_env env, napi_callback_info info) std::lock_guard lock(fileIteratorEntity->entityOperateMutex); fileIteratorEntity->fileAccessHelper = rootEntity->fileAccessHelper; fileIteratorEntity->fileInfo = fileInfo; + fileIteratorEntity->fileInfoVec.clear(); fileIteratorEntity->offset = 0; fileIteratorEntity->pos = 0; auto ret = rootEntity->fileAccessHelper->ListFile(fileInfo, fileIteratorEntity->offset, - fileIteratorEntity->maxCount, fileIteratorEntity->fileInfoVec); + MAX_COUNT, fileIteratorEntity->fileInfoVec); if (ret != ERR_OK) { NError(ret).ThrowErr(env, "ListFile get result fail."); return nullptr; diff --git a/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp b/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp new file mode 100644 index 00000000..fe90f865 --- /dev/null +++ b/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp @@ -0,0 +1,123 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "napi_root_iterator_exporter.h" + +#include "hilog_wrapper.h" +#include "napi_root_info_exporter.h" +#include "root_info_entity.h" +#include "root_iterator_entity.h" + +namespace OHOS { +namespace FileAccessFwk { +bool NapiRootIteratorExporter::Export() +{ + std::vector props = { + NVal::DeclareNapiFunction("next", Next), + }; + + std::string className = GetClassName(); + bool succ = false; + napi_value classValue = nullptr; + std::tie(succ, classValue) = NClass::DefineClass(exports_.env_, className, + NapiRootIteratorExporter::Constructor, std::move(props)); + if (!succ) { + NError(ERR_NULL_POINTER).ThrowErr(exports_.env_, + "INNER BUG. Failed to define class NapiRootIteratorExporter"); + return false; + } + + succ = NClass::SaveClass(exports_.env_, className, classValue); + if (!succ) { + NError(ERR_NULL_POINTER).ThrowErr(exports_.env_, "INNER BUG. Failed to save class NapiRootIteratorExporter"); + return false; + } + + return exports_.AddProp(className, classValue); +} + +napi_value NapiRootIteratorExporter::Constructor(napi_env env, napi_callback_info info) +{ + NFuncArg funcArg(env, info); + if (!funcArg.InitArgs(NARG_CNT::ZERO)) { + NError(ERR_PARAM_NUMBER).ThrowErr(env, "Number of arguments unmatched"); + return nullptr; + } + + auto rootIteratorEntity = std::make_unique(); + if (!NClass::SetEntityFor(env, funcArg.GetThisVar(), std::move(rootIteratorEntity))) { + NError(ERR_NULL_POINTER).ThrowErr(env, "INNER BUG. Failed to wrap entity for obj FileIteratorEntity"); + return nullptr; + } + + return funcArg.GetThisVar(); +} + +napi_value NapiRootIteratorExporter::Next(napi_env env, napi_callback_info info) +{ + NFuncArg funcArg(env, info); + if (!funcArg.InitArgs(NARG_CNT::ZERO)) { + NError(ERR_PARAM_NUMBER).ThrowErr(env, "Number of arguments unmatched"); + return nullptr; + } + + napi_value thisVar = funcArg.GetThisVar(); + auto iterEntity = NClass::GetEntityOf(env, thisVar); + if (iterEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of RootIteratorEntity"); + return nullptr; + } + + napi_value objRootExporter = NClass::InstantiateClass(env, NapiRootInfoExporter::className_, {}); + if (objRootExporter == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot instantiate class NapiRootInfoExporter"); + return nullptr; + } + + auto rootEntity = NClass::GetEntityOf(env, objRootExporter); + if (rootEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get the entity of RootInfoEntity"); + return nullptr; + } + + auto retNVal = NVal::CreateObject(env); + bool done = true; + { + std::lock_guard lock(iterEntity->entityOperateMutex); + auto len = (int64_t)iterEntity->devVec.size(); + rootEntity->fileAccessHelper = iterEntity->fileAccessHelper; + if (iterEntity->pos < len) { + rootEntity->rootInfo = iterEntity->devVec[iterEntity->pos]; + iterEntity->pos++; + done = (iterEntity->pos == len); + } else { + iterEntity->pos++; + rootEntity = nullptr; + objRootExporter = NVal::CreateUndefined(env).val_; + done = true; + } + retNVal.AddProp("value", objRootExporter); + retNVal.AddProp("done", NVal::CreateBool(env, done).val_); + } + + return retNVal.val_; +} + +std::string NapiRootIteratorExporter::GetClassName() +{ + return NapiRootIteratorExporter::className_; +} +} // namespace FileAccessFwk +} // namespace OHOS \ No newline at end of file diff --git a/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.h b/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.h new file mode 100644 index 00000000..9902d7d1 --- /dev/null +++ b/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.h @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef NAPI_ROOT_ITERATOR_H +#define NAPI_ROOT_ITERATOR_H + +#include + +#include "filemgmt_libn.h" + +namespace OHOS { +namespace FileAccessFwk { +using namespace FileManagement::LibN; +class NapiRootIteratorExporter final : public NExporter { +public: + inline static const std::string className_ = "NapiRootIteratorExporter"; + + NapiRootIteratorExporter(napi_env env, napi_value exports) : NExporter(env, exports) {}; + ~NapiRootIteratorExporter() = default; + + static napi_value Constructor(napi_env env, napi_callback_info info); + static napi_value Next(napi_env env, napi_callback_info info); + + bool Export() override; + std::string GetClassName() override; +}; +} // namespace FileAccessFwk +} // namespace OHOS +#endif // NAPI_ROOT_ITERATOR_H \ No newline at end of file diff --git a/interfaces/kits/napi/file_access_module/root_info/root_info_entity.h b/interfaces/kits/napi/file_access_module/root_info/root_info_entity.h new file mode 100644 index 00000000..bfeef115 --- /dev/null +++ b/interfaces/kits/napi/file_access_module/root_info/root_info_entity.h @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ROOT_INFO_ENTITY_H +#define ROOT_INFO_ENTITY_H + +#include "file_access_extension_info.h" +#include "file_access_helper.h" + +namespace OHOS { +namespace FileAccessFwk { +struct RootInfoEntity { + FileAccessHelper *fileAccessHelper { nullptr }; + RootInfo rootInfo {}; +}; +} // namespace FileAccessFwk +} // namespace OHOS +#endif // ROOT_INFO_ENTITY_H \ No newline at end of file diff --git a/interfaces/kits/napi/file_access_module/root_info/root_iterator_entity.h b/interfaces/kits/napi/file_access_module/root_info/root_iterator_entity.h new file mode 100644 index 00000000..8e746cf9 --- /dev/null +++ b/interfaces/kits/napi/file_access_module/root_info/root_iterator_entity.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ROOT_ITERATOR_ENTITY_H +#define ROOT_ITERATOR_ENTITY_H + +#include +#include + +#include "file_access_extension_info.h" +#include "file_access_helper.h" + +namespace OHOS { +namespace FileAccessFwk { +struct RootIteratorEntity { + FileAccessHelper *fileAccessHelper { nullptr }; + std::vector devVec {}; + std::mutex entityOperateMutex; + int64_t pos { 0 }; +}; +} // namespace FileAccessFwk +} // namespace OHOS +#endif // ROOT_ITERATOR_ENTITY_H \ No newline at end of file diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index c4ee729b..5e5f732d 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -446,7 +446,7 @@ export default class FileExtAbility extends Extension { }; } - listFile(sourceFileUri) { + listFile(sourceFileUri, offset, count) { if (!this.checkUri(sourceFileUri)) { return { infos: [], @@ -458,6 +458,7 @@ export default class FileExtAbility extends Extension { let path = this.getPath(sourceFileUri); let dir = fileio.opendirSync(path); let hasNextFile = true; + let i = 0; while (hasNextFile) { try { let dirent = dir.readSync(); @@ -468,6 +469,12 @@ export default class FileExtAbility extends Extension { } else { mode |= DocumentFlag.REPRESENTS_FILE; } + + if (offset > i) { + i ++; + continue; + } + infos.push({ uri: this.genNewFileUri(sourceFileUri, dirent.name), fileName: dirent.name, @@ -476,6 +483,12 @@ export default class FileExtAbility extends Extension { mtime: stat.mtime, mimeType: '', }); + + i ++; + if (i == (offset + count)) { + hasNextFile = false; + break; + } } catch (e) { hasNextFile = false; } -- Gitee From d1cd55151e4c48d8c15d7d9031d159ccdb647e88 Mon Sep 17 00:00:00 2001 From: wangminmin Date: Sat, 3 Sep 2022 12:07:12 +0800 Subject: [PATCH 087/122] slove sync code fail Signed-off-by: wangminmin --- .../innerkits/file_access/src/file_access_ext_proxy.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 70f821c4..f7776e84 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -402,7 +402,7 @@ int FileAccessExtProxy::ListFile(const Uri &sourceFile, std::vector &f fileInfo.clear(); uint64_t count = 0; if (!reply.ReadUint64(count)) { - HILOG_ERROR("ListFile operation failed count : %{public}llu", count); + HILOG_ERROR("ListFile operation failed count : %{public}llu", (unsigned long long)count); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_RESULT; } @@ -452,7 +452,7 @@ int FileAccessExtProxy::GetRoots(std::vector &rootInfo) rootInfo.clear(); uint64_t count = 0; if (!reply.ReadUint64(count)) { - HILOG_ERROR("ListFile operation failed count : %{public}llu", count); + HILOG_ERROR("ListFile operation failed count : %{public}llu", (unsigned long long)count); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_RESULT; } -- Gitee From b294d47b789f846854e0067896ef77396f17e164 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Sat, 3 Sep 2022 16:21:10 +0800 Subject: [PATCH 088/122] fix code review Signed-off-by: linjun9528 --- .../include/file_access_extension_info.h | 23 ++++++------ .../file_access/src/file_access_ext_proxy.cpp | 4 +-- .../file_access/src/file_access_ext_stub.cpp | 10 +++--- .../file_access/src/file_access_helper.cpp | 36 +++++++++++++++++++ .../src/js_file_access_ext_ability.cpp | 5 ++- .../file_info/file_info_entity.h | 4 +-- .../file_info/file_iterator_entity.h | 10 +++--- .../file_info/napi_file_info_exporter.cpp | 18 ++-------- .../file_info/napi_file_info_exporter.h | 2 -- .../file_info/napi_file_iterator_exporter.cpp | 3 +- .../root_info/napi_root_iterator_exporter.cpp | 30 ++++++++-------- 11 files changed, 82 insertions(+), 63 deletions(-) diff --git a/frameworks/innerkits/file_access/include/file_access_extension_info.h b/frameworks/innerkits/file_access/include/file_access_extension_info.h index e4990cc7..e9afe522 100644 --- a/frameworks/innerkits/file_access/include/file_access_extension_info.h +++ b/frameworks/innerkits/file_access/include/file_access_extension_info.h @@ -51,18 +51,17 @@ const int32_t DOCUMENT_FLAG_SUPPORTS_WRITE = 1 << 3; struct FileInfo : public virtual OHOS::Parcelable { public: - std::string uri { "" }; - std::string fileName { "" }; - int32_t mode { 0 }; - int64_t size { 0 }; - int64_t mtime { 0 }; - std::string mimeType { "" }; + std::string uri; + std::string fileName; + int32_t mode; + int64_t size; + int64_t mtime; + std::string mimeType; FileInfo() = default; FileInfo(std::string uriIn, std::string fileNameIn, int32_t modeIn, std::string mimeTypeIn) : uri(uriIn), fileName(fileNameIn), mode(modeIn), mimeType(mimeTypeIn) - { - } + {} bool ReadFromParcel(Parcel &parcel) { @@ -115,10 +114,10 @@ public: struct RootInfo : public virtual OHOS::Parcelable { public: - int32_t deviceType { 0 }; - std::string uri { "" }; - std::string displayName { "" }; - int32_t deviceFlags { 0 }; + int32_t deviceType; + std::string uri; + std::string displayName; + int32_t deviceFlags; bool ReadFromParcel(Parcel &parcel) { diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 261fa989..68ea16dc 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -1,4 +1,4 @@ -8/* +/* * Copyright (c) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -361,7 +361,7 @@ int FileAccessExtProxy::Rename(const Uri &sourceFile, const std::string &display return ERR_OK; } -int GetListFileResult(MessageParcel &reply, std::vector &fileInfoVec) +static int GetListFileResult(MessageParcel &reply, std::vector &fileInfoVec) { int ret = ERR_PARCEL_FAIL; if (!reply.ReadInt32(ret)) { diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp index e7d58519..af7532fe 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp @@ -329,24 +329,24 @@ ErrCode FileAccessExtStub::CmdListFile(MessageParcel &data, MessageParcel &reply return ERR_PARCEL_FAIL; } - std::vector vecFileInfo; - int ret = ListFile(*fileInfo, offset, maxCount, vecFileInfo); + std::vector fileInfoVec; + int ret = ListFile(*fileInfo, offset, maxCount, fileInfoVec); if (!reply.WriteInt32(ret)) { HILOG_ERROR("Parameter ListFile fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } - int64_t count {vecFileInfo.size()}; + int64_t count {fileInfoVec.size()}; if (!reply.WriteInt64(count)) { HILOG_ERROR("Parameter ListFile fail to WriteInt64 count"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } - for (const auto &fileInfo : vecFileInfo) { + for (const auto &fileInfo : fileInfoVec) { if (!reply.WriteParcelable(&fileInfo)) { - HILOG_ERROR("parameter ListFile fail to WriteParcelable vecFileInfo"); + HILOG_ERROR("parameter ListFile fail to WriteParcelable fileInfoVec"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 07e32420..b04194b2 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -424,6 +424,12 @@ int FileAccessHelper::OpenFile(Uri &uri, int flags, int &fd) } int ret = fileExtProxy->OpenFile(uri, flags, fd); + if (ret != ERR_OK) { + HILOG_ERROR("OpenFile get result error, code:%{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; + } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -445,6 +451,12 @@ int FileAccessHelper::CreateFile(Uri &parent, const std::string &displayName, Ur } int ret = fileExtProxy->CreateFile(parent, displayName, newFile); + if (ret != ERR_OK) { + HILOG_ERROR("CreateFile get result error, code:%{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; + } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -466,6 +478,12 @@ int FileAccessHelper::Mkdir(Uri &parent, const std::string &displayName, Uri &ne } int ret = fileExtProxy->Mkdir(parent, displayName, newDir); + if (ret != ERR_OK) { + HILOG_ERROR("Mkdir get result error, code:%{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; + } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -487,6 +505,12 @@ int FileAccessHelper::Delete(Uri &selectFile) } int ret = fileExtProxy->Delete(selectFile); + if (ret != ERR_OK) { + HILOG_ERROR("Delete get result error, code:%{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; + } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -521,6 +545,12 @@ int FileAccessHelper::Move(Uri &sourceFile, Uri &targetParent, Uri &newFile) } int ret = fileExtProxy->Move(sourceFile, targetParent, newFile); + if (ret != ERR_OK) { + HILOG_ERROR("Move get result error, code:%{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; + } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -542,6 +572,12 @@ int FileAccessHelper::Rename(Uri &sourceFile, const std::string &displayName, Ur } int ret = fileExtProxy->Rename(sourceFile, displayName, newFile); + if (ret != ERR_OK) { + HILOG_ERROR("Rename get result error, code:%{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; + } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index eb319d08..323bf783 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -847,8 +847,7 @@ int JsFileAccessExtAbility::GetRoots(std::vector &rootInfoVec) return ret; } - value->code = rootInfoVec.code; - value->data = std::move(rootInfoVec.data); + *value = std::move(rootInfoVec); return true; }; @@ -863,7 +862,7 @@ int JsFileAccessExtAbility::GetRoots(std::vector &rootInfoVec) return ERR_FILEIO_FAIL; } - rootInfoVec = value->data; + rootInfoVec = std::move(value->data); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; } diff --git a/interfaces/kits/napi/file_access_module/file_info/file_info_entity.h b/interfaces/kits/napi/file_access_module/file_info/file_info_entity.h index e668b1f6..d74ed4e2 100644 --- a/interfaces/kits/napi/file_access_module/file_info/file_info_entity.h +++ b/interfaces/kits/napi/file_access_module/file_info/file_info_entity.h @@ -22,8 +22,8 @@ namespace OHOS { namespace FileAccessFwk { struct FileInfoEntity { - FileAccessHelper *fileAccessHelper { nullptr }; - FileInfo fileInfo {}; + FileAccessHelper *fileAccessHelper; + FileInfo fileInfo; }; } // namespace FileAccessFwk } // namespace OHOS diff --git a/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h b/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h index 3335b8a7..083de779 100644 --- a/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h +++ b/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h @@ -27,12 +27,12 @@ namespace FileAccessFwk { constexpr int64_t MAX_COUNT = 1000; // ListFile get file's max count struct FileIteratorEntity { - FileAccessHelper *fileAccessHelper { nullptr }; + FileAccessHelper *fileAccessHelper; std::mutex entityOperateMutex; - FileInfo fileInfo {}; - std::vector fileInfoVec {}; - int64_t offset { 0 }; - int64_t pos { 0 }; + FileInfo fileInfo; + std::vector fileInfoVec; + int64_t offset; + int64_t pos; }; } // namespace FileAccessFwk } // namespace OHOS diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp index 0e2a0b25..e3e53c25 100644 --- a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp @@ -20,6 +20,7 @@ #include "file_iterator_entity.h" #include "hilog_wrapper.h" #include "napi_file_iterator_exporter.h" +#include "napi_utils.h" namespace OHOS { namespace FileAccessFwk { @@ -71,21 +72,6 @@ napi_value NapiFileInfoExporter::Constructor(napi_env env, napi_callback_info in return funcArg.GetThisVar(); } -int CheckFileMode(const int64_t mode) -{ - if ((mode & DOCUMENT_FLAG_REPRESENTS_DIR) != DOCUMENT_FLAG_REPRESENTS_DIR) { - HILOG_ERROR("current FileInfo is not dir"); - return ERR_INVALID_PARAM; - } - - if ((mode & DOCUMENT_FLAG_REPRESENTS_FILE) == DOCUMENT_FLAG_REPRESENTS_FILE) { - HILOG_ERROR("file mode is incorrect"); - return ERR_INVALID_PARAM; - } - - return ERR_OK; -} - napi_value NapiFileInfoExporter::ListFile(napi_env env, napi_callback_info info) { NFuncArg funcArg(env, info); @@ -100,7 +86,7 @@ napi_value NapiFileInfoExporter::ListFile(napi_env env, napi_callback_info info) return nullptr; } - if (CheckFileMode(fileInfoEntity->fileInfo.mode) != ERR_OK) { + if (IsDirectory(fileInfoEntity->fileInfo.mode) != ERR_OK) { HILOG_ERROR("current FileInfo's mode error"); return NVal::CreateUndefined(env).val_; } diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.h b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.h index 318096c6..57264e33 100644 --- a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.h +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.h @@ -26,8 +26,6 @@ namespace OHOS { namespace FileAccessFwk { using namespace FileManagement::LibN; -int CheckFileMode(const int64_t mode); - class NapiFileInfoExporter final : public NExporter { public: inline static const std::string className_ = "NapiFileInfoExporter"; diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp b/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp index 13549085..8f7197e8 100644 --- a/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp @@ -21,6 +21,7 @@ #include "file_iterator_entity.h" #include "hilog_wrapper.h" #include "napi_file_info_exporter.h" +#include "napi_utils.h" namespace OHOS { namespace FileAccessFwk { @@ -126,7 +127,7 @@ napi_value NapiFileIteratorExporter::Next(napi_env env, napi_callback_info info) return nullptr; } - if (CheckFileMode(fileIteratorEntity->fileInfo.mode) != ERR_OK) { + if (IsDirectory(fileIteratorEntity->fileInfo.mode) != ERR_OK) { HILOG_ERROR("current FileInfo's mode error"); return NVal::CreateUndefined(env).val_; } diff --git a/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp b/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp index fe90f865..91c6d832 100644 --- a/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp @@ -74,19 +74,19 @@ napi_value NapiRootIteratorExporter::Next(napi_env env, napi_callback_info info) } napi_value thisVar = funcArg.GetThisVar(); - auto iterEntity = NClass::GetEntityOf(env, thisVar); - if (iterEntity == nullptr) { + auto rootIterator = NClass::GetEntityOf(env, thisVar); + if (rootIterator == nullptr) { NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of RootIteratorEntity"); return nullptr; } - napi_value objRootExporter = NClass::InstantiateClass(env, NapiRootInfoExporter::className_, {}); - if (objRootExporter == nullptr) { + napi_value objRootInfoExporter = NClass::InstantiateClass(env, NapiRootInfoExporter::className_, {}); + if (objRootInfoExporter == nullptr) { NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot instantiate class NapiRootInfoExporter"); return nullptr; } - auto rootEntity = NClass::GetEntityOf(env, objRootExporter); + auto rootEntity = NClass::GetEntityOf(env, objRootInfoExporter); if (rootEntity == nullptr) { NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get the entity of RootInfoEntity"); return nullptr; @@ -95,20 +95,20 @@ napi_value NapiRootIteratorExporter::Next(napi_env env, napi_callback_info info) auto retNVal = NVal::CreateObject(env); bool done = true; { - std::lock_guard lock(iterEntity->entityOperateMutex); - auto len = (int64_t)iterEntity->devVec.size(); - rootEntity->fileAccessHelper = iterEntity->fileAccessHelper; - if (iterEntity->pos < len) { - rootEntity->rootInfo = iterEntity->devVec[iterEntity->pos]; - iterEntity->pos++; - done = (iterEntity->pos == len); + std::lock_guard lock(rootIterator->entityOperateMutex); + auto len = (int64_t)rootIterator->devVec.size(); + rootEntity->fileAccessHelper = rootIterator->fileAccessHelper; + if (rootIterator->pos < len) { + rootEntity->rootInfo = rootIterator->devVec[rootIterator->pos]; + rootIterator->pos++; + done = (rootIterator->pos == len); } else { - iterEntity->pos++; + rootIterator->pos++; rootEntity = nullptr; - objRootExporter = NVal::CreateUndefined(env).val_; + objRootInfoExporter = NVal::CreateUndefined(env).val_; done = true; } - retNVal.AddProp("value", objRootExporter); + retNVal.AddProp("value", objRootInfoExporter); retNVal.AddProp("done", NVal::CreateBool(env, done).val_); } -- Gitee From c3bfa2df16d4fe4381e57f895239ab9568eecd6e Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Sat, 3 Sep 2022 16:34:40 +0800 Subject: [PATCH 089/122] fix TDD test code Signed-off-by: linjun9528 --- .../test/file_access_helper_test.cpp | 55 ++++++++++++------- .../test/file_extension_helper_test.cpp | 42 ++++++++++---- 2 files changed, 66 insertions(+), 31 deletions(-) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 9911ab34..86dbc2c4 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -14,6 +14,7 @@ */ #include +#include #include #include @@ -163,10 +164,10 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0000, testing::ext::T EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(""); if (info.size() > 0) { - parentUri = Uri(info[0].uri); + parentUri = Uri(info[0].uri + "/file"); GTEST_LOG_(INFO) << parentUri.ToString(); } - + result = fah->Mkdir(parentUri, "Download", newDirUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -1358,10 +1359,14 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0000, testing::ext::T result = fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::vector fileInfo; - fah->ListFile(newDirUriTest, fileInfo); - EXPECT_GT(fileInfo.size(), 0); - GTEST_LOG_(INFO) << "ListFile_0000 result:" << fileInfo.size() << endl; + FileInfo fileInfo; + fileInfo.uri = newDirUriTest.ToString(); + int64_t offset = 0; + int64_t maxCount = 1000; + std::vector fileInfoVec; + fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + EXPECT_GT(fileInfoVec.size(), 0); + GTEST_LOG_(INFO) << "ListFile_0000 result:" << fileInfoVec.size() << endl; result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1385,10 +1390,14 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0001, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0001"; try { Uri sourceFileUri(""); - std::vector fileInfo; - fah->ListFile(sourceFileUri, fileInfo); - EXPECT_EQ(fileInfo.size(), 0); - GTEST_LOG_(INFO) << "ListFile_0001 result:" << fileInfo.size() << endl; + FileInfo fileInfo; + fileInfo.uri = sourceFileUri.ToString(); + int64_t offset = 0; + int64_t maxCount = 1000; + vector fileInfoVec; + fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + EXPECT_EQ(fileInfoVec.size(), 0); + GTEST_LOG_(INFO) << "ListFile_0001 result:" << fileInfoVec.size() << endl; } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } @@ -1417,10 +1426,14 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0002, testing::ext::T EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); - std::vector fileInfo; - fah->ListFile(sourceFileUri, fileInfo); - EXPECT_EQ(fileInfo.size(), 0); - GTEST_LOG_(INFO) << "ListFile_0002 result:" << fileInfo.size() << endl; + FileInfo fileInfo; + fileInfo.uri = sourceFileUri.ToString(); + int64_t offset = 0; + int64_t maxCount = 1000; + vector fileInfoVec; + fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + EXPECT_EQ(fileInfoVec.size(), 0); + GTEST_LOG_(INFO) << "ListFile_0002 result:" << fileInfoVec.size() << endl; result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1444,10 +1457,14 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0003, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0003"; try { Uri sourceFileUri("~!@#$%^&*()_"); - std::vector fileInfo; - fah->ListFile(sourceFileUri, fileInfo); - EXPECT_EQ(fileInfo.size(), 0); - GTEST_LOG_(INFO) << "ListFile_0003 result:" << fileInfo.size() << endl; + FileInfo fileInfo; + fileInfo.uri = sourceFileUri.ToString(); + int64_t offset = 0; + int64_t maxCount = 1000; + vector fileInfoVec; + fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + EXPECT_EQ(fileInfoVec.size(), 0); + GTEST_LOG_(INFO) << "ListFile_0003 result:" << fileInfoVec.size() << endl; } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } @@ -1468,7 +1485,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_GetRoots_0000, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_GetRoots_0000"; try { uint64_t selfTokenId_ = GetSelfTokenID(); - + vector info; int result = fah->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index 1d1dadbb..2d9dc0aa 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -1568,9 +1568,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0000, testing:: result = fah->CreateFile(newDirUriTest, "file_extension_helper_ListFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::vector fileInfo; - fah->ListFile(newDirUriTest, fileInfo); - EXPECT_GT(fileInfo.size(), 0); + FileInfo fileInfo; + fileInfo.uri = newDirUriTest.ToString(); + int64_t offset = 0; + int64_t maxCount = 1000; + std::vector fileInfoVec; + fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + EXPECT_GT(fileInfoVec.size(), 0); result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1595,9 +1599,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0001, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0001"; try { Uri sourceFileUri(""); - std::vector fileInfo; - fah->ListFile(sourceFileUri, fileInfo); - EXPECT_EQ(fileInfo.size(), 0); + FileInfo fileInfo; + fileInfo.uri = sourceFileUri.ToString(); + int64_t offset = 0; + int64_t maxCount = 1000; + std::vector fileInfoVec; + fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + EXPECT_EQ(fileInfoVec.size(), 0); } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } @@ -1631,9 +1639,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0002, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); - std::vector fileInfo; - fah->ListFile(sourceFileUri, fileInfo); - EXPECT_EQ(fileInfo.size(), 0); + FileInfo fileInfo; + fileInfo.uri = sourceFileUri.ToString(); + Uri sourceFile(fileInfo.uri); + int64_t offset = 0; + int64_t maxCount = 1000; + std::vector fileInfoVec; + fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + EXPECT_EQ(fileInfoVec.size(), 0); result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1658,9 +1671,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0003, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0003"; try { Uri sourceFileUri("~!@#$%^&*()_"); - std::vector fileInfo; - fah->ListFile(sourceFileUri, fileInfo); - EXPECT_EQ(fileInfo.size(), 0); + FileInfo fileInfo; + fileInfo.uri = sourceFileUri.ToString(); + Uri sourceFile(fileInfo.uri); + int64_t offset = 0; + int64_t maxCount = 1000; + std::vector fileInfoVec; + fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + EXPECT_EQ(fileInfoVec.size(), 0); } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } -- Gitee From e71aa124cb014ad323f8703b163bef14c4040926 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Sat, 3 Sep 2022 16:41:16 +0800 Subject: [PATCH 090/122] fix compile Signed-off-by: linjun9528 --- .../kits/napi/file_access_module/BUILD.gn | 1 + .../napi/file_access_module/napi_utils.cpp | 41 +++++++++++++++++++ .../kits/napi/file_access_module/napi_utils.h | 27 ++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 interfaces/kits/napi/file_access_module/napi_utils.cpp create mode 100644 interfaces/kits/napi/file_access_module/napi_utils.h diff --git a/interfaces/kits/napi/file_access_module/BUILD.gn b/interfaces/kits/napi/file_access_module/BUILD.gn index b0b76b08..17184d7c 100644 --- a/interfaces/kits/napi/file_access_module/BUILD.gn +++ b/interfaces/kits/napi/file_access_module/BUILD.gn @@ -35,6 +35,7 @@ ohos_shared_library("fileaccess") { "file_info/napi_file_iterator_exporter.cpp", "napi_fileaccess_helper.cpp", "napi_notify_callback.cpp", + "napi_utils.cpp", "native_fileaccess_module.cpp", "root_info/napi_root_info_exporter.cpp", "root_info/napi_root_iterator_exporter.cpp", diff --git a/interfaces/kits/napi/file_access_module/napi_utils.cpp b/interfaces/kits/napi/file_access_module/napi_utils.cpp new file mode 100644 index 00000000..3e000c7b --- /dev/null +++ b/interfaces/kits/napi/file_access_module/napi_utils.cpp @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "napi_utils.h" + +#include + +#include "file_access_extension_info.h" +#include "file_access_framework_errno.h" +#include "hilog_wrapper.h" + +namespace OHOS { +namespace FileAccessFwk { +int IsDirectory(const int64_t mode) +{ + if ((mode & DOCUMENT_FLAG_REPRESENTS_DIR) != DOCUMENT_FLAG_REPRESENTS_DIR) { + HILOG_ERROR("current FileInfo is not dir"); + return ERR_INVALID_PARAM; + } + + if ((mode & DOCUMENT_FLAG_REPRESENTS_FILE) == DOCUMENT_FLAG_REPRESENTS_FILE) { + HILOG_ERROR("file mode(%{public}" PRId64 ") is incorrect", mode); + return ERR_INVALID_PARAM; + } + + return ERR_OK; +} +} // namespace FileAccessFwk +} // namespace OHOS \ No newline at end of file diff --git a/interfaces/kits/napi/file_access_module/napi_utils.h b/interfaces/kits/napi/file_access_module/napi_utils.h new file mode 100644 index 00000000..d5144ee8 --- /dev/null +++ b/interfaces/kits/napi/file_access_module/napi_utils.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2022 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef NAPI_UTILS_H +#define NAPI_UTILS_H + +#include + + +namespace OHOS { +namespace FileAccessFwk { +int IsDirectory(const int64_t mode); +} // namespace FileAccessFwk +} // namespace OHOS +#endif // NAPI_UTILS_H \ No newline at end of file -- Gitee From 0d917e3ee87d17cac0eb805857e65809a9c7a924 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Sat, 3 Sep 2022 19:06:18 +0800 Subject: [PATCH 091/122] add file filter code Signed-off-by: linjun9528 --- bundle.json | 3 +- frameworks/innerkits/file_access/BUILD.gn | 1 + .../include/file_access_ext_ability.h | 4 +- .../include/file_access_ext_proxy.h | 2 +- .../include/file_access_ext_stub_impl.h | 2 +- .../file_access/include/file_access_helper.h | 2 +- .../include/ifile_access_ext_base.h | 5 +- .../include/js_file_access_ext_ability.h | 2 +- .../src/file_access_ext_ability.cpp | 2 +- .../file_access/src/file_access_ext_proxy.cpp | 8 +- .../file_access/src/file_access_ext_stub.cpp | 9 +- .../src/file_access_ext_stub_impl.cpp | 6 +- .../file_access/src/file_access_helper.cpp | 4 +- .../src/js_file_access_ext_ability.cpp | 6 +- .../file_access_ext_ability.js | 54 ++++++++---- .../kits/napi/file_access_module/BUILD.gn | 1 + .../file_info/file_info_entity.h | 4 + .../file_info/file_iterator_entity.h | 4 + .../file_info/napi_file_info_exporter.cpp | 12 ++- .../file_info/napi_file_iterator_exporter.cpp | 2 +- .../napi/file_access_module/napi_utils.cpp | 85 +++++++++++++++++++ .../kits/napi/file_access_module/napi_utils.h | 6 ++ .../root_info/napi_root_info_exporter.cpp | 14 ++- .../root_info/root_info_entity.h | 4 +- .../root_info/root_iterator_entity.h | 6 +- .../FileExtensionAbility.ts | 2 +- 26 files changed, 209 insertions(+), 41 deletions(-) diff --git a/bundle.json b/bundle.json index d3a857cb..b29469ce 100644 --- a/bundle.json +++ b/bundle.json @@ -42,8 +42,7 @@ "//foundation/filemanagement/user_file_service/interfaces/kits/napi/file_extension_info_module:fileextensioninfo" ], "test": [ - "//foundation/filemanagement/user_file_service/services/test:user_file_manager_test", - "//foundation/filemanagement/user_file_service/frameworks/innerkits/file_access/test:user_file_service_test" + "//foundation/filemanagement/user_file_service/services/test:user_file_manager_test" ] } } diff --git a/frameworks/innerkits/file_access/BUILD.gn b/frameworks/innerkits/file_access/BUILD.gn index 78e238b3..14f189dd 100644 --- a/frameworks/innerkits/file_access/BUILD.gn +++ b/frameworks/innerkits/file_access/BUILD.gn @@ -28,6 +28,7 @@ config("ability_config") { "${ability_runtime_napi_path}/inner/napi_common", "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", + "//foundation/distributeddatamgr/distributedfile/interfaces/kits/js/src/common", ] cflags = [] diff --git a/frameworks/innerkits/file_access/include/file_access_ext_ability.h b/frameworks/innerkits/file_access/include/file_access_ext_ability.h index b5ccc8ee..7147a0c2 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_ability.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_ability.h @@ -19,12 +19,14 @@ #include "extension_base.h" #include "file_access_extension_info.h" #include "file_access_notify_manager.h" +#include "file_filter.h" namespace OHOS { namespace AbilityRuntime { class Runtime; } namespace FileAccessFwk { +using namespace DistributedFS; using namespace AbilityRuntime; class FileAccessExtAbility; using CreatorFunc = std::function& runtime)>; @@ -47,7 +49,7 @@ public: virtual int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile); virtual int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile); virtual int ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, - std::vector &fileInfoVec); + const FileFilter &filter, std::vector &fileInfoVec); virtual int GetRoots(std::vector &rootInfoVec); virtual int Access(const Uri &uri, bool &isExist); virtual int RegisterNotify(sptr ¬ify); diff --git a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h index c543d8cf..9d88faec 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h @@ -43,7 +43,7 @@ public: virtual int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) override; virtual int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) override; virtual int ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, - std::vector &fileInfoVec) override; + const FileFilter &filter, std::vector &fileInfoVec) override; virtual int GetRoots(std::vector &rootInfoVec) override; virtual int Access(const Uri &uri, bool &isExist) override; virtual int RegisterNotify(sptr ¬ify) override; diff --git a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h index e7daae40..ac194c85 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h @@ -41,7 +41,7 @@ public: int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) override; int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) override; int ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, - std::vector &fileInfoVec) override; + const FileFilter &filter, std::vector &fileInfoVec) override; int GetRoots(std::vector &rootInfoVec) override; int Access(const Uri &uri, bool &isExist) override; int RegisterNotify(sptr ¬ify) override; diff --git a/frameworks/innerkits/file_access/include/file_access_helper.h b/frameworks/innerkits/file_access/include/file_access_helper.h index 07139b03..123b24e0 100644 --- a/frameworks/innerkits/file_access/include/file_access_helper.h +++ b/frameworks/innerkits/file_access/include/file_access_helper.h @@ -65,7 +65,7 @@ public: int Delete(Uri &selectFile); int Move(Uri &sourceFile, Uri &targetParent, Uri &newFile); int Rename(Uri &sourceFile, const std::string &displayName, Uri &newFile); - int ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + int ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, const FileFilter &filter, std::vector &fileInfoVec); int GetRoots(std::vector &rootInfoVec); int On(std::shared_ptr &callback); diff --git a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h index 465e94c4..7e8c23a6 100644 --- a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h +++ b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h @@ -23,11 +23,14 @@ #include "file_access_extension_info.h" #include "file_access_framework_errno.h" +#include "file_filter.h" #include "ifile_access_notify.h" #include "uri.h" namespace OHOS { namespace FileAccessFwk { +using namespace DistributedFS; + class IFileAccessExtBase : public IRemoteBroker { public: DECLARE_INTERFACE_DESCRIPTOR(u"OHOS.FileAccessFwk.IFileAccessExtBase"); @@ -53,7 +56,7 @@ public: virtual int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) = 0; virtual int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) = 0; virtual int ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, - std::vector &fileInfoVec) = 0; + const FileFilter &filter, std::vector &fileInfoVec) = 0; virtual int GetRoots(std::vector &rootInfoVec) = 0; virtual int Access(const Uri &uri, bool &isExist) = 0; virtual int RegisterNotify(sptr ¬ify) = 0; diff --git a/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h b/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h index eab8e9b1..df7179ee 100644 --- a/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h +++ b/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h @@ -66,7 +66,7 @@ public: int Delete(const Uri &sourceFile) override; int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) override; int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) override; - int ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + int ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, const FileFilter &filter, std::vector &fileInfoVec) override; int GetRoots(std::vector &rootInfoVec) override; int Access(const Uri &uri, bool &isExist) override; diff --git a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp index a50988f8..0736e650 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp @@ -98,7 +98,7 @@ int FileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &displ } int FileAccessExtAbility::ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, - std::vector &fileInfoVec) + const FileFilter &filter, std::vector &fileInfoVec) { HILOG_ERROR("FileAccessExtAbility::ListFile Undefined operation"); return ERR_OPERATION_NOT_SUPPORT; diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 68ea16dc..2f41d118 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -394,7 +394,7 @@ static int GetListFileResult(MessageParcel &reply, std::vector &fileIn } int FileAccessExtProxy::ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, - std::vector &fileInfoVec) + const FileFilter &filter, std::vector &fileInfoVec) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); MessageParcel data; @@ -422,6 +422,12 @@ int FileAccessExtProxy::ListFile(const FileInfo &fileInfo, const int64_t offset, return ERR_PARCEL_FAIL; } + if (!data.WriteParcelable(&filter)) { + HILOG_ERROR("fail to WriteParcelable filter"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + MessageParcel reply; MessageOption option; int32_t err = Remote()->SendRequest(CMD_LIST_FILE, data, reply, option); diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp index af7532fe..58e29fb9 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp @@ -329,8 +329,15 @@ ErrCode FileAccessExtStub::CmdListFile(MessageParcel &data, MessageParcel &reply return ERR_PARCEL_FAIL; } + std::shared_ptr filter(data.ReadParcelable()); + if (filter == nullptr) { + HILOG_ERROR("parameter ListFile FileFilter is invalid"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + std::vector fileInfoVec; - int ret = ListFile(*fileInfo, offset, maxCount, fileInfoVec); + int ret = ListFile(*fileInfo, offset, maxCount, *filter, fileInfoVec); if (!reply.WriteInt32(ret)) { HILOG_ERROR("Parameter ListFile fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp index 201f66e5..1cefd250 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp @@ -15,6 +15,8 @@ #include "file_access_ext_stub_impl.h" +#include + #include "file_access_framework_errno.h" #include "hilog_wrapper.h" #include "hitrace_meter.h" @@ -111,7 +113,7 @@ int FileAccessExtStubImpl::Rename(const Uri &sourceFile, const std::string &disp } int FileAccessExtStubImpl::ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, - std::vector &fileInfoVec) + const FileFilter &filter, std::vector &fileInfoVec) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); if (extension_ == nullptr) { @@ -120,7 +122,7 @@ int FileAccessExtStubImpl::ListFile(const FileInfo &fileInfo, const int64_t offs return ERR_IPC_ERROR; } - int ret = extension_->ListFile(fileInfo, offset, maxCount, fileInfoVec); + int ret = extension_->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index b04194b2..a01e95c1 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -583,7 +583,7 @@ int FileAccessHelper::Rename(Uri &sourceFile, const std::string &displayName, Ur } int FileAccessHelper::ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, - std::vector &fileInfoVec) + const FileFilter &filter, std::vector &fileInfoVec) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); Uri sourceFile(fileInfo.uri); @@ -600,7 +600,7 @@ int FileAccessHelper::ListFile(const FileInfo &fileInfo, const int64_t offset, c return ERR_IPC_ERROR; } - int ret = fileExtProxy->ListFile(fileInfo, offset, maxCount, fileInfoVec); + int ret = fileExtProxy->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); if (ret != ERR_OK) { HILOG_ERROR("ListFile get result error, code:%{public}d", ret); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index 323bf783..0bf058f9 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -488,6 +488,7 @@ int JsFileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayN if (!ret) { HILOG_ERROR("Convert js value fail."); } + return ret; }; @@ -720,7 +721,7 @@ static bool ParserListFileJsResult(NativeEngine &engine, NativeValue *nativeValu } int JsFileAccessExtAbility::ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, - std::vector &fileInfoVec) + const FileFilter &filter, std::vector &fileInfoVec) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); auto value = std::make_shared>>(); @@ -729,7 +730,8 @@ int JsFileAccessExtAbility::ListFile(const FileInfo &fileInfo, const int64_t off return ERR_NULL_POINTER; } - auto argParser = [fileInfo, offset, maxCount](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { + auto argParser = + [fileInfo, offset, maxCount, filter](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { NativeValue *uri = engine.CreateString(fileInfo.uri.c_str(), fileInfo.uri.length()); if (uri == nullptr) { HILOG_ERROR("create sourceFile uri native js value fail."); diff --git a/interfaces/kits/napi/file_access_ext_ability/file_access_ext_ability.js b/interfaces/kits/napi/file_access_ext_ability/file_access_ext_ability.js index 3af025e5..71b318f4 100644 --- a/interfaces/kits/napi/file_access_ext_ability/file_access_ext_ability.js +++ b/interfaces/kits/napi/file_access_ext_ability/file_access_ext_ability.js @@ -20,42 +20,66 @@ class FileAccessExtensionAbility { registerCallback(callback) { } - openFile(uri, mode) { - return 0; + openFile(sourceFileUri, flags) { + return { + fd: -1, + code: ERR_ERROR, + }; } createFile(parentUri, displayName) { - return ""; + return { + uri: "", + code: ERR_ERROR, + }; } mkdir(parentUri, displayName) { - return ""; + return { + uri: "", + code: ERR_ERROR, + }; } - delete(sourceFileUri) { - return 0; + delete(selectFileUri) { + return { + code: ERR_ERROR, + }; } move(sourceFileUri, targetParentUri) { - return ""; + return { + uri: '', + code: ERR_ERROR, + }; } rename(sourceFileUri, displayName) { - return ""; + return { + uri: '', + code: ERR_ERROR, + }; } - listFile(sourceFileUri) { - let infos = []; - return infos; + listFile(sourceFileUri, offset, count, filter) { + return { + infos: [], + code: ERR_ERROR, + }; } getRoots() { - let roots = []; - return roots; + return { + roots: [], + code: ERR_OK, + }; } - isFileExist() { - return true; + access(sourceFileUri) { + return { + isExist: false, + code: ERR_ERROR, + }; } } diff --git a/interfaces/kits/napi/file_access_module/BUILD.gn b/interfaces/kits/napi/file_access_module/BUILD.gn index 17184d7c..39eea3bf 100644 --- a/interfaces/kits/napi/file_access_module/BUILD.gn +++ b/interfaces/kits/napi/file_access_module/BUILD.gn @@ -26,6 +26,7 @@ ohos_shared_library("fileaccess") { "${BASE_DIR}/interfaces/kits/napi/file_access_module/file_info", "${BASE_DIR}/interfaces/kits/napi/file_access_module/root_info", "${BASE_DIR}/utils", + "//foundation/distributeddatamgr/distributedfile/interfaces/kits/js/src/common", "//foundation/distributeddatamgr/distributedfile/utils/filemgmt_libn/include", ] diff --git a/interfaces/kits/napi/file_access_module/file_info/file_info_entity.h b/interfaces/kits/napi/file_access_module/file_info/file_info_entity.h index d74ed4e2..d71f1a0f 100644 --- a/interfaces/kits/napi/file_access_module/file_info/file_info_entity.h +++ b/interfaces/kits/napi/file_access_module/file_info/file_info_entity.h @@ -18,12 +18,16 @@ #include "file_access_extension_info.h" #include "file_access_helper.h" +#include "file_filter.h" namespace OHOS { namespace FileAccessFwk { +using namespace DistributedFS; + struct FileInfoEntity { FileAccessHelper *fileAccessHelper; FileInfo fileInfo; + FileFilter filter; }; } // namespace FileAccessFwk } // namespace OHOS diff --git a/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h b/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h index 083de779..44562ce3 100644 --- a/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h +++ b/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h @@ -21,9 +21,12 @@ #include "file_access_extension_info.h" #include "file_access_helper.h" #include "hilog_wrapper.h" +#include "file_filter.h" namespace OHOS { namespace FileAccessFwk { +using namespace DistributedFS; + constexpr int64_t MAX_COUNT = 1000; // ListFile get file's max count struct FileIteratorEntity { @@ -33,6 +36,7 @@ struct FileIteratorEntity { std::vector fileInfoVec; int64_t offset; int64_t pos; + FileFilter filter; }; } // namespace FileAccessFwk } // namespace OHOS diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp index e3e53c25..4a35309d 100644 --- a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp @@ -80,6 +80,15 @@ napi_value NapiFileInfoExporter::ListFile(napi_env env, napi_callback_info info) return nullptr; } + FileFilter filter({}, {}, {}, 0, 0, false, false); + if (funcArg.GetArgc() == NARG_CNT::ONE) { + auto ret = GetFileFilterParam(NVal(env, funcArg.GetArg(NARG_POS::FIRST)), filter); + if (ret != ERR_OK) { + NError(ret).ThrowErr(env, "ListFile get FileFilter param fail"); + return nullptr; + } + } + auto fileInfoEntity = NClass::GetEntityOf(env, funcArg.GetThisVar()); if (fileInfoEntity == nullptr) { NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of FileInfoEntity"); @@ -115,8 +124,9 @@ napi_value NapiFileInfoExporter::ListFile(napi_env env, napi_callback_info info) fileIteratorEntity->fileInfoVec.clear(); fileIteratorEntity->offset = 0; fileIteratorEntity->pos = 0; + fileIteratorEntity->filter = std::move(filter); auto ret = fileInfoEntity->fileAccessHelper->ListFile(fileInfoEntity->fileInfo, fileIteratorEntity->offset, - MAX_COUNT, fileIteratorEntity->fileInfoVec); + MAX_COUNT, fileIteratorEntity->filter, fileIteratorEntity->fileInfoVec); if (ret != ERR_OK) { NError(ret).ThrowErr(env, "exec ListFile fail"); return nullptr; diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp b/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp index 8f7197e8..71f062f4 100644 --- a/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp @@ -96,7 +96,7 @@ static int MakeResult(napi_value objFileInfoExporter, FileIteratorEntity *fileIt fileIteratorEntity->offset += MAX_COUNT; fileIteratorEntity->pos = 0; int ret = fileIteratorEntity->fileAccessHelper->ListFile(fileIteratorEntity->fileInfo, - fileIteratorEntity->offset, MAX_COUNT, fileIteratorEntity->fileInfoVec); + fileIteratorEntity->offset, MAX_COUNT, fileIteratorEntity->filter, fileIteratorEntity->fileInfoVec); if (ret != ERR_OK) { HILOG_ERROR("exec ListFile fail, code:%{public}d", ret); return ret; diff --git a/interfaces/kits/napi/file_access_module/napi_utils.cpp b/interfaces/kits/napi/file_access_module/napi_utils.cpp index 3e000c7b..5cf0c5d8 100644 --- a/interfaces/kits/napi/file_access_module/napi_utils.cpp +++ b/interfaces/kits/napi/file_access_module/napi_utils.cpp @@ -16,6 +16,8 @@ #include "napi_utils.h" #include +#include +#include #include "file_access_extension_info.h" #include "file_access_framework_errno.h" @@ -37,5 +39,88 @@ int IsDirectory(const int64_t mode) return ERR_OK; } + +int GetFileFilterParam(const NVal &argv, FileFilter &filter) +{ + bool ret = false; + filter.SetHasFilter(false); + if (argv.HasProp("suffix")) { + std::vector filter_suffix; + std::tie(ret, filter_suffix, std::ignore) = argv.GetProp("suffix").ToStringArray(); + if (!ret) { + HILOG_ERROR("FileFilter get suffix param fail."); + return ERR_INVALID_PARAM; + } + + filter.SetSuffix(filter_suffix); + filter.SetHasFilter(true); + } + + if (argv.HasProp("display_name")) { + std::vector display_name; + std::tie(ret, display_name, std::ignore) = argv.GetProp("display_name").ToStringArray(); + if (!ret) { + HILOG_ERROR("FileFilter get display_name param fail."); + return ERR_INVALID_PARAM; + } + filter.SetDisplayName(display_name); + filter.SetHasFilter(true); + + } + + if (argv.HasProp("mime_type")) { + std::vector mime_type; + std::tie(ret, mime_type, std::ignore) = argv.GetProp("mime_type").ToStringArray(); + if (!ret) { + HILOG_ERROR("FileFilter get mime_type param fail."); + return ERR_INVALID_PARAM; + } + + filter.SetMimeType(mime_type); + filter.SetHasFilter(true); + } + + if (argv.HasProp("file_size_over")) { + int64_t file_size_over; + std::tie(ret, file_size_over) = argv.GetProp("file_size_over").ToInt64(); + if (!ret) { + HILOG_ERROR("FileFilter get file_size_over param fail."); + return ERR_INVALID_PARAM; + } + + filter.SetFileSizeOver(file_size_over); + filter.SetHasFilter(true); + } + + if (argv.HasProp("last_modified_after")) { + double last_modified_after; + std::tie(ret, last_modified_after) = argv.GetProp("last_modified_after").ToDouble(); + if (!ret) { + HILOG_ERROR("FileFilter get last_modified_after param fail."); + return ERR_INVALID_PARAM; + } + + filter.SetLastModifiedAfter(last_modified_after); + filter.SetHasFilter(true); + } + + if (argv.HasProp("exclude_media")) { + bool exclude_media; + std::tie(ret, exclude_media) = argv.GetProp("exclude_media").ToBool(); + if (!ret) { + HILOG_ERROR("FileFilter get exclude_media param fail."); + return ERR_INVALID_PARAM; + } + + filter.SetExcludeMedia(exclude_media); + filter.SetHasFilter(true); + } + + if (!filter.GetHasFilter()) { + HILOG_ERROR("FileFilter must have one property."); + return ERR_INVALID_PARAM; + } + return ERR_OK; +} } // namespace FileAccessFwk } // namespace OHOS \ No newline at end of file diff --git a/interfaces/kits/napi/file_access_module/napi_utils.h b/interfaces/kits/napi/file_access_module/napi_utils.h index d5144ee8..6f127d96 100644 --- a/interfaces/kits/napi/file_access_module/napi_utils.h +++ b/interfaces/kits/napi/file_access_module/napi_utils.h @@ -18,10 +18,16 @@ #include +#include "filemgmt_libn.h" +#include "file_filter.h" namespace OHOS { namespace FileAccessFwk { +using namespace DistributedFS; +using namespace FileManagement::LibN; + int IsDirectory(const int64_t mode); +int GetFileFilterParam(const NVal &argv, FileFilter &filter); } // namespace FileAccessFwk } // namespace OHOS #endif // NAPI_UTILS_H \ No newline at end of file diff --git a/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp b/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp index 2c0a6f47..2161ee7e 100644 --- a/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp @@ -19,9 +19,11 @@ #include "napi_root_info_exporter.h" #include "file_access_framework_errno.h" +#include "file_filter.h" #include "file_iterator_entity.h" #include "hilog_wrapper.h" #include "napi_file_iterator_exporter.h" +#include "napi_utils.h" #include "root_info_entity.h" namespace OHOS { @@ -80,6 +82,15 @@ napi_value NapiRootInfoExporter::ListFile(napi_env env, napi_callback_info info) return nullptr; } + FileFilter filter({}, {}, {}, 0, 0, false, false); + if (funcArg.GetArgc() == NARG_CNT::ONE) { + auto ret = GetFileFilterParam(NVal(env, funcArg.GetArg(NARG_POS::FIRST)), filter); + if (ret != ERR_OK) { + NError(ret).ThrowErr(env, "ListFile get FileFilter param fail"); + return nullptr; + } + } + auto rootEntity = NClass::GetEntityOf(env, funcArg.GetThisVar()); if (rootEntity == nullptr) { NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of FileInfoEntity"); @@ -113,8 +124,9 @@ napi_value NapiRootInfoExporter::ListFile(napi_env env, napi_callback_info info) fileIteratorEntity->fileInfoVec.clear(); fileIteratorEntity->offset = 0; fileIteratorEntity->pos = 0; + fileIteratorEntity->filter = std::move(filter); auto ret = rootEntity->fileAccessHelper->ListFile(fileInfo, fileIteratorEntity->offset, - MAX_COUNT, fileIteratorEntity->fileInfoVec); + MAX_COUNT, filter, fileIteratorEntity->fileInfoVec); if (ret != ERR_OK) { NError(ret).ThrowErr(env, "ListFile get result fail."); return nullptr; diff --git a/interfaces/kits/napi/file_access_module/root_info/root_info_entity.h b/interfaces/kits/napi/file_access_module/root_info/root_info_entity.h index bfeef115..cd9a2a50 100644 --- a/interfaces/kits/napi/file_access_module/root_info/root_info_entity.h +++ b/interfaces/kits/napi/file_access_module/root_info/root_info_entity.h @@ -22,8 +22,8 @@ namespace OHOS { namespace FileAccessFwk { struct RootInfoEntity { - FileAccessHelper *fileAccessHelper { nullptr }; - RootInfo rootInfo {}; + FileAccessHelper *fileAccessHelper; + RootInfo rootInfo; }; } // namespace FileAccessFwk } // namespace OHOS diff --git a/interfaces/kits/napi/file_access_module/root_info/root_iterator_entity.h b/interfaces/kits/napi/file_access_module/root_info/root_iterator_entity.h index 8e746cf9..e8ca260a 100644 --- a/interfaces/kits/napi/file_access_module/root_info/root_iterator_entity.h +++ b/interfaces/kits/napi/file_access_module/root_info/root_iterator_entity.h @@ -25,10 +25,10 @@ namespace OHOS { namespace FileAccessFwk { struct RootIteratorEntity { - FileAccessHelper *fileAccessHelper { nullptr }; - std::vector devVec {}; + FileAccessHelper *fileAccessHelper; + std::vector devVec; std::mutex entityOperateMutex; - int64_t pos { 0 }; + int64_t pos; }; } // namespace FileAccessFwk } // namespace OHOS diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index 5e5f732d..ba224e1a 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -446,7 +446,7 @@ export default class FileExtAbility extends Extension { }; } - listFile(sourceFileUri, offset, count) { + listFile(sourceFileUri, offset, count, filter) { if (!this.checkUri(sourceFileUri)) { return { infos: [], -- Gitee From 9003dd805f4dc7c076a093d8b0bcb540358fdaa7 Mon Sep 17 00:00:00 2001 From: zhuhongtao666 Date: Sun, 4 Sep 2022 20:54:51 +0800 Subject: [PATCH 092/122] oh3.2.7.2_add_scanfile Signed-off-by: zhuhongtao666 --- .../include/file_access_ext_ability.h | 2 + .../include/file_access_ext_proxy.h | 2 + .../include/file_access_ext_stub.h | 1 + .../include/file_access_ext_stub_impl.h | 2 + .../file_access/include/file_access_helper.h | 2 + .../include/ifile_access_ext_base.h | 3 + .../src/file_access_ext_ability.cpp | 7 ++ .../file_access/src/file_access_ext_proxy.cpp | 48 +++++++++++++ .../file_access/src/file_access_ext_stub.cpp | 60 +++++++++++++++++ .../src/file_access_ext_stub_impl.cpp | 15 +++++ .../file_access/src/file_access_helper.cpp | 29 ++++++++ .../file_info/file_iterator_entity.h | 1 + .../file_info/napi_file_info_exporter.cpp | 67 +++++++++++++++++++ .../file_info/napi_file_info_exporter.h | 1 + .../file_info/napi_file_iterator_exporter.cpp | 18 +++-- .../napi/file_access_module/napi_utils.cpp | 2 + .../root_info/napi_root_info_exporter.cpp | 65 ++++++++++++++++++ .../root_info/napi_root_info_exporter.h | 1 + 18 files changed, 322 insertions(+), 4 deletions(-) diff --git a/frameworks/innerkits/file_access/include/file_access_ext_ability.h b/frameworks/innerkits/file_access/include/file_access_ext_ability.h index 7147a0c2..d3879776 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_ability.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_ability.h @@ -50,6 +50,8 @@ public: virtual int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile); virtual int ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, const FileFilter &filter, std::vector &fileInfoVec); + virtual int ScanFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + const FileFilter &filter, std::vector &fileInfoVec); virtual int GetRoots(std::vector &rootInfoVec); virtual int Access(const Uri &uri, bool &isExist); virtual int RegisterNotify(sptr ¬ify); diff --git a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h index 9d88faec..b16630b4 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h @@ -44,6 +44,8 @@ public: virtual int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) override; virtual int ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, const FileFilter &filter, std::vector &fileInfoVec) override; + virtual int ScanFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + const FileFilter &filter, std::vector &fileInfoVec) override; virtual int GetRoots(std::vector &rootInfoVec) override; virtual int Access(const Uri &uri, bool &isExist) override; virtual int RegisterNotify(sptr ¬ify) override; diff --git a/frameworks/innerkits/file_access/include/file_access_ext_stub.h b/frameworks/innerkits/file_access/include/file_access_ext_stub.h index e1ab83e2..080287f0 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_stub.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_stub.h @@ -42,6 +42,7 @@ private: ErrCode CmdMove(MessageParcel &data, MessageParcel &reply); ErrCode CmdRename(MessageParcel &data, MessageParcel &reply); ErrCode CmdListFile(MessageParcel &data, MessageParcel &reply); + ErrCode CmdScanFile(MessageParcel &data, MessageParcel &reply); ErrCode CmdGetRoots(MessageParcel &data, MessageParcel &reply); ErrCode CmdAccess(MessageParcel &data, MessageParcel &reply); ErrCode CmdRegisterNotify(MessageParcel &data, MessageParcel &reply); diff --git a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h index ac194c85..8bf80eed 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h @@ -42,6 +42,8 @@ public: int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) override; int ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, const FileFilter &filter, std::vector &fileInfoVec) override; + int ScanFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + const FileFilter &filter, std::vector &fileInfoVec) override; int GetRoots(std::vector &rootInfoVec) override; int Access(const Uri &uri, bool &isExist) override; int RegisterNotify(sptr ¬ify) override; diff --git a/frameworks/innerkits/file_access/include/file_access_helper.h b/frameworks/innerkits/file_access/include/file_access_helper.h index 123b24e0..23b2a152 100644 --- a/frameworks/innerkits/file_access/include/file_access_helper.h +++ b/frameworks/innerkits/file_access/include/file_access_helper.h @@ -67,6 +67,8 @@ public: int Rename(Uri &sourceFile, const std::string &displayName, Uri &newFile); int ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, const FileFilter &filter, std::vector &fileInfoVec); + int ScanFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, const FileFilter &filter, + std::vector &fileInfoVec); int GetRoots(std::vector &rootInfoVec); int On(std::shared_ptr &callback); int Off(); diff --git a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h index 7e8c23a6..ddae40eb 100644 --- a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h +++ b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h @@ -43,6 +43,7 @@ public: CMD_MOVE, CMD_RENAME, CMD_LIST_FILE, + CMD_SCAN_FILE, CMD_GET_ROOTS, CMD_ACCESS, CMD_REGISTER_NOTIFY, @@ -57,6 +58,8 @@ public: virtual int Rename(const Uri &sourceFile, const std::string &displayName, Uri &newFile) = 0; virtual int ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, const FileFilter &filter, std::vector &fileInfoVec) = 0; + virtual int ScanFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + const FileFilter &filter, std::vector &fileInfoVec) = 0; virtual int GetRoots(std::vector &rootInfoVec) = 0; virtual int Access(const Uri &uri, bool &isExist) = 0; virtual int RegisterNotify(sptr ¬ify) = 0; diff --git a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp index 0736e650..27a8f975 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp @@ -104,6 +104,13 @@ int FileAccessExtAbility::ListFile(const FileInfo &fileInfo, const int64_t offse return ERR_OPERATION_NOT_SUPPORT; } +int FileAccessExtAbility::ScanFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + const FileFilter &filter, std::vector &fileInfoVec) +{ + HILOG_ERROR("FileAccessExtAbility::ScanFile Undefined operation"); + return ERR_OPERATION_NOT_SUPPORT; +} + int FileAccessExtAbility::GetRoots(std::vector &rootInfoVec) { HILOG_ERROR("FileAccessExtAbility::GetRoots Undefined operation"); diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 2f41d118..b493a06c 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -441,6 +441,54 @@ int FileAccessExtProxy::ListFile(const FileInfo &fileInfo, const int64_t offset, return GetListFileResult(reply, fileInfoVec); } +int FileAccessExtProxy::ScanFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + const FileFilter &filter, std::vector &fileInfoVec) +{ + StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ScanFile"); + MessageParcel data; + if (!data.WriteInterfaceToken(FileAccessExtProxy::GetDescriptor())) { + HILOG_ERROR("WriteInterfaceToken failed"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + if (!data.WriteParcelable(&fileInfo)) { + HILOG_ERROR("fail to WriteParcelable fileInfo"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + if (!data.WriteInt64(offset)) { + HILOG_ERROR("fail to WriteInt64 offset"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + if (!data.WriteInt64(maxCount)) { + HILOG_ERROR("fail to WriteInt64 maxCount"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + if (!data.WriteParcelable(&filter)) { + HILOG_ERROR("fail to WriteParcelable filter"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + MessageParcel reply; + MessageOption option; + int32_t err = Remote()->SendRequest(CMD_SCAN_FILE, data, reply, option); + if (err != ERR_OK) { + HILOG_ERROR("fail to SendRequest. err: %{public}d", err); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return err; + } + + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return GetListFileResult(reply, fileInfoVec); +} + int FileAccessExtProxy::GetRoots(std::vector &rootInfoVec) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp index 58e29fb9..ab1b1f9a 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp @@ -47,6 +47,7 @@ FileAccessExtStub::FileAccessExtStub() stubFuncMap_[CMD_MOVE] = &FileAccessExtStub::CmdMove; stubFuncMap_[CMD_RENAME] = &FileAccessExtStub::CmdRename; stubFuncMap_[CMD_LIST_FILE] = &FileAccessExtStub::CmdListFile; + stubFuncMap_[CMD_SCAN_FILE] = &FileAccessExtStub::CmdScanFile; stubFuncMap_[CMD_GET_ROOTS] = &FileAccessExtStub::CmdGetRoots; stubFuncMap_[CMD_ACCESS] = &FileAccessExtStub::CmdAccess; stubFuncMap_[CMD_REGISTER_NOTIFY] = &FileAccessExtStub::CmdRegisterNotify; @@ -363,6 +364,65 @@ ErrCode FileAccessExtStub::CmdListFile(MessageParcel &data, MessageParcel &reply return ERR_OK; } +ErrCode FileAccessExtStub::CmdScanFile(MessageParcel &data, MessageParcel &reply) +{ + StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdScanFile"); + std::shared_ptr fileInfo(data.ReadParcelable()); + if (fileInfo == nullptr) { + HILOG_ERROR("Parameter ScanFile fail to ReadParcelable fileInfo"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + int64_t offset = 0; + if (!data.ReadInt64(offset)) { + HILOG_ERROR("parameter ScanFile offset is invalid"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + int64_t maxCount = 0; + if (!data.ReadInt64(maxCount)) { + HILOG_ERROR("parameter ScanFile maxCount is invalid"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + std::shared_ptr filter(data.ReadParcelable()); + if (filter == nullptr) { + HILOG_ERROR("parameter ScanFile FileFilter is invalid"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + std::vector fileInfoVec; + int ret = ScanFile(*fileInfo, offset, maxCount, *filter, fileInfoVec); + if (!reply.WriteInt32(ret)) { + HILOG_ERROR("Parameter ScanFile fail to WriteInt32 ret"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + int64_t count {fileInfoVec.size()}; + if (!reply.WriteInt64(count)) { + HILOG_ERROR("Parameter ScanFile fail to WriteInt64 count"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + + for (const auto &fileInfo : fileInfoVec) { + if (!reply.WriteParcelable(&fileInfo)) { + HILOG_ERROR("parameter ScanFile fail to WriteParcelable fileInfoVec"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_PARCEL_FAIL; + } + } + + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_OK; +} + + ErrCode FileAccessExtStub::CmdGetRoots(MessageParcel &data, MessageParcel &reply) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdGetRoots"); diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp index 1cefd250..2bc3c127 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp @@ -127,6 +127,21 @@ int FileAccessExtStubImpl::ListFile(const FileInfo &fileInfo, const int64_t offs return ret; } +int FileAccessExtStubImpl::ScanFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + const FileFilter &filter, std::vector &fileInfoVec) +{ + StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ScanFile"); + if (extension_ == nullptr) { + HILOG_ERROR("ScanFile get extension failed."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_IPC_ERROR; + } + + int ret = extension_->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; +} + int FileAccessExtStubImpl::GetRoots(std::vector &rootInfoVec) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index a01e95c1..e7f78e71 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -611,6 +611,35 @@ int FileAccessHelper::ListFile(const FileInfo &fileInfo, const int64_t offset, c return ERR_OK; } +int FileAccessHelper::ScanFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, + const FileFilter &filter, std::vector &fileInfoVec) +{ + StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ScanFile"); + Uri sourceFile(fileInfo.uri); + if (!CheckUri(sourceFile)) { + HILOG_ERROR("sourceFile format check error."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_INVALID_URI; + } + + sptr fileExtProxy = GetProxyByUri(sourceFile); + if (fileExtProxy == nullptr) { + HILOG_ERROR("failed with invalid fileAccessExtProxy"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_IPC_ERROR; + } + + int ret = fileExtProxy->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + if (ret != ERR_OK) { + HILOG_ERROR("ScanFile get result error, code:%{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; + } + + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_OK; +} + int FileAccessHelper::GetRoots(std::vector &rootInfoVec) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); diff --git a/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h b/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h index 44562ce3..20cfc973 100644 --- a/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h +++ b/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h @@ -37,6 +37,7 @@ struct FileIteratorEntity { int64_t offset; int64_t pos; FileFilter filter; + int flag = 0; }; } // namespace FileAccessFwk } // namespace OHOS diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp index 4a35309d..952307c3 100644 --- a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp @@ -28,6 +28,7 @@ bool NapiFileInfoExporter::Export() { std::vector props = { NVal::DeclareNapiFunction("listFile", ListFile), + NVal::DeclareNapiFunction("scanFile", ScanFile), NVal::DeclareNapiGetter("uri", GetUri), NVal::DeclareNapiGetter("fileName", GetFileName), NVal::DeclareNapiGetter("mode", GetMode), @@ -125,6 +126,7 @@ napi_value NapiFileInfoExporter::ListFile(napi_env env, napi_callback_info info) fileIteratorEntity->offset = 0; fileIteratorEntity->pos = 0; fileIteratorEntity->filter = std::move(filter); + fileIteratorEntity->flag = 0; auto ret = fileInfoEntity->fileAccessHelper->ListFile(fileInfoEntity->fileInfo, fileIteratorEntity->offset, MAX_COUNT, fileIteratorEntity->filter, fileIteratorEntity->fileInfoVec); if (ret != ERR_OK) { @@ -136,6 +138,71 @@ napi_value NapiFileInfoExporter::ListFile(napi_env env, napi_callback_info info) return NVal(env, objFileIteratorExporter).val_; } +napi_value NapiFileInfoExporter::ScanFile(napi_env env, napi_callback_info info) +{ + NFuncArg funcArg(env, info); + if (!funcArg.InitArgs(NARG_CNT::ZERO, NARG_CNT::ONE)) { + NError(ERR_PARAM_NUMBER).ThrowErr(env, "Number of arguments unmatched"); + return nullptr; + } + + FileFilter filter({}, {}, {}, 0, 0, false, false); + if (funcArg.GetArgc() == NARG_CNT::ONE) { + auto ret = GetFileFilterParam(NVal(env, funcArg.GetArg(NARG_POS::FIRST)), filter); + if (ret != ERR_OK) { + NError(ret).ThrowErr(env, "ScanFile get FileFilter param fail"); + return nullptr; + } + } + + auto fileInfoEntity = NClass::GetEntityOf(env, funcArg.GetThisVar()); + if (fileInfoEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of FileInfoEntity"); + return nullptr; + } + + if (IsDirectory(fileInfoEntity->fileInfo.mode) != ERR_OK) { + HILOG_ERROR("current FileInfo's mode error"); + return NVal::CreateUndefined(env).val_; + } + + if (fileInfoEntity->fileAccessHelper == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "fileAccessHelper is null."); + return nullptr; + } + + auto objFileIteratorExporter = NClass::InstantiateClass(env, NapiFileIteratorExporter::className_, {}); + if (objFileIteratorExporter == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot instantiate class NapiFileIteratorExporter"); + return nullptr; + } + + auto fileIteratorEntity = NClass::GetEntityOf(env, objFileIteratorExporter); + if (fileIteratorEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get the entity of FileIteratorEntity"); + return nullptr; + } + + { + std::lock_guard lock(fileIteratorEntity->entityOperateMutex); + fileIteratorEntity->fileAccessHelper = fileInfoEntity->fileAccessHelper; + fileIteratorEntity->fileInfo = fileInfoEntity->fileInfo; + fileIteratorEntity->fileInfoVec.clear(); + fileIteratorEntity->offset = 0; + fileIteratorEntity->pos = 0; + fileIteratorEntity->filter = std::move(filter); + fileIteratorEntity->flag = 1; + auto ret = fileInfoEntity->fileAccessHelper->ScanFile(fileInfoEntity->fileInfo, fileIteratorEntity->offset, + MAX_COUNT, fileIteratorEntity->filter, fileIteratorEntity->fileInfoVec); + if (ret != ERR_OK) { + NError(ret).ThrowErr(env, "exec ScanFile fail"); + return nullptr; + } + } + + return NVal(env, objFileIteratorExporter).val_; +} + static FileInfoEntity *GetFileInfoEntity(napi_env env, napi_callback_info info) { NFuncArg funcArg(env, info); diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.h b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.h index 57264e33..cba95c6b 100644 --- a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.h +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.h @@ -35,6 +35,7 @@ public: static napi_value Constructor(napi_env env, napi_callback_info info); static napi_value ListFile(napi_env env, napi_callback_info info); + static napi_value ScanFile(napi_env env, napi_callback_info info); static napi_value GetUri(napi_env env, napi_callback_info info); static napi_value GetFileName(napi_env env, napi_callback_info info); static napi_value GetMode(napi_env env, napi_callback_info info); diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp b/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp index 71f062f4..d3aa9e46 100644 --- a/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp @@ -95,12 +95,22 @@ static int MakeResult(napi_value objFileInfoExporter, FileIteratorEntity *fileIt fileIteratorEntity->fileInfoVec.clear(); fileIteratorEntity->offset += MAX_COUNT; fileIteratorEntity->pos = 0; - int ret = fileIteratorEntity->fileAccessHelper->ListFile(fileIteratorEntity->fileInfo, + if (fileIteratorEntity->flag == 0) { + int ret = fileIteratorEntity->fileAccessHelper->ListFile(fileIteratorEntity->fileInfo, + fileIteratorEntity->offset, MAX_COUNT, fileIteratorEntity->filter, fileIteratorEntity->fileInfoVec); + if (ret != ERR_OK) { + HILOG_ERROR("exec ListFile fail, code:%{public}d", ret); + return ret; + } + } else if (fileIteratorEntity->flag == 1) { + int ret = fileIteratorEntity->fileAccessHelper->ScanFile(fileIteratorEntity->fileInfo, fileIteratorEntity->offset, MAX_COUNT, fileIteratorEntity->filter, fileIteratorEntity->fileInfoVec); - if (ret != ERR_OK) { - HILOG_ERROR("exec ListFile fail, code:%{public}d", ret); - return ret; + if (ret != ERR_OK) { + HILOG_ERROR("exec ScanFile fail, code:%{public}d", ret); + return ret; + } } + } else if (fileIteratorEntity->pos == fileIteratorEntity->fileInfoVec.size()) { fileIteratorEntity->fileInfoVec.clear(); fileIteratorEntity->pos = 0; diff --git a/interfaces/kits/napi/file_access_module/napi_utils.cpp b/interfaces/kits/napi/file_access_module/napi_utils.cpp index 5cf0c5d8..4a6c3192 100644 --- a/interfaces/kits/napi/file_access_module/napi_utils.cpp +++ b/interfaces/kits/napi/file_access_module/napi_utils.cpp @@ -54,6 +54,8 @@ int GetFileFilterParam(const NVal &argv, FileFilter &filter) filter.SetSuffix(filter_suffix); filter.SetHasFilter(true); + } else { + return ERR_INVALID_PARAM; } if (argv.HasProp("display_name")) { diff --git a/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp b/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp index 2161ee7e..23f009b6 100644 --- a/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp @@ -32,6 +32,7 @@ bool NapiRootInfoExporter::Export() { std::vector props = { NVal::DeclareNapiFunction("listFile", ListFile), + NVal::DeclareNapiFunction("scanFile", ScanFile), NVal::DeclareNapiGetter("deviceType", GetDeviceType), NVal::DeclareNapiGetter("uri", GetUri), NVal::DeclareNapiGetter("displayName", GetDisplayName), @@ -125,6 +126,7 @@ napi_value NapiRootInfoExporter::ListFile(napi_env env, napi_callback_info info) fileIteratorEntity->offset = 0; fileIteratorEntity->pos = 0; fileIteratorEntity->filter = std::move(filter); + fileIteratorEntity->flag = 0; auto ret = rootEntity->fileAccessHelper->ListFile(fileInfo, fileIteratorEntity->offset, MAX_COUNT, filter, fileIteratorEntity->fileInfoVec); if (ret != ERR_OK) { @@ -136,6 +138,69 @@ napi_value NapiRootInfoExporter::ListFile(napi_env env, napi_callback_info info) return NVal(env, objFileIteratorExporter).val_; } +napi_value NapiRootInfoExporter::ScanFile(napi_env env, napi_callback_info info) +{ + NFuncArg funcArg(env, info); + if (!funcArg.InitArgs(NARG_CNT::ZERO, NARG_CNT::ONE)) { + NError(ERR_PARAM_NUMBER).ThrowErr(env, "Number of arguments unmatched"); + return nullptr; + } + + FileFilter filter({}, {}, {}, 0, 0, false, false); + if (funcArg.GetArgc() == NARG_CNT::ONE) { + auto ret = GetFileFilterParam(NVal(env, funcArg.GetArg(NARG_POS::FIRST)), filter); + if (ret != ERR_OK) { + NError(ret).ThrowErr(env, "ScanFile get FileFilter param fail"); + return nullptr; + } + } + + auto rootEntity = NClass::GetEntityOf(env, funcArg.GetThisVar()); + if (rootEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of FileInfoEntity"); + return nullptr; + } + + if (rootEntity->fileAccessHelper == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "fileAccessHelper is null."); + return nullptr; + } + + napi_value objFileIteratorExporter = NClass::InstantiateClass(env, NapiFileIteratorExporter::className_, {}); + if (objFileIteratorExporter == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot instantiate class NapiFileIteratorExporter"); + return nullptr; + } + + auto fileIteratorEntity = NClass::GetEntityOf(env, objFileIteratorExporter); + if (fileIteratorEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get the entity of FileIteratorEntity"); + return nullptr; + } + + FileInfo fileInfo; + fileInfo.uri = rootEntity->rootInfo.uri; + fileInfo.mode = DOCUMENT_FLAG_REPRESENTS_DIR | DOCUMENT_FLAG_SUPPORTS_READ | DOCUMENT_FLAG_SUPPORTS_WRITE; + { + std::lock_guard lock(fileIteratorEntity->entityOperateMutex); + fileIteratorEntity->fileAccessHelper = rootEntity->fileAccessHelper; + fileIteratorEntity->fileInfo = fileInfo; + fileIteratorEntity->fileInfoVec.clear(); + fileIteratorEntity->offset = 0; + fileIteratorEntity->pos = 0; + fileIteratorEntity->filter = std::move(filter); + fileIteratorEntity->flag = 1; + auto ret = rootEntity->fileAccessHelper->ScanFile(fileInfo, fileIteratorEntity->offset, + MAX_COUNT, filter, fileIteratorEntity->fileInfoVec); + if (ret != ERR_OK) { + NError(ret).ThrowErr(env, "ScanFile get result fail."); + return nullptr; + } + } + + return NVal(env, objFileIteratorExporter).val_; +} + napi_value NapiRootInfoExporter::GetDeviceType(napi_env env, napi_callback_info info) { NFuncArg funcArg(env, info); diff --git a/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.h b/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.h index 720a7c40..3892fd26 100644 --- a/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.h +++ b/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.h @@ -35,6 +35,7 @@ public: static napi_value Constructor(napi_env env, napi_callback_info info); static napi_value ListFile(napi_env env, napi_callback_info info); + static napi_value ScanFile(napi_env env, napi_callback_info info); static napi_value GetDeviceType(napi_env env, napi_callback_info info); static napi_value GetUri(napi_env env, napi_callback_info info); static napi_value GetDisplayName(napi_env env, napi_callback_info info); -- Gitee From 16468eab4be46a22c2a5943a274145d33571c464 Mon Sep 17 00:00:00 2001 From: gf721 Date: Tue, 6 Sep 2022 14:50:10 +0800 Subject: [PATCH 093/122] 1 Signed-off-by: gf721 --- bundle.json | 3 +- .../innerkits/file_access/test/BUILD.gn | 2 + .../test/file_access_helper_test.cpp | 298 +++++++++++++--- .../test/file_extension_helper_test.cpp | 333 +++++++++++------- 4 files changed, 451 insertions(+), 185 deletions(-) diff --git a/bundle.json b/bundle.json index b29469ce..d3a857cb 100644 --- a/bundle.json +++ b/bundle.json @@ -42,7 +42,8 @@ "//foundation/filemanagement/user_file_service/interfaces/kits/napi/file_extension_info_module:fileextensioninfo" ], "test": [ - "//foundation/filemanagement/user_file_service/services/test:user_file_manager_test" + "//foundation/filemanagement/user_file_service/services/test:user_file_manager_test", + "//foundation/filemanagement/user_file_service/frameworks/innerkits/file_access/test:user_file_service_test" ] } } diff --git a/frameworks/innerkits/file_access/test/BUILD.gn b/frameworks/innerkits/file_access/test/BUILD.gn index 5d6e4c3d..b72c8110 100644 --- a/frameworks/innerkits/file_access/test/BUILD.gn +++ b/frameworks/innerkits/file_access/test/BUILD.gn @@ -23,6 +23,7 @@ ohos_unittest("file_access_helper_test") { "//foundation/ability/ability_runtime/frameworks/kits/appkit/native/ability_runtime/context", "//foundation/filemanagement/user_file_service/frameworks/innerkits/file_access/include", "//third_party/googletest/googlemock/include/gmock", + "//foundation/distributeddatamgr/distributedfile/interfaces/kits/js/src/common", ] configs = [ "//build/config/compiler:exceptions" ] @@ -62,6 +63,7 @@ ohos_unittest("file_extension_helper_test") { "//third_party/googletest/googlemock/include/gmock", "//foundation/ability/ability_runtime/frameworks/kits/appkit/native/ability_runtime/context", "//foundation/filemanagement/user_file_service/frameworks/innerkits/file_access/include", + "//foundation/distributeddatamgr/distributedfile/interfaces/kits/js/src/common", ] configs = [ "//build/config/compiler:exceptions" ] diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 86dbc2c4..d982a417 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -14,7 +14,6 @@ */ #include -#include #include #include @@ -141,7 +140,7 @@ public: }; /** - * @tc.number: SUB_user_file_service_file_access_helper_OpenFile_0000 + * @tc.number: user_file_service_file_access_helper_OpenFile_0000 * @tc.name: file_access_helper_OpenFile_0000 * @tc.desc: Test function of OpenFile interface for SUCCESS. * @tc.size: MEDIUM @@ -194,7 +193,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0000, testing::ext::T } /** - * @tc.number: SUB_user_file_service_file_access_helper_OpenFile_0001 + * @tc.number: user_file_service_file_access_helper_OpenFile_0001 * @tc.name: file_access_helper_OpenFile_0001 * @tc.desc: Test function of OpenFile interface for ERROR which Uri is null. * @tc.size: MEDIUM @@ -218,7 +217,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0001, testing::ext::T } /** - * @tc.number: SUB_user_file_service_file_access_helper_OpenFile_0002 + * @tc.number: user_file_service_file_access_helper_OpenFile_0002 * @tc.name: file_access_helper_OpenFile_0002 * @tc.desc: Test function of OpenFile interface for ERROR which Uri is absolute path. * @tc.size: MEDIUM @@ -249,7 +248,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0002, testing::ext::T } /** - * @tc.number: SUB_user_file_service_file_access_helper_OpenFile_0003 + * @tc.number: user_file_service_file_access_helper_OpenFile_0003 * @tc.name: file_access_helper_OpenFile_0003 * @tc.desc: Test function of OpenFile interface for ERROR which Uri is special symbols. * @tc.size: MEDIUM @@ -273,7 +272,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0003, testing::ext::T } /** - * @tc.number: SUB_user_file_service_file_access_helper_OpenFile_0004 + * @tc.number: user_file_service_file_access_helper_OpenFile_0004 * @tc.name: file_access_helper_OpenFile_0004 * @tc.desc: Test function of OpenFile interface for ERROR which flag is -1. * @tc.size: MEDIUM @@ -303,7 +302,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0004, testing::ext::T } /** - * @tc.number: SUB_user_file_service_file_access_helper_OpenFile_0005 + * @tc.number: user_file_service_file_access_helper_OpenFile_0005 * @tc.name: file_access_helper_OpenFile_0005 * @tc.desc: Test function of OpenFile interface for SUCCESS which flag is 1. * @tc.size: MEDIUM @@ -333,7 +332,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0005, testing::ext::T } /** - * @tc.number: SUB_user_file_service_file_access_helper_OpenFile_0006 + * @tc.number: user_file_service_file_access_helper_OpenFile_0006 * @tc.name: file_access_helper_OpenFile_0006 * @tc.desc: Test function of OpenFile interface for SUCCESS which flag is 2. * @tc.size: MEDIUM @@ -363,7 +362,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0006, testing::ext::T } /** - * @tc.number: SUB_user_file_service_file_access_helper_CreateFile_0000 + * @tc.number: user_file_service_file_access_helper_CreateFile_0000 * @tc.name: file_access_helper_CreateFile_0000 * @tc.desc: Test function of CreateFile interface for SUCCESS. * @tc.size: MEDIUM @@ -389,7 +388,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0000, testing::ext: } /** - * @tc.number: SUB_user_file_service_file_access_helper_CreateFile_0001 + * @tc.number: user_file_service_file_access_helper_CreateFile_0001 * @tc.name: file_access_helper_CreateFile_0001 * @tc.desc: Test function of CreateFile interface for ERROR which parentUri is null. * @tc.size: MEDIUM @@ -413,7 +412,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0001, testing::ext: } /** - * @tc.number: SUB_user_file_service_file_access_helper_CreateFile_0002 + * @tc.number: user_file_service_file_access_helper_CreateFile_0002 * @tc.name: file_access_helper_CreateFile_0002 * @tc.desc: Test function of CreateFile interface for ERROR which parentUri is absolute path. * @tc.size: MEDIUM @@ -437,7 +436,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0002, testing::ext: } /** - * @tc.number: SUB_user_file_service_file_access_helper_CreateFile_0003 + * @tc.number: user_file_service_file_access_helper_CreateFile_0003 * @tc.name: file_access_helper_CreateFile_0003 * @tc.desc: Test function of CreateFile interface for ERROR which parentUri is special symbols. * @tc.size: MEDIUM @@ -461,7 +460,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0003, testing::ext: } /** - * @tc.number: SUB_user_file_service_file_access_helper_CreateFile_0004 + * @tc.number: user_file_service_file_access_helper_CreateFile_0004 * @tc.name: file_access_helper_CreateFile_0004 * @tc.desc: Test function of CreateFile interface for ERROR which displayName is null. * @tc.size: MEDIUM @@ -485,7 +484,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0004, testing::ext: } /** - * @tc.number: SUB_user_file_service_file_access_helper_Mkdir_0000 + * @tc.number: user_file_service_file_access_helper_Mkdir_0000 * @tc.name: file_access_helper_Mkdir_0000 * @tc.desc: Test function of Mkdir interface for SUCCESS. * @tc.size: MEDIUM @@ -511,7 +510,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0000, testing::ext::Test } /** - * @tc.number: SUB_user_file_service_file_access_helper_Mkdir_0001 + * @tc.number: user_file_service_file_access_helper_Mkdir_0001 * @tc.name: file_access_helper_Mkdir_0001 * @tc.desc: Test function of Mkdir interface for ERROR which parentUri is null. * @tc.size: MEDIUM @@ -535,7 +534,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0001, testing::ext::Test } /** - * @tc.number: SUB_user_file_service_file_access_helper_Mkdir_0002 + * @tc.number: user_file_service_file_access_helper_Mkdir_0002 * @tc.name: file_access_helper_Mkdir_0002 * @tc.desc: Test function of Mkdir interface for ERROR which parentUri is absolute path. * @tc.size: MEDIUM @@ -559,7 +558,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0002, testing::ext::Test } /** - * @tc.number: SUB_user_file_service_file_access_helper_Mkdir_0003 + * @tc.number: user_file_service_file_access_helper_Mkdir_0003 * @tc.name: file_access_helper_Mkdir_0003 * @tc.desc: Test function of Mkdir interface for ERROR which parentUri is special symbols. * @tc.size: MEDIUM @@ -583,7 +582,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0003, testing::ext::Test } /** - * @tc.number: SUB_user_file_service_file_access_helper_Mkdir_0004 + * @tc.number: user_file_service_file_access_helper_Mkdir_0004 * @tc.name: file_access_helper_Mkdir_0004 * @tc.desc: Test function of Mkdir interface for ERROR which displayName is null. * @tc.size: MEDIUM @@ -607,7 +606,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0004, testing::ext::Test } /** - * @tc.number: SUB_user_file_service_file_access_helper_Delete_0000 + * @tc.number: user_file_service_file_access_helper_Delete_0000 * @tc.name: file_access_helper_Delete_0000 * @tc.desc: Test function of Delete interface for SUCCESS which delete file. * @tc.size: MEDIUM @@ -640,7 +639,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0000, testing::ext::Tes } /** - * @tc.number: SUB_user_file_service_file_access_helper_Delete_0001 + * @tc.number: user_file_service_file_access_helper_Delete_0001 * @tc.name: file_access_helper_Delete_0001 * @tc.desc: Test function of Delete interface for SUCCESS which delete folder. * @tc.size: MEDIUM @@ -666,7 +665,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0001, testing::ext::Tes } /** - * @tc.number: SUB_user_file_service_file_access_helper_Delete_0002 + * @tc.number: user_file_service_file_access_helper_Delete_0002 * @tc.name: file_access_helper_Delete_0002 * @tc.desc: Test function of Delete interface for ERROR which selectFileUri is null. * @tc.size: MEDIUM @@ -689,7 +688,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0002, testing::ext::Tes } /** - * @tc.number: SUB_user_file_service_file_access_helper_Delete_0003 + * @tc.number: user_file_service_file_access_helper_Delete_0003 * @tc.name: file_access_helper_Delete_0003 * @tc.desc: Test function of Delete interface for ERROR which selectFileUri is absolute path. * @tc.size: MEDIUM @@ -719,7 +718,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0003, testing::ext::Tes } /** - * @tc.number: SUB_user_file_service_file_access_helper_Delete_0004 + * @tc.number: user_file_service_file_access_helper_Delete_0004 * @tc.name: file_access_helper_Delete_0004 * @tc.desc: Test function of Delete interface for ERROR which selectFileUri is special symbols. * @tc.size: MEDIUM @@ -742,7 +741,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0004, testing::ext::Tes } /** - * @tc.number: SUB_user_file_service_file_access_helper_Move_0000 + * @tc.number: user_file_service_file_access_helper_Move_0000 * @tc.name: file_access_helper_Move_0000 * @tc.desc: Test function of Move interface for SUCCESS which move file. * @tc.size: MEDIUM @@ -783,7 +782,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0000, testing::ext::TestS } /** - * @tc.number: SUB_user_file_service_file_access_helper_Move_0001 + * @tc.number: user_file_service_file_access_helper_Move_0001 * @tc.name: file_access_helper_Move_0001 * @tc.desc: Test function of Move interface for SUCCESS which move folder. * @tc.size: MEDIUM @@ -821,7 +820,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0001, testing::ext::TestS } /** - * @tc.number: SUB_user_file_service_file_access_helper_Move_0002 + * @tc.number: user_file_service_file_access_helper_Move_0002 * @tc.name: file_access_helper_Move_0002 * @tc.desc: Test function of Move interface for ERROR which sourceFileUri is null. * @tc.size: MEDIUM @@ -852,7 +851,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0002, testing::ext::TestS } /** - * @tc.number: SUB_user_file_service_file_access_helper_Move_0003 + * @tc.number: user_file_service_file_access_helper_Move_0003 * @tc.name: file_access_helper_Move_0003 * @tc.desc: Test function of Move interface for ERROR which sourceFileUri is absolute path. * @tc.size: MEDIUM @@ -894,7 +893,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0003, testing::ext::TestS } /** - * @tc.number: SUB_user_file_service_file_access_helper_Move_0004 + * @tc.number: user_file_service_file_access_helper_Move_0004 * @tc.name: file_access_helper_Move_0004 * @tc.desc: Test function of Move interface for ERROR which sourceFileUri is special symbols. * @tc.size: MEDIUM @@ -925,7 +924,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0004, testing::ext::TestS } /** - * @tc.number: SUB_user_file_service_file_access_helper_Move_0005 + * @tc.number: user_file_service_file_access_helper_Move_0005 * @tc.name: file_access_helper_Move_0005 * @tc.desc: Test function of Move interface for ERROR which targetParentUri is null. * @tc.size: MEDIUM @@ -960,7 +959,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0005, testing::ext::TestS } /** - * @tc.number: SUB_user_file_service_file_access_helper_Move_0006 + * @tc.number: user_file_service_file_access_helper_Move_0006 * @tc.name: file_access_helper_Move_0006 * @tc.desc: Test function of Move interface for ERROR which targetParentUri is absolute path. * @tc.size: MEDIUM @@ -1002,7 +1001,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0006, testing::ext::TestS } /** - * @tc.number: SUB_user_file_service_file_access_helper_Move_0007 + * @tc.number: user_file_service_file_access_helper_Move_0007 * @tc.name: file_access_helper_Move_0007 * @tc.desc: Test function of Move interface for ERROR which targetParentUri is special symbols. * @tc.size: MEDIUM @@ -1044,7 +1043,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0007, testing::ext::TestS } /** - * @tc.number: SUB_user_file_service_file_access_helper_Move_0008 + * @tc.number: user_file_service_file_access_helper_Move_0008 * @tc.name: file_access_helper_Move_0008 * @tc.desc: Test function of Move interface for SUCCESS which move empty folder. * @tc.size: MEDIUM @@ -1078,7 +1077,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0008, testing::ext::TestS } /** - * @tc.number: SUB_user_file_service_file_access_helper_Move_0009 + * @tc.number: user_file_service_file_access_helper_Move_0009 * @tc.name: file_access_helper_Move_0009 * @tc.desc: Test function of Move interface for SUCCESS which move more file in folder. * @tc.size: MEDIUM @@ -1118,7 +1117,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0009, testing::ext::TestS } /** - * @tc.number: SUB_user_file_service_file_access_helper_Move_0010 + * @tc.number: user_file_service_file_access_helper_Move_0010 * @tc.name: file_access_helper_Move_0010 * @tc.desc: Test function of Move interface for SUCCESS which move Multilevel directory folder. * @tc.size: MEDIUM @@ -1158,7 +1157,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0010, testing::ext::TestS } /** - * @tc.number: SUB_user_file_service_file_access_helper_Rename_0000 + * @tc.number: user_file_service_file_access_helper_Rename_0000 * @tc.name: file_access_helper_Rename_0000 * @tc.desc: Test function of Rename interface for SUCCESS which rename file. * @tc.size: MEDIUM @@ -1192,7 +1191,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0000, testing::ext::Tes } /** - * @tc.number: SUB_user_file_service_file_access_helper_Rename_0001 + * @tc.number: user_file_service_file_access_helper_Rename_0001 * @tc.name: file_access_helper_Rename_0001 * @tc.desc: Test function of Rename interface for SUCCESS which rename folder. * @tc.size: MEDIUM @@ -1222,7 +1221,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0001, testing::ext::Tes } /** - * @tc.number: SUB_user_file_service_file_access_helper_Rename_0002 + * @tc.number: user_file_service_file_access_helper_Rename_0002 * @tc.name: file_access_helper_Rename_0002 * @tc.desc: Test function of Rename interface for ERROR which sourceFileUri is null. * @tc.size: MEDIUM @@ -1246,7 +1245,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0002, testing::ext::Tes } /** - * @tc.number: SUB_user_file_service_file_access_helper_Rename_0003 + * @tc.number: user_file_service_file_access_helper_Rename_0003 * @tc.name: file_access_helper_Rename_0003 * @tc.desc: Test function of Rename interface for ERROR which sourceFileUri is absolute path. * @tc.size: MEDIUM @@ -1281,7 +1280,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0003, testing::ext::Tes } /** - * @tc.number: SUB_user_file_service_file_access_helper_Rename_0004 + * @tc.number: user_file_service_file_access_helper_Rename_0004 * @tc.name: file_access_helper_Rename_0004 * @tc.desc: Test function of Rename interface for ERROR which sourceFileUri is special symbols. * @tc.size: MEDIUM @@ -1305,7 +1304,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0004, testing::ext::Tes } /** - * @tc.number: SUB_user_file_service_file_access_helper_Rename_0005 + * @tc.number: user_file_service_file_access_helper_Rename_0005 * @tc.name: file_access_helper_Rename_0005 * @tc.desc: Test function of Rename interface for ERROR which displayName is null. * @tc.size: MEDIUM @@ -1339,7 +1338,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0005, testing::ext::Tes } /** - * @tc.number: SUB_user_file_service_file_access_helper_ListFile_0000 + * @tc.number: user_file_service_file_access_helper_ListFile_0000 * @tc.name: file_access_helper_ListFile_0000 * @tc.desc: Test function of ListFile interface for SUCCESS. * @tc.size: MEDIUM @@ -1364,7 +1363,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0000, testing::ext::T int64_t offset = 0; int64_t maxCount = 1000; std::vector fileInfoVec; - fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + FileFilter filter; + fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_GT(fileInfoVec.size(), 0); GTEST_LOG_(INFO) << "ListFile_0000 result:" << fileInfoVec.size() << endl; @@ -1377,7 +1377,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0000, testing::ext::T } /** - * @tc.number: SUB_user_file_service_file_access_helper_ListFile_0001 + * @tc.number: user_file_service_file_access_helper_ListFile_0001 * @tc.name: file_access_helper_ListFile_0001 * @tc.desc: Test function of ListFile interface for ERROR which Uri is nullptr. * @tc.size: MEDIUM @@ -1395,7 +1395,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0001, testing::ext::T int64_t offset = 0; int64_t maxCount = 1000; vector fileInfoVec; - fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + FileFilter filter; + fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(fileInfoVec.size(), 0); GTEST_LOG_(INFO) << "ListFile_0001 result:" << fileInfoVec.size() << endl; } catch (...) { @@ -1405,7 +1406,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0001, testing::ext::T } /** - * @tc.number: SUB_user_file_service_file_access_helper_ListFile_0002 + * @tc.number: user_file_service_file_access_helper_ListFile_0002 * @tc.name: file_access_helper_ListFile_0002 * @tc.desc: Test function of ListFile interface for ERROR which sourceFileUri is absolute path. * @tc.size: MEDIUM @@ -1431,7 +1432,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0002, testing::ext::T int64_t offset = 0; int64_t maxCount = 1000; vector fileInfoVec; - fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + FileFilter filter; + fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(fileInfoVec.size(), 0); GTEST_LOG_(INFO) << "ListFile_0002 result:" << fileInfoVec.size() << endl; @@ -1444,7 +1446,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0002, testing::ext::T } /** - * @tc.number: SUB_user_file_service_file_access_helper_ListFile_0003 + * @tc.number: user_file_service_file_access_helper_ListFile_0003 * @tc.name: file_access_helper_ListFile_0003 * @tc.desc: Test function of ListFile interface for ERROR which sourceFileUri is special symbols. * @tc.size: MEDIUM @@ -1462,7 +1464,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0003, testing::ext::T int64_t offset = 0; int64_t maxCount = 1000; vector fileInfoVec; - fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + FileFilter filter; + fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(fileInfoVec.size(), 0); GTEST_LOG_(INFO) << "ListFile_0003 result:" << fileInfoVec.size() << endl; } catch (...) { @@ -1472,7 +1475,204 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0003, testing::ext::T } /** - * @tc.number: SUB_user_file_service_file_access_helper_GetRoots_0000 + * @tc.number: user_file_service_file_access_helper_ListFile_0004 + * @tc.name: file_access_helper_ListFile_0004 + * @tc.desc: Test function of ListFile interface for ERROR which add filter. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0004, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0004"; + try { + Uri newDirUriTest(""); + int result = fah->Mkdir(newDirUri, "test", newDirUriTest); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + Uri testUri1(""); + result = fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0004.txt", testUri1); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + Uri testUri2(""); + result = fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0004.docx", testUri2); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + FileInfo fileInfo; + fileInfo.uri = newDirUriTest.ToString(); + int64_t offset = 0; + int64_t maxCount = 1000; + std::vector fileInfoVec; + FileFilter filter({".txt"}, {}, {}, 0, 0, false, true); + fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_EQ(fileInfoVec.size(), 1); + + result = fah->Delete(newDirUriTest); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + } catch (...) { + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ListFile_0004"; +} + +/** + * @tc.number: user_file_service_file_access_helper_ScanFile_0000 + * @tc.name: file_access_helper_ScanFile_0000 + * @tc.desc: Test function of ScanFile interface for SUCCESS which scan root directory with filter. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0000, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0000"; + try { + Uri newDirUriTest(""); + int result = fah->Mkdir(newDirUri, "Download", newDirUriTest); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + Uri testUri(""); + FileInfo fileInfo; + result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.q1w2e3r4", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.txt", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + fileInfo.uri = newDirUriTest.ToString(); + int64_t offset = 0; + int64_t maxCount = 1000; + std::vector fileInfoVec; + FileFilter filter({".q1w2e3r4"}, {}, {}, 0, 0, false, true); + fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_GE(fileInfoVec.size(), 1); + GTEST_LOG_(INFO) << "ScanFile_0000 result:" << fileInfoVec.size() << endl; + + result = fah->Delete(newDirUriTest); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + } catch (...) { + GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ScanFile_0000"; +} + +/** + * @tc.number: user_file_service_file_access_helper_ScanFile_0001 + * @tc.name: file_access_helper_ScanFile_0001 + * @tc.desc: Test function of ScanFile interface for SUCCESS which scan root directory with no filter. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0001, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0001"; + try { + Uri newDirUriTest(""); + int result = fah->Mkdir(newDirUri, "Download", newDirUriTest); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + Uri testUri(""); + FileInfo fileInfo; + fileInfo.uri = newDirUriTest.ToString(); + result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0001.q1w2e3r4", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + int64_t offset = 0; + int64_t maxCount = 1000; + std::vector fileInfoVec; + FileFilter filter; + fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_GE(fileInfoVec.size(), 1); + GTEST_LOG_(INFO) << "ScanFile_0000 result:" << fileInfoVec.size() << endl; + + result = fah->Delete(newDirUriTest); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + } catch (...) { + GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ScanFile_0001"; +} + +/** + * @tc.number: user_file_service_file_access_helper_ScanFile_0002 + * @tc.name: file_access_helper_ScanFile_0002 + * @tc.desc: Test function of ScanFile interface for SUCCESS which self created directory with filter. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0002, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0002"; + try { + Uri newDirUriTest(""); + int result = fah->Mkdir(newDirUri, "Download", newDirUriTest); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + Uri testUri(""); + result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0002.q1w2e3r4", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.txt", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + FileInfo fileInfo; + fileInfo.uri = newDirUriTest.ToString(); + int64_t offset = 0; + int64_t maxCount = 1000; + std::vector fileInfoVec; + FileFilter filter({".q1w2e3r4"}, {}, {}, 0, 0, false, true); + fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_EQ(fileInfoVec.size(), 1); + + GTEST_LOG_(INFO) << "ScanFile_0002 result:" << fileInfoVec.size() << endl; + result = fah->Delete(newDirUriTest); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + } catch (...) { + GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ScanFile_0002"; +} + +/** + * @tc.number: user_file_service_file_access_helper_ScanFile_0003 + * @tc.name: file_access_helper_ScanFile_0003 + * @tc.desc: Test function of ScanFile interface for SUCCESS which self created directory with filter. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0003, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0003"; + try { + Uri newDirUriTest(""); + int result = fah->Mkdir(newDirUri, "Download", newDirUriTest); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + Uri testUri(""); + result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0003.q1w2e3r4", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + FileInfo fileInfo; + fileInfo.uri = newDirUriTest.ToString(); + int64_t offset = 0; + int64_t maxCount = 1000; + std::vector fileInfoVec; + FileFilter filter({".q1w2e3r4"}, {}, {}, 0, 0, false, true); + fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_EQ(fileInfoVec.size(), 1); + GTEST_LOG_(INFO) << "ScanFile_0003 result:" << fileInfoVec.size() << endl; + + result = fah->Delete(newDirUriTest); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + } catch (...) { + GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ScanFile_0003"; +} + +/** + * @tc.number: user_file_service_file_access_helper_GetRoots_0000 * @tc.name: file_access_helper_GetRoots_0000 * @tc.desc: Test function of GetRoots interface for SUCCESS. * @tc.size: MEDIUM diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index 2d9dc0aa..be9da359 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -30,6 +30,82 @@ using namespace OHOS; using namespace FileAccessFwk; int ABILITY_ID = 5003; shared_ptr fah = nullptr; +OHOS::Security::AccessToken::AccessTokenID tokenId; + +// permission state +OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState = { + .permissionName = "ohos.permission.FILE_ACCESS_MANAGER", + .isGeneral = true, + .resDeviceID = {"local"}, + .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED}, + .grantFlags = {1} +}; + +OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState1 = { + .permissionName = "ohos.permission.READ_MEDIA", + .isGeneral = true, + .resDeviceID = {"local"}, + .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED}, + .grantFlags = {1} +}; + +OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState2 = { + .permissionName = "ohos.permission.WRITE_MEDIA", + .isGeneral = true, + .resDeviceID = {"local"}, + .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED}, + .grantFlags = {1} +}; + +// permission define +OHOS::Security::AccessToken::PermissionDef g_infoManagerTestPermDef = { + .permissionName = "ohos.permission.FILE_ACCESS_MANAGER", + .bundleName = "ohos.acts.multimedia.mediaLibrary", + .grantMode = 1, + .availableLevel = OHOS::Security::AccessToken::APL_NORMAL, + .label = "label", + .labelId = 1, + .description = "FILE_ACCESS_MANAGER", + .descriptionId = 1 +}; + +OHOS::Security::AccessToken::PermissionDef g_infoManagerTestPermDef1 = { + .permissionName = "ohos.permission.READ_MEDIA", + .bundleName = "ohos.acts.multimedia.mediaLibrary", + .grantMode = 1, + .availableLevel = OHOS::Security::AccessToken::APL_NORMAL, + .label = "label", + .labelId = 1, + .description = "READ_MEDIA", + .descriptionId = 1 +}; + +OHOS::Security::AccessToken::PermissionDef g_infoManagerTestPermDef2 = { + .permissionName = "ohos.permission.WRITE_MEDIA", + .bundleName = "ohos.acts.multimedia.mediaLibrary", + .grantMode = 1, + .availableLevel = OHOS::Security::AccessToken::APL_NORMAL, + .label = "label", + .labelId = 1, + .description = "WRITE_MEDIA", + .descriptionId = 1 +}; + +// permission info +OHOS::Security::AccessToken::HapPolicyParams g_infoManagerTestPolicyPrams = { + .apl = OHOS::Security::AccessToken::APL_NORMAL, + .domain = "test.domain", + .permList = {g_infoManagerTestPermDef, g_infoManagerTestPermDef1, g_infoManagerTestPermDef2}, + .permStateList = {g_infoManagerTestState, g_infoManagerTestState1, g_infoManagerTestState2} +}; + +// hap info +OHOS::Security::AccessToken::HapInfoParams g_infoManagerTestInfoParms = { + .userID = 1, + .bundleName = "FileExtensionHelperTest", + .instIndex = 0, + .appIDDesc = "testtesttesttest" +}; class FileExtensionHelperTest : public testing::Test { public: @@ -56,89 +132,24 @@ public: EXPECT_TRUE(sus); vector wants {want}; fah = FileAccessHelper::Creator(remoteObj, wants); + + OHOS::Security::AccessToken::AccessTokenIDEx tokenIdEx = {0}; + tokenIdEx = OHOS::Security::AccessToken::AccessTokenKit::AllocHapToken + (g_infoManagerTestInfoParms, g_infoManagerTestPolicyPrams); + tokenId = tokenIdEx.tokenIdExStruct.tokenID; + SetSelfTokenID(tokenId); } - static void TearDownTestCase() {}; + static void TearDownTestCase() { + fah->Release(); + fah = nullptr; + OHOS::Security::AccessToken::AccessTokenKit::DeleteToken(tokenId); + }; void SetUp() {}; void TearDown() {}; - - // permission state - OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState = { - .permissionName = "ohos.permission.FILE_ACCESS_MANAGER", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} - }; - - OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState1 = { - .permissionName = "ohos.permission.READ_MEDIA", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} - }; - - OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState2 = { - .permissionName = "ohos.permission.WRITE_MEDIA", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} - }; - - // permission define - OHOS::Security::AccessToken::PermissionDef g_infoManagerTestPermDef = { - .permissionName = "ohos.permission.FILE_ACCESS_MANAGER", - .bundleName = "ohos.acts.multimedia.mediaLibrary", - .grantMode = 1, - .availableLevel = OHOS::Security::AccessToken::APL_NORMAL, - .label = "label", - .labelId = 1, - .description = "FILE_ACCESS_MANAGER", - .descriptionId = 1 - }; - - OHOS::Security::AccessToken::PermissionDef g_infoManagerTestPermDef1 = { - .permissionName = "ohos.permission.READ_MEDIA", - .bundleName = "ohos.acts.multimedia.mediaLibrary", - .grantMode = 1, - .availableLevel = OHOS::Security::AccessToken::APL_NORMAL, - .label = "label", - .labelId = 1, - .description = "READ_MEDIA", - .descriptionId = 1 - }; - - OHOS::Security::AccessToken::PermissionDef g_infoManagerTestPermDef2 = { - .permissionName = "ohos.permission.WRITE_MEDIA", - .bundleName = "ohos.acts.multimedia.mediaLibrary", - .grantMode = 1, - .availableLevel = OHOS::Security::AccessToken::APL_NORMAL, - .label = "label", - .labelId = 1, - .description = "WRITE_MEDIA", - .descriptionId = 1 - }; - - // permission info - OHOS::Security::AccessToken::HapPolicyParams g_infoManagerTestPolicyPrams = { - .apl = OHOS::Security::AccessToken::APL_NORMAL, - .domain = "test.domain", - .permList = {g_infoManagerTestPermDef, g_infoManagerTestPermDef1, g_infoManagerTestPermDef2}, - .permStateList = {g_infoManagerTestState, g_infoManagerTestState1, g_infoManagerTestState2} - }; - - // hap info - OHOS::Security::AccessToken::HapInfoParams g_infoManagerTestInfoParms = { - .userID = 1, - .bundleName = "FileExtensionHelperTest", - .instIndex = 0, - .appIDDesc = "testtesttesttest" - }; }; /** - * @tc.number: SUB_user_file_service_file_extension_helper_OpenFile_0000 + * @tc.number: user_file_service_file_extension_helper_OpenFile_0000 * @tc.name: file_extension_helper_OpenFile_0000 * @tc.desc: Test function of OpenFile interface for SUCCESS. * @tc.size: MEDIUM @@ -150,11 +161,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0000, testing:: { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0000"; try { - OHOS::Security::AccessToken::AccessTokenIDEx tokenIdEx = {0}; - tokenIdEx = OHOS::Security::AccessToken::AccessTokenKit::AllocHapToken - (g_infoManagerTestInfoParms, g_infoManagerTestPolicyPrams); - OHOS::Security::AccessToken::AccessTokenID tokenId = tokenIdEx.tokenIdExStruct.tokenID; - SetSelfTokenID(tokenId); vector info; int result = fah->GetRoots(info); @@ -187,7 +193,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0000, testing:: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_OpenFile_0001 + * @tc.number: user_file_service_file_extension_helper_OpenFile_0001 * @tc.name: file_extension_helper_OpenFile_0001 * @tc.desc: Test function of OpenFile interface for ERROR which Uri is null. * @tc.size: MEDIUM @@ -211,7 +217,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0001, testing:: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_OpenFile_0002 + * @tc.number: user_file_service_file_extension_helper_OpenFile_0002 * @tc.name: file_extension_helper_OpenFile_0002 * @tc.desc: Test function of OpenFile interface for ERROR which Uri is absolute path. * @tc.size: MEDIUM @@ -248,7 +254,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0002, testing:: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_OpenFile_0003 + * @tc.number: user_file_service_file_extension_helper_OpenFile_0003 * @tc.name: file_extension_helper_OpenFile_0003 * @tc.desc: Test function of OpenFile interface for ERROR which Uri is special symbols. * @tc.size: MEDIUM @@ -272,7 +278,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0003, testing:: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_OpenFile_0004 + * @tc.number: user_file_service_file_extension_helper_OpenFile_0004 * @tc.name: file_extension_helper_OpenFile_0004 * @tc.desc: Test function of OpenFile interface for ERROR which flag is -1. * @tc.size: MEDIUM @@ -308,7 +314,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0004, testing:: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_OpenFile_0005 + * @tc.number: user_file_service_file_extension_helper_OpenFile_0005 * @tc.name: file_extension_helper_OpenFile_0005 * @tc.desc: Test function of OpenFile interface for SUCCESS which flag is 1. * @tc.size: MEDIUM @@ -344,7 +350,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0005, testing:: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_OpenFile_0006 + * @tc.number: user_file_service_file_extension_helper_OpenFile_0006 * @tc.name: file_extension_helper_OpenFile_0006 * @tc.desc: Test function of OpenFile interface for SUCCESS which flag is 2. * @tc.size: MEDIUM @@ -380,7 +386,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0006, testing:: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_CreateFile_0000 + * @tc.number: user_file_service_file_extension_helper_CreateFile_0000 * @tc.name: file_extension_helper_CreateFile_0000 * @tc.desc: Test function of CreateFile interface for SUCCESS. * @tc.size: MEDIUM @@ -412,7 +418,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0000, testing } /** - * @tc.number: SUB_user_file_service_file_extension_helper_CreateFile_0001 + * @tc.number: user_file_service_file_extension_helper_CreateFile_0001 * @tc.name: file_extension_helper_CreateFile_0001 * @tc.desc: Test function of CreateFile interface for ERROR which parentUri is null. * @tc.size: MEDIUM @@ -436,7 +442,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0001, testing } /** - * @tc.number: SUB_user_file_service_file_extension_helper_CreateFile_0002 + * @tc.number: user_file_service_file_extension_helper_CreateFile_0002 * @tc.name: file_extension_helper_CreateFile_0002 * @tc.desc: Test function of CreateFile interface for ERROR which parentUri is absolute path. * @tc.size: MEDIUM @@ -460,7 +466,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0002, testing } /** - * @tc.number: SUB_user_file_service_file_extension_helper_CreateFile_0003 + * @tc.number: user_file_service_file_extension_helper_CreateFile_0003 * @tc.name: file_extension_helper_CreateFile_0003 * @tc.desc: Test function of CreateFile interface for ERROR which parentUri is special symbols. * @tc.size: MEDIUM @@ -484,7 +490,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0003, testing } /** - * @tc.number: SUB_user_file_service_file_extension_helper_CreateFile_0004 + * @tc.number: user_file_service_file_extension_helper_CreateFile_0004 * @tc.name: file_extension_helper_CreateFile_0004 * @tc.desc: Test function of CreateFile interface for ERROR which displayName is null. * @tc.size: MEDIUM @@ -514,7 +520,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0004, testing } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Mkdir_0000 + * @tc.number: user_file_service_file_extension_helper_Mkdir_0000 * @tc.name: file_extension_helper_Mkdir_0000 * @tc.desc: Test function of Mkdir interface for SUCCESS. * @tc.size: MEDIUM @@ -546,7 +552,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0000, testing::ext } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Mkdir_0001 + * @tc.number: user_file_service_file_extension_helper_Mkdir_0001 * @tc.name: file_extension_helper_Mkdir_0001 * @tc.desc: Test function of Mkdir interface for ERROR which parentUri is null. * @tc.size: MEDIUM @@ -570,7 +576,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0001, testing::ext } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Mkdir_0002 + * @tc.number: user_file_service_file_extension_helper_Mkdir_0002 * @tc.name: file_extension_helper_Mkdir_0002 * @tc.desc: Test function of Mkdir interface for ERROR which parentUri is absolute path. * @tc.size: MEDIUM @@ -594,7 +600,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0002, testing::ext } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Mkdir_0003 + * @tc.number: user_file_service_file_extension_helper_Mkdir_0003 * @tc.name: file_extension_helper_Mkdir_0003 * @tc.desc: Test function of Mkdir interface for ERROR which parentUri is special symbols. * @tc.size: MEDIUM @@ -618,7 +624,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0003, testing::ext } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Mkdir_0004 + * @tc.number: user_file_service_file_extension_helper_Mkdir_0004 * @tc.name: file_extension_helper_Mkdir_0004 * @tc.desc: Test function of Mkdir interface for ERROR which displayName is null. * @tc.size: MEDIUM @@ -648,7 +654,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0004, testing::ext } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Delete_0000 + * @tc.number: user_file_service_file_extension_helper_Delete_0000 * @tc.name: file_extension_helper_Delete_0000 * @tc.desc: Test function of Delete interface for SUCCESS which delete file. * @tc.size: MEDIUM @@ -687,7 +693,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0000, testing::ex } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Delete_0001 + * @tc.number: user_file_service_file_extension_helper_Delete_0001 * @tc.name: file_extension_helper_Delete_0001 * @tc.desc: Test function of Delete interface for SUCCESS which delete folder. * @tc.size: MEDIUM @@ -719,7 +725,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0001, testing::ex } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Delete_0002 + * @tc.number: user_file_service_file_extension_helper_Delete_0002 * @tc.name: file_extension_helper_Delete_0002 * @tc.desc: Test function of Delete interface for ERROR which selectFileUri is null. * @tc.size: MEDIUM @@ -742,7 +748,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0002, testing::ex } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Delete_0003 + * @tc.number: user_file_service_file_extension_helper_Delete_0003 * @tc.name: file_extension_helper_Delete_0003 * @tc.desc: Test function of Delete interface for ERROR which selectFileUri is absolute path. * @tc.size: MEDIUM @@ -779,7 +785,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0003, testing::ex } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Delete_0004 + * @tc.number: user_file_service_file_extension_helper_Delete_0004 * @tc.name: file_extension_helper_Delete_0004 * @tc.desc: Test function of Delete interface for ERROR which selectFileUri is special symbols. * @tc.size: MEDIUM @@ -802,7 +808,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0004, testing::ex } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Move_0000 + * @tc.number: user_file_service_file_extension_helper_Move_0000 * @tc.name: file_extension_helper_Move_0000 * @tc.desc: Test function of Move interface for SUCCESS which move file. * @tc.size: MEDIUM @@ -849,7 +855,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0000, testing::ext: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Move_0001 + * @tc.number: user_file_service_file_extension_helper_Move_0001 * @tc.name: file_extension_helper_Move_0001 * @tc.desc: Test function of Move interface for SUCCESS which move folder. * @tc.size: MEDIUM @@ -893,7 +899,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0001, testing::ext: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Move_0002 + * @tc.number: user_file_service_file_extension_helper_Move_0002 * @tc.name: file_extension_helper_Move_0002 * @tc.desc: Test function of Move interface for ERROR which sourceFileUri is null. * @tc.size: MEDIUM @@ -930,7 +936,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0002, testing::ext: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Move_0003 + * @tc.number: user_file_service_file_extension_helper_Move_0003 * @tc.name: file_extension_helper_Move_0003 * @tc.desc: Test function of Move interface for ERROR which sourceFileUri is absolute path. * @tc.size: MEDIUM @@ -978,7 +984,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0003, testing::ext: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Move_0004 + * @tc.number: user_file_service_file_extension_helper_Move_0004 * @tc.name: file_extension_helper_Move_0004 * @tc.desc: Test function of Move interface for ERROR which sourceFileUri is special symbols. * @tc.size: MEDIUM @@ -1015,7 +1021,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0004, testing::ext: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Move_0005 + * @tc.number: user_file_service_file_extension_helper_Move_0005 * @tc.name: file_extension_helper_Move_0005 * @tc.desc: Test function of Move interface for ERROR which targetParentUri is null. * @tc.size: MEDIUM @@ -1056,7 +1062,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0005, testing::ext: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Move_0006 + * @tc.number: user_file_service_file_extension_helper_Move_0006 * @tc.name: file_extension_helper_Move_0006 * @tc.desc: Test function of Move interface for ERROR which targetParentUri is absolute path. * @tc.size: MEDIUM @@ -1104,7 +1110,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0006, testing::ext: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Move_0007 + * @tc.number: user_file_service_file_extension_helper_Move_0007 * @tc.name: file_extension_helper_Move_0007 * @tc.desc: Test function of Move interface for ERROR which targetParentUri is special symbols. * @tc.size: MEDIUM @@ -1152,7 +1158,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0007, testing::ext: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Move_0008 + * @tc.number: user_file_service_file_extension_helper_Move_0008 * @tc.name: file_extension_helper_Move_0008 * @tc.desc: Test function of Move interface for SUCCESS which move empty folder. * @tc.size: MEDIUM @@ -1192,7 +1198,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0008, testing::ext: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Move_0009 + * @tc.number: user_file_service_file_extension_helper_Move_0009 * @tc.name: file_extension_helper_Move_0009 * @tc.desc: Test function of Move interface for SUCCESS which move more file in folder. * @tc.size: MEDIUM @@ -1239,7 +1245,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0009, testing::ext: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Move_0010 + * @tc.number: user_file_service_file_extension_helper_Move_0010 * @tc.name: file_extension_helper_Move_0010 * @tc.desc: Test function of Move interface for SUCCESS which move Multilevel directory folder. * @tc.size: MEDIUM @@ -1286,7 +1292,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0010, testing::ext: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Move_0011 + * @tc.number: user_file_service_file_extension_helper_Move_0011 * @tc.name: file_extension_helper_Move_0011 * @tc.desc: Test function of Move interface for SUCCESS which move other equipment file. * @tc.size: MEDIUM @@ -1338,7 +1344,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0011, testing::ext: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Rename_0000 + * @tc.number: user_file_service_file_extension_helper_Rename_0000 * @tc.name: file_extension_helper_Rename_0000 * @tc.desc: Test function of Rename interface for SUCCESS which rename file. * @tc.size: MEDIUM @@ -1378,7 +1384,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0000, testing::ex } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Rename_0001 + * @tc.number: user_file_service_file_extension_helper_Rename_0001 * @tc.name: file_extension_helper_Rename_0001 * @tc.desc: Test function of Rename interface for SUCCESS which rename folder. * @tc.size: MEDIUM @@ -1414,7 +1420,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0001, testing::ex } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Rename_0002 + * @tc.number: user_file_service_file_extension_helper_Rename_0002 * @tc.name: file_extension_helper_Rename_0002 * @tc.desc: Test function of Rename interface for ERROR which sourceFileUri is null. * @tc.size: MEDIUM @@ -1438,7 +1444,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0002, testing::ex } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Rename_0003 + * @tc.number: user_file_service_file_extension_helper_Rename_0003 * @tc.name: file_extension_helper_Rename_0003 * @tc.desc: Test function of Rename interface for ERROR which sourceFileUri is absolute path. * @tc.size: MEDIUM @@ -1479,7 +1485,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0003, testing::ex } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Rename_0004 + * @tc.number: user_file_service_file_extension_helper_Rename_0004 * @tc.name: file_extension_helper_Rename_0004 * @tc.desc: Test function of Rename interface for ERROR which sourceFileUri is special symbols. * @tc.size: MEDIUM @@ -1503,7 +1509,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0004, testing::ex } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Rename_0005 + * @tc.number: user_file_service_file_extension_helper_Rename_0005 * @tc.name: file_extension_helper_Rename_0005 * @tc.desc: Test function of Rename interface for ERROR which displayName is null. * @tc.size: MEDIUM @@ -1543,7 +1549,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0005, testing::ex } /** - * @tc.number: SUB_user_file_service_file_extension_helper_ListFile_0000 + * @tc.number: user_file_service_file_extension_helper_ListFile_0000 * @tc.name: file_extension_helper_ListFile_0000 * @tc.desc: Test function of ListFile interface for SUCCESS. * @tc.size: MEDIUM @@ -1573,7 +1579,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0000, testing:: int64_t offset = 0; int64_t maxCount = 1000; std::vector fileInfoVec; - fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + FileFilter filter; + fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_GT(fileInfoVec.size(), 0); result = fah->Delete(newDirUriTest); @@ -1586,7 +1593,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0000, testing:: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_ListFile_0001 + * @tc.number: user_file_service_file_extension_helper_ListFile_0001 * @tc.name: file_extension_helper_ListFile_0001 * @tc.desc: Test function of ListFile interface for ERROR which Uri is nullptr. * @tc.size: MEDIUM @@ -1604,7 +1611,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0001, testing:: int64_t offset = 0; int64_t maxCount = 1000; std::vector fileInfoVec; - fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + FileFilter filter; + fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(fileInfoVec.size(), 0); } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; @@ -1613,7 +1621,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0001, testing:: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_ListFile_0002 + * @tc.number: user_file_service_file_extension_helper_ListFile_0002 * @tc.name: file_extension_helper_ListFile_0002 * @tc.desc: Test function of ListFile interface for ERROR which sourceFileUri is absolute path. * @tc.size: MEDIUM @@ -1645,7 +1653,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0002, testing:: int64_t offset = 0; int64_t maxCount = 1000; std::vector fileInfoVec; - fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + FileFilter filter; + fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(fileInfoVec.size(), 0); result = fah->Delete(newDirUriTest); @@ -1658,7 +1667,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0002, testing:: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_ListFile_0003 + * @tc.number: user_file_service_file_extension_helper_ListFile_0003 * @tc.name: file_extension_helper_ListFile_0003 * @tc.desc: Test function of ListFile interface for ERROR which sourceFileUri is special symbols. * @tc.size: MEDIUM @@ -1677,7 +1686,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0003, testing:: int64_t offset = 0; int64_t maxCount = 1000; std::vector fileInfoVec; - fah->ListFile(fileInfo, offset, maxCount, fileInfoVec); + FileFilter filter; + fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(fileInfoVec.size(), 0); } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; @@ -1686,7 +1696,55 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0003, testing:: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_GetRoots_0000 + * @tc.number: user_file_service_file_extension_helper_ScanFile_0000 + * @tc.name: file_extension_helper_ScanFile_0000 + * @tc.desc: Test function of ScanFile interface for SUCCESS which scan root directory with filter. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileExtensionHelperTest, file_extension_helper_ScanFile_0000, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ScanFile_0000"; + try { + vector info; + int result = 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(""); + result = fah->Mkdir(parentUri, "test", newDirUriTest); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + Uri testUri(""); + result = fah->CreateFile(newDirUriTest, "file_extension_helper_ListFile_0000.docx", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + result = fah->CreateFile(newDirUriTest, "file_extension_helper_ListFile_0000.txt", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + result = fah->CreateFile(newDirUriTest, "file_extension_helper_ListFile_0000.pptx", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + FileInfo fileInfo; + fileInfo.uri = newDirUriTest.ToString(); + int64_t offset = 0; + int64_t maxCount = 1000; + std::vector fileInfoVec; + FileFilter filter; + fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_EQ(fileInfoVec.size(), 3); + + result = fah->Delete(newDirUriTest); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + } + } catch (...) { + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_ScanFile_0000"; +} + +/** + * @tc.number: user_file_service_file_extension_helper_GetRoots_0000 * @tc.name: file_extension_helper_GetRoots_0000 * @tc.desc: Test function of GetRoots interface for SUCCESS. * @tc.size: MEDIUM @@ -1717,7 +1775,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_GetRoots_0000, testing:: } /** - * @tc.number: SUB_user_file_service_file_extension_helper_allInterface_0000 + * @tc.number: user_file_service_file_extension_helper_allInterface_0000 * @tc.name: file_extension_helper_allInterface_0000 * @tc.desc: Test function of allInterface interface for SUCCESS. * @tc.size: MEDIUM @@ -1744,9 +1802,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi string uri = parentUri.ToString(); GTEST_LOG_(INFO) << uri; - Uri documentUri(""); - result = fahs->Mkdir(parentUri, "Documents", documentUri); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + string document = uri + "/Documents"; + Uri documentUri(document); + bool isExist = false; + result = fahs->Access(documentUri, isExist); + if (!isExist) { + result = fahs->Mkdir(parentUri, "Documents", documentUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + } Uri newDirUriTest1(""); Uri newDirUriTest2(""); @@ -1786,7 +1849,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi } /** - * @tc.number: SUB_user_file_service_file_extension_helper_Access_0000 + * @tc.number: user_file_service_file_extension_helper_Access_0000 * @tc.name: file_extension_helper_Access_0000 * @tc.desc: Test function of Access interface for SUCCESS. * @tc.size: MEDIUM -- Gitee From 738a124c9649ebcb04d3c05d039b8469daca9c43 Mon Sep 17 00:00:00 2001 From: gf721 Date: Tue, 6 Sep 2022 19:19:29 +0800 Subject: [PATCH 094/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9review?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gf721 --- .../test/file_access_helper_test.cpp | 111 ++++++++++-------- 1 file changed, 60 insertions(+), 51 deletions(-) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index d982a417..7405250c 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -31,7 +31,7 @@ using namespace OHOS; using namespace FileAccessFwk; int ABILITY_ID = 5003; shared_ptr fah = nullptr; -Uri newDirUri(""); +Uri g_newDirUri(""); class FileAccessHelperTest : public testing::Test { public: @@ -167,11 +167,11 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0000, testing::ext::T GTEST_LOG_(INFO) << parentUri.ToString(); } - result = fah->Mkdir(parentUri, "Download", newDirUri); + result = fah->Mkdir(parentUri, "Download", g_newDirUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newDirUriTest(""); - result = fah->Mkdir(newDirUri, "test1", newDirUriTest); + result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); @@ -230,7 +230,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0002, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0002"; try { Uri newFileUri(""); - int result = fah->CreateFile(newDirUri, "file_access_helper_OpenFile_0002.txt", newFileUri); + int result = fah->CreateFile(g_newDirUri, "file_access_helper_OpenFile_0002.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri uri("storage/media/100/local/files/Download/file_access_helper_OpenFile_0002.txt"); @@ -285,7 +285,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0004, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0004"; try { Uri newFileUri(""); - int result = fah->CreateFile(newDirUri, "file_access_helper_OpenFile_0004.txt", newFileUri); + int result = fah->CreateFile(g_newDirUri, "file_access_helper_OpenFile_0004.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; @@ -315,7 +315,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0005, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0005"; try { Uri newFileUri(""); - int result = fah->CreateFile(newDirUri, "file_access_helper_OpenFile_0005.txt", newFileUri); + int result = fah->CreateFile(g_newDirUri, "file_access_helper_OpenFile_0005.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; @@ -345,7 +345,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0006, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0006"; try { Uri newFileUri(""); - int result = fah->CreateFile(newDirUri, "file_access_helper_OpenFile_0006.txt", newFileUri); + int result = fah->CreateFile(g_newDirUri, "file_access_helper_OpenFile_0006.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; @@ -375,7 +375,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0000, testing::ext: GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_CreateFile_0000"; try { Uri newFileUri(""); - int result = fah->CreateFile(newDirUri, "file_access_helper_CreateFile_0000.txt", newFileUri); + int result = fah->CreateFile(g_newDirUri, "file_access_helper_CreateFile_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0000 result:" << result << endl; @@ -474,7 +474,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0004, testing::ext: try { Uri newFileUri(""); string displayName = ""; - int result = fah->CreateFile(newDirUri, displayName, newFileUri); + int result = fah->CreateFile(g_newDirUri, displayName, newFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0004 result:" << result << endl; } catch (...) { @@ -497,7 +497,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0000, testing::ext::Test GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Mkdir_0000"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(newDirUri, "file_access_helper_Mkdir_0000", newDirUriTest); + int result = fah->Mkdir(g_newDirUri, "file_access_helper_Mkdir_0000", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0000 result:" << result << endl; @@ -596,7 +596,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0004, testing::ext::Test try { Uri newDirUriTest(""); string displayName = ""; - int result = fah->Mkdir(newDirUri, displayName, newDirUriTest); + int result = fah->Mkdir(g_newDirUri, displayName, newDirUriTest); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0004 result:" << result << endl; } catch (...) { @@ -619,7 +619,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0000, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0000"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(newDirUri, "test", newDirUriTest); + int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); @@ -652,7 +652,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0001, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0001"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(newDirUri, "test", newDirUriTest); + int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->Delete(newDirUriTest); @@ -701,7 +701,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0003, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0003"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(newDirUri, "test", newDirUriTest); + int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri selectFileUri("storage/media/100/local/files/Download/test"); @@ -755,10 +755,10 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0000, testing::ext::TestS try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = fah->Mkdir(newDirUri, "test1", newDirUriTest1); + int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(newDirUri, "test2", newDirUriTest2); + result = fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -796,10 +796,10 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0001, testing::ext::TestS try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = fah->Mkdir(newDirUri, "test1", newDirUriTest1); + int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(newDirUri, "test2", newDirUriTest2); + result = fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -833,7 +833,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0002, testing::ext::TestS GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0002"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(newDirUri, "test", newDirUriTest); + int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -865,10 +865,10 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0003, testing::ext::TestS try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = fah->Mkdir(newDirUri, "test1", newDirUriTest1); + int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(newDirUri, "test2", newDirUriTest2); + result = fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -906,7 +906,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0004, testing::ext::TestS GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0004"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(newDirUri, "test", newDirUriTest); + int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -937,7 +937,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0005, testing::ext::TestS GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0005"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(newDirUri, "test1", newDirUriTest); + int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -973,10 +973,10 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0006, testing::ext::TestS try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = fah->Mkdir(newDirUri, "test1", newDirUriTest1); + int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(newDirUri, "test2", newDirUriTest2); + result = fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1015,10 +1015,10 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0007, testing::ext::TestS try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = fah->Mkdir(newDirUri, "test1", newDirUriTest1); + int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(newDirUri, "test2", newDirUriTest2); + result = fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1057,10 +1057,10 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0008, testing::ext::TestS try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = fah->Mkdir(newDirUri, "test1", newDirUriTest1); + int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(newDirUri, "test2", newDirUriTest2); + result = fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); @@ -1091,10 +1091,10 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0009, testing::ext::TestS try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = fah->Mkdir(newDirUri, "test1", newDirUriTest1); + int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(newDirUri, "test2", newDirUriTest2); + result = fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1131,10 +1131,10 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0010, testing::ext::TestS try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = fah->Mkdir(newDirUri, "test1", newDirUriTest1); + int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(newDirUri, "test2", newDirUriTest2); + result = fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1170,7 +1170,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0000, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0000"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(newDirUri, "test", newDirUriTest); + int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1204,7 +1204,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0001, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0001"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(newDirUri, "test", newDirUriTest); + int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri renameUri(""); @@ -1258,7 +1258,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0003, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0003"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(newDirUri, "test", newDirUriTest); + int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1317,7 +1317,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0005, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0005"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(newDirUri, "test", newDirUriTest); + int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1351,7 +1351,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0000, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0000"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(newDirUri, "test", newDirUriTest); + int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1395,8 +1395,9 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0001, testing::ext::T int64_t offset = 0; int64_t maxCount = 1000; vector fileInfoVec; - FileFilter filter; - fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + FileFilter filter({}, {}, {}, 0, 0, false, false); + int result = fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 0); GTEST_LOG_(INFO) << "ListFile_0001 result:" << fileInfoVec.size() << endl; } catch (...) { @@ -1419,7 +1420,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0002, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0002"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(newDirUri, "test", newDirUriTest); + int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1432,8 +1433,9 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0002, testing::ext::T int64_t offset = 0; int64_t maxCount = 1000; vector fileInfoVec; - FileFilter filter; - fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + FileFilter filter({}, {}, {}, 0, 0, false, false); + result = fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 0); GTEST_LOG_(INFO) << "ListFile_0002 result:" << fileInfoVec.size() << endl; @@ -1488,7 +1490,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0004, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0004"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(newDirUri, "test", newDirUriTest); + int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri1(""); @@ -1529,7 +1531,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0000, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0000"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(newDirUri, "Download", newDirUriTest); + int result = fah->Mkdir(g_newDirUri, "Download", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1538,7 +1540,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0000, testing::ext::T EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - fileInfo.uri = newDirUriTest.ToString(); + fileInfo.uri = "datashare:///media/root"; int64_t offset = 0; int64_t maxCount = 1000; std::vector fileInfoVec; @@ -1569,20 +1571,22 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0001, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0001"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(newDirUri, "Download", newDirUriTest); + int result = fah->Mkdir(g_newDirUri, "Download", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); FileInfo fileInfo; - fileInfo.uri = newDirUriTest.ToString(); + fileInfo.uri = "datashare:///media/root"; result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0001.q1w2e3r4", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0001.txt", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int64_t offset = 0; int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter; fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); - EXPECT_GE(fileInfoVec.size(), 1); + EXPECT_GE(fileInfoVec.size(), 2); GTEST_LOG_(INFO) << "ScanFile_0000 result:" << fileInfoVec.size() << endl; result = fah->Delete(newDirUriTest); @@ -1607,7 +1611,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0002, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0002"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(newDirUri, "Download", newDirUriTest); + int result = fah->Mkdir(g_newDirUri, "Download", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1615,6 +1619,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0002, testing::ext::T EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.docx", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); FileInfo fileInfo; fileInfo.uri = newDirUriTest.ToString(); int64_t offset = 0; @@ -1623,6 +1629,9 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0002, testing::ext::T FileFilter filter({".q1w2e3r4"}, {}, {}, 0, 0, false, true); fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(fileInfoVec.size(), 1); + FileFilter filter1({".q1w2e3r4", ".txt"}, {}, {}, 0, 0, false, true); + fah->ScanFile(fileInfo, offset, maxCount, filter1, fileInfoVec); + EXPECT_EQ(fileInfoVec.size(), 2); GTEST_LOG_(INFO) << "ScanFile_0002 result:" << fileInfoVec.size() << endl; result = fah->Delete(newDirUriTest); @@ -1647,7 +1656,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0003, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0003"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(newDirUri, "Download", newDirUriTest); + int result = fah->Mkdir(g_newDirUri, "Download", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); -- Gitee From 3c9dba62d1141009923cda410860ad73d67ca6f0 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Tue, 6 Sep 2022 20:20:23 +0800 Subject: [PATCH 095/122] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../file_info/napi_file_info_exporter.cpp | 5 +++ .../napi_fileaccess_helper.cpp | 35 +++++++++++++++++++ .../root_info/napi_root_info_exporter.cpp | 5 +++ .../root_info/napi_root_iterator_exporter.cpp | 5 +++ 4 files changed, 50 insertions(+) diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp index 952307c3..35895ac5 100644 --- a/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_info_exporter.cpp @@ -65,6 +65,11 @@ napi_value NapiFileInfoExporter::Constructor(napi_env env, napi_callback_info in } auto fileInfoEntity = std::make_unique(); + if (fileInfoEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of fileInfoEntity"); + return nullptr; + } + if (!NClass::SetEntityFor(env, funcArg.GetThisVar(), std::move(fileInfoEntity))) { NError(ERR_NULL_POINTER).ThrowErr(env, "INNER BUG. Failed to wrap entity for obj FileInfoEntity"); return nullptr; diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index cbba5049..5055d924 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -176,6 +176,11 @@ napi_value NAPI_GetFileAccessAbilityInfo(napi_env env, napi_callback_info info) } auto result = std::make_shared>(); + if (result == nullptr) { + NapiError(ERR_NULL_POINTER).ThrowErr(env);; + return nullptr; + } + auto cbExec = [result]() -> NError { int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(*result); return NError(ret); @@ -304,6 +309,11 @@ napi_value NAPI_OpenFile(napi_env env, napi_callback_info info) } auto result = std::make_shared(); + if (result == nullptr) { + NapiError(ERR_NULL_POINTER).ThrowErr(env); + return nullptr; + } + string uriString(uri.get()); auto cbExec = [uriString, flags, result, fileAccessHelper]() -> NError { OHOS::Uri uri(uriString); @@ -353,6 +363,11 @@ napi_value NAPI_CreateFile(napi_env env, napi_callback_info info) } auto result = std::make_shared(); + if (result == nullptr) { + NapiError(ERR_NULL_POINTER).ThrowErr(env); + return nullptr; + } + string uriString(uri.get()); string name(displayName.get()); auto cbExec = [uriString, name, result, fileAccessHelper]() -> NError { @@ -405,6 +420,11 @@ napi_value NAPI_Mkdir(napi_env env, napi_callback_info info) } auto result = std::make_shared(); + if (result == nullptr) { + NapiError(ERR_NULL_POINTER).ThrowErr(env); + return nullptr; + } + string uriString(uri.get()); string name(displayName.get()); auto cbExec = [uriString, name, result, fileAccessHelper]() -> NError { @@ -457,6 +477,11 @@ napi_value NAPI_Delete(napi_env env, napi_callback_info info) } auto result = std::make_shared(); + if (result == nullptr) { + NapiError(ERR_NULL_POINTER).ThrowErr(env); + return nullptr; + } + string uriString(uri.get()); auto cbExec = [uriString, result, fileAccessHelper]() -> NError { OHOS::Uri uri(uriString); @@ -506,6 +531,11 @@ napi_value NAPI_Move(napi_env env, napi_callback_info info) } auto result = std::make_shared(); + if (result == nullptr) { + NapiError(ERR_NULL_POINTER).ThrowErr(env); + return nullptr; + } + string sourceFileString(sourceFile.get()); string targetParentString(targetParent.get()); auto cbExec = [sourceFileString, targetParentString, result, fileAccessHelper]() -> NError { @@ -559,6 +589,11 @@ napi_value NAPI_Rename(napi_env env, napi_callback_info info) } auto result = std::make_shared(); + if (result == nullptr) { + NapiError(ERR_NULL_POINTER).ThrowErr(env); + return nullptr; + } + string uriString(uri.get()); string name(displayName.get()); auto cbExec = [uriString, name, result, fileAccessHelper]() -> NError { diff --git a/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp b/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp index 23f009b6..6cb3b456 100644 --- a/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/root_info/napi_root_info_exporter.cpp @@ -67,6 +67,11 @@ napi_value NapiRootInfoExporter::Constructor(napi_env env, napi_callback_info in } auto rootInfoEntity = std::make_unique(); + if (rootInfoEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of RootInfoEntity"); + return nullptr; + } + if (!NClass::SetEntityFor(env, funcArg.GetThisVar(), std::move(rootInfoEntity))) { NError(ERR_NULL_POINTER).ThrowErr(env, "INNER BUG. Failed to wrap entity for obj RootInfoEntity"); return nullptr; diff --git a/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp b/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp index 91c6d832..f5734af8 100644 --- a/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp @@ -57,6 +57,11 @@ napi_value NapiRootIteratorExporter::Constructor(napi_env env, napi_callback_inf } auto rootIteratorEntity = std::make_unique(); + if (rootIteratorEntity == nullptr) { + NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of rootIteratorEntity"); + return nullptr; + } + if (!NClass::SetEntityFor(env, funcArg.GetThisVar(), std::move(rootIteratorEntity))) { NError(ERR_NULL_POINTER).ThrowErr(env, "INNER BUG. Failed to wrap entity for obj FileIteratorEntity"); return nullptr; -- Gitee From ba06a9142e64e38b29de5a8d6d37100fc9b342c4 Mon Sep 17 00:00:00 2001 From: gf721 Date: Tue, 6 Sep 2022 20:50:24 +0800 Subject: [PATCH 096/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9review?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gf721 --- .../test/file_access_helper_test.cpp | 23 ++++--- .../test/file_extension_helper_test.cpp | 61 +++---------------- 2 files changed, 24 insertions(+), 60 deletions(-) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 7405250c..86b4826f 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -1364,7 +1364,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0000, testing::ext::T int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter; - fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + result = fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_GT(fileInfoVec.size(), 0); GTEST_LOG_(INFO) << "ListFile_0000 result:" << fileInfoVec.size() << endl; @@ -1467,7 +1468,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0003, testing::ext::T int64_t maxCount = 1000; vector fileInfoVec; FileFilter filter; - fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + int result = fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 0); GTEST_LOG_(INFO) << "ListFile_0003 result:" << fileInfoVec.size() << endl; } catch (...) { @@ -1506,7 +1508,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0004, testing::ext::T int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter({".txt"}, {}, {}, 0, 0, false, true); - fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + result = fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 1); result = fah->Delete(newDirUriTest); @@ -1545,7 +1548,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0000, testing::ext::T int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter({".q1w2e3r4"}, {}, {}, 0, 0, false, true); - fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + result = fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_GE(fileInfoVec.size(), 1); GTEST_LOG_(INFO) << "ScanFile_0000 result:" << fileInfoVec.size() << endl; @@ -1584,8 +1588,9 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0001, testing::ext::T int64_t offset = 0; int64_t maxCount = 1000; std::vector fileInfoVec; - FileFilter filter; - fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + FileFilter filter({}, {}, {}, 0, 0, false, false); + result = fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_GE(fileInfoVec.size(), 2); GTEST_LOG_(INFO) << "ScanFile_0000 result:" << fileInfoVec.size() << endl; @@ -1630,7 +1635,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0002, testing::ext::T fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(fileInfoVec.size(), 1); FileFilter filter1({".q1w2e3r4", ".txt"}, {}, {}, 0, 0, false, true); - fah->ScanFile(fileInfo, offset, maxCount, filter1, fileInfoVec); + result = fah->ScanFile(fileInfo, offset, maxCount, filter1, fileInfoVec); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 2); GTEST_LOG_(INFO) << "ScanFile_0002 result:" << fileInfoVec.size() << endl; @@ -1668,7 +1674,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0003, testing::ext::T int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter({".q1w2e3r4"}, {}, {}, 0, 0, false, true); - fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + result = fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 1); GTEST_LOG_(INFO) << "ScanFile_0003 result:" << fileInfoVec.size() << endl; diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index be9da359..ae68864e 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -1580,7 +1580,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0000, testing:: int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter; - fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + result = fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_GT(fileInfoVec.size(), 0); result = fah->Delete(newDirUriTest); @@ -1612,7 +1613,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0001, testing:: int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter; - fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + int result = fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 0); } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; @@ -1654,7 +1656,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0002, testing:: int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter; - fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + result = fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 0); result = fah->Delete(newDirUriTest); @@ -1687,7 +1690,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0003, testing:: int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter; - fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + int result = fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 0); } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; @@ -1695,54 +1699,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0003, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_ListFile_0003"; } -/** - * @tc.number: user_file_service_file_extension_helper_ScanFile_0000 - * @tc.name: file_extension_helper_ScanFile_0000 - * @tc.desc: Test function of ScanFile interface for SUCCESS which scan root directory with filter. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: SR000H0386 - */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_ScanFile_0000, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ScanFile_0000"; - try { - vector info; - int result = 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(""); - result = fah->Mkdir(parentUri, "test", newDirUriTest); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - - Uri testUri(""); - result = fah->CreateFile(newDirUriTest, "file_extension_helper_ListFile_0000.docx", testUri); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->CreateFile(newDirUriTest, "file_extension_helper_ListFile_0000.txt", testUri); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->CreateFile(newDirUriTest, "file_extension_helper_ListFile_0000.pptx", testUri); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - - FileInfo fileInfo; - fileInfo.uri = newDirUriTest.ToString(); - int64_t offset = 0; - int64_t maxCount = 1000; - std::vector fileInfoVec; - FileFilter filter; - fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); - EXPECT_EQ(fileInfoVec.size(), 3); - - result = fah->Delete(newDirUriTest); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - } - } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; - } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_ScanFile_0000"; -} - /** * @tc.number: user_file_service_file_extension_helper_GetRoots_0000 * @tc.name: file_extension_helper_GetRoots_0000 @@ -1806,6 +1762,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi Uri documentUri(document); bool isExist = false; result = fahs->Access(documentUri, isExist); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); if (!isExist) { result = fahs->Mkdir(parentUri, "Documents", documentUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); -- Gitee From a0faa13ee1b5e3f4b5c02aa8351f65e11242172c Mon Sep 17 00:00:00 2001 From: gf721 Date: Tue, 6 Sep 2022 21:20:58 +0800 Subject: [PATCH 097/122] =?UTF-8?q?listfile=E9=94=99=E8=AF=AF=E7=A0=81?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gf721 --- .../innerkits/file_access/test/file_access_helper_test.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 86b4826f..3b22fbc7 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -1632,7 +1632,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0002, testing::ext::T int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter({".q1w2e3r4"}, {}, {}, 0, 0, false, true); - fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + result = fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 1); FileFilter filter1({".q1w2e3r4", ".txt"}, {}, {}, 0, 0, false, true); result = fah->ScanFile(fileInfo, offset, maxCount, filter1, fileInfoVec); -- Gitee From 14ec44b23dd72aa7da18490f379cf98345b55e7d Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Tue, 6 Sep 2022 10:50:06 +0800 Subject: [PATCH 098/122] fix code review Signed-off-by: linjun9528 --- .../include/file_access_extension_info.h | 24 +-- .../file_access/src/file_access_ext_proxy.cpp | 51 ++++-- .../file_access/src/file_access_ext_stub.cpp | 7 +- .../file_access/src/file_access_helper.cpp | 40 +++-- .../src/js_file_access_ext_ability.cpp | 152 +++++++++++++++++- .../file_access_ext_ability.js | 2 +- .../file_info/file_info_entity.h | 4 +- .../file_info/file_iterator_entity.h | 10 +- .../file_info/napi_file_iterator_exporter.cpp | 38 +++-- .../napi_fileaccess_helper.cpp | 12 +- .../napi/file_access_module/napi_utils.cpp | 38 ++--- .../root_info/napi_root_iterator_exporter.cpp | 13 +- .../root_info/root_info_entity.h | 2 +- .../root_info/root_iterator_entity.h | 4 +- .../FileExtensionAbility.ts | 35 +--- 15 files changed, 298 insertions(+), 134 deletions(-) diff --git a/frameworks/innerkits/file_access/include/file_access_extension_info.h b/frameworks/innerkits/file_access/include/file_access_extension_info.h index e9afe522..896f96e3 100644 --- a/frameworks/innerkits/file_access/include/file_access_extension_info.h +++ b/frameworks/innerkits/file_access/include/file_access_extension_info.h @@ -51,16 +51,16 @@ const int32_t DOCUMENT_FLAG_SUPPORTS_WRITE = 1 << 3; struct FileInfo : public virtual OHOS::Parcelable { public: - std::string uri; - std::string fileName; - int32_t mode; - int64_t size; - int64_t mtime; - std::string mimeType; + std::string uri { "" }; + std::string fileName { "" }; + int32_t mode { 0 }; + int64_t size { 0 }; + int64_t mtime { 0 }; + std::string mimeType { "" }; FileInfo() = default; - FileInfo(std::string uriIn, std::string fileNameIn, int32_t modeIn, std::string mimeTypeIn) - : uri(uriIn), fileName(fileNameIn), mode(modeIn), mimeType(mimeTypeIn) + FileInfo(std::string uri, std::string fileName, int32_t mode, std::string mimeType) + : uri(uri), fileName(fileName), mode(mode), mimeType(mimeType) {} bool ReadFromParcel(Parcel &parcel) @@ -114,10 +114,10 @@ public: struct RootInfo : public virtual OHOS::Parcelable { public: - int32_t deviceType; - std::string uri; - std::string displayName; - int32_t deviceFlags; + int32_t deviceType { 0 }; + std::string uri { "" }; + std::string displayName { "" }; + int32_t deviceFlags { 0 }; bool ReadFromParcel(Parcel &parcel) { diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index b493a06c..992adf6c 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -48,7 +48,7 @@ int FileAccessExtProxy::OpenFile(const Uri &uri, const int flags, int &fd) MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_OPEN_FILE, data, reply, option); + int err = Remote()->SendRequest(CMD_OPEN_FILE, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -103,7 +103,7 @@ int FileAccessExtProxy::CreateFile(const Uri &parent, const std::string &display MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_CREATE_FILE, data, reply, option); + int err = Remote()->SendRequest(CMD_CREATE_FILE, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -133,8 +133,10 @@ int FileAccessExtProxy::CreateFile(const Uri &parent, const std::string &display newFile = Uri(*tempUri); if (newFile.ToString().empty()) { HILOG_ERROR("get uri is empty."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_RESULT; } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; } @@ -163,7 +165,7 @@ int FileAccessExtProxy::Mkdir(const Uri &parent, const std::string &displayName, MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_MKDIR, data, reply, option); + int err = Remote()->SendRequest(CMD_MKDIR, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -193,8 +195,10 @@ int FileAccessExtProxy::Mkdir(const Uri &parent, const std::string &displayName, newFile = Uri(*tempUri); if (newFile.ToString().empty()) { HILOG_ERROR("get uri is empty."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_RESULT; } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; } @@ -217,7 +221,7 @@ int FileAccessExtProxy::Delete(const Uri &sourceFile) MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_DELETE, data, reply, option); + int err = Remote()->SendRequest(CMD_DELETE, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -265,7 +269,7 @@ int FileAccessExtProxy::Move(const Uri &sourceFile, const Uri &targetParent, Uri MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_MOVE, data, reply, option); + int err = Remote()->SendRequest(CMD_MOVE, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -295,8 +299,10 @@ int FileAccessExtProxy::Move(const Uri &sourceFile, const Uri &targetParent, Uri newFile = Uri(*tempUri); if (newFile.ToString().empty()) { HILOG_ERROR("get uri is empty."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_RESULT; } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; } @@ -325,7 +331,7 @@ int FileAccessExtProxy::Rename(const Uri &sourceFile, const std::string &display MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_RENAME, data, reply, option); + int err = Remote()->SendRequest(CMD_RENAME, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -355,8 +361,10 @@ int FileAccessExtProxy::Rename(const Uri &sourceFile, const std::string &display newFile = Uri(*tempUri); if (newFile.ToString().empty()) { HILOG_ERROR("get uri is empty."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_RESULT; } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; } @@ -366,20 +374,17 @@ static int GetListFileResult(MessageParcel &reply, std::vector &fileIn int ret = ERR_PARCEL_FAIL; if (!reply.ReadInt32(ret)) { HILOG_ERROR("fail to ReadInt32 ret"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } if (ret != ERR_OK) { HILOG_ERROR("ListFile operation failed ret : %{public}d", ret); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } int64_t count = 0; if (!reply.ReadInt64(count)) { HILOG_ERROR("ListFile operation failed to Read count"); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_RESULT; } @@ -430,15 +435,22 @@ int FileAccessExtProxy::ListFile(const FileInfo &fileInfo, const int64_t offset, MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_LIST_FILE, data, reply, option); + int err = Remote()->SendRequest(CMD_LIST_FILE, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return err; } + err = GetListFileResult(reply, fileInfoVec); + if (err != ERR_OK) { + HILOG_ERROR("fail to GetListFileResult. err: %{public}d", err); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return err; + } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return GetListFileResult(reply, fileInfoVec); + return ERR_OK; } int FileAccessExtProxy::ScanFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, @@ -478,15 +490,22 @@ int FileAccessExtProxy::ScanFile(const FileInfo &fileInfo, const int64_t offset, MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_SCAN_FILE, data, reply, option); + int err = Remote()->SendRequest(CMD_SCAN_FILE, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return err; } + err = GetListFileResult(reply, fileInfoVec); + if (err != ERR_OK) { + HILOG_ERROR("fail to GetListFileResult. err: %{public}d", err); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return err; + } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return GetListFileResult(reply, fileInfoVec); + return ERR_OK; } int FileAccessExtProxy::GetRoots(std::vector &rootInfoVec) @@ -501,7 +520,7 @@ int FileAccessExtProxy::GetRoots(std::vector &rootInfoVec) MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_GET_ROOTS, data, reply, option); + int err = Remote()->SendRequest(CMD_GET_ROOTS, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -558,7 +577,7 @@ int FileAccessExtProxy::Access(const Uri &uri, bool &isExist) MessageParcel reply; MessageOption option; - int32_t err = Remote()->SendRequest(CMD_ACCESS, data, reply, option); + int err = Remote()->SendRequest(CMD_ACCESS, data, reply, option); if (err != ERR_OK) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -580,8 +599,10 @@ int FileAccessExtProxy::Access(const Uri &uri, bool &isExist) if (!reply.ReadBool(isExist)) { HILOG_ERROR("fail to ReadInt32 isExist"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; } diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp index ab1b1f9a..2b0983b7 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp @@ -99,6 +99,7 @@ ErrCode FileAccessExtStub::CmdOpenFile(MessageParcel &data, MessageParcel &reply int flags = ERR_PARCEL_FAIL; if (!data.ReadInt32(flags)) { HILOG_ERROR("Parameter OpenFile fail to ReadInt32 flags"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -139,6 +140,7 @@ ErrCode FileAccessExtStub::CmdCreateFile(MessageParcel &data, MessageParcel &rep std::string displayName = ""; if (!data.ReadString(displayName)) { HILOG_ERROR("Parameter CreateFile fail to ReadString displayName"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -180,6 +182,7 @@ ErrCode FileAccessExtStub::CmdMkdir(MessageParcel &data, MessageParcel &reply) std::string displayName = ""; if (!data.ReadString(displayName)) { HILOG_ERROR("Parameter Mkdir fail to ReadString displayName"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -278,6 +281,7 @@ ErrCode FileAccessExtStub::CmdRename(MessageParcel &data, MessageParcel &reply) std::string displayName = ""; if (!data.ReadString(displayName)) { HILOG_ERROR("Parameter Rename fail to ReadString displayName"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARCEL_FAIL; } @@ -422,7 +426,6 @@ ErrCode FileAccessExtStub::CmdScanFile(MessageParcel &data, MessageParcel &reply return ERR_OK; } - ErrCode FileAccessExtStub::CmdGetRoots(MessageParcel &data, MessageParcel &reply) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdGetRoots"); @@ -484,7 +487,7 @@ ErrCode FileAccessExtStub::CmdAccess(MessageParcel &data, MessageParcel &reply) bool FileAccessExtStub::CheckCallingPermission(const std::string &permission) { - StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdGetRoots"); + StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CheckCallingPermission"); Security::AccessToken::AccessTokenID tokenCaller = IPCSkeleton::GetCallingTokenID(); int res = Security::AccessToken::AccessTokenKit::VerifyAccessToken(tokenCaller, permission); if (res != Security::AccessToken::PermissionState::PERMISSION_GRANTED) { diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index e7f78e71..2f7cdfc0 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -413,6 +413,7 @@ int FileAccessHelper::OpenFile(Uri &uri, int flags, int &fd) if (flags != READ && flags != WRITE && flags != WRITE_READ) { HILOG_ERROR("flags type error."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_PARAM; } @@ -431,7 +432,7 @@ int FileAccessHelper::OpenFile(Uri &uri, int flags, int &fd) } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessHelper::CreateFile(Uri &parent, const std::string &displayName, Uri &newFile) @@ -458,7 +459,7 @@ int FileAccessHelper::CreateFile(Uri &parent, const std::string &displayName, Ur } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessHelper::Mkdir(Uri &parent, const std::string &displayName, Uri &newDir) @@ -485,7 +486,7 @@ int FileAccessHelper::Mkdir(Uri &parent, const std::string &displayName, Uri &ne } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessHelper::Delete(Uri &selectFile) @@ -512,7 +513,7 @@ int FileAccessHelper::Delete(Uri &selectFile) } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessHelper::Move(Uri &sourceFile, Uri &targetParent, Uri &newFile) @@ -534,6 +535,7 @@ int FileAccessHelper::Move(Uri &sourceFile, Uri &targetParent, Uri &newFile) if (sourceFileUri.GetScheme() != targetParentUri.GetScheme()) { HILOG_WARN("Operation failed, move not supported"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OPERATION_NOT_SUPPORT; } @@ -552,7 +554,7 @@ int FileAccessHelper::Move(Uri &sourceFile, Uri &targetParent, Uri &newFile) } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessHelper::Rename(Uri &sourceFile, const std::string &displayName, Uri &newFile) @@ -579,7 +581,7 @@ int FileAccessHelper::Rename(Uri &sourceFile, const std::string &displayName, Ur } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessHelper::ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, @@ -661,23 +663,32 @@ int FileAccessHelper::GetRoots(std::vector &rootInfoVec) ret = fileAccessExtProxy->GetRoots(results); if (ret != ERR_OK) { HILOG_ERROR("getRoots get fail ret:%{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } rootInfoVec.insert(rootInfoVec.end(), results.begin(), results.end()); } - return ret; + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_OK; } int FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(std::vector &wantVec) { + StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRegisteredFileAccessExtAbilityInfo"); std::vector extensionInfos; sptr bm = FileAccessHelper::GetBundleMgrProxy(); + if (bm == nullptr) { + HILOG_ERROR("GetBundleMgrProxy nullptr."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ERR_QUERY_EXTENSIONINFOS_FAIL; + } bool ret = bm->QueryExtensionAbilityInfos( AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, DEFAULT_USERID, extensionInfos); if (!ret) { HILOG_ERROR("FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo QueryExtensionAbilityInfos error"); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_QUERY_EXTENSIONINFOS_FAIL; } @@ -690,6 +701,7 @@ int FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(std::vectorAccess(uri, isExist); + if (ret != ERR_OK) { + HILOG_ERROR("Access get result error, code:%{public}d", ret); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return ret; + } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ret; + return ERR_OK; } int FileAccessHelper::On(std::shared_ptr &callback) @@ -753,12 +771,13 @@ int FileAccessHelper::On(std::shared_ptr &callback) if (errorCode != ERR_OK) { HILOG_ERROR("fileAccessExtProxy RegisterNotify fail, bundleName:%{public}s, ret:%{public}d.", connectInfo->want.GetElement().GetBundleName().c_str(), errorCode); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errorCode; } } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return errorCode; + return ERR_OK; } int FileAccessHelper::Off() @@ -785,13 +804,14 @@ int FileAccessHelper::Off() if (errorCode != ERR_OK) { HILOG_ERROR("fileAccessExtProxy UnregisterNotify fail, bundleName:%{public}s, ret:%{public}d.", connectInfo->want.GetElement().GetBundleName().c_str(), errorCode); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errorCode; } } notifyAgent_.clear(); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return errorCode; + return ERR_OK; } void FileAccessDeathRecipient::OnRemoteDied(const wptr &remote) diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index 0bf058f9..1bc16761 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -39,6 +39,7 @@ namespace { constexpr size_t ARGC_ONE = 1; constexpr size_t ARGC_TWO = 2; constexpr size_t ARGC_THREE = 3; + constexpr size_t ARGC_FOUR = 4; constexpr size_t MAX_ARG_COUNT = 5; } @@ -255,6 +256,7 @@ static int DoCallJsMethod(CallJsParam *param) FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_PARSER_FAIL; } + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_OK; } @@ -345,6 +347,7 @@ int JsFileAccessExtAbility::OpenFile(const Uri &uri, int flags, int &fd) auto value = std::make_shared>(); if (value == nullptr) { HILOG_ERROR("OpenFile value is nullptr."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_NULL_POINTER; } @@ -384,12 +387,14 @@ int JsFileAccessExtAbility::OpenFile(const Uri &uri, int flags, int &fd) if (value->code != ERR_OK) { HILOG_ERROR("fileio fail."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_FILEIO_FAIL; } fd = value->data; if (fd < ERR_OK) { HILOG_ERROR("Failed to get file descriptor fd: %{public}d", fd); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_FILEIO_FAIL; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -402,6 +407,7 @@ int JsFileAccessExtAbility::CreateFile(const Uri &parent, const std::string &dis auto value = std::make_shared>(); if (value == nullptr) { HILOG_ERROR("CreateFile value is nullptr."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_NULL_POINTER; } @@ -441,6 +447,7 @@ int JsFileAccessExtAbility::CreateFile(const Uri &parent, const std::string &dis if (value->code != ERR_OK) { HILOG_ERROR("fileio fail."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_FILEIO_FAIL; } @@ -461,6 +468,7 @@ int JsFileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayN auto value = std::make_shared>(); if (value == nullptr) { HILOG_ERROR("Mkdir value is nullptr."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_NULL_POINTER; } @@ -501,6 +509,7 @@ int JsFileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayN if (value->code != ERR_OK) { HILOG_ERROR("fileio fail."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_FILEIO_FAIL; } @@ -520,6 +529,7 @@ int JsFileAccessExtAbility::Delete(const Uri &sourceFile) auto ret = std::make_shared(); if (ret == nullptr) { HILOG_ERROR("Delete value is nullptr."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_NULL_POINTER; } @@ -550,6 +560,7 @@ int JsFileAccessExtAbility::Delete(const Uri &sourceFile) if (*ret != ERR_OK) { HILOG_ERROR("fileio fail."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_FILEIO_FAIL; } @@ -563,6 +574,7 @@ int JsFileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, auto value = std::make_shared>(); if (value == nullptr) { HILOG_ERROR("Move value is nullptr."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_NULL_POINTER; } @@ -603,6 +615,7 @@ int JsFileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, if (value->code != ERR_OK) { HILOG_ERROR("fileio fail."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_FILEIO_FAIL; } @@ -622,6 +635,7 @@ int JsFileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &dis auto value = std::make_shared>(); if (value == nullptr) { HILOG_ERROR("Rename value is nullptr."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_NULL_POINTER; } auto argParser = [sourceFile, displayName](NativeEngine &engine, NativeValue *argv[], size_t &argc) -> bool { @@ -661,6 +675,7 @@ int JsFileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &dis if (value->code != ERR_OK) { HILOG_ERROR("fileio fail."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_FILEIO_FAIL; } @@ -720,6 +735,117 @@ static bool ParserListFileJsResult(NativeEngine &engine, NativeValue *nativeValu return true; } +static int MakeStringNativeArray(NativeEngine &engine, std::vector &inputArray, NativeValue *resultArray) +{ + NativeArray *nativeArray = ConvertNativeValueTo(resultArray); + if (nativeArray == nullptr) { + HILOG_ERROR("Create NativeArray nullptr"); + return ERR_NULL_POINTER; + } + + bool ret = false; + for (uint32_t i = 0; i < nativeArray->GetLength(); i++) { + NativeValue* nativeValue = engine.CreateString(inputArray[i].c_str(), inputArray[i].length()); + if (nativeValue == nullptr) { + HILOG_ERROR("Create NativeValue fail."); + return ERR_NULL_POINTER; + } + + ret = nativeArray->SetElement(i, nativeValue); + if (!ret) { + HILOG_ERROR("Add NativeValue to NativeArray fail."); + return ERR_INVALID_PARAM; + } + } + + return ERR_OK; +} + +static int MakeJsNativeFileFilter(NativeEngine &engine, const FileFilter &filter, NativeValue *nativeFilter) +{ + nativeFilter = engine.CreateObject(); + if (nativeFilter == nullptr) { + HILOG_ERROR("Create js NativeValue fail."); + return ERR_NULL_POINTER; + } + + NativeValue *suffixArray = engine.CreateArray(filter.GetSuffix().size()); + if (suffixArray == nullptr) { + HILOG_ERROR("Create Suffix native array value fail."); + return ERR_NULL_POINTER; + } + + std::vector suffixVec = filter.GetSuffix(); + int errorCode = MakeStringNativeArray(engine, suffixVec, suffixArray); + if (errorCode != ERR_OK) { + HILOG_ERROR("Create Suffix native array value fail, code:%{public}d.", errorCode); + return errorCode; + } + + NativeValue *displayNameArray = engine.CreateArray(filter.GetDisplayName().size()); + if (displayNameArray == nullptr) { + HILOG_ERROR("Create DisplayName native array value fail."); + return ERR_NULL_POINTER; + } + + std::vector displayNameVec = filter.GetDisplayName(); + errorCode = MakeStringNativeArray(engine, displayNameVec, displayNameArray); + if (errorCode != ERR_OK) { + HILOG_ERROR("Create DisplayName native array value fail, code:%{public}d.", errorCode); + return errorCode; + } + + NativeValue *mimeTypeArray = engine.CreateArray(filter.GetMimeType().size()); + if (mimeTypeArray == nullptr) { + HILOG_ERROR("Create MimeType native array value fail."); + return ERR_NULL_POINTER; + } + + std::vector mimeTypeVec = filter.GetMimeType(); + errorCode = MakeStringNativeArray(engine, mimeTypeVec, mimeTypeArray); + if (errorCode != ERR_OK) { + HILOG_ERROR("Create MimeType native array value fail, code:%{public}d.", errorCode); + return errorCode; + } + + NativeValue *nativeFileSizeOver = engine.CreateNumber(filter.GetFileSizeOver()); + if (nativeFileSizeOver == nullptr) { + HILOG_ERROR("Create NativeFileSizeOver native js value fail."); + return ERR_NULL_POINTER; + } + + NativeValue *nativeLastModifiedAfter = engine.CreateNumber(filter.GetLastModifiedAfter()); + if (nativeLastModifiedAfter == nullptr) { + HILOG_ERROR("Create NativeLastModifiedAfter native js value fail."); + return ERR_NULL_POINTER; + } + + NativeValue *nativeExcludeMedia = engine.CreateBoolean(filter.GetExcludeMedia()); + if (nativeExcludeMedia == nullptr) { + HILOG_ERROR("Create NativeExcludeMedia native js value fail."); + return ERR_NULL_POINTER; + } + + NativeObject *objFilter = ConvertNativeValueTo(nativeFilter); + if (objFilter == nullptr) { + HILOG_ERROR("Convert js object fail."); + return ERR_NULL_POINTER; + } + + bool ret = objFilter->SetProperty("suffix", suffixArray); + ret = ret && objFilter->SetProperty("display_name", displayNameArray); + ret = ret && objFilter->SetProperty("mime_type", mimeTypeArray); + ret = ret && objFilter->SetProperty("file_size_over", nativeFileSizeOver); + ret = ret && objFilter->SetProperty("last_modified_after", nativeLastModifiedAfter); + ret = ret && objFilter->SetProperty("exclude_media", nativeExcludeMedia); + if (!ret) { + HILOG_ERROR("Set property to Filter NativeValue fail."); + return ERR_INVALID_PARAM; + } + + return ERR_OK; +} + int JsFileAccessExtAbility::ListFile(const FileInfo &fileInfo, const int64_t offset, const int64_t maxCount, const FileFilter &filter, std::vector &fileInfoVec) { @@ -727,6 +853,7 @@ int JsFileAccessExtAbility::ListFile(const FileInfo &fileInfo, const int64_t off auto value = std::make_shared>>(); if (value == nullptr) { HILOG_ERROR("ListFile value is nullptr."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_NULL_POINTER; } @@ -750,10 +877,26 @@ int JsFileAccessExtAbility::ListFile(const FileInfo &fileInfo, const int64_t off return false; } + NativeValue* nativeFilter = nullptr; + if (filter.GetHasFilter()) { + int ret = MakeJsNativeFileFilter(engine ,filter, nativeFilter); + if (ret != ERR_OK) { + HILOG_ERROR("Create js NativeValue fail."); + return ret; + } + } else { + nativeFilter = engine.CreateNull(); + if (nativeFilter == nullptr) { + HILOG_ERROR("Create js NativeValue fail."); + return ERR_NULL_POINTER; + } + } + argv[ARGC_ZERO] = uri; argv[ARGC_ONE] = nativeOffset; argv[ARGC_TWO] = nativeMaxCount; - argc = ARGC_THREE; + argv[ARGC_THREE] = nativeFilter; + argc = ARGC_FOUR; return true; }; auto retParser = [value](NativeEngine &engine, NativeValue *result) -> bool { @@ -771,11 +914,13 @@ int JsFileAccessExtAbility::ListFile(const FileInfo &fileInfo, const int64_t off auto errCode = CallJsMethod("listFile", jsRuntime_, jsObj_.get(), argParser, retParser); if (errCode != ERR_OK) { HILOG_ERROR("CallJsMethod error, code:%{public}d.", errCode); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errCode; } if (value->code != ERR_OK) { HILOG_ERROR("fileio fail."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_FILEIO_FAIL; } @@ -834,6 +979,7 @@ int JsFileAccessExtAbility::GetRoots(std::vector &rootInfoVec) auto value = std::make_shared>>(); if (value == nullptr) { HILOG_ERROR("GetRoots value is nullptr."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_NULL_POINTER; } @@ -856,11 +1002,13 @@ int JsFileAccessExtAbility::GetRoots(std::vector &rootInfoVec) auto errCode = CallJsMethod("getRoots", jsRuntime_, jsObj_.get(), argParser, retParser); if (errCode != ERR_OK) { HILOG_ERROR("CallJsMethod error, code:%{public}d", errCode); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return errCode; } if (value->code != ERR_OK) { HILOG_ERROR("fileio fail."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_FILEIO_FAIL; } @@ -875,6 +1023,7 @@ int JsFileAccessExtAbility::Access(const Uri &uri, bool &isExist) auto value = std::make_shared>(); if (value == nullptr) { HILOG_ERROR("Access value is nullptr."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_NULL_POINTER; } @@ -908,6 +1057,7 @@ int JsFileAccessExtAbility::Access(const Uri &uri, bool &isExist) if (value->code != ERR_OK) { HILOG_ERROR("fileio fail."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_FILEIO_FAIL; } diff --git a/interfaces/kits/napi/file_access_ext_ability/file_access_ext_ability.js b/interfaces/kits/napi/file_access_ext_ability/file_access_ext_ability.js index 71b318f4..b8844cec 100644 --- a/interfaces/kits/napi/file_access_ext_ability/file_access_ext_ability.js +++ b/interfaces/kits/napi/file_access_ext_ability/file_access_ext_ability.js @@ -71,7 +71,7 @@ class FileAccessExtensionAbility { getRoots() { return { roots: [], - code: ERR_OK, + code: ERR_ERROR, }; } diff --git a/interfaces/kits/napi/file_access_module/file_info/file_info_entity.h b/interfaces/kits/napi/file_access_module/file_info/file_info_entity.h index d71f1a0f..3450af5b 100644 --- a/interfaces/kits/napi/file_access_module/file_info/file_info_entity.h +++ b/interfaces/kits/napi/file_access_module/file_info/file_info_entity.h @@ -25,9 +25,9 @@ namespace FileAccessFwk { using namespace DistributedFS; struct FileInfoEntity { - FileAccessHelper *fileAccessHelper; + FileAccessHelper *fileAccessHelper { nullptr }; FileInfo fileInfo; - FileFilter filter; + FileFilter filter { {}, {}, {}, 0, 0, false, false }; }; } // namespace FileAccessFwk } // namespace OHOS diff --git a/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h b/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h index 20cfc973..990fdc36 100644 --- a/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h +++ b/interfaces/kits/napi/file_access_module/file_info/file_iterator_entity.h @@ -30,14 +30,14 @@ using namespace DistributedFS; constexpr int64_t MAX_COUNT = 1000; // ListFile get file's max count struct FileIteratorEntity { - FileAccessHelper *fileAccessHelper; + FileAccessHelper *fileAccessHelper { nullptr }; std::mutex entityOperateMutex; FileInfo fileInfo; std::vector fileInfoVec; - int64_t offset; - int64_t pos; - FileFilter filter; - int flag = 0; + int64_t offset { 0 }; + int64_t pos { 0 }; + FileFilter filter { {}, {}, {}, 0, 0, false, false }; + int flag { 0 }; }; } // namespace FileAccessFwk } // namespace OHOS diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp b/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp index d3aa9e46..3d3bd493 100644 --- a/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp @@ -72,25 +72,21 @@ napi_value NapiFileIteratorExporter::Constructor(napi_env env, napi_callback_inf return funcArg.GetThisVar(); } -static int MakeResult(napi_value objFileInfoExporter, FileIteratorEntity *fileIteratorEntity, +static int MakeResult(napi_value &objFileInfoExporter, FileIteratorEntity *fileIteratorEntity, FileInfoEntity *fileInfoEntity, napi_env env, NVal &nVal) { std::lock_guard lock(fileIteratorEntity->entityOperateMutex); - bool done = true; if (fileIteratorEntity->fileInfoVec.size() == 0) { - nVal.AddProp("value", NVal::CreateUndefined(env).val_); - nVal.AddProp("done", NVal::CreateBool(env, done).val_); + 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()) { - HILOG_ERROR("pos out of index."); - return ERR_INVALID_RESULT; - } - - fileInfoEntity->fileAccessHelper = fileIteratorEntity->fileAccessHelper; - fileInfoEntity->fileInfo = fileIteratorEntity->fileInfoVec[fileIteratorEntity->pos]; - fileIteratorEntity->pos++; if (fileIteratorEntity->pos == MAX_COUNT) { fileIteratorEntity->fileInfoVec.clear(); fileIteratorEntity->offset += MAX_COUNT; @@ -110,16 +106,24 @@ static int MakeResult(napi_value objFileInfoExporter, FileIteratorEntity *fileIt return ret; } } - - } else if (fileIteratorEntity->pos == fileIteratorEntity->fileInfoVec.size()) { + } + + if (fileIteratorEntity->pos == fileIteratorEntity->fileInfoVec.size()) { fileIteratorEntity->fileInfoVec.clear(); - fileIteratorEntity->pos = 0; 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; } - done = (fileIteratorEntity->pos == fileIteratorEntity->fileInfoVec.size()); + fileInfoEntity->fileAccessHelper = fileIteratorEntity->fileAccessHelper; + fileInfoEntity->fileInfo = fileIteratorEntity->fileInfoVec[fileIteratorEntity->pos]; + fileIteratorEntity->pos++; nVal.AddProp("value", objFileInfoExporter); - nVal.AddProp("done", NVal::CreateBool(env, done).val_); + nVal.AddProp("done", NVal::CreateBool(env, false).val_); return ERR_OK; } diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index cbba5049..078c0905 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -603,13 +603,11 @@ static int MakeGetRootsResult(napi_env &env, FileAccessHelper *helper, std::vect return ERR_NULL_POINTER; } - { - std::lock_guard lock(rootIteratorEntity->entityOperateMutex); - rootIteratorEntity->fileAccessHelper = helper; - rootIteratorEntity->devVec = std::move(rootInfoVec); - rootIteratorEntity->pos = 0; - nVal = { env, objRootIterator }; - } + std::lock_guard lock(rootIteratorEntity->entityOperateMutex); + rootIteratorEntity->fileAccessHelper = helper; + rootIteratorEntity->devVec = std::move(rootInfoVec); + rootIteratorEntity->pos = 0; + nVal = { env, objRootIterator }; return ERR_OK; } diff --git a/interfaces/kits/napi/file_access_module/napi_utils.cpp b/interfaces/kits/napi/file_access_module/napi_utils.cpp index 4a6c3192..b0793126 100644 --- a/interfaces/kits/napi/file_access_module/napi_utils.cpp +++ b/interfaces/kits/napi/file_access_module/napi_utils.cpp @@ -45,76 +45,76 @@ int GetFileFilterParam(const NVal &argv, FileFilter &filter) bool ret = false; filter.SetHasFilter(false); if (argv.HasProp("suffix")) { - std::vector filter_suffix; - std::tie(ret, filter_suffix, std::ignore) = argv.GetProp("suffix").ToStringArray(); + std::vector suffixs; + std::tie(ret, suffixs, std::ignore) = argv.GetProp("suffix").ToStringArray(); if (!ret) { HILOG_ERROR("FileFilter get suffix param fail."); return ERR_INVALID_PARAM; } - filter.SetSuffix(filter_suffix); + filter.SetSuffix(suffixs); filter.SetHasFilter(true); } else { return ERR_INVALID_PARAM; } if (argv.HasProp("display_name")) { - std::vector display_name; - std::tie(ret, display_name, std::ignore) = argv.GetProp("display_name").ToStringArray(); + std::vector displayNames; + std::tie(ret, displayNames, std::ignore) = argv.GetProp("display_name").ToStringArray(); if (!ret) { HILOG_ERROR("FileFilter get display_name param fail."); return ERR_INVALID_PARAM; } - filter.SetDisplayName(display_name); - filter.SetHasFilter(true); + filter.SetDisplayName(displayNames); + filter.SetHasFilter(true); } if (argv.HasProp("mime_type")) { - std::vector mime_type; - std::tie(ret, mime_type, std::ignore) = argv.GetProp("mime_type").ToStringArray(); + std::vector mimeTypes; + std::tie(ret, mimeTypes, std::ignore) = argv.GetProp("mime_type").ToStringArray(); if (!ret) { HILOG_ERROR("FileFilter get mime_type param fail."); return ERR_INVALID_PARAM; } - filter.SetMimeType(mime_type); + filter.SetMimeType(mimeTypes); filter.SetHasFilter(true); } if (argv.HasProp("file_size_over")) { - int64_t file_size_over; - std::tie(ret, file_size_over) = argv.GetProp("file_size_over").ToInt64(); + int64_t fileSizeOver; + std::tie(ret, fileSizeOver) = argv.GetProp("file_size_over").ToInt64(); if (!ret) { HILOG_ERROR("FileFilter get file_size_over param fail."); return ERR_INVALID_PARAM; } - filter.SetFileSizeOver(file_size_over); + filter.SetFileSizeOver(fileSizeOver); filter.SetHasFilter(true); } if (argv.HasProp("last_modified_after")) { - double last_modified_after; - std::tie(ret, last_modified_after) = argv.GetProp("last_modified_after").ToDouble(); + double lastModifiedAfter; + std::tie(ret, lastModifiedAfter) = argv.GetProp("last_modified_after").ToDouble(); if (!ret) { HILOG_ERROR("FileFilter get last_modified_after param fail."); return ERR_INVALID_PARAM; } - filter.SetLastModifiedAfter(last_modified_after); + filter.SetLastModifiedAfter(lastModifiedAfter); filter.SetHasFilter(true); } if (argv.HasProp("exclude_media")) { - bool exclude_media; - std::tie(ret, exclude_media) = argv.GetProp("exclude_media").ToBool(); + bool excludeMedia; + std::tie(ret, excludeMedia) = argv.GetProp("exclude_media").ToBool(); if (!ret) { HILOG_ERROR("FileFilter get exclude_media param fail."); return ERR_INVALID_PARAM; } - filter.SetExcludeMedia(exclude_media); + filter.SetExcludeMedia(excludeMedia); filter.SetHasFilter(true); } diff --git a/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp b/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp index 91c6d832..047f08d8 100644 --- a/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp @@ -86,8 +86,8 @@ napi_value NapiRootIteratorExporter::Next(napi_env env, napi_callback_info info) return nullptr; } - auto rootEntity = NClass::GetEntityOf(env, objRootInfoExporter); - if (rootEntity == nullptr) { + auto rootInfoEntity = NClass::GetEntityOf(env, objRootInfoExporter); + if (rootInfoEntity == nullptr) { NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get the entity of RootInfoEntity"); return nullptr; } @@ -97,14 +97,13 @@ napi_value NapiRootIteratorExporter::Next(napi_env env, napi_callback_info info) { std::lock_guard lock(rootIterator->entityOperateMutex); auto len = (int64_t)rootIterator->devVec.size(); - rootEntity->fileAccessHelper = rootIterator->fileAccessHelper; + rootInfoEntity->fileAccessHelper = rootIterator->fileAccessHelper; if (rootIterator->pos < len) { - rootEntity->rootInfo = rootIterator->devVec[rootIterator->pos]; - rootIterator->pos++; + rootInfoEntity->rootInfo = rootIterator->devVec[rootIterator->pos]; done = (rootIterator->pos == len); - } else { rootIterator->pos++; - rootEntity = nullptr; + } else { + rootInfoEntity = nullptr; objRootInfoExporter = NVal::CreateUndefined(env).val_; done = true; } diff --git a/interfaces/kits/napi/file_access_module/root_info/root_info_entity.h b/interfaces/kits/napi/file_access_module/root_info/root_info_entity.h index cd9a2a50..136c8bec 100644 --- a/interfaces/kits/napi/file_access_module/root_info/root_info_entity.h +++ b/interfaces/kits/napi/file_access_module/root_info/root_info_entity.h @@ -22,7 +22,7 @@ namespace OHOS { namespace FileAccessFwk { struct RootInfoEntity { - FileAccessHelper *fileAccessHelper; + FileAccessHelper *fileAccessHelper { nullptr }; RootInfo rootInfo; }; } // namespace FileAccessFwk diff --git a/interfaces/kits/napi/file_access_module/root_info/root_iterator_entity.h b/interfaces/kits/napi/file_access_module/root_info/root_iterator_entity.h index e8ca260a..49959bd0 100644 --- a/interfaces/kits/napi/file_access_module/root_info/root_iterator_entity.h +++ b/interfaces/kits/napi/file_access_module/root_info/root_iterator_entity.h @@ -25,10 +25,10 @@ namespace OHOS { namespace FileAccessFwk { struct RootIteratorEntity { - FileAccessHelper *fileAccessHelper; + FileAccessHelper *fileAccessHelper { nullptr }; std::vector devVec; std::mutex entityOperateMutex; - int64_t pos; + int64_t pos { 0 }; }; } // namespace FileAccessFwk } // namespace OHOS diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index ba224e1a..a628c2d3 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -192,16 +192,6 @@ export default class FileExtAbility extends Extension { } } - closeFile(fd) { - try { - fileio.closeSync(fd); - return true; - } catch (e) { - hilog.error(DOMAIN_CODE, TAG, 'closeFile error ' + e.message); - return false; - } - } - createFile(parentUri, displayName) { if (!this.checkUri(parentUri)) { return { @@ -395,27 +385,6 @@ export default class FileExtAbility extends Extension { } } - query(sourceFileUri) { - if (!this.checkUri(sourceFileUri)) { - return null; - } - try { - let path = this.getPath(sourceFileUri); - let stat = fileio.statSync(path); - return { - uri: sourceFileUri, - fileName: this.getFileName(sourceFileUri), - mode: '' + stat.mode, - size: stat.size, - mtime: stat.mtime, - mimeType: '', - }; - } catch (e) { - hilog.error(DOMAIN_CODE, TAG, 'query error ' + e.message); - return null; - } - } - access(sourceFileUri) { if (!this.checkUri(sourceFileUri)) { hilog.error(DOMAIN_CODE, TAG, 'access checkUri fail'); @@ -471,7 +440,7 @@ export default class FileExtAbility extends Extension { } if (offset > i) { - i ++; + i++; continue; } @@ -484,7 +453,7 @@ export default class FileExtAbility extends Extension { mimeType: '', }); - i ++; + i++; if (i == (offset + count)) { hasNextFile = false; break; -- Gitee From c48e1d6361a8b0e4a33a6a046c61d17dcedb0c9f Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Wed, 7 Sep 2022 14:57:15 +0800 Subject: [PATCH 099/122] fix code review Signed-off-by: linjun9528 --- .../innerkits/file_access/src/js_file_access_ext_ability.cpp | 2 +- .../root_info/napi_root_iterator_exporter.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index 1bc16761..45f04e8a 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -754,7 +754,7 @@ static int MakeStringNativeArray(NativeEngine &engine, std::vector ret = nativeArray->SetElement(i, nativeValue); if (!ret) { HILOG_ERROR("Add NativeValue to NativeArray fail."); - return ERR_INVALID_PARAM; + return ERR_PARCEL_FAIL; } } diff --git a/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp b/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp index 047f08d8..c8ec9666 100644 --- a/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp @@ -100,7 +100,7 @@ napi_value NapiRootIteratorExporter::Next(napi_env env, napi_callback_info info) rootInfoEntity->fileAccessHelper = rootIterator->fileAccessHelper; if (rootIterator->pos < len) { rootInfoEntity->rootInfo = rootIterator->devVec[rootIterator->pos]; - done = (rootIterator->pos == len); + done = false; rootIterator->pos++; } else { rootInfoEntity = nullptr; -- Gitee From c30a42b94f3c23a43bd9192b0f03168392ecc775 Mon Sep 17 00:00:00 2001 From: linjun9528 Date: Wed, 7 Sep 2022 16:37:07 +0800 Subject: [PATCH 100/122] alter FileFilter param name Signed-off-by: linjun9528 --- .../file_access/src/file_access_ext_stub.cpp | 2 +- .../src/js_file_access_ext_ability.cpp | 12 ++++---- .../napi/common/file_extension_info_napi.cpp | 14 ++++----- .../file_info/napi_file_iterator_exporter.cpp | 2 +- .../napi_fileaccess_helper.cpp | 2 +- .../napi/file_access_module/napi_utils.cpp | 30 +++++++++---------- .../root_info/napi_root_iterator_exporter.cpp | 2 +- .../FileExtensionAbility.ts | 2 +- .../ets/FileExtensionAbility/VolumeManager.ts | 2 +- 9 files changed, 34 insertions(+), 34 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp index 2b0983b7..dac72722 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp @@ -109,7 +109,7 @@ ErrCode FileAccessExtStub::CmdOpenFile(MessageParcel &data, MessageParcel &reply return ERR_INVALID_PARAM; } - int fd; + int fd = -1; int ret = OpenFile(*uri, flags, fd); if (!reply.WriteInt32(ret)) { HILOG_ERROR("Parameter OpenFile fail to WriteInt32 ret"); diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index 45f04e8a..c1cc9ed0 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -833,11 +833,11 @@ static int MakeJsNativeFileFilter(NativeEngine &engine, const FileFilter &filter } bool ret = objFilter->SetProperty("suffix", suffixArray); - ret = ret && objFilter->SetProperty("display_name", displayNameArray); - ret = ret && objFilter->SetProperty("mime_type", mimeTypeArray); - ret = ret && objFilter->SetProperty("file_size_over", nativeFileSizeOver); - ret = ret && objFilter->SetProperty("last_modified_after", nativeLastModifiedAfter); - ret = ret && objFilter->SetProperty("exclude_media", nativeExcludeMedia); + ret = ret && objFilter->SetProperty("displayName", displayNameArray); + ret = ret && objFilter->SetProperty("mimeType", mimeTypeArray); + ret = ret && objFilter->SetProperty("fileSizeOver", nativeFileSizeOver); + ret = ret && objFilter->SetProperty("lastModifiedAfter", nativeLastModifiedAfter); + ret = ret && objFilter->SetProperty("excludeMedia", nativeExcludeMedia); if (!ret) { HILOG_ERROR("Set property to Filter NativeValue fail."); return ERR_INVALID_PARAM; @@ -879,7 +879,7 @@ int JsFileAccessExtAbility::ListFile(const FileInfo &fileInfo, const int64_t off NativeValue* nativeFilter = nullptr; if (filter.GetHasFilter()) { - int ret = MakeJsNativeFileFilter(engine ,filter, nativeFilter); + int ret = MakeJsNativeFileFilter(engine, filter, nativeFilter); if (ret != ERR_OK) { HILOG_ERROR("Create js NativeValue fail."); return ret; diff --git a/interfaces/kits/napi/common/file_extension_info_napi.cpp b/interfaces/kits/napi/common/file_extension_info_napi.cpp index b0c47349..386b921f 100644 --- a/interfaces/kits/napi/common/file_extension_info_napi.cpp +++ b/interfaces/kits/napi/common/file_extension_info_napi.cpp @@ -134,14 +134,14 @@ void InitDeviceType(napi_env env, napi_value exports) { char propertyName[] = "DeviceType"; napi_property_descriptor desc[] = { - DECLARE_NAPI_STATIC_PROPERTY("LOCAL_DISK", NVal::CreateInt32(env, DEVICE_LOCAL_DISK).val_), - DECLARE_NAPI_STATIC_PROPERTY("SHARED_DISK", NVal::CreateInt32(env, DEVICE_SHARED_DISK).val_), - DECLARE_NAPI_STATIC_PROPERTY("SHARED_TERMINAL", NVal::CreateInt32(env, DEVICE_SHARED_TERMINAL).val_), - DECLARE_NAPI_STATIC_PROPERTY("NETWORK_NEIGHBORHOODS", + DECLARE_NAPI_STATIC_PROPERTY("DEVICE_LOCAL_DISK", NVal::CreateInt32(env, DEVICE_LOCAL_DISK).val_), + DECLARE_NAPI_STATIC_PROPERTY("DEVICE_SHARED_DISK", NVal::CreateInt32(env, DEVICE_SHARED_DISK).val_), + DECLARE_NAPI_STATIC_PROPERTY("DEVICE_SHARED_TERMINAL", NVal::CreateInt32(env, DEVICE_SHARED_TERMINAL).val_), + DECLARE_NAPI_STATIC_PROPERTY("DEVICE_NETWORK_NEIGHBORHOODS", NVal::CreateInt32(env, DEVICE_NETWORK_NEIGHBORHOODS).val_), - DECLARE_NAPI_STATIC_PROPERTY("EXTERNAL_MTP", NVal::CreateInt32(env, DEVICE_EXTERNAL_MTP).val_), - DECLARE_NAPI_STATIC_PROPERTY("EXTERNAL_USB", NVal::CreateInt32(env, DEVICE_EXTERNAL_USB).val_), - DECLARE_NAPI_STATIC_PROPERTY("EXTERNAL_CLOUD", NVal::CreateInt32(env, DEVICE_EXTERNAL_CLOUD).val_) + DECLARE_NAPI_STATIC_PROPERTY("DEVICE_EXTERNAL_MTP", NVal::CreateInt32(env, DEVICE_EXTERNAL_MTP).val_), + DECLARE_NAPI_STATIC_PROPERTY("DEVICE_EXTERNAL_USB", NVal::CreateInt32(env, DEVICE_EXTERNAL_USB).val_), + DECLARE_NAPI_STATIC_PROPERTY("DEVICE_EXTERNAL_CLOUD", NVal::CreateInt32(env, DEVICE_EXTERNAL_CLOUD).val_) }; napi_value obj = nullptr; napi_create_object(env, &obj); diff --git a/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp b/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp index 3d3bd493..139439d3 100644 --- a/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/file_info/napi_file_iterator_exporter.cpp @@ -114,7 +114,7 @@ static int MakeResult(napi_value &objFileInfoExporter, FileIteratorEntity *fileI fileIteratorEntity->pos = 0; fileInfoEntity = nullptr; objFileInfoExporter = NVal::CreateUndefined(env).val_; - nVal.AddProp("value",objFileInfoExporter); + nVal.AddProp("value", objFileInfoExporter); nVal.AddProp("done", NVal::CreateBool(env, true).val_); return ERR_OK; } diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp index e206e79c..804a73fb 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.cpp @@ -177,7 +177,7 @@ napi_value NAPI_GetFileAccessAbilityInfo(napi_env env, napi_callback_info info) auto result = std::make_shared>(); if (result == nullptr) { - NapiError(ERR_NULL_POINTER).ThrowErr(env);; + NapiError(ERR_NULL_POINTER).ThrowErr(env); return nullptr; } diff --git a/interfaces/kits/napi/file_access_module/napi_utils.cpp b/interfaces/kits/napi/file_access_module/napi_utils.cpp index b0793126..ecbe70a5 100644 --- a/interfaces/kits/napi/file_access_module/napi_utils.cpp +++ b/interfaces/kits/napi/file_access_module/napi_utils.cpp @@ -58,11 +58,11 @@ int GetFileFilterParam(const NVal &argv, FileFilter &filter) return ERR_INVALID_PARAM; } - if (argv.HasProp("display_name")) { + if (argv.HasProp("displayName")) { std::vector displayNames; - std::tie(ret, displayNames, std::ignore) = argv.GetProp("display_name").ToStringArray(); + std::tie(ret, displayNames, std::ignore) = argv.GetProp("displayName").ToStringArray(); if (!ret) { - HILOG_ERROR("FileFilter get display_name param fail."); + HILOG_ERROR("FileFilter get displayName param fail."); return ERR_INVALID_PARAM; } @@ -70,11 +70,11 @@ int GetFileFilterParam(const NVal &argv, FileFilter &filter) filter.SetHasFilter(true); } - if (argv.HasProp("mime_type")) { + if (argv.HasProp("mimeType")) { std::vector mimeTypes; - std::tie(ret, mimeTypes, std::ignore) = argv.GetProp("mime_type").ToStringArray(); + std::tie(ret, mimeTypes, std::ignore) = argv.GetProp("mimeType").ToStringArray(); if (!ret) { - HILOG_ERROR("FileFilter get mime_type param fail."); + HILOG_ERROR("FileFilter get mimeType param fail."); return ERR_INVALID_PARAM; } @@ -82,11 +82,11 @@ int GetFileFilterParam(const NVal &argv, FileFilter &filter) filter.SetHasFilter(true); } - if (argv.HasProp("file_size_over")) { + if (argv.HasProp("fileSizeOver")) { int64_t fileSizeOver; - std::tie(ret, fileSizeOver) = argv.GetProp("file_size_over").ToInt64(); + std::tie(ret, fileSizeOver) = argv.GetProp("fileSizeOver").ToInt64(); if (!ret) { - HILOG_ERROR("FileFilter get file_size_over param fail."); + HILOG_ERROR("FileFilter get fileSizeOver param fail."); return ERR_INVALID_PARAM; } @@ -94,11 +94,11 @@ int GetFileFilterParam(const NVal &argv, FileFilter &filter) filter.SetHasFilter(true); } - if (argv.HasProp("last_modified_after")) { + if (argv.HasProp("lastModifiedAfter")) { double lastModifiedAfter; - std::tie(ret, lastModifiedAfter) = argv.GetProp("last_modified_after").ToDouble(); + std::tie(ret, lastModifiedAfter) = argv.GetProp("lastModifiedAfter").ToDouble(); if (!ret) { - HILOG_ERROR("FileFilter get last_modified_after param fail."); + HILOG_ERROR("FileFilter get lastModifiedAfter param fail."); return ERR_INVALID_PARAM; } @@ -106,11 +106,11 @@ int GetFileFilterParam(const NVal &argv, FileFilter &filter) filter.SetHasFilter(true); } - if (argv.HasProp("exclude_media")) { + if (argv.HasProp("excludeMedia")) { bool excludeMedia; - std::tie(ret, excludeMedia) = argv.GetProp("exclude_media").ToBool(); + std::tie(ret, excludeMedia) = argv.GetProp("excludeMedia").ToBool(); if (!ret) { - HILOG_ERROR("FileFilter get exclude_media param fail."); + HILOG_ERROR("FileFilter get excludeMedia param fail."); return ERR_INVALID_PARAM; } diff --git a/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp b/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp index f8179b79..0961321b 100644 --- a/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp +++ b/interfaces/kits/napi/file_access_module/root_info/napi_root_iterator_exporter.cpp @@ -59,7 +59,7 @@ napi_value NapiRootIteratorExporter::Constructor(napi_env env, napi_callback_inf auto rootIteratorEntity = std::make_unique(); if (rootIteratorEntity == nullptr) { NError(ERR_NULL_POINTER).ThrowErr(env, "Cannot get entity of rootIteratorEntity"); - return nullptr; + return nullptr; } if (!NClass::SetEntityFor(env, funcArg.GetThisVar(), std::move(rootIteratorEntity))) { diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index a628c2d3..ad06af17 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -479,7 +479,7 @@ export default class FileExtAbility extends Extension { let roots = getVolumeInfoList().concat({ uri: 'datashare:///com.ohos.UserFile.ExternalFileManager/data/storage/el1/bundle/storage_daemon', displayName: 'shared_disk', - deviceType: DeviceType.SHARED_DISK, + deviceType: DeviceType.DEVICE_SHARED_DISK, deviceFlags: DeviceFlag.SUPPORTS_READ | DeviceFlag.SUPPORTS_WRITE, }); return { diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts index 03f572e5..bd41e8d9 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/VolumeManager.ts @@ -36,7 +36,7 @@ function init() { 'uri': path2uri('', volume.path), 'displayName': volume.id, 'deviceFlags': flags, - 'deviceType': DeviceType.EXTERNAL_USB + 'deviceType': DeviceType.DEVICE_EXTERNAL_USB } globalThis.volumeInfoList.push(volumeInfo); } -- Gitee From 486b3c95350cb25d4b831e8fe32b60a54e71c4d4 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Wed, 7 Sep 2022 21:38:37 +0800 Subject: [PATCH 101/122] =?UTF-8?q?=E5=A2=9E=E5=8A=A0TDD=E5=B9=B6=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../file_access/include/file_access_helper.h | 1 + .../file_access/src/file_access_helper.cpp | 14 +- .../test/file_access_helper_test.cpp | 382 +++++++++++++++++- .../test/file_extension_helper_test.cpp | 358 ++++++++++++++++ 4 files changed, 750 insertions(+), 5 deletions(-) diff --git a/frameworks/innerkits/file_access/include/file_access_helper.h b/frameworks/innerkits/file_access/include/file_access_helper.h index 23b2a152..cfef03cb 100644 --- a/frameworks/innerkits/file_access/include/file_access_helper.h +++ b/frameworks/innerkits/file_access/include/file_access_helper.h @@ -96,6 +96,7 @@ private: static std::unordered_map wantsMap_; static std::string GetKeyOfWantsMap(const AAFwk::Want &want); + static int getUserId(); sptr callerDeathRecipient_ = nullptr; diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 2f7cdfc0..d1db31b1 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -21,13 +21,14 @@ #include "hitrace_meter.h" #include "if_system_ability_manager.h" #include "ifile_access_ext_base.h" +#include "ipc_skeleton.h" #include "iservice_registry.h" #include "system_ability_definition.h" namespace OHOS { namespace FileAccessFwk { namespace { - static const int32_t DEFAULT_USERID = 100; + static const int32_t UID_TRANSFORM_DIVISOR = 200000; static const std::string SCHEME_NAME = "datashare"; static const std::string MEDIA_BNUDLE_NAME_ALIAS = "media"; static const std::string MEDIA_BNUDLE_NAME = "com.ohos.medialibrary.medialibrarydata"; @@ -37,6 +38,13 @@ namespace { } std::unordered_map FileAccessHelper::wantsMap_; +int FileAccessHelper::getUserId() +{ + int uid = IPCSkeleton::GetCallingUid(); + int userId = uid / UID_TRANSFORM_DIVISOR; + return userId; +} + static bool GetBundleNameFromPath(const std::string &path, std::string &bundleName) { if (path.size() == 0) { @@ -190,7 +198,7 @@ std::shared_ptr FileAccessHelper::Creator( std::unordered_map> cMap; std::vector extensionInfos; bool ret = bm->QueryExtensionAbilityInfos( - AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, DEFAULT_USERID, extensionInfos); + AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, FileAccessHelper::getUserId(), extensionInfos); if (!ret) { HILOG_ERROR("FileAccessHelper::Creator QueryExtensionAbilityInfos failed"); return nullptr; @@ -685,7 +693,7 @@ int FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(std::vectorQueryExtensionAbilityInfos( - AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, DEFAULT_USERID, extensionInfos); + AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, FileAccessHelper::getUserId(), extensionInfos); if (!ret) { HILOG_ERROR("FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo QueryExtensionAbilityInfos error"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 3b22fbc7..5cfd7409 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -14,6 +14,7 @@ */ #include +#include #include #include @@ -24,7 +25,6 @@ #include "file_access_helper.h" #include "iservice_registry.h" - namespace { using namespace std; using namespace OHOS; @@ -32,6 +32,8 @@ using namespace FileAccessFwk; int ABILITY_ID = 5003; shared_ptr fah = nullptr; Uri g_newDirUri(""); +int UID_TRANSFORM_TMP = 20000000; +int UID_DEFAULT = 0; class FileAccessHelperTest : public testing::Test { public: @@ -43,7 +45,9 @@ public: auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); AAFwk::Want want; vector wantVec; + setuid(UID_TRANSFORM_TMP); int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(wantVec); + setuid(UID_DEFAULT); EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); bool sus = false; for (size_t i = 0; i < wantVec.size(); i++) { @@ -361,6 +365,48 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0006, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_OpenFile_0006"; } +void OpenFileTdd(shared_ptr fahs, Uri uri, int flags, int fd) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_OpenFileTdd"; + int ret = fahs->OpenFile(uri, flags, fd); + if (ret != OHOS::FileAccessFwk::ERR_OK) { + GTEST_LOG_(INFO) << "OpenFileTdd get result error, code:" << ret; + } + EXPECT_GE(fd, 0); + int result = fah->Delete(uri); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_OpenFileTdd"; +} + +/** + * @tc.number: user_file_service_file_access_helper_OpenFile_0007 + * @tc.name: file_access_helper_OpenFile_0007 + * @tc.desc: Test function of OpenFile interface for SUCCESS which Concurrent. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0007, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0007"; + try { + Uri newFileUri(""); + int flags; + int fd; + std::string displayName[4] = {"test1", "test2", "test3", "test4"}; + for (int j = 0; j < 4; j++) { + int result = fah->CreateFile(g_newDirUri, displayName[j], newFileUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + std::thread OpenFile_Thread(OpenFileTdd, fah, newFileUri, flags, fd); + OpenFile_Thread.detach(); + } + } catch (...) { + GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_OpenFile_0007"; +} + /** * @tc.number: user_file_service_file_access_helper_CreateFile_0000 * @tc.name: file_access_helper_CreateFile_0000 @@ -483,6 +529,44 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0004, testing::ext: GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_CreateFile_0004"; } +void CreateFileTdd(shared_ptr fahs, Uri parent, std::string displayName, Uri newDir) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_CreateFileTdd"; + int ret = fahs->CreateFile(parent, displayName, newDir); + if (ret < OHOS::FileAccessFwk::ERR_OK) { + GTEST_LOG_(INFO) << "CreateFileTdd get result error, code:" << ret; + } + EXPECT_NE(newDir.ToString(), ""); + int result = fah->Delete(newDir); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_CreateFileTdd"; +} + +/** + * @tc.number: user_file_service_file_access_helper_CreateFile_0005 + * @tc.name: file_access_helper_CreateFile_0005 + * @tc.desc: Test function of CreateFile interface for SUCCESS while Concurrent. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0005, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_CreateFile_0005"; + try { + Uri newFileUri(""); + std::string displayName[4] = {"test1", "test2", "test3", "test4"}; + for (int j = 0; j < 4; j++) { + std::thread CreateFile_Thread(CreateFileTdd, fah, g_newDirUri, displayName[j], newFileUri); + CreateFile_Thread.detach(); + } + } catch (...) { + GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_CreateFile_0005"; +} + /** * @tc.number: user_file_service_file_access_helper_Mkdir_0000 * @tc.name: file_access_helper_Mkdir_0000 @@ -605,6 +689,44 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0004, testing::ext::Test GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Mkdir_0004"; } +void MkdirTdd(shared_ptr fahs, Uri parent, std::string displayName, Uri newDir) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_MkdirTdd"; + int ret = fahs->Mkdir(parent, displayName, newDir); + if (ret < OHOS::FileAccessFwk::ERR_OK) { + GTEST_LOG_(INFO) << "MkdirTdd get result error, code:" << ret; + } + EXPECT_NE(newDir.ToString(), ""); + int result = fah->Delete(newDir); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_MkdirTdd"; +} + +/** + * @tc.number: user_file_service_file_access_helper_Mkdir_0005 + * @tc.name: file_access_helper_Mkdir_0005 + * @tc.desc: Test function of Mkdir interface for SUCCESS which Concurrent. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0005, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Mkdir_0005"; + try { + Uri newDirUriTest(""); + std::string displayName[4] = {"test1", "test2", "test3", "test4"}; + for (int j = 0; j < 4; j++) { + std::thread Mkdir_Thread(MkdirTdd, fah, g_newDirUri, displayName[j], newDirUriTest); + Mkdir_Thread.detach(); + } + } catch (...) { + GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Mkdir_0005"; +} + /** * @tc.number: user_file_service_file_access_helper_Delete_0000 * @tc.name: file_access_helper_Delete_0000 @@ -740,6 +862,56 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0004, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Delete_0004"; } +void DeleteTdd(shared_ptr fahs, Uri selectFile) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_DeleteTdd"; + int ret = fahs->Delete(selectFile); + if (ret < OHOS::FileAccessFwk::ERR_OK) { + GTEST_LOG_(INFO) << "DeleteTdd get result error, code:" << ret; + } + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_DeleteTdd"; +} + +/** + * @tc.number: user_file_service_file_access_helper_Delete_0005 + * @tc.name: file_access_helper_Delete_0005 + * @tc.desc: Test function of Delete interface for SUCCESS which Concurrent. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0005, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0005"; + try { + Uri newDirUriTest(""); + int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + Uri newFileUri(""); + result = fah->CreateFile(newDirUriTest, "file_access_helper_Delete_0005.txt", newFileUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + Uri testUri[4] = {Uri(""), Uri(""), Uri(""), Uri("")}; + std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; + Uri testUri2(""); + for (int j = 0; j < 4; j++) { + result = fah->CreateFile(newDirUriTest, displayName[j], testUri[j]); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + std::thread Delete_Thread(DeleteTdd, fah, testUri[j]); + Delete_Thread.detach(); + } + + result = fah->Delete(newDirUriTest); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + } catch (...) { + GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Delete_0005"; +} + + /** * @tc.number: user_file_service_file_access_helper_Move_0000 * @tc.name: file_access_helper_Move_0000 @@ -1156,6 +1328,57 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0010, testing::ext::TestS GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Move_0010"; } +void MoveTdd(shared_ptr fahs, Uri sourceFile, Uri targetParent, Uri newFile) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_MoveTdd"; + int ret = fahs->Move(sourceFile, targetParent, newFile); + if (ret != OHOS::FileAccessFwk::ERR_OK) { + GTEST_LOG_(INFO) << "MoveTdd get result error, code:" << ret; + } + EXPECT_NE(newFile.ToString(), ""); + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_MoveTdd"; +} + +/** + * @tc.number: user_file_service_file_access_helper_Move_0011 + * @tc.name: file_access_helper_Move_0011 + * @tc.desc: Test function of Move interface for SUCCESS which Concurrent. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0011, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0011"; + try { + Uri newDirUriTest1(""); + Uri newDirUriTest2(""); + int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + result = fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + Uri testUri[4] = {Uri(""), Uri(""), Uri(""), Uri("")}; + std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; + + Uri testUri2(""); + for (int j = 0; j < 4; j++) { + result = fah->CreateFile(newDirUriTest1, displayName[j], testUri[j]); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + std::thread Move_Thread(MoveTdd, fah, testUri[j], newDirUriTest2, testUri2); + Move_Thread.detach(); + } + + result = fah->Delete(newDirUriTest2); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + } catch (...) { + GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Move_0011"; +} + /** * @tc.number: user_file_service_file_access_helper_Rename_0000 * @tc.name: file_access_helper_Rename_0000 @@ -1337,6 +1560,53 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0005, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Rename_0005"; } +void RenameTdd(shared_ptr fahs, Uri sourceFile, std::string displayName, Uri newFile) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_RenameTdd"; + int ret = fahs->Rename(sourceFile, displayName, newFile); + if (ret != OHOS::FileAccessFwk::ERR_OK) { + GTEST_LOG_(INFO) << "RenameTdd get result error, code:" << ret; + } + EXPECT_NE(newFile.ToString(), ""); + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_RenameTdd"; +} + +/** + * @tc.number: user_file_service_file_access_helper_Rename_0006 + * @tc.name: file_access_helper_Rename_0006 + * @tc.desc: Test function of Rename interface for SUCCESS which Concurrent. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0006, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0006"; + try { + Uri newDirUriTest(""); + int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + Uri testUri[4] = {Uri(""), Uri(""), Uri(""), Uri("")}; + std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; + std::string displayName1[4] = {"test11.txt", "test22.txt", "test33.txt", "test44.txt"}; + Uri renameUri(""); + for (int j = 0; j < 4; j++) { + result = fah->CreateFile(newDirUriTest, displayName[j], testUri[j]); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + std::thread Rename_Thread(RenameTdd, fah, testUri[j], displayName1[j], renameUri); + Rename_Thread.detach(); + } + + result = fah->Delete(newDirUriTest); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + } catch (...) { + GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Rename_0006"; +} + /** * @tc.number: user_file_service_file_access_helper_ListFile_0000 * @tc.name: file_access_helper_ListFile_0000 @@ -1515,11 +1785,66 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0004, testing::ext::T result = fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ListFile_0004"; } +void ListFileTdd(shared_ptr fahs, FileInfo fileInfo, int offset, int maxCount, + FileFilter filter, std::vector fileInfoVec) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_ListFileTdd"; + int ret = fahs->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + if (ret != OHOS::FileAccessFwk::ERR_OK) { + GTEST_LOG_(INFO) << "ListFileTdd get result error, code:" << ret; + } + EXPECT_EQ(fileInfoVec.size(), 1); + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_ListFileTdd"; +} + +/** + * @tc.number: user_file_service_file_access_helper_ListFile_0005 + * @tc.name: file_access_helper_ListFile_0005 + * @tc.desc: Test function of ListFile interface for ERROR which Concurrent. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0005, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0005"; + try { + Uri newDirUriTest(""); + int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + Uri testUri1(""); + result = fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0005.txt", testUri1); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + Uri testUri2(""); + result = fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0005.docx", testUri2); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + FileInfo fileInfo; + fileInfo.uri = newDirUriTest.ToString(); + int64_t offset = 0; + int64_t maxCount = 1000; + std::vector fileInfoVec; + FileFilter filter({".txt"}, {}, {}, 0, 0, false, true); + for (int j = 0; j < 4; j++) { + std::thread ListFile_Thread(ListFileTdd, fah, fileInfo, offset, maxCount, filter, fileInfoVec); + ListFile_Thread.detach(); + } + + result = fah->Delete(newDirUriTest); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + } catch (...) { + GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ListFile_0005"; +} + /** * @tc.number: user_file_service_file_access_helper_ScanFile_0000 * @tc.name: file_access_helper_ScanFile_0000 @@ -1688,6 +2013,59 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0003, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ScanFile_0003"; } +void ScanFileTdd(shared_ptr fahs, FileInfo fileInfo, int offset, int maxCount, + FileFilter filter, std::vector fileInfoVec) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFileTdd"; + int ret = fahs->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + if (ret != OHOS::FileAccessFwk::ERR_OK) { + GTEST_LOG_(INFO) << "ScanFileTdd get result error, code:" << ret; + } + EXPECT_EQ(fileInfoVec.size(), 1); + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_ScanFileTdd"; +} + +/** + * @tc.number: user_file_service_file_access_helper_ScanFile_0004 + * @tc.name: file_access_helper_ScanFile_0004 + * @tc.desc: Test function of ScanFile interface for SUCCESS which Concurrent. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0004, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0004"; + try { + Uri newDirUriTest(""); + int result = fah->Mkdir(g_newDirUri, "Download", newDirUriTest); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + Uri testUri(""); + FileInfo fileInfo; + result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.q1w2e3r4", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.txt", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + fileInfo.uri = "datashare:///media/root"; + int64_t offset = 0; + int64_t maxCount = 1000; + std::vector fileInfoVec; + FileFilter filter({".q1w2e3r4"}, {}, {}, 0, 0, false, true); + for (int j = 0; j < 4; j++) { + std::thread ScanFile_Thread(ScanFileTdd, fah, fileInfo, offset, maxCount, filter, fileInfoVec); + ScanFile_Thread.detach(); + } + + result = fah->Delete(newDirUriTest); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + } catch (...) { + GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ScanFile_0004"; +} + /** * @tc.number: user_file_service_file_access_helper_GetRoots_0000 * @tc.name: file_access_helper_GetRoots_0000 diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index ae68864e..57740a0e 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -14,6 +14,7 @@ */ #include +#include #include #include @@ -31,6 +32,8 @@ using namespace FileAccessFwk; int ABILITY_ID = 5003; shared_ptr fah = nullptr; OHOS::Security::AccessToken::AccessTokenID tokenId; +int UID_TRANSFORM_TMP = 20000000; +int UID_DEFAULT = 0; // permission state OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState = { @@ -117,7 +120,9 @@ public: auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); AAFwk::Want want; vector wantVec; + setuid(UID_TRANSFORM_TMP); int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(wantVec); + setuid(UID_DEFAULT); EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); bool sus = false; for (size_t i = 0; i < wantVec.size(); i++) { @@ -385,6 +390,55 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0006, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_OpenFile_0006"; } +void OpenFileTdd(shared_ptr fahs, Uri uri, int flags, int fd) +{ + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile"; + int ret = fahs->OpenFile(uri, flags, fd); + if (ret != OHOS::FileAccessFwk::ERR_OK) { + GTEST_LOG_(INFO) << "OpenFile get result error, code:" << ret; + } + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile"; +} + +/** + * @tc.number: user_file_service_file_extension_helper_OpenFile_0007 + * @tc.name: file_extension_helper_OpenFile_0007 + * @tc.desc: Test function of OpenFile interface for SUCCESS which Concurrent. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0007, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0007"; + try { + vector info; + int result = 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 newFileUri(""); + result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0007.txt", newFileUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + int flags; + int fd[4]; + for (size_t j = 0; j< 4; j++) { + std::thread OpenFile_Thread(OpenFileTdd, fah, newFileUri, flags, fd[j]); + OpenFile_Thread.detach(); + EXPECT_GE(fd[j], OHOS::FileAccessFwk::ERR_OK); + } + + result = fah->Delete(newFileUri); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + } + } catch (...) { + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_OpenFile_0007"; +} + /** * @tc.number: user_file_service_file_extension_helper_CreateFile_0000 * @tc.name: file_extension_helper_CreateFile_0000 @@ -519,6 +573,51 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0004, testing GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_CreateFile_0004"; } +void CreateFileTdd(shared_ptr fahs, Uri uri, std::string displayName, Uri newFile) +{ + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFileTdd"; + int ret = fahs->CreateFile(uri, displayName, newFile); + if (ret != OHOS::FileAccessFwk::ERR_OK) { + GTEST_LOG_(INFO) << "CreateFileTdd get result error, code:" << ret; + } + EXPECT_NE(newFile.ToString(), ""); + ret = fah->Delete(newFile); + EXPECT_GE(ret, OHOS::FileAccessFwk::ERR_OK); + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFileTdd"; +} + +/** + * @tc.number: user_file_service_file_extension_helper_CreateFile_0005 + * @tc.name: file_extension_helper_CreateFile_0005 + * @tc.desc: Test function of CreateFile interface for ERROR which Concurrent. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0005, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0005"; + try { + vector info; + int result = 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 newFileUri(""); + std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; + for (int j = 0; j < 1; j++) { + std::thread CreateFile_Thread(CreateFileTdd, fah, parentUri, displayName[j], newFileUri); + CreateFile_Thread.detach(); + } + GTEST_LOG_(INFO) << "CreateFile_0005 result:" << result << endl; + } + } catch (...) { + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_CreateFile_0005"; +} + /** * @tc.number: user_file_service_file_extension_helper_Mkdir_0000 * @tc.name: file_extension_helper_Mkdir_0000 @@ -653,6 +752,51 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0004, testing::ext GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Mkdir_0004"; } +void MkdirTdd(shared_ptr fahs, Uri uri, std::string displayName, Uri newFile) +{ + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_MkdirTdd"; + int ret = fahs->Mkdir(uri, displayName, newFile); + if (ret != OHOS::FileAccessFwk::ERR_OK) { + GTEST_LOG_(INFO) << "MkdirTdd get result error, code:" << ret; + } + EXPECT_NE(newFile.ToString(), ""); + ret = fah->Delete(newFile); + EXPECT_GE(ret, OHOS::FileAccessFwk::ERR_OK); + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_MkdirTdd"; +} + +/** + * @tc.number: user_file_service_file_extension_helper_Mkdir_0005 + * @tc.name: file_extension_helper_Mkdir_0005 + * @tc.desc: Test function of Mkdir interface for SUCCESS which Concurrent. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0005, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0005"; + try { + vector info; + int result = 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(""); + std::string displayName[4] = {"test1", "test2", "test3", "test4"}; + for (int j = 0; j < 4; j++) { + std::thread Mkdir_Thread(MkdirTdd, fah, parentUri, displayName[j], newDirUriTest); + Mkdir_Thread.detach(); + } + } + } catch (...) { + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Mkdir_0005"; +} + /** * @tc.number: user_file_service_file_extension_helper_Delete_0000 * @tc.name: file_extension_helper_Delete_0000 @@ -807,6 +951,55 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0004, testing::ex GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Delete_0004"; } +void DeleteTdd(shared_ptr fahs, Uri selectFile) +{ + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_DeleteTdd"; + int ret = fahs->Delete(selectFile); + if (ret != OHOS::FileAccessFwk::ERR_OK) { + GTEST_LOG_(INFO) << "DeleteTdd get result error, code:" << ret; + } + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_DeleteTdd"; +} + +/** + * @tc.number: user_file_service_file_extension_helper_Delete_0005 + * @tc.name: file_extension_helper_Delete_0005 + * @tc.desc: Test function of Delete interface for SUCCESS which Concurrent. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0005, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0005"; + try { + vector info; + int result = 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(""); + result = fah->Mkdir(parentUri, "test", newDirUriTest); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + Uri newFileUri(""); + std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; + for (int j = 0; j < 4; j++) { + result = fah->CreateFile(newDirUriTest, displayName[j], newFileUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + std::thread Delete_Thread(DeleteTdd, fah, newFileUri); + Delete_Thread.detach(); + } + result = fah->Delete(newDirUriTest); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + } + } catch (...) { + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Delete_0005"; +} + /** * @tc.number: user_file_service_file_extension_helper_Move_0000 * @tc.name: file_extension_helper_Move_0000 @@ -1343,6 +1536,61 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0011, testing::ext: GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Move_0011"; } +void MoveTdd(shared_ptr fahs, Uri sourceFile, Uri targetParent, Uri newFile) +{ + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_MoveTdd"; + int ret = fahs->Move(sourceFile, targetParent, newFile); + if (ret != OHOS::FileAccessFwk::ERR_OK) { + GTEST_LOG_(INFO) << "MoveTdd get result error, code:" << ret; + } + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_MoveTdd"; +} + +/** + * @tc.number: user_file_service_file_extension_helper_Move_0012 + * @tc.name: file_extension_helper_Move_0012 + * @tc.desc: Test function of Move interface for SUCCESS which Concurrent. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0012, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0012"; + try { + vector info; + int result = 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 newDirUriTest2(""); + result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + result = fah->Mkdir(parentUri, "test2", newDirUriTest2); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + Uri testUri[4] = {Uri(""), Uri(""), Uri(""), Uri("")}; + std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; + for (int j = 0; j < 4; j++) { + Uri testUri2(""); + result = fah->CreateFile(newDirUriTest1, displayName[j], testUri[j]); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + std::thread Move_Thread(MoveTdd, fah, testUri[j], newDirUriTest2, testUri2); + Move_Thread.detach(); + } + + result = fah->Delete(newDirUriTest1); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + } + } catch (...) { + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Move_0012"; +} + /** * @tc.number: user_file_service_file_extension_helper_Rename_0000 * @tc.name: file_extension_helper_Rename_0000 @@ -1548,6 +1796,57 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0005, testing::ex GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Rename_0005"; } +void RenameTdd(shared_ptr fahs, Uri sourceFile, std::string displayName, Uri newFile) +{ + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_RenameTdd"; + int ret = fahs->Rename(sourceFile, displayName, newFile); + if (ret != OHOS::FileAccessFwk::ERR_OK) { + GTEST_LOG_(INFO) << "RenameTdd get result error, code:" << ret; + } + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_RenameTdd"; +} + +/** + * @tc.number: user_file_service_file_extension_helper_Rename_0006 + * @tc.name: file_extension_helper_Rename_0006 + * @tc.desc: Test function of Rename interface for SUCCESS which Concurrent. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0006, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0006"; + try { + vector info; + int result = 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(""); + result = fah->Mkdir(parentUri, "test", newDirUriTest); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + Uri testUri(""); + std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; + Uri renameUri(""); + for (int j = 0; j < 4; j++) { + result = fah->CreateFile(newDirUriTest, displayName[j], testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + std::thread Rename_Thread(RenameTdd, fah, testUri, displayName[j], renameUri); + Rename_Thread.detach(); + } + + result = fah->Delete(newDirUriTest); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + } + } catch (...) { + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Rename_0006"; +} + /** * @tc.number: user_file_service_file_extension_helper_ListFile_0000 * @tc.name: file_extension_helper_ListFile_0000 @@ -1699,6 +1998,63 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0003, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_ListFile_0003"; } +void ListFileTdd(shared_ptr fahs, FileInfo fileInfo, int offset, int maxCount, + FileFilter filter, std::vector fileInfoVec) +{ + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFileTdd"; + int ret = fahs->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + if (ret != OHOS::FileAccessFwk::ERR_OK) { + GTEST_LOG_(INFO) << "ListFile get result error, code:" << ret; + } + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFileTdd"; +} + +/** + * @tc.number: user_file_service_file_extension_helper_ListFile_0004 + * @tc.name: file_extension_helper_ListFile_0004 + * @tc.desc: Test function of ListFile interface for SUCCESS which Concurrent. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0004, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0004"; + try { + vector info; + int result = 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(""); + result = fah->Mkdir(parentUri, "test", newDirUriTest); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + Uri testUri(""); + result = fah->CreateFile(newDirUriTest, "file_extension_helper_ListFile_0004.txt", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + FileInfo fileInfo; + fileInfo.uri = newDirUriTest.ToString(); + int offset = 0; + int maxCount = 1000; + std::vector fileInfoVec; + FileFilter filter; + for (int j = 0; j < 4; j++) { + std::thread ListFile_Thread(ListFileTdd, fah, fileInfo, offset, maxCount, filter, fileInfoVec); + ListFile_Thread.detach(); + } + + result = fah->Delete(newDirUriTest); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + } + } catch (...) { + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + } + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_ListFile_0004"; +} + /** * @tc.number: user_file_service_file_extension_helper_GetRoots_0000 * @tc.name: file_extension_helper_GetRoots_0000 @@ -1746,7 +2102,9 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); vector wants; + setuid(UID_TRANSFORM_TMP); int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(wants); + setuid(UID_DEFAULT); EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); shared_ptr fahs = FileAccessHelper::Creator(remoteObj, wants); -- Gitee From 14c6c65a7299fe2cc1fb9f3984a5271fa5b0aa84 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 8 Sep 2022 11:24:52 +0800 Subject: [PATCH 102/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9userid=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../file_access/include/file_access_helper.h | 1 + .../file_access/src/file_access_helper.cpp | 14 +++++++++++--- .../file_access/test/file_access_helper_test.cpp | 4 ++++ .../test/file_extension_helper_test.cpp | 6 ++++++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/frameworks/innerkits/file_access/include/file_access_helper.h b/frameworks/innerkits/file_access/include/file_access_helper.h index 23b2a152..cfef03cb 100644 --- a/frameworks/innerkits/file_access/include/file_access_helper.h +++ b/frameworks/innerkits/file_access/include/file_access_helper.h @@ -96,6 +96,7 @@ private: static std::unordered_map wantsMap_; static std::string GetKeyOfWantsMap(const AAFwk::Want &want); + static int getUserId(); sptr callerDeathRecipient_ = nullptr; diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 2f7cdfc0..d1db31b1 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -21,13 +21,14 @@ #include "hitrace_meter.h" #include "if_system_ability_manager.h" #include "ifile_access_ext_base.h" +#include "ipc_skeleton.h" #include "iservice_registry.h" #include "system_ability_definition.h" namespace OHOS { namespace FileAccessFwk { namespace { - static const int32_t DEFAULT_USERID = 100; + static const int32_t UID_TRANSFORM_DIVISOR = 200000; static const std::string SCHEME_NAME = "datashare"; static const std::string MEDIA_BNUDLE_NAME_ALIAS = "media"; static const std::string MEDIA_BNUDLE_NAME = "com.ohos.medialibrary.medialibrarydata"; @@ -37,6 +38,13 @@ namespace { } std::unordered_map FileAccessHelper::wantsMap_; +int FileAccessHelper::getUserId() +{ + int uid = IPCSkeleton::GetCallingUid(); + int userId = uid / UID_TRANSFORM_DIVISOR; + return userId; +} + static bool GetBundleNameFromPath(const std::string &path, std::string &bundleName) { if (path.size() == 0) { @@ -190,7 +198,7 @@ std::shared_ptr FileAccessHelper::Creator( std::unordered_map> cMap; std::vector extensionInfos; bool ret = bm->QueryExtensionAbilityInfos( - AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, DEFAULT_USERID, extensionInfos); + AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, FileAccessHelper::getUserId(), extensionInfos); if (!ret) { HILOG_ERROR("FileAccessHelper::Creator QueryExtensionAbilityInfos failed"); return nullptr; @@ -685,7 +693,7 @@ int FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(std::vectorQueryExtensionAbilityInfos( - AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, DEFAULT_USERID, extensionInfos); + AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, FileAccessHelper::getUserId(), extensionInfos); if (!ret) { HILOG_ERROR("FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo QueryExtensionAbilityInfos error"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 3b22fbc7..21b1817a 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -32,6 +32,8 @@ using namespace FileAccessFwk; int ABILITY_ID = 5003; shared_ptr fah = nullptr; Uri g_newDirUri(""); +int UID_TRANSFORM_TMP = 20000000; +int UID_DEFAULT = 0; class FileAccessHelperTest : public testing::Test { public: @@ -43,7 +45,9 @@ public: auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); AAFwk::Want want; vector wantVec; + setuid(UID_TRANSFORM_TMP); int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(wantVec); + setuid(UID_DEFAULT); EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); bool sus = false; for (size_t i = 0; i < wantVec.size(); i++) { diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index ae68864e..c89f2b69 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -31,6 +31,8 @@ using namespace FileAccessFwk; int ABILITY_ID = 5003; shared_ptr fah = nullptr; OHOS::Security::AccessToken::AccessTokenID tokenId; +int UID_TRANSFORM_TMP = 20000000; +int UID_DEFAULT = 0; // permission state OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState = { @@ -117,7 +119,9 @@ public: auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); AAFwk::Want want; vector wantVec; + setuid(UID_TRANSFORM_TMP); int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(wantVec); + setuid(UID_DEFAULT); EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); bool sus = false; for (size_t i = 0; i < wantVec.size(); i++) { @@ -1746,7 +1750,9 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); vector wants; + setuid(UID_TRANSFORM_TMP); int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(wants); + setuid(UID_DEFAULT); EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); shared_ptr fahs = FileAccessHelper::Creator(remoteObj, wants); -- Gitee From cf6f05dc860214cd9a60735e745571fa3d0767f9 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 8 Sep 2022 17:06:14 +0800 Subject: [PATCH 103/122] =?UTF-8?q?review=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../file_access/include/file_access_helper.h | 1 - .../file_access/src/file_access_helper.cpp | 14 +- .../test/file_access_helper_test.cpp | 579 +++++++++--------- .../test/file_extension_helper_test.cpp | 441 +++++++------ 4 files changed, 519 insertions(+), 516 deletions(-) diff --git a/frameworks/innerkits/file_access/include/file_access_helper.h b/frameworks/innerkits/file_access/include/file_access_helper.h index cfef03cb..23b2a152 100644 --- a/frameworks/innerkits/file_access/include/file_access_helper.h +++ b/frameworks/innerkits/file_access/include/file_access_helper.h @@ -96,7 +96,6 @@ private: static std::unordered_map wantsMap_; static std::string GetKeyOfWantsMap(const AAFwk::Want &want); - static int getUserId(); sptr callerDeathRecipient_ = nullptr; diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index d1db31b1..2f7cdfc0 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -21,14 +21,13 @@ #include "hitrace_meter.h" #include "if_system_ability_manager.h" #include "ifile_access_ext_base.h" -#include "ipc_skeleton.h" #include "iservice_registry.h" #include "system_ability_definition.h" namespace OHOS { namespace FileAccessFwk { namespace { - static const int32_t UID_TRANSFORM_DIVISOR = 200000; + static const int32_t DEFAULT_USERID = 100; static const std::string SCHEME_NAME = "datashare"; static const std::string MEDIA_BNUDLE_NAME_ALIAS = "media"; static const std::string MEDIA_BNUDLE_NAME = "com.ohos.medialibrary.medialibrarydata"; @@ -38,13 +37,6 @@ namespace { } std::unordered_map FileAccessHelper::wantsMap_; -int FileAccessHelper::getUserId() -{ - int uid = IPCSkeleton::GetCallingUid(); - int userId = uid / UID_TRANSFORM_DIVISOR; - return userId; -} - static bool GetBundleNameFromPath(const std::string &path, std::string &bundleName) { if (path.size() == 0) { @@ -198,7 +190,7 @@ std::shared_ptr FileAccessHelper::Creator( std::unordered_map> cMap; std::vector extensionInfos; bool ret = bm->QueryExtensionAbilityInfos( - AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, FileAccessHelper::getUserId(), extensionInfos); + AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, DEFAULT_USERID, extensionInfos); if (!ret) { HILOG_ERROR("FileAccessHelper::Creator QueryExtensionAbilityInfos failed"); return nullptr; @@ -693,7 +685,7 @@ int FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(std::vectorQueryExtensionAbilityInfos( - AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, FileAccessHelper::getUserId(), extensionInfos); + AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, DEFAULT_USERID, extensionInfos); if (!ret) { HILOG_ERROR("FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo QueryExtensionAbilityInfos error"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 5cfd7409..4d66a0bd 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -25,15 +25,90 @@ #include "file_access_helper.h" #include "iservice_registry.h" + namespace { using namespace std; using namespace OHOS; using namespace FileAccessFwk; int ABILITY_ID = 5003; -shared_ptr fah = nullptr; +shared_ptr g_fah = nullptr; +OHOS::Security::AccessToken::AccessTokenID g_tokenId; Uri g_newDirUri(""); -int UID_TRANSFORM_TMP = 20000000; -int UID_DEFAULT = 0; + +// permission state +OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState = { + .permissionName = "ohos.permission.FILE_ACCESS_MANAGER", + .isGeneral = true, + .resDeviceID = {"local"}, + .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED}, + .grantFlags = {1} +}; + +OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState1 = { + .permissionName = "ohos.permission.READ_MEDIA", + .isGeneral = true, + .resDeviceID = {"local"}, + .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED}, + .grantFlags = {1} +}; + +OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState2 = { + .permissionName = "ohos.permission.WRITE_MEDIA", + .isGeneral = true, + .resDeviceID = {"local"}, + .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED}, + .grantFlags = {1} +}; + +// permission define +OHOS::Security::AccessToken::PermissionDef g_infoManagerTestPermDef = { + .permissionName = "ohos.permission.FILE_ACCESS_MANAGER", + .bundleName = "ohos.acts.multimedia.mediaLibrary", + .grantMode = 1, + .availableLevel = OHOS::Security::AccessToken::APL_NORMAL, + .label = "label", + .labelId = 1, + .description = "FILE_ACCESS_MANAGER", + .descriptionId = 1 +}; + +OHOS::Security::AccessToken::PermissionDef g_infoManagerTestPermDef1 = { + .permissionName = "ohos.permission.READ_MEDIA", + .bundleName = "ohos.acts.multimedia.mediaLibrary", + .grantMode = 1, + .availableLevel = OHOS::Security::AccessToken::APL_NORMAL, + .label = "label", + .labelId = 1, + .description = "READ_MEDIA", + .descriptionId = 1 +}; + +OHOS::Security::AccessToken::PermissionDef g_infoManagerTestPermDef2 = { + .permissionName = "ohos.permission.WRITE_MEDIA", + .bundleName = "ohos.acts.multimedia.mediaLibrary", + .grantMode = 1, + .availableLevel = OHOS::Security::AccessToken::APL_NORMAL, + .label = "label", + .labelId = 1, + .description = "WRITE_MEDIA", + .descriptionId = 1 +}; + +// permission info +OHOS::Security::AccessToken::HapPolicyParams g_infoManagerTestPolicyPrams = { + .apl = OHOS::Security::AccessToken::APL_NORMAL, + .domain = "test.domain", + .permList = {g_infoManagerTestPermDef, g_infoManagerTestPermDef1, g_infoManagerTestPermDef2}, + .permStateList = {g_infoManagerTestState, g_infoManagerTestState1, g_infoManagerTestState2} +}; + +// hap info +OHOS::Security::AccessToken::HapInfoParams g_infoManagerTestInfoParms = { + .userID = 1, + .bundleName = "fileAccessHelperTest", + .instIndex = 0, + .appIDDesc = "testtesttesttest" +}; class FileAccessHelperTest : public testing::Test { public: @@ -45,9 +120,7 @@ public: auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); AAFwk::Want want; vector wantVec; - setuid(UID_TRANSFORM_TMP); int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(wantVec); - setuid(UID_DEFAULT); EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); bool sus = false; for (size_t i = 0; i < wantVec.size(); i++) { @@ -61,86 +134,21 @@ public: } EXPECT_TRUE(sus); vector wants {want}; - fah = FileAccessHelper::Creator(remoteObj, wants); + g_fah = FileAccessHelper::Creator(remoteObj, wants); + + OHOS::Security::AccessToken::AccessTokenIDEx tokenIdEx = {0}; + tokenIdEx = OHOS::Security::AccessToken::AccessTokenKit::AllocHapToken + (g_infoManagerTestInfoParms, g_infoManagerTestPolicyPrams); + g_tokenId = tokenIdEx.tokenIdExStruct.tokenID; + SetSelfTokenID(g_tokenId); } - static void TearDownTestCase() {}; + static void TearDownTestCase() { + g_fah->Release(); + g_fah = nullptr; + OHOS::Security::AccessToken::AccessTokenKit::DeleteToken(g_tokenId); + }; void SetUp() {}; void TearDown() {}; - - // permission state - OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState = { - .permissionName = "ohos.permission.FILE_ACCESS_MANAGER", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} - }; - - OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState1 = { - .permissionName = "ohos.permission.READ_MEDIA", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} - }; - - OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState2 = { - .permissionName = "ohos.permission.WRITE_MEDIA", - .isGeneral = true, - .resDeviceID = {"local"}, - .grantStatus = {OHOS::Security::AccessToken::PermissionState::PERMISSION_GRANTED}, - .grantFlags = {1} - }; - - // permission define - OHOS::Security::AccessToken::PermissionDef g_infoManagerTestPermDef = { - .permissionName = "ohos.permission.FILE_ACCESS_MANAGER", - .bundleName = "ohos.acts.multimedia.mediaLibrary", - .grantMode = 1, - .availableLevel = OHOS::Security::AccessToken::APL_NORMAL, - .label = "label", - .labelId = 1, - .description = "FILE_ACCESS_MANAGER", - .descriptionId = 1 - }; - - OHOS::Security::AccessToken::PermissionDef g_infoManagerTestPermDef1 = { - .permissionName = "ohos.permission.READ_MEDIA", - .bundleName = "ohos.acts.multimedia.mediaLibrary", - .grantMode = 1, - .availableLevel = OHOS::Security::AccessToken::APL_NORMAL, - .label = "label", - .labelId = 1, - .description = "READ_MEDIA", - .descriptionId = 1 - }; - - OHOS::Security::AccessToken::PermissionDef g_infoManagerTestPermDef2 = { - .permissionName = "ohos.permission.WRITE_MEDIA", - .bundleName = "ohos.acts.multimedia.mediaLibrary", - .grantMode = 1, - .availableLevel = OHOS::Security::AccessToken::APL_NORMAL, - .label = "label", - .labelId = 1, - .description = "WRITE_MEDIA", - .descriptionId = 1 - }; - - // permission info - OHOS::Security::AccessToken::HapPolicyParams g_infoManagerTestPolicyPrams = { - .apl = OHOS::Security::AccessToken::APL_NORMAL, - .domain = "test.domain", - .permList = {g_infoManagerTestPermDef, g_infoManagerTestPermDef1, g_infoManagerTestPermDef2}, - .permStateList = {g_infoManagerTestState, g_infoManagerTestState1, g_infoManagerTestState2} - }; - - // hap info - OHOS::Security::AccessToken::HapInfoParams g_infoManagerTestInfoParms = { - .userID = 1, - .bundleName = "fileAccessHelperTest", - .instIndex = 0, - .appIDDesc = "testtesttesttest" - }; }; /** @@ -156,14 +164,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0000, testing::ext::T { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0000"; try { - OHOS::Security::AccessToken::AccessTokenIDEx tokenIdEx = {0}; - tokenIdEx = OHOS::Security::AccessToken::AccessTokenKit::AllocHapToken - (g_infoManagerTestInfoParms, g_infoManagerTestPolicyPrams); - OHOS::Security::AccessToken::AccessTokenID tokenId = tokenIdEx.tokenIdExStruct.tokenID; - SetSelfTokenID(tokenId); - vector info; - int result = fah->GetRoots(info); + int result = g_fah->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(""); if (info.size() > 0) { @@ -171,24 +173,25 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0000, testing::ext::T GTEST_LOG_(INFO) << parentUri.ToString(); } - result = fah->Mkdir(parentUri, "Download", g_newDirUri); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + result = g_fah->Mkdir(parentUri, "Download", g_newDirUri); + EXPECT_LE(result, OHOS::FileAccessFwk::ERR_OK); + g_newDirUri = Uri("datashare:///media/file/1"); Uri newDirUriTest(""); - result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest); + result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); - result = fah->CreateFile(newDirUriTest, "file_access_helper_OpenFile_0000.txt", newFileUri); + result = g_fah->CreateFile(newDirUriTest, "file_access_helper_OpenFile_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = fah->OpenFile(newFileUri, 0, fd); + result = g_fah->OpenFile(newFileUri, 0, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -211,7 +214,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0001, testing::ext::T try { Uri uri(""); int fd; - int result = fah->OpenFile(uri, 0, fd); + int result = g_fah->OpenFile(uri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0001 result:" << result << endl; } catch (...) { @@ -234,16 +237,16 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0002, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0002"; try { Uri newFileUri(""); - int result = fah->CreateFile(g_newDirUri, "file_access_helper_OpenFile_0002.txt", newFileUri); + int result = g_fah->CreateFile(g_newDirUri, "file_access_helper_OpenFile_0002.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri uri("storage/media/100/local/files/Download/file_access_helper_OpenFile_0002.txt"); int fd; - result = fah->OpenFile(uri, 0, fd); + result = g_fah->OpenFile(uri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0002 result:" << result << endl; - result = fah->Delete(newFileUri); + result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -266,7 +269,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0003, testing::ext::T try { Uri uri("~!@#$%^&*()_"); int fd; - int result = fah->OpenFile(uri, 0, fd); + int result = g_fah->OpenFile(uri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0003 result:" << result << endl; } catch (...) { @@ -289,15 +292,15 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0004, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0004"; try { Uri newFileUri(""); - int result = fah->CreateFile(g_newDirUri, "file_access_helper_OpenFile_0004.txt", newFileUri); + int result = g_fah->CreateFile(g_newDirUri, "file_access_helper_OpenFile_0004.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = fah->OpenFile(newFileUri, -1, fd); + result = g_fah->OpenFile(newFileUri, -1, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0004 result:" << result << endl; - result = fah->Delete(newFileUri); + result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -319,15 +322,15 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0005, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0005"; try { Uri newFileUri(""); - int result = fah->CreateFile(g_newDirUri, "file_access_helper_OpenFile_0005.txt", newFileUri); + int result = g_fah->CreateFile(g_newDirUri, "file_access_helper_OpenFile_0005.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = fah->OpenFile(newFileUri, 1, fd); + result = g_fah->OpenFile(newFileUri, 1, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0005 result:" << result << endl; - result = fah->Delete(newFileUri); + result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -349,15 +352,15 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0006, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0006"; try { Uri newFileUri(""); - int result = fah->CreateFile(g_newDirUri, "file_access_helper_OpenFile_0006.txt", newFileUri); + int result = g_fah->CreateFile(g_newDirUri, "file_access_helper_OpenFile_0006.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = fah->OpenFile(newFileUri, 2, fd); + result = g_fah->OpenFile(newFileUri, 2, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0006 result:" << result << endl; - result = fah->Delete(newFileUri); + result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -373,9 +376,9 @@ void OpenFileTdd(shared_ptr fahs, Uri uri, int flags, int fd) GTEST_LOG_(INFO) << "OpenFileTdd get result error, code:" << ret; } EXPECT_GE(fd, 0); - int result = fah->Delete(uri); + int result = fahs->Delete(uri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_OpenFileTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_OpenFileTdd"; } /** @@ -392,13 +395,15 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0007, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0007"; try { Uri newFileUri(""); - int flags; + int flags = 0; int fd; - std::string displayName[4] = {"test1", "test2", "test3", "test4"}; + std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; for (int j = 0; j < 4; j++) { - int result = fah->CreateFile(g_newDirUri, displayName[j], newFileUri); + int result = g_fah->CreateFile(g_newDirUri, displayName[j], newFileUri); + GTEST_LOG_(INFO) << "g_newDirUri-------gf" << g_newDirUri.ToString(); + GTEST_LOG_(INFO) << "newFileUri-------gf" << newFileUri.ToString(); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::thread OpenFile_Thread(OpenFileTdd, fah, newFileUri, flags, fd); + std::thread OpenFile_Thread(OpenFileTdd, g_fah, newFileUri, flags, fd); OpenFile_Thread.detach(); } } catch (...) { @@ -421,11 +426,11 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0000, testing::ext: GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_CreateFile_0000"; try { Uri newFileUri(""); - int result = fah->CreateFile(g_newDirUri, "file_access_helper_CreateFile_0000.txt", newFileUri); + int result = g_fah->CreateFile(g_newDirUri, "file_access_helper_CreateFile_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0000 result:" << result << endl; - result = fah->Delete(newFileUri); + result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -448,7 +453,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0001, testing::ext: try { Uri newFileUri(""); Uri parentUri(""); - int result = fah->CreateFile(parentUri, "file_access_helper_CreateFile_0001.txt", newFileUri); + int result = g_fah->CreateFile(parentUri, "file_access_helper_CreateFile_0001.txt", newFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0001 result:" << result << endl; } catch (...) { @@ -472,7 +477,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0002, testing::ext: try { Uri newFileUri(""); Uri parentUri("storage/media/100/local/files/Download"); - int result = fah->CreateFile(parentUri, "file_access_helper_CreateFile_0002.txt", newFileUri); + int result = g_fah->CreateFile(parentUri, "file_access_helper_CreateFile_0002.txt", newFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0002 result:" << result << endl; } catch (...) { @@ -496,7 +501,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0003, testing::ext: try { Uri newFileUri(""); Uri parentUri("~!@#$%^&*()_"); - int result = fah->CreateFile(parentUri, "file_access_helper_CreateFile_0003.txt", newFileUri); + int result = g_fah->CreateFile(parentUri, "file_access_helper_CreateFile_0003.txt", newFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0003 result:" << result << endl; } catch (...) { @@ -520,7 +525,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0004, testing::ext: try { Uri newFileUri(""); string displayName = ""; - int result = fah->CreateFile(g_newDirUri, displayName, newFileUri); + int result = g_fah->CreateFile(g_newDirUri, displayName, newFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0004 result:" << result << endl; } catch (...) { @@ -537,9 +542,9 @@ void CreateFileTdd(shared_ptr fahs, Uri parent, std::string di GTEST_LOG_(INFO) << "CreateFileTdd get result error, code:" << ret; } EXPECT_NE(newDir.ToString(), ""); - int result = fah->Delete(newDir); + int result = fahs->Delete(newDir); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_CreateFileTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_CreateFileTdd"; } /** @@ -558,7 +563,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0005, testing::ext: Uri newFileUri(""); std::string displayName[4] = {"test1", "test2", "test3", "test4"}; for (int j = 0; j < 4; j++) { - std::thread CreateFile_Thread(CreateFileTdd, fah, g_newDirUri, displayName[j], newFileUri); + std::thread CreateFile_Thread(CreateFileTdd, g_fah, g_newDirUri, displayName[j], newFileUri); CreateFile_Thread.detach(); } } catch (...) { @@ -581,11 +586,11 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0000, testing::ext::Test GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Mkdir_0000"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "file_access_helper_Mkdir_0000", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "file_access_helper_Mkdir_0000", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0000 result:" << result << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -608,7 +613,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0001, testing::ext::Test try { Uri newDirUriTest(""); Uri parentUri(""); - int result = fah->Mkdir(parentUri, "file_access_helper_Mkdir_0001", newDirUriTest); + int result = g_fah->Mkdir(parentUri, "file_access_helper_Mkdir_0001", newDirUriTest); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0001 result:" << result << endl; } catch (...) { @@ -632,7 +637,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0002, testing::ext::Test try { Uri newDirUriTest(""); Uri parentUri("storage/media/100/local/files/Download"); - int result = fah->Mkdir(parentUri, "file_access_helper_Mkdir_0002", newDirUriTest); + int result = g_fah->Mkdir(parentUri, "file_access_helper_Mkdir_0002", newDirUriTest); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0002 result:" << result << endl; } catch (...) { @@ -656,7 +661,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0003, testing::ext::Test try { Uri newDirUriTest(""); Uri parentUri("~!@#$%^&*()_"); - int result = fah->Mkdir(parentUri, "file_access_helper_Mkdir_0003", newDirUriTest); + int result = g_fah->Mkdir(parentUri, "file_access_helper_Mkdir_0003", newDirUriTest); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0003 result:" << result << endl; } catch (...) { @@ -680,7 +685,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0004, testing::ext::Test try { Uri newDirUriTest(""); string displayName = ""; - int result = fah->Mkdir(g_newDirUri, displayName, newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, displayName, newDirUriTest); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0004 result:" << result << endl; } catch (...) { @@ -697,9 +702,9 @@ void MkdirTdd(shared_ptr fahs, Uri parent, std::string display GTEST_LOG_(INFO) << "MkdirTdd get result error, code:" << ret; } EXPECT_NE(newDir.ToString(), ""); - int result = fah->Delete(newDir); + int result = fahs->Delete(newDir); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_MkdirTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_MkdirTdd"; } /** @@ -718,7 +723,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0005, testing::ext::Test Uri newDirUriTest(""); std::string displayName[4] = {"test1", "test2", "test3", "test4"}; for (int j = 0; j < 4; j++) { - std::thread Mkdir_Thread(MkdirTdd, fah, g_newDirUri, displayName[j], newDirUriTest); + std::thread Mkdir_Thread(MkdirTdd, g_fah, g_newDirUri, displayName[j], newDirUriTest); Mkdir_Thread.detach(); } } catch (...) { @@ -741,18 +746,18 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0000, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0000"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); - result = fah->CreateFile(newDirUriTest, "file_access_helper_Delete_0000.txt", newFileUri); + result = g_fah->CreateFile(newDirUriTest, "file_access_helper_Delete_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Delete(newFileUri); + result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0000 result:" << result << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -774,10 +779,10 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0001, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0001"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0001 result:" << result << endl; } catch (...) { @@ -800,7 +805,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0002, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0002"; try { Uri selectFileUri(""); - int result = fah->Delete(selectFileUri); + int result = g_fah->Delete(selectFileUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0002 result:" << result << endl; } catch (...) { @@ -823,14 +828,14 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0003, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0003"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri selectFileUri("storage/media/100/local/files/Download/test"); - result = fah->Delete(selectFileUri); + result = g_fah->Delete(selectFileUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0003 result:" << result << endl; } catch (...) { @@ -853,7 +858,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0004, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0004"; try { Uri selectFileUri("!@#$%^&*()"); - int result = fah->Delete(selectFileUri); + int result = g_fah->Delete(selectFileUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0004 result:" << result << endl; } catch (...) { @@ -869,7 +874,7 @@ void DeleteTdd(shared_ptr fahs, Uri selectFile) if (ret < OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "DeleteTdd get result error, code:" << ret; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_DeleteTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_DeleteTdd"; } /** @@ -886,24 +891,24 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0005, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0005"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); - result = fah->CreateFile(newDirUriTest, "file_access_helper_Delete_0005.txt", newFileUri); + result = g_fah->CreateFile(newDirUriTest, "file_access_helper_Delete_0005.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri[4] = {Uri(""), Uri(""), Uri(""), Uri("")}; std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; Uri testUri2(""); for (int j = 0; j < 4; j++) { - result = fah->CreateFile(newDirUriTest, displayName[j], testUri[j]); + result = g_fah->CreateFile(newDirUriTest, displayName[j], testUri[j]); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::thread Delete_Thread(DeleteTdd, fah, testUri[j]); + std::thread Delete_Thread(DeleteTdd, g_fah, testUri[j]); Delete_Thread.detach(); } - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -927,25 +932,25 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0000, testing::ext::TestS try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); + int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest1, "test.txt", testUri); + result = g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); - result = fah->Move(testUri, newDirUriTest2, testUri2); + result = g_fah->Move(testUri, newDirUriTest2, testUri2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0000 result:" << result << endl; - result = fah->Delete(newDirUriTest1); + result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Delete(newDirUriTest2); + result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -968,22 +973,24 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0001, testing::ext::TestS try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); + int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest1, "test.txt", testUri); + result = g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); - result = fah->Move(newDirUriTest1, newDirUriTest2, testUri2); + result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0001 result:" << result << endl; - result = fah->Delete(newDirUriTest2); + result = g_fah->Delete(newDirUriTest1); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1005,16 +1012,16 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0002, testing::ext::TestS GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0002"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); Uri sourceFileUri(""); - result = fah->Move(sourceFileUri, newDirUriTest, testUri); + result = g_fah->Move(sourceFileUri, newDirUriTest, testUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0002 result:" << result << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1037,26 +1044,26 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0003, testing::ext::TestS try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); + int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest1, "test.txt", 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"); - result = fah->Move(sourceFileUri, newDirUriTest2, testUri2); + result = g_fah->Move(sourceFileUri, newDirUriTest2, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0003 result:" << result << endl; - result = fah->Delete(newDirUriTest1); + result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Delete(newDirUriTest2); + result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1078,16 +1085,16 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0004, testing::ext::TestS GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0004"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); Uri sourceFileUri("~!@#$%^&*()_"); - result = fah->Move(sourceFileUri, newDirUriTest, testUri); + result = g_fah->Move(sourceFileUri, newDirUriTest, testUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0004 result:" << result << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1109,20 +1116,20 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0005, testing::ext::TestS GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0005"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest, "test.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); Uri targetParentUri(""); - result = fah->Move(testUri, targetParentUri, testUri2); + result = g_fah->Move(testUri, targetParentUri, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0005 result:" << result << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1145,26 +1152,26 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0006, testing::ext::TestS try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); + int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest1, "test.txt", testUri); + result = g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); Uri targetParentUri("storage/media/100/local/files/Download/test2"); - result = fah->Move(testUri, targetParentUri, testUri2); + result = g_fah->Move(testUri, targetParentUri, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0006 result:" << result << endl; - result = fah->Delete(newDirUriTest1); + result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Delete(newDirUriTest2); + result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1187,26 +1194,26 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0007, testing::ext::TestS try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); + int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest1, "test.txt", testUri); + result = g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); Uri targetParentUri("~!@#$^%&*()_"); - result = fah->Move(testUri, targetParentUri, testUri2); + result = g_fah->Move(testUri, targetParentUri, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0007 result:" << result << endl; - result = fah->Delete(newDirUriTest1); + result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Delete(newDirUriTest2); + result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1229,18 +1236,20 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0008, testing::ext::TestS try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); + int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); - result = fah->Move(newDirUriTest1, newDirUriTest2, testUri2); + result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0008 result:" << result << endl; - result = fah->Delete(newDirUriTest2); + result = g_fah->Delete(newDirUriTest1); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1263,24 +1272,26 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0009, testing::ext::TestS try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); + int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); for (size_t i = 0; i < 2000; i++) { string fileName = "test" + ToString(i) + ".txt"; - fah->CreateFile(newDirUriTest1, fileName, testUri); + g_fah->CreateFile(newDirUriTest1, fileName, testUri); } Uri testUri2(""); - result = fah->Move(newDirUriTest1, newDirUriTest2, testUri2); + result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0009 result:" << result << endl; - result = fah->Delete(newDirUriTest2); + result = g_fah->Delete(newDirUriTest1); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1303,24 +1314,26 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0010, testing::ext::TestS try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); + int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - fah->Mkdir(newDirUriTest1, "test", testUri); + g_fah->Mkdir(newDirUriTest1, "test", testUri); for (size_t i = 0; i < 50; i++) { - fah->Mkdir(testUri, "test", testUri); + g_fah->Mkdir(testUri, "test", testUri); } Uri testUri2(""); - result = fah->Move(newDirUriTest1, newDirUriTest2, testUri2); + result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0010 result:" << result << endl; - result = fah->Delete(newDirUriTest2); + result = g_fah->Delete(newDirUriTest1); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1336,7 +1349,7 @@ void MoveTdd(shared_ptr fahs, Uri sourceFile, Uri targetParent GTEST_LOG_(INFO) << "MoveTdd get result error, code:" << ret; } EXPECT_NE(newFile.ToString(), ""); - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_MoveTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_MoveTdd"; } /** @@ -1354,10 +1367,10 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0011, testing::ext::TestS try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); - int result = fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); + int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri[4] = {Uri(""), Uri(""), Uri(""), Uri("")}; @@ -1365,13 +1378,15 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0011, testing::ext::TestS Uri testUri2(""); for (int j = 0; j < 4; j++) { - result = fah->CreateFile(newDirUriTest1, displayName[j], testUri[j]); + result = g_fah->CreateFile(newDirUriTest1, displayName[j], testUri[j]); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::thread Move_Thread(MoveTdd, fah, testUri[j], newDirUriTest2, testUri2); + std::thread Move_Thread(MoveTdd, g_fah, testUri[j], newDirUriTest2, testUri2); Move_Thread.detach(); } - result = fah->Delete(newDirUriTest2); + result = g_fah->Delete(newDirUriTest1); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1393,19 +1408,19 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0000, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0000"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest, "test.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri renameUri(""); - result = fah->Rename(testUri, "test2.txt", renameUri); + result = g_fah->Rename(testUri, "test2.txt", renameUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0000 result:" << result << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1427,15 +1442,15 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0001, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0001"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri renameUri(""); - result = fah->Rename(newDirUriTest, "testRename", renameUri); + result = g_fah->Rename(newDirUriTest, "testRename", renameUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0001 result:" << result << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1458,7 +1473,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0002, testing::ext::Tes try { Uri renameUri(""); Uri sourceFileUri(""); - int result = fah->Rename(sourceFileUri, "testRename.txt", renameUri); + int result = g_fah->Rename(sourceFileUri, "testRename.txt", renameUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0002 result:" << result << endl; } catch (...) { @@ -1481,20 +1496,20 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0003, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0003"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest, "test.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri renameUri(""); Uri sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); - result = fah->Rename(sourceFileUri, "testRename.txt", renameUri); + result = g_fah->Rename(sourceFileUri, "testRename.txt", renameUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0003 result:" << result << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1517,7 +1532,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0004, testing::ext::Tes try { Uri renameUri(""); Uri sourceFileUri("~!@#$%^&*()_"); - int result = fah->Rename(sourceFileUri, "testRename.txt", renameUri); + int result = g_fah->Rename(sourceFileUri, "testRename.txt", renameUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0004 result:" << result << endl; } catch (...) { @@ -1540,19 +1555,19 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0005, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0005"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest, "test.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri renameUri(""); - result = fah->Rename(testUri, "", renameUri); + result = g_fah->Rename(testUri, "", renameUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0005 result:" << result << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1568,7 +1583,7 @@ void RenameTdd(shared_ptr fahs, Uri sourceFile, std::string di GTEST_LOG_(INFO) << "RenameTdd get result error, code:" << ret; } EXPECT_NE(newFile.ToString(), ""); - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_RenameTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_RenameTdd"; } /** @@ -1585,7 +1600,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0006, testing::ext::Tes GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0006"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri[4] = {Uri(""), Uri(""), Uri(""), Uri("")}; @@ -1593,13 +1608,13 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0006, testing::ext::Tes std::string displayName1[4] = {"test11.txt", "test22.txt", "test33.txt", "test44.txt"}; Uri renameUri(""); for (int j = 0; j < 4; j++) { - result = fah->CreateFile(newDirUriTest, displayName[j], testUri[j]); + result = g_fah->CreateFile(newDirUriTest, displayName[j], testUri[j]); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::thread Rename_Thread(RenameTdd, fah, testUri[j], displayName1[j], renameUri); + std::thread Rename_Thread(RenameTdd, g_fah, testUri[j], displayName1[j], renameUri); Rename_Thread.detach(); } - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1621,11 +1636,11 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0000, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0000"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0000.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); FileInfo fileInfo; @@ -1634,12 +1649,12 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0000, testing::ext::T int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter; - result = fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_GT(fileInfoVec.size(), 0); GTEST_LOG_(INFO) << "ListFile_0000 result:" << fileInfoVec.size() << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1667,7 +1682,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0001, testing::ext::T int64_t maxCount = 1000; vector fileInfoVec; FileFilter filter({}, {}, {}, 0, 0, false, false); - int result = fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + int result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 0); GTEST_LOG_(INFO) << "ListFile_0001 result:" << fileInfoVec.size() << endl; @@ -1691,11 +1706,11 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0002, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0002"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest, "test.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); @@ -1705,12 +1720,12 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0002, testing::ext::T int64_t maxCount = 1000; vector fileInfoVec; FileFilter filter({}, {}, {}, 0, 0, false, false); - result = fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 0); GTEST_LOG_(INFO) << "ListFile_0002 result:" << fileInfoVec.size() << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1738,7 +1753,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0003, testing::ext::T int64_t maxCount = 1000; vector fileInfoVec; FileFilter filter; - int result = fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + int result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 0); GTEST_LOG_(INFO) << "ListFile_0003 result:" << fileInfoVec.size() << endl; @@ -1762,14 +1777,14 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0004, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0004"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri1(""); - result = fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0004.txt", testUri1); + result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0004.txt", testUri1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); - result = fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0004.docx", testUri2); + result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0004.docx", testUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); FileInfo fileInfo; @@ -1778,11 +1793,11 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0004, testing::ext::T int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter({".txt"}, {}, {}, 0, 0, false, true); - result = fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 1); - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1799,7 +1814,7 @@ void ListFileTdd(shared_ptr fahs, FileInfo fileInfo, int offse GTEST_LOG_(INFO) << "ListFileTdd get result error, code:" << ret; } EXPECT_EQ(fileInfoVec.size(), 1); - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_ListFileTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_ListFileTdd"; } /** @@ -1816,14 +1831,14 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0005, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0005"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "test", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri1(""); - result = fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0005.txt", testUri1); + result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0005.txt", testUri1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); - result = fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0005.docx", testUri2); + result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0005.docx", testUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); FileInfo fileInfo; @@ -1833,11 +1848,11 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0005, testing::ext::T std::vector fileInfoVec; FileFilter filter({".txt"}, {}, {}, 0, 0, false, true); for (int j = 0; j < 4; j++) { - std::thread ListFile_Thread(ListFileTdd, fah, fileInfo, offset, maxCount, filter, fileInfoVec); + std::thread ListFile_Thread(ListFileTdd, g_fah, fileInfo, offset, maxCount, filter, fileInfoVec); ListFile_Thread.detach(); } - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1859,26 +1874,26 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0000, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0000"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "Download", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "Download", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); FileInfo fileInfo; - result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.q1w2e3r4", testUri); + result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.q1w2e3r4", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); fileInfo.uri = "datashare:///media/root"; int64_t offset = 0; int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter({".q1w2e3r4"}, {}, {}, 0, 0, false, true); - result = fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + result = g_fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_GE(fileInfoVec.size(), 1); GTEST_LOG_(INFO) << "ScanFile_0000 result:" << fileInfoVec.size() << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1900,26 +1915,26 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0001, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0001"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "Download", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "Download", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); FileInfo fileInfo; fileInfo.uri = "datashare:///media/root"; - result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0001.q1w2e3r4", testUri); + result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0001.q1w2e3r4", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0001.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0001.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int64_t offset = 0; int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter({}, {}, {}, 0, 0, false, false); - result = fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + result = g_fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_GE(fileInfoVec.size(), 2); GTEST_LOG_(INFO) << "ScanFile_0000 result:" << fileInfoVec.size() << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1941,15 +1956,15 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0002, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0002"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "Download", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "Download", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0002.q1w2e3r4", testUri); + result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0002.q1w2e3r4", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.docx", testUri); + result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.docx", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); FileInfo fileInfo; fileInfo.uri = newDirUriTest.ToString(); @@ -1957,16 +1972,16 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0002, testing::ext::T int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter({".q1w2e3r4"}, {}, {}, 0, 0, false, true); - result = fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + result = g_fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 1); FileFilter filter1({".q1w2e3r4", ".txt"}, {}, {}, 0, 0, false, true); - result = fah->ScanFile(fileInfo, offset, maxCount, filter1, fileInfoVec); + result = g_fah->ScanFile(fileInfo, offset, maxCount, filter1, fileInfoVec); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 2); GTEST_LOG_(INFO) << "ScanFile_0002 result:" << fileInfoVec.size() << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -1988,11 +2003,11 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0003, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0003"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "Download", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "Download", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0003.q1w2e3r4", testUri); + result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0003.q1w2e3r4", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); FileInfo fileInfo; fileInfo.uri = newDirUriTest.ToString(); @@ -2000,12 +2015,12 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0003, testing::ext::T int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter({".q1w2e3r4"}, {}, {}, 0, 0, false, true); - result = fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + result = g_fah->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 1); GTEST_LOG_(INFO) << "ScanFile_0003 result:" << fileInfoVec.size() << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -2022,13 +2037,13 @@ void ScanFileTdd(shared_ptr fahs, FileInfo fileInfo, int offse GTEST_LOG_(INFO) << "ScanFileTdd get result error, code:" << ret; } EXPECT_EQ(fileInfoVec.size(), 1); - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_ScanFileTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_ScanFileTdd"; } /** * @tc.number: user_file_service_file_access_helper_ScanFile_0004 * @tc.name: file_access_helper_ScanFile_0004 - * @tc.desc: Test function of ScanFile interface for SUCCESS which Concurrent. + * @tc.desc: Test function of ScanFile interface for SUCCESS which scan root directory with Concurrent. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 @@ -2039,14 +2054,14 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0004, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0004"; try { Uri newDirUriTest(""); - int result = fah->Mkdir(g_newDirUri, "Download", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "Download", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); FileInfo fileInfo; - result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.q1w2e3r4", testUri); + result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.q1w2e3r4", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); fileInfo.uri = "datashare:///media/root"; int64_t offset = 0; @@ -2054,11 +2069,11 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0004, testing::ext::T std::vector fileInfoVec; FileFilter filter({".q1w2e3r4"}, {}, {}, 0, 0, false, true); for (int j = 0; j < 4; j++) { - std::thread ScanFile_Thread(ScanFileTdd, fah, fileInfo, offset, maxCount, filter, fileInfoVec); + std::thread ScanFile_Thread(ScanFileTdd, g_fah, fileInfo, offset, maxCount, filter, fileInfoVec); ScanFile_Thread.detach(); } - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -2082,7 +2097,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_GetRoots_0000, testing::ext::T uint64_t selfTokenId_ = GetSelfTokenID(); vector info; - int result = fah->GetRoots(info); + int result = g_fah->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_GT(info.size(), 0); diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index 57740a0e..115ca480 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -30,10 +30,8 @@ using namespace std; using namespace OHOS; using namespace FileAccessFwk; int ABILITY_ID = 5003; -shared_ptr fah = nullptr; -OHOS::Security::AccessToken::AccessTokenID tokenId; -int UID_TRANSFORM_TMP = 20000000; -int UID_DEFAULT = 0; +shared_ptr g_fah = nullptr; +OHOS::Security::AccessToken::AccessTokenID g_tokenId; // permission state OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState = { @@ -120,9 +118,7 @@ public: auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); AAFwk::Want want; vector wantVec; - setuid(UID_TRANSFORM_TMP); int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(wantVec); - setuid(UID_DEFAULT); EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); bool sus = false; for (size_t i = 0; i < wantVec.size(); i++) { @@ -136,18 +132,18 @@ public: } EXPECT_TRUE(sus); vector wants {want}; - fah = FileAccessHelper::Creator(remoteObj, wants); + g_fah = FileAccessHelper::Creator(remoteObj, wants); OHOS::Security::AccessToken::AccessTokenIDEx tokenIdEx = {0}; tokenIdEx = OHOS::Security::AccessToken::AccessTokenKit::AllocHapToken (g_infoManagerTestInfoParms, g_infoManagerTestPolicyPrams); - tokenId = tokenIdEx.tokenIdExStruct.tokenID; - SetSelfTokenID(tokenId); + g_tokenId = tokenIdEx.tokenIdExStruct.tokenID; + SetSelfTokenID(g_tokenId); } static void TearDownTestCase() { - fah->Release(); - fah = nullptr; - OHOS::Security::AccessToken::AccessTokenKit::DeleteToken(tokenId); + g_fah->Release(); + g_fah = nullptr; + OHOS::Security::AccessToken::AccessTokenKit::DeleteToken(g_tokenId); }; void SetUp() {}; void TearDown() {}; @@ -168,27 +164,27 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0000, testing:: try { vector info; - int result = fah->GetRoots(info); + 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); GTEST_LOG_(INFO) << parentUri.ToString(); Uri newDirUriTest1(""); - result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); - result = fah->CreateFile(newDirUriTest1, "file_extension_helper_OpenFile_0000.txt", newFileUri); + result = g_fah->CreateFile(newDirUriTest1, "file_extension_helper_OpenFile_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = fah->OpenFile(newFileUri, 0, fd); + result = g_fah->OpenFile(newFileUri, 0, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; - result = fah->Delete(newDirUriTest1); + result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -212,7 +208,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0001, testing:: try { Uri uri(""); int fd; - int result = fah->OpenFile(uri, 0, fd); + int result = g_fah->OpenFile(uri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0001 result:" << result << endl; } catch (...) { @@ -235,21 +231,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0002, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0002"; try { vector info; - int result = fah->GetRoots(info); + 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 newFileUri(""); - result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0002.txt", newFileUri); + result = g_fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0002.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri uri("storage/media/100/local/files/Download/file_extension_helper_OpenFile_0002.txt"); int fd; - result = fah->OpenFile(uri, 0, fd); + result = g_fah->OpenFile(uri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0002 result:" << result << endl; - result = fah->Delete(newFileUri); + result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -273,7 +269,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0003, testing:: try { Uri uri("~!@#$%^&*()_"); int fd; - int result = fah->OpenFile(uri, 0, fd); + int result = g_fah->OpenFile(uri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0003 result:" << result << endl; } catch (...) { @@ -296,20 +292,20 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0004, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0004"; try { vector info; - int result = fah->GetRoots(info); + 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 newFileUri(""); - result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0004.txt", newFileUri); + result = g_fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0004.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = fah->OpenFile(newFileUri, -1, fd); + result = g_fah->OpenFile(newFileUri, -1, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0004 result:" << result << endl; - result = fah->Delete(newFileUri); + result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -332,20 +328,20 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0005, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0005"; try { vector info; - int result = fah->GetRoots(info); + 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 newFileUri(""); - result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0005.txt", newFileUri); + result = g_fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0005.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = fah->OpenFile(newFileUri, 1, fd); + result = g_fah->OpenFile(newFileUri, 1, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0005 result:" << result << endl; - result = fah->Delete(newFileUri); + result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -368,20 +364,20 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0006, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0006"; try { vector info; - int result = fah->GetRoots(info); + 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 newFileUri(""); - result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0006.txt", newFileUri); + result = g_fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0006.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = fah->OpenFile(newFileUri, 2, fd); + result = g_fah->OpenFile(newFileUri, 2, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0006 result:" << result << endl; - result = fah->Delete(newFileUri); + result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -392,12 +388,12 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0006, testing:: void OpenFileTdd(shared_ptr fahs, Uri uri, int flags, int fd) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFileTdd"; int ret = fahs->OpenFile(uri, flags, fd); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "OpenFile get result error, code:" << ret; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_OpenFileTdd"; } /** @@ -414,23 +410,23 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0007, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0007"; try { vector info; - int result = fah->GetRoots(info); + 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 newFileUri(""); - result = fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0007.txt", newFileUri); + result = g_fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0007.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int flags; int fd[4]; for (size_t j = 0; j< 4; j++) { - std::thread OpenFile_Thread(OpenFileTdd, fah, newFileUri, flags, fd[j]); + std::thread OpenFile_Thread(OpenFileTdd, g_fah, newFileUri, flags, fd[j]); OpenFile_Thread.detach(); EXPECT_GE(fd[j], OHOS::FileAccessFwk::ERR_OK); } - result = fah->Delete(newFileUri); + result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -453,16 +449,16 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0000, testing GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0000"; try { vector info; - int result = fah->GetRoots(info); + 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 newFileUri(""); - result = fah->CreateFile(parentUri, "file_extension_helper_CreateFile_0000.txt", newFileUri); + result = g_fah->CreateFile(parentUri, "file_extension_helper_CreateFile_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0000 result:" << result << endl; - result = fah->Delete(newFileUri); + result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -486,7 +482,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0001, testing try { Uri newFileUri(""); Uri parentUri(""); - int result = fah->CreateFile(parentUri, "file_extension_helper_CreateFile_0001.txt", newFileUri); + int result = g_fah->CreateFile(parentUri, "file_extension_helper_CreateFile_0001.txt", newFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0001 result:" << result << endl; } catch (...) { @@ -510,7 +506,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0002, testing try { Uri newFileUri(""); Uri parentUri("storage/media/100/local/files/Download"); - int result = fah->CreateFile(parentUri, "file_extension_helper_CreateFile_0002.txt", newFileUri); + int result = g_fah->CreateFile(parentUri, "file_extension_helper_CreateFile_0002.txt", newFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0002 result:" << result << endl; } catch (...) { @@ -534,7 +530,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0003, testing try { Uri newFileUri(""); Uri parentUri("~!@#$%^&*()_"); - int result = fah->CreateFile(parentUri, "file_extension_helper_CreateFile_0003.txt", newFileUri); + int result = g_fah->CreateFile(parentUri, "file_extension_helper_CreateFile_0003.txt", newFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0003 result:" << result << endl; } catch (...) { @@ -557,13 +553,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0004, testing GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0004"; try { vector info; - int result = fah->GetRoots(info); + 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 newFileUri(""); string displayName = ""; - result = fah->CreateFile(parentUri, displayName, newFileUri); + result = g_fah->CreateFile(parentUri, displayName, newFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0004 result:" << result << endl; } @@ -581,9 +577,9 @@ void CreateFileTdd(shared_ptr fahs, Uri uri, std::string displ GTEST_LOG_(INFO) << "CreateFileTdd get result error, code:" << ret; } EXPECT_NE(newFile.ToString(), ""); - ret = fah->Delete(newFile); + ret = fahs->Delete(newFile); EXPECT_GE(ret, OHOS::FileAccessFwk::ERR_OK); - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFileTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_CreateFileTdd"; } /** @@ -600,14 +596,14 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0005, testing GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0005"; try { vector info; - int result = fah->GetRoots(info); + 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 newFileUri(""); std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; for (int j = 0; j < 1; j++) { - std::thread CreateFile_Thread(CreateFileTdd, fah, parentUri, displayName[j], newFileUri); + std::thread CreateFile_Thread(CreateFileTdd, g_fah, parentUri, displayName[j], newFileUri); CreateFile_Thread.detach(); } GTEST_LOG_(INFO) << "CreateFile_0005 result:" << result << endl; @@ -632,16 +628,16 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0000, testing::ext GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0000"; try { vector info; - int result = fah->GetRoots(info); + 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(""); - result = fah->Mkdir(parentUri, "file_extension_helper_Mkdir_0000", newDirUriTest); + result = g_fah->Mkdir(parentUri, "file_extension_helper_Mkdir_0000", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0000 result:" << result << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -665,7 +661,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0001, testing::ext try { Uri newDirUriTest(""); Uri parentUri(""); - int result = fah->Mkdir(parentUri, "file_extension_helper_Mkdir_0001", newDirUriTest); + int result = g_fah->Mkdir(parentUri, "file_extension_helper_Mkdir_0001", newDirUriTest); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0001 result:" << result << endl; } catch (...) { @@ -689,7 +685,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0002, testing::ext try { Uri newDirUriTest(""); Uri parentUri("storage/media/100/local/files/Download"); - int result = fah->Mkdir(parentUri, "file_extension_helper_Mkdir_0002", newDirUriTest); + int result = g_fah->Mkdir(parentUri, "file_extension_helper_Mkdir_0002", newDirUriTest); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0002 result:" << result << endl; } catch (...) { @@ -713,7 +709,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0003, testing::ext try { Uri newDirUriTest(""); Uri parentUri("~!@#$%^&*()_"); - int result = fah->Mkdir(parentUri, "file_extension_helper_Mkdir_0003", newDirUriTest); + int result = g_fah->Mkdir(parentUri, "file_extension_helper_Mkdir_0003", newDirUriTest); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0003 result:" << result << endl; } catch (...) { @@ -736,13 +732,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0004, testing::ext GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0004"; try { vector info; - int result = fah->GetRoots(info); + 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(""); string displayName = ""; - result = fah->Mkdir(parentUri, displayName, newDirUriTest); + result = g_fah->Mkdir(parentUri, displayName, newDirUriTest); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0004 result:" << result << endl; } @@ -760,9 +756,9 @@ void MkdirTdd(shared_ptr fahs, Uri uri, std::string displayNam GTEST_LOG_(INFO) << "MkdirTdd get result error, code:" << ret; } EXPECT_NE(newFile.ToString(), ""); - ret = fah->Delete(newFile); + ret = fahs->Delete(newFile); EXPECT_GE(ret, OHOS::FileAccessFwk::ERR_OK); - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_MkdirTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_MkdirTdd"; } /** @@ -779,7 +775,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0005, testing::ext GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0005"; try { vector info; - int result = fah->GetRoots(info); + int result = g_fah->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < info.size(); i++) { @@ -787,7 +783,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0005, testing::ext Uri newDirUriTest(""); std::string displayName[4] = {"test1", "test2", "test3", "test4"}; for (int j = 0; j < 4; j++) { - std::thread Mkdir_Thread(MkdirTdd, fah, parentUri, displayName[j], newDirUriTest); + std::thread Mkdir_Thread(MkdirTdd, g_fah, parentUri, displayName[j], newDirUriTest); Mkdir_Thread.detach(); } } @@ -811,23 +807,23 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0000, testing::ex GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0000"; try { vector info; - int result = fah->GetRoots(info); + 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(""); - result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); - result = fah->CreateFile(newDirUriTest, "file_extension_helper_Delete_0000.txt", newFileUri); + result = g_fah->CreateFile(newDirUriTest, "file_extension_helper_Delete_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Delete(newFileUri); + result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0000 result:" << result << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -850,15 +846,15 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0001, testing::ex GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0001"; try { vector info; - int result = fah->GetRoots(info); + 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(""); - result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0001 result:" << result << endl; } @@ -882,7 +878,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0002, testing::ex GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0002"; try { Uri selectFileUri(""); - int result = fah->Delete(selectFileUri); + int result = g_fah->Delete(selectFileUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0002 result:" << result << endl; } catch (...) { @@ -905,19 +901,19 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0003, testing::ex GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0003"; try { vector info; - int result = fah->GetRoots(info); + 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(""); - result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri selectFileUri("storage/media/100/local/files/Download/test"); - result = fah->Delete(selectFileUri); + result = g_fah->Delete(selectFileUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0003 result:" << result << endl; } @@ -942,7 +938,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0004, testing::ex GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0004"; try { Uri selectFileUri("!@#$%^&*()"); - int result = fah->Delete(selectFileUri); + int result = g_fah->Delete(selectFileUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0004 result:" << result << endl; } catch (...) { @@ -958,7 +954,7 @@ void DeleteTdd(shared_ptr fahs, Uri selectFile) if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "DeleteTdd get result error, code:" << ret; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_DeleteTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_DeleteTdd"; } /** @@ -975,23 +971,23 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0005, testing::ex GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0005"; try { vector info; - int result = fah->GetRoots(info); + 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(""); - result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; for (int j = 0; j < 4; j++) { - result = fah->CreateFile(newDirUriTest, displayName[j], newFileUri); + result = g_fah->CreateFile(newDirUriTest, displayName[j], newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::thread Delete_Thread(DeleteTdd, fah, newFileUri); + std::thread Delete_Thread(DeleteTdd, g_fah, newFileUri); Delete_Thread.detach(); } - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1014,31 +1010,31 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0000, testing::ext: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0000"; try { vector info; - int result = fah->GetRoots(info); + 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 newDirUriTest2(""); - result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest1, "test.txt", testUri); + result = g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); - result = fah->Move(testUri, newDirUriTest2, testUri2); + result = g_fah->Move(testUri, newDirUriTest2, testUri2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0000 result:" << result << endl; - result = fah->Delete(newDirUriTest1); + result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Delete(newDirUriTest2); + result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1061,28 +1057,28 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0001, testing::ext: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0001"; try { vector info; - int result = fah->GetRoots(info); + 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 newDirUriTest2(""); - result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest1, "test.txt", testUri); + result = g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); - result = fah->Move(newDirUriTest1, newDirUriTest2, testUri2); + result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0001 result:" << result << endl; - result = fah->Delete(newDirUriTest2); + result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1105,21 +1101,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0002, testing::ext: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0002"; try { vector info; - int result = fah->GetRoots(info); + 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(""); - result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); Uri sourceFileUri(""); - result = fah->Move(sourceFileUri, newDirUriTest, testUri); + result = g_fah->Move(sourceFileUri, newDirUriTest, testUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0002 result:" << result << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1142,32 +1138,32 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0003, testing::ext: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0003"; try { vector info; - int result = fah->GetRoots(info); + 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 newDirUriTest2(""); - result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest1, "test.txt", 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"); - result = fah->Move(sourceFileUri, newDirUriTest2, testUri2); + result = g_fah->Move(sourceFileUri, newDirUriTest2, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0003 result:" << result << endl; - result = fah->Delete(newDirUriTest1); + result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Delete(newDirUriTest2); + result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1190,21 +1186,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0004, testing::ext: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0004"; try { vector info; - int result = fah->GetRoots(info); + 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(""); - result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); Uri sourceFileUri("~!@#$%^&*()_"); - result = fah->Move(sourceFileUri, newDirUriTest, testUri); + result = g_fah->Move(sourceFileUri, newDirUriTest, testUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0004 result:" << result << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1227,25 +1223,25 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0005, testing::ext: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0005"; try { vector info; - int result = fah->GetRoots(info); + 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(""); - result = fah->Mkdir(parentUri, "test1", newDirUriTest); + result = g_fah->Mkdir(parentUri, "test1", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest, "test.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); Uri targetParentUri(""); - result = fah->Move(testUri, targetParentUri, testUri2); + result = g_fah->Move(testUri, targetParentUri, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0005 result:" << result << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1268,32 +1264,32 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0006, testing::ext: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0006"; try { vector info; - int result = fah->GetRoots(info); + 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 newDirUriTest2(""); - result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest1, "test.txt", testUri); + result = g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); Uri targetParentUri("storage/media/100/local/files/Download/test2"); - result = fah->Move(testUri, targetParentUri, testUri2); + result = g_fah->Move(testUri, targetParentUri, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0006 result:" << result << endl; - result = fah->Delete(newDirUriTest1); + result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Delete(newDirUriTest2); + result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1316,32 +1312,32 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0007, testing::ext: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0007"; try { vector info; - int result = fah->GetRoots(info); + 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 newDirUriTest2(""); - result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest1, "test.txt", testUri); + result = g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); Uri targetParentUri("~!@#$^%&*()_"); - result = fah->Move(testUri, targetParentUri, testUri2); + result = g_fah->Move(testUri, targetParentUri, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0007 result:" << result << endl; - result = fah->Delete(newDirUriTest1); + result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Delete(newDirUriTest2); + result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1364,24 +1360,24 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0008, testing::ext: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0008"; try { vector info; - int result = fah->GetRoots(info); + 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 newDirUriTest2(""); - result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->Move(newDirUriTest1, newDirUriTest2, testUri); + result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0008 result:" << result << endl; - result = fah->Delete(newDirUriTest2); + result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1404,31 +1400,31 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0009, testing::ext: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0009"; try { vector info; - int result = fah->GetRoots(info); + 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 newDirUriTest2(""); - result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); for (size_t j = 0; j < 2000; j++) { string fileName = "test" + ToString(j) + ".txt"; - fah->CreateFile(newDirUriTest1, fileName, testUri); + g_fah->CreateFile(newDirUriTest1, fileName, testUri); } Uri testUri2(""); - result = fah->Move(newDirUriTest1, newDirUriTest2, testUri2); + result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0009 result:" << result << endl; - result = fah->Delete(newDirUriTest2); + result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1451,31 +1447,31 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0010, testing::ext: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0010"; try { vector info; - int result = fah->GetRoots(info); + 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 newDirUriTest2(""); - result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - fah->Mkdir(newDirUriTest1, "test", testUri); + g_fah->Mkdir(newDirUriTest1, "test", testUri); for (size_t j = 0; j < 64; j++) { - fah->Mkdir(testUri, "test", testUri); + g_fah->Mkdir(testUri, "test", testUri); } Uri testUri2(""); - result = fah->Move(newDirUriTest1, newDirUriTest2, testUri2); + result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0010 result:" << result << endl; - result = fah->Delete(newDirUriTest2); + result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1498,36 +1494,36 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0011, testing::ext: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0011"; try { vector info; - int result = fah->GetRoots(info); + 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 newDirUriTest2(""); - result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - fah->CreateFile(newDirUriTest1, "test.txt", testUri); + g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); for (size_t j = i + 1; j < info.size(); j++) { Uri otherUri(info[j].uri); - result = fah->Mkdir(otherUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(otherUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Move(testUri, newDirUriTest2, testUri); + result = g_fah->Move(testUri, newDirUriTest2, testUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Move(testUri, newDirUriTest1, testUri); + result = g_fah->Move(testUri, newDirUriTest1, testUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0011 result:" << result << endl; - result = fah->Delete(newDirUriTest2); + result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } - result = fah->Delete(newDirUriTest1); + result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1543,7 +1539,7 @@ void MoveTdd(shared_ptr fahs, Uri sourceFile, Uri targetParent if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "MoveTdd get result error, code:" << ret; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_MoveTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_MoveTdd"; } /** @@ -1560,29 +1556,32 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0012, testing::ext: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0012"; try { vector info; - int result = fah->GetRoots(info); + 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 newDirUriTest2(""); - result = fah->Mkdir(parentUri, "test1", newDirUriTest1); + result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Mkdir(parentUri, "test2", newDirUriTest2); + result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri[4] = {Uri(""), Uri(""), Uri(""), Uri("")}; std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; for (int j = 0; j < 4; j++) { Uri testUri2(""); - result = fah->CreateFile(newDirUriTest1, displayName[j], testUri[j]); + result = g_fah->CreateFile(newDirUriTest1, displayName[j], testUri[j]); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::thread Move_Thread(MoveTdd, fah, testUri[j], newDirUriTest2, testUri2); + std::thread Move_Thread(MoveTdd, g_fah, testUri[j], newDirUriTest2, testUri2); Move_Thread.detach(); } - result = fah->Delete(newDirUriTest1); + result = g_fah->Delete(newDirUriTest1); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + + result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1605,24 +1604,24 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0000, testing::ex GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0000"; try { vector info; - int result = fah->GetRoots(info); + 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(""); - result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest, "test.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri renameUri(""); - result = fah->Rename(testUri, "test2.txt", renameUri); + result = g_fah->Rename(testUri, "test2.txt", renameUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0000 result:" << result << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1645,20 +1644,20 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0001, testing::ex GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0001"; try { vector info; - int result = fah->GetRoots(info); + 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(""); - result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri renameUri(""); - result = fah->Rename(newDirUriTest, "testRename", renameUri); + result = g_fah->Rename(newDirUriTest, "testRename", renameUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0001 result:" << result << endl; - result = fah->Delete(renameUri); + result = g_fah->Delete(renameUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1682,7 +1681,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0002, testing::ex try { Uri renameUri(""); Uri sourceFileUri(""); - int result = fah->Rename(sourceFileUri, "testRename.txt", renameUri); + int result = g_fah->Rename(sourceFileUri, "testRename.txt", renameUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0002 result:" << result << endl; } catch (...) { @@ -1705,25 +1704,25 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0003, testing::ex GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0003"; try { vector info; - int result = fah->GetRoots(info); + 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(""); - result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest, "test.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri renameUri(""); Uri sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); - result = fah->Rename(sourceFileUri, "testRename.txt", renameUri); + result = g_fah->Rename(sourceFileUri, "testRename.txt", renameUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0003 result:" << result << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1747,7 +1746,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0004, testing::ex try { Uri renameUri(""); Uri sourceFileUri("~!@#$%^&*()_"); - int result = fah->Rename(sourceFileUri, "testRename.txt", renameUri); + int result = g_fah->Rename(sourceFileUri, "testRename.txt", renameUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0004 result:" << result << endl; } catch (...) { @@ -1770,24 +1769,24 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0005, testing::ex GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0005"; try { vector info; - int result = fah->GetRoots(info); + 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(""); - result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest, "test.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri renameUri(""); - result = fah->Rename(testUri, "", renameUri); + result = g_fah->Rename(testUri, "", renameUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0005 result:" << result << endl; - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1803,7 +1802,7 @@ void RenameTdd(shared_ptr fahs, Uri sourceFile, std::string di if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "RenameTdd get result error, code:" << ret; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_RenameTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_RenameTdd"; } /** @@ -1820,25 +1819,25 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0006, testing::ex GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0006"; try { vector info; - int result = fah->GetRoots(info); + 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(""); - result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; Uri renameUri(""); for (int j = 0; j < 4; j++) { - result = fah->CreateFile(newDirUriTest, displayName[j], testUri); + result = g_fah->CreateFile(newDirUriTest, displayName[j], testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::thread Rename_Thread(RenameTdd, fah, testUri, displayName[j], renameUri); + std::thread Rename_Thread(RenameTdd, g_fah, testUri, displayName[j], renameUri); Rename_Thread.detach(); } - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1861,16 +1860,16 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0000, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0000"; try { vector info; - int result = fah->GetRoots(info); + 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(""); - result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest, "file_extension_helper_ListFile_0000.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "file_extension_helper_ListFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); FileInfo fileInfo; @@ -1879,11 +1878,11 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0000, testing:: int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter; - result = fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_GT(fileInfoVec.size(), 0); - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1912,7 +1911,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0001, testing:: int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter; - int result = fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + int result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 0); } catch (...) { @@ -1935,16 +1934,16 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0002, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0002"; try { vector info; - int result = fah->GetRoots(info); + 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(""); - result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest, "test.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "test.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); @@ -1955,11 +1954,11 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0002, testing:: int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter; - result = fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 0); - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -1989,7 +1988,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0003, testing:: int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter; - int result = fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + int result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 0); } catch (...) { @@ -2006,7 +2005,7 @@ void ListFileTdd(shared_ptr fahs, FileInfo fileInfo, int offse if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "ListFile get result error, code:" << ret; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFileTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_ListFileTdd"; } /** @@ -2023,16 +2022,16 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0004, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0004"; try { vector info; - int result = fah->GetRoots(info); + 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(""); - result = fah->Mkdir(parentUri, "test", newDirUriTest); + result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = fah->CreateFile(newDirUriTest, "file_extension_helper_ListFile_0004.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "file_extension_helper_ListFile_0004.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); FileInfo fileInfo; @@ -2042,11 +2041,11 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0004, testing:: std::vector fileInfoVec; FileFilter filter; for (int j = 0; j < 4; j++) { - std::thread ListFile_Thread(ListFileTdd, fah, fileInfo, offset, maxCount, filter, fileInfoVec); + std::thread ListFile_Thread(ListFileTdd, g_fah, fileInfo, offset, maxCount, filter, fileInfoVec); ListFile_Thread.detach(); } - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { @@ -2069,7 +2068,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_GetRoots_0000, testing:: GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_GetRoots_0000"; try { vector info; - int result = fah->GetRoots(info); + int result = g_fah->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_GT(info.size(), 0); GTEST_LOG_(INFO) << "GetRoots_0000 result:" << info.size() << endl; @@ -2102,14 +2101,12 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); vector wants; - setuid(UID_TRANSFORM_TMP); int ret = FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(wants); - setuid(UID_DEFAULT); EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); shared_ptr fahs = FileAccessHelper::Creator(remoteObj, wants); vector info; - int result = fah->GetRoots(info); + 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); @@ -2146,7 +2143,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = fah->OpenFile(moveUri, 0, fd); + result = g_fah->OpenFile(moveUri, 0, fd); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; @@ -2179,33 +2176,33 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Access_0000, testing::ex uint64_t selfTokenId_ = GetSelfTokenID(); vector info; - int result = fah->GetRoots(info); + 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); GTEST_LOG_(INFO) << parentUri.ToString(); Uri newDirUriTest(""); - result = fah->Mkdir(parentUri, "test1", newDirUriTest); + result = g_fah->Mkdir(parentUri, "test1", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); - result = fah->CreateFile(newDirUriTest, "file_extension_helper_Access_0000.txt", newFileUri); + result = g_fah->CreateFile(newDirUriTest, "file_extension_helper_Access_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); bool isExist = false; - result = fah->Access(newDirUriTest, isExist); + result = g_fah->Access(newDirUriTest, isExist); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_TRUE(isExist); - result = fah->Access(newFileUri, isExist); + result = g_fah->Access(newFileUri, isExist); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_TRUE(isExist); - result = fah->Delete(newDirUriTest); + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - result = fah->Access(newDirUriTest, isExist); + result = g_fah->Access(newDirUriTest, isExist); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_FALSE(isExist); } -- Gitee From f2a2ee045364bb45351a519df99802ca1e62e863 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 8 Sep 2022 19:32:55 +0800 Subject: [PATCH 104/122] =?UTF-8?q?review=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- frameworks/innerkits/file_access/BUILD.gn | 1 + .../innerkits/file_access/include/file_access_helper.h | 1 - .../innerkits/file_access/src/file_access_helper.cpp | 10 +++++----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frameworks/innerkits/file_access/BUILD.gn b/frameworks/innerkits/file_access/BUILD.gn index 14f189dd..d094a902 100644 --- a/frameworks/innerkits/file_access/BUILD.gn +++ b/frameworks/innerkits/file_access/BUILD.gn @@ -28,6 +28,7 @@ config("ability_config") { "${ability_runtime_napi_path}/inner/napi_common", "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include", "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include", + "//foundation/bundlemanager/bundle_framework/interfaces/inner_api/appexecfwk_base/include", "//foundation/distributeddatamgr/distributedfile/interfaces/kits/js/src/common", ] diff --git a/frameworks/innerkits/file_access/include/file_access_helper.h b/frameworks/innerkits/file_access/include/file_access_helper.h index cfef03cb..23b2a152 100644 --- a/frameworks/innerkits/file_access/include/file_access_helper.h +++ b/frameworks/innerkits/file_access/include/file_access_helper.h @@ -96,7 +96,6 @@ private: static std::unordered_map wantsMap_; static std::string GetKeyOfWantsMap(const AAFwk::Want &want); - static int getUserId(); sptr callerDeathRecipient_ = nullptr; diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index d1db31b1..4420f0a5 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -15,6 +15,7 @@ #include "file_access_helper.h" +#include "bundle_constants.h" #include "bundle_mgr_proxy.h" #include "file_access_framework_errno.h" #include "hilog_wrapper.h" @@ -28,7 +29,6 @@ namespace OHOS { namespace FileAccessFwk { namespace { - static const int32_t UID_TRANSFORM_DIVISOR = 200000; static const std::string SCHEME_NAME = "datashare"; static const std::string MEDIA_BNUDLE_NAME_ALIAS = "media"; static const std::string MEDIA_BNUDLE_NAME = "com.ohos.medialibrary.medialibrarydata"; @@ -38,10 +38,10 @@ namespace { } std::unordered_map FileAccessHelper::wantsMap_; -int FileAccessHelper::getUserId() +static int getUserId() { int uid = IPCSkeleton::GetCallingUid(); - int userId = uid / UID_TRANSFORM_DIVISOR; + int userId = uid / AppExecFwk::Constants::BASE_USER_RANGE; return userId; } @@ -198,7 +198,7 @@ std::shared_ptr FileAccessHelper::Creator( std::unordered_map> cMap; std::vector extensionInfos; bool ret = bm->QueryExtensionAbilityInfos( - AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, FileAccessHelper::getUserId(), extensionInfos); + AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, getUserId(), extensionInfos); if (!ret) { HILOG_ERROR("FileAccessHelper::Creator QueryExtensionAbilityInfos failed"); return nullptr; @@ -693,7 +693,7 @@ int FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(std::vectorQueryExtensionAbilityInfos( - AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, FileAccessHelper::getUserId(), extensionInfos); + AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, getUserId(), extensionInfos); if (!ret) { HILOG_ERROR("FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo QueryExtensionAbilityInfos error"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); -- Gitee From e94239f703657925be84b1a1232cf1eae15f3154 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 8 Sep 2022 21:07:56 +0800 Subject: [PATCH 105/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9SR=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../file_access/test/file_access_helper_test.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 4d66a0bd..1559a8c8 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -1770,7 +1770,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0003, testing::ext::T * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000HB855 */ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0004, testing::ext::TestSize.Level1) { @@ -1867,7 +1867,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0005, testing::ext::T * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000HB866 */ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0000, testing::ext::TestSize.Level1) { @@ -1908,7 +1908,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0000, testing::ext::T * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000HB866 */ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0001, testing::ext::TestSize.Level1) { @@ -1949,7 +1949,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0001, testing::ext::T * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000HB866 */ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0002, testing::ext::TestSize.Level1) { @@ -1996,7 +1996,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0002, testing::ext::T * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000HB866 */ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0003, testing::ext::TestSize.Level1) { @@ -2047,7 +2047,7 @@ void ScanFileTdd(shared_ptr fahs, FileInfo fileInfo, int offse * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000HB866 */ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0004, testing::ext::TestSize.Level1) { -- Gitee From abbb9e68caf9f405ada16bbaf1a1d3b563c1fe14 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 8 Sep 2022 21:41:10 +0800 Subject: [PATCH 106/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9SR=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../test/file_extension_helper_test.cpp | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index 115ca480..d78abce8 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -1003,7 +1003,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0005, testing::ex * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0000, testing::ext::TestSize.Level1) { @@ -1050,7 +1050,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0000, testing::ext: * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0001, testing::ext::TestSize.Level1) { @@ -1094,7 +1094,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0001, testing::ext: * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0002, testing::ext::TestSize.Level1) { @@ -1179,7 +1179,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0003, testing::ext: * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0004, testing::ext::TestSize.Level1) { @@ -1216,7 +1216,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0004, testing::ext: * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0005, testing::ext::TestSize.Level1) { @@ -1257,7 +1257,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0005, testing::ext: * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0006, testing::ext::TestSize.Level1) { @@ -1305,7 +1305,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0006, testing::ext: * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0007, testing::ext::TestSize.Level1) { @@ -1353,7 +1353,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0007, testing::ext: * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0008, testing::ext::TestSize.Level1) { @@ -1393,7 +1393,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0008, testing::ext: * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0009, testing::ext::TestSize.Level1) { @@ -1440,7 +1440,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0009, testing::ext: * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0010, testing::ext::TestSize.Level1) { @@ -1487,7 +1487,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0010, testing::ext: * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0011, testing::ext::TestSize.Level1) { @@ -1597,7 +1597,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0012, testing::ext: * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0000, testing::ext::TestSize.Level1) { @@ -1637,7 +1637,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0000, testing::ex * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0001, testing::ext::TestSize.Level1) { @@ -1673,7 +1673,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0001, testing::ex * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0002, testing::ext::TestSize.Level1) { @@ -1697,7 +1697,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0002, testing::ex * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0003, testing::ext::TestSize.Level1) { @@ -1738,7 +1738,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0003, testing::ex * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0004, testing::ext::TestSize.Level1) { @@ -1762,7 +1762,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0004, testing::ex * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0005, testing::ext::TestSize.Level1) { @@ -1853,7 +1853,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0006, testing::ex * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0000, testing::ext::TestSize.Level1) { @@ -1898,7 +1898,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0000, testing:: * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0001, testing::ext::TestSize.Level1) { @@ -1927,7 +1927,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0001, testing:: * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0002, testing::ext::TestSize.Level1) { @@ -1974,7 +1974,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0002, testing:: * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0003, testing::ext::TestSize.Level1) { @@ -2061,7 +2061,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0004, testing:: * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 - * @tc.require: SR000H0386 + * @tc.require: SR000H0387 */ HWTEST_F(FileExtensionHelperTest, file_extension_helper_GetRoots_0000, testing::ext::TestSize.Level1) { -- Gitee From a445f57ed6d8b3bcd17f25fa2fad8972b12ff64d Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 8 Sep 2022 22:03:34 +0800 Subject: [PATCH 107/122] add const Signed-off-by: onexiaomin --- frameworks/innerkits/file_access/src/file_access_helper.cpp | 6 +++--- .../innerkits/file_access/test/file_access_helper_test.cpp | 6 +++--- .../file_access/test/file_extension_helper_test.cpp | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 4420f0a5..dc3f22b5 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -38,7 +38,7 @@ namespace { } std::unordered_map FileAccessHelper::wantsMap_; -static int getUserId() +static int GetUserId() { int uid = IPCSkeleton::GetCallingUid(); int userId = uid / AppExecFwk::Constants::BASE_USER_RANGE; @@ -198,7 +198,7 @@ std::shared_ptr FileAccessHelper::Creator( std::unordered_map> cMap; std::vector extensionInfos; bool ret = bm->QueryExtensionAbilityInfos( - AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, getUserId(), extensionInfos); + AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, GetUserId(), extensionInfos); if (!ret) { HILOG_ERROR("FileAccessHelper::Creator QueryExtensionAbilityInfos failed"); return nullptr; @@ -693,7 +693,7 @@ int FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(std::vectorQueryExtensionAbilityInfos( - AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, getUserId(), extensionInfos); + AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, GetUserId(), extensionInfos); if (!ret) { HILOG_ERROR("FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo QueryExtensionAbilityInfos error"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 21b1817a..125b1039 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -29,11 +29,11 @@ namespace { using namespace std; using namespace OHOS; using namespace FileAccessFwk; -int ABILITY_ID = 5003; +const int ABILITY_ID = 5003; shared_ptr fah = nullptr; Uri g_newDirUri(""); -int UID_TRANSFORM_TMP = 20000000; -int UID_DEFAULT = 0; +const int UID_TRANSFORM_TMP = 20000000; +const int UID_DEFAULT = 0; class FileAccessHelperTest : public testing::Test { public: diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index c89f2b69..9f80a915 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -28,11 +28,11 @@ namespace { using namespace std; using namespace OHOS; using namespace FileAccessFwk; -int ABILITY_ID = 5003; +const int ABILITY_ID = 5003; shared_ptr fah = nullptr; OHOS::Security::AccessToken::AccessTokenID tokenId; -int UID_TRANSFORM_TMP = 20000000; -int UID_DEFAULT = 0; +const int UID_TRANSFORM_TMP = 20000000; +const int UID_DEFAULT = 0; // permission state OHOS::Security::AccessToken::PermissionStateFull g_infoManagerTestState = { -- Gitee From 06453ec5d78c681261be85aebac4df6ff648f465 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Fri, 9 Sep 2022 11:32:09 +0800 Subject: [PATCH 108/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9review?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../test/file_access_helper_test.cpp | 48 +++++++++-------- .../test/file_extension_helper_test.cpp | 52 +++++++++++-------- 2 files changed, 56 insertions(+), 44 deletions(-) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 1559a8c8..e637488d 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -103,7 +103,7 @@ OHOS::Security::AccessToken::HapPolicyParams g_infoManagerTestPolicyPrams = { }; // hap info -OHOS::Security::AccessToken::HapInfoParams g_infoManagerTestInfoParms = { +OHOS::Security::AccessToken::HapInfoParams const g_infoManagerTestInfoParms = { .userID = 1, .bundleName = "fileAccessHelperTest", .instIndex = 0, @@ -372,6 +372,7 @@ void OpenFileTdd(shared_ptr fahs, Uri uri, int flags, int fd) { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_OpenFileTdd"; int ret = fahs->OpenFile(uri, flags, fd); + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "OpenFileTdd get result error, code:" << ret; } @@ -400,11 +401,9 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0007, testing::ext::T std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; for (int j = 0; j < 4; j++) { int result = g_fah->CreateFile(g_newDirUri, displayName[j], newFileUri); - GTEST_LOG_(INFO) << "g_newDirUri-------gf" << g_newDirUri.ToString(); - GTEST_LOG_(INFO) << "newFileUri-------gf" << newFileUri.ToString(); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::thread OpenFile_Thread(OpenFileTdd, g_fah, newFileUri, flags, fd); - OpenFile_Thread.detach(); + std::thread execthread(OpenFileTdd, g_fah, newFileUri, flags, fd); + execthread.join(); } } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -538,6 +537,7 @@ void CreateFileTdd(shared_ptr fahs, Uri parent, std::string di { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_CreateFileTdd"; int ret = fahs->CreateFile(parent, displayName, newDir); + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret < OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "CreateFileTdd get result error, code:" << ret; } @@ -563,8 +563,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0005, testing::ext: Uri newFileUri(""); std::string displayName[4] = {"test1", "test2", "test3", "test4"}; for (int j = 0; j < 4; j++) { - std::thread CreateFile_Thread(CreateFileTdd, g_fah, g_newDirUri, displayName[j], newFileUri); - CreateFile_Thread.detach(); + std::thread execthread(CreateFileTdd, g_fah, g_newDirUri, displayName[j], newFileUri); + execthread.join(); } } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -698,6 +698,7 @@ void MkdirTdd(shared_ptr fahs, Uri parent, std::string display { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_MkdirTdd"; int ret = fahs->Mkdir(parent, displayName, newDir); + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret < OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "MkdirTdd get result error, code:" << ret; } @@ -723,8 +724,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0005, testing::ext::Test Uri newDirUriTest(""); std::string displayName[4] = {"test1", "test2", "test3", "test4"}; for (int j = 0; j < 4; j++) { - std::thread Mkdir_Thread(MkdirTdd, g_fah, g_newDirUri, displayName[j], newDirUriTest); - Mkdir_Thread.detach(); + std::thread execthread(MkdirTdd, g_fah, g_newDirUri, displayName[j], newDirUriTest); + execthread.join(); } } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; @@ -871,6 +872,7 @@ void DeleteTdd(shared_ptr fahs, Uri selectFile) { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_DeleteTdd"; int ret = fahs->Delete(selectFile); + EXPECT_GE(ret, OHOS::FileAccessFwk::ERR_OK); if (ret < OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "DeleteTdd get result error, code:" << ret; } @@ -898,14 +900,14 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0005, testing::ext::Tes result = g_fah->CreateFile(newDirUriTest, "file_access_helper_Delete_0005.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri[4] = {Uri(""), Uri(""), Uri(""), Uri("")}; + Uri testUri(""); std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; Uri testUri2(""); for (int j = 0; j < 4; j++) { - result = g_fah->CreateFile(newDirUriTest, displayName[j], testUri[j]); + result = g_fah->CreateFile(newDirUriTest, displayName[j], testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::thread Delete_Thread(DeleteTdd, g_fah, testUri[j]); - Delete_Thread.detach(); + std::thread execthread(DeleteTdd, g_fah, testUri); + execthread.join(); } result = g_fah->Delete(newDirUriTest); @@ -1345,6 +1347,7 @@ void MoveTdd(shared_ptr fahs, Uri sourceFile, Uri targetParent { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_MoveTdd"; int ret = fahs->Move(sourceFile, targetParent, newFile); + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "MoveTdd get result error, code:" << ret; } @@ -1380,8 +1383,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0011, testing::ext::TestS for (int j = 0; j < 4; j++) { result = g_fah->CreateFile(newDirUriTest1, displayName[j], testUri[j]); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::thread Move_Thread(MoveTdd, g_fah, testUri[j], newDirUriTest2, testUri2); - Move_Thread.detach(); + std::thread execthread(MoveTdd, g_fah, testUri[j], newDirUriTest2, testUri2); + execthread.join(); } result = g_fah->Delete(newDirUriTest1); @@ -1579,6 +1582,7 @@ void RenameTdd(shared_ptr fahs, Uri sourceFile, std::string di { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_RenameTdd"; int ret = fahs->Rename(sourceFile, displayName, newFile); + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "RenameTdd get result error, code:" << ret; } @@ -1610,8 +1614,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0006, testing::ext::Tes for (int j = 0; j < 4; j++) { result = g_fah->CreateFile(newDirUriTest, displayName[j], testUri[j]); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::thread Rename_Thread(RenameTdd, g_fah, testUri[j], displayName1[j], renameUri); - Rename_Thread.detach(); + std::thread execthread(RenameTdd, g_fah, testUri[j], displayName1[j], renameUri); + execthread.join(); } result = g_fah->Delete(newDirUriTest); @@ -1810,6 +1814,7 @@ void ListFileTdd(shared_ptr fahs, FileInfo fileInfo, int offse { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_ListFileTdd"; int ret = fahs->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "ListFileTdd get result error, code:" << ret; } @@ -1848,8 +1853,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0005, testing::ext::T std::vector fileInfoVec; FileFilter filter({".txt"}, {}, {}, 0, 0, false, true); for (int j = 0; j < 4; j++) { - std::thread ListFile_Thread(ListFileTdd, g_fah, fileInfo, offset, maxCount, filter, fileInfoVec); - ListFile_Thread.detach(); + std::thread execthread(ListFileTdd, g_fah, fileInfo, offset, maxCount, filter, fileInfoVec); + execthread.join(); } result = g_fah->Delete(newDirUriTest); @@ -2033,6 +2038,7 @@ void ScanFileTdd(shared_ptr fahs, FileInfo fileInfo, int offse { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFileTdd"; int ret = fahs->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "ScanFileTdd get result error, code:" << ret; } @@ -2069,8 +2075,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0004, testing::ext::T std::vector fileInfoVec; FileFilter filter({".q1w2e3r4"}, {}, {}, 0, 0, false, true); for (int j = 0; j < 4; j++) { - std::thread ScanFile_Thread(ScanFileTdd, g_fah, fileInfo, offset, maxCount, filter, fileInfoVec); - ScanFile_Thread.detach(); + std::thread execthread(ScanFileTdd, g_fah, fileInfo, offset, maxCount, filter, fileInfoVec); + execthread.join(); } result = g_fah->Delete(newDirUriTest); diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index d78abce8..cc26c72b 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -101,7 +101,7 @@ OHOS::Security::AccessToken::HapPolicyParams g_infoManagerTestPolicyPrams = { }; // hap info -OHOS::Security::AccessToken::HapInfoParams g_infoManagerTestInfoParms = { +OHOS::Security::AccessToken::HapInfoParams const g_infoManagerTestInfoParms = { .userID = 1, .bundleName = "FileExtensionHelperTest", .instIndex = 0, @@ -390,9 +390,13 @@ void OpenFileTdd(shared_ptr fahs, Uri uri, int flags, int fd) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFileTdd"; int ret = fahs->OpenFile(uri, flags, fd); + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "OpenFile get result error, code:" << ret; } + EXPECT_GE(fd, OHOS::FileAccessFwk::ERR_OK); + ret = fahs->Delete(uri); + EXPECT_GE(ret, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_OpenFileTdd"; } @@ -415,19 +419,15 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0007, testing:: for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newFileUri(""); - result = g_fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0007.txt", newFileUri); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - int flags; int fd[4]; + std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; for (size_t j = 0; j< 4; j++) { - std::thread OpenFile_Thread(OpenFileTdd, g_fah, newFileUri, flags, fd[j]); - OpenFile_Thread.detach(); - EXPECT_GE(fd[j], OHOS::FileAccessFwk::ERR_OK); + result = g_fah->CreateFile(parentUri, displayName[j], newFileUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + std::thread execthread(OpenFileTdd, g_fah, newFileUri, flags, fd[j]); + execthread.join(); } - - result = g_fah->Delete(newFileUri); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; @@ -573,6 +573,7 @@ void CreateFileTdd(shared_ptr fahs, Uri uri, std::string displ { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFileTdd"; int ret = fahs->CreateFile(uri, displayName, newFile); + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "CreateFileTdd get result error, code:" << ret; } @@ -603,8 +604,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0005, testing Uri newFileUri(""); std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; for (int j = 0; j < 1; j++) { - std::thread CreateFile_Thread(CreateFileTdd, g_fah, parentUri, displayName[j], newFileUri); - CreateFile_Thread.detach(); + std::thread execthread(CreateFileTdd, g_fah, parentUri, displayName[j], newFileUri); + execthread.join(); } GTEST_LOG_(INFO) << "CreateFile_0005 result:" << result << endl; } @@ -752,6 +753,7 @@ void MkdirTdd(shared_ptr fahs, Uri uri, std::string displayNam { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_MkdirTdd"; int ret = fahs->Mkdir(uri, displayName, newFile); + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "MkdirTdd get result error, code:" << ret; } @@ -777,14 +779,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0005, testing::ext vector info; 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(""); std::string displayName[4] = {"test1", "test2", "test3", "test4"}; for (int j = 0; j < 4; j++) { - std::thread Mkdir_Thread(MkdirTdd, g_fah, parentUri, displayName[j], newDirUriTest); - Mkdir_Thread.detach(); + std::thread execthread(MkdirTdd, g_fah, parentUri, displayName[j], newDirUriTest); + execthread.join(); } } } catch (...) { @@ -951,6 +952,7 @@ void DeleteTdd(shared_ptr fahs, Uri selectFile) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_DeleteTdd"; int ret = fahs->Delete(selectFile); + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "DeleteTdd get result error, code:" << ret; } @@ -984,9 +986,10 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0005, testing::ex for (int j = 0; j < 4; j++) { result = g_fah->CreateFile(newDirUriTest, displayName[j], newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::thread Delete_Thread(DeleteTdd, g_fah, newFileUri); - Delete_Thread.detach(); + std::thread execthread(DeleteTdd, g_fah, newFileUri); + execthread.join(); } + result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } @@ -1536,6 +1539,7 @@ void MoveTdd(shared_ptr fahs, Uri sourceFile, Uri targetParent { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_MoveTdd"; int ret = fahs->Move(sourceFile, targetParent, newFile); + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "MoveTdd get result error, code:" << ret; } @@ -1574,8 +1578,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0012, testing::ext: Uri testUri2(""); result = g_fah->CreateFile(newDirUriTest1, displayName[j], testUri[j]); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::thread Move_Thread(MoveTdd, g_fah, testUri[j], newDirUriTest2, testUri2); - Move_Thread.detach(); + std::thread execthread(MoveTdd, g_fah, testUri[j], newDirUriTest2, testUri2); + execthread.join(); } result = g_fah->Delete(newDirUriTest1); @@ -1799,6 +1803,7 @@ void RenameTdd(shared_ptr fahs, Uri sourceFile, std::string di { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_RenameTdd"; int ret = fahs->Rename(sourceFile, displayName, newFile); + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "RenameTdd get result error, code:" << ret; } @@ -1833,8 +1838,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0006, testing::ex for (int j = 0; j < 4; j++) { result = g_fah->CreateFile(newDirUriTest, displayName[j], testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::thread Rename_Thread(RenameTdd, g_fah, testUri, displayName[j], renameUri); - Rename_Thread.detach(); + std::thread execthread(RenameTdd, g_fah, testUri, displayName[j], renameUri); + execthread.join(); } result = g_fah->Delete(newDirUriTest); @@ -2002,6 +2007,7 @@ void ListFileTdd(shared_ptr fahs, FileInfo fileInfo, int offse { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFileTdd"; int ret = fahs->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "ListFile get result error, code:" << ret; } @@ -2041,8 +2047,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0004, testing:: std::vector fileInfoVec; FileFilter filter; for (int j = 0; j < 4; j++) { - std::thread ListFile_Thread(ListFileTdd, g_fah, fileInfo, offset, maxCount, filter, fileInfoVec); - ListFile_Thread.detach(); + std::thread execthread(ListFileTdd, g_fah, fileInfo, offset, maxCount, filter, fileInfoVec); + execthread.join(); } result = g_fah->Delete(newDirUriTest); -- Gitee From b651c344612299e11e1005b9f25458e6cab71a50 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Tue, 13 Sep 2022 21:34:49 +0800 Subject: [PATCH 109/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9review?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../test/file_access_helper_test.cpp | 163 ++++++++++++------ .../test/file_extension_helper_test.cpp | 110 +++++++----- 2 files changed, 182 insertions(+), 91 deletions(-) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index 3ae1111c..e6848f62 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -31,6 +31,7 @@ using namespace std; using namespace OHOS; using namespace FileAccessFwk; const int ABILITY_ID = 5003; +int g_num = 0; shared_ptr g_fah = nullptr; OHOS::Security::AccessToken::AccessTokenID g_tokenId; Uri g_newDirUri(""); @@ -141,12 +142,13 @@ public: g_fah = FileAccessHelper::Creator(remoteObj, wants); OHOS::Security::AccessToken::AccessTokenIDEx tokenIdEx = {0}; - tokenIdEx = OHOS::Security::AccessToken::AccessTokenKit::AllocHapToken - (g_infoManagerTestInfoParms, g_infoManagerTestPolicyPrams); + tokenIdEx = OHOS::Security::AccessToken::AccessTokenKit::AllocHapToken( + g_infoManagerTestInfoParms, g_infoManagerTestPolicyPrams); g_tokenId = tokenIdEx.tokenIdExStruct.tokenID; SetSelfTokenID(g_tokenId); } - static void TearDownTestCase() { + static void TearDownTestCase() + { g_fah->Release(); g_fah = nullptr; OHOS::Security::AccessToken::AccessTokenKit::DeleteToken(g_tokenId); @@ -177,11 +179,29 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0000, testing::ext::T GTEST_LOG_(INFO) << parentUri.ToString(); } - result = g_fah->Mkdir(parentUri, "Download", g_newDirUri); - EXPECT_LE(result, OHOS::FileAccessFwk::ERR_OK); - g_newDirUri = Uri("datashare:///media/file/1"); + bool isExist = false; + g_fah->Access(g_newDirUri, isExist); + if (!isExist) { + result = g_fah->Mkdir(parentUri, "Download", g_newDirUri); + EXPECT_LE(result, OHOS::FileAccessFwk::ERR_OK); + } + + Uri newDirUriTest("datashare:///media/root/file"); + FileInfo fileInfo; + fileInfo.uri = newDirUriTest.ToString(); + int64_t offset = 0; + int64_t maxCount = 1000; + std::vector fileInfoVec; + FileFilter filter; + result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_GE(fileInfoVec.size(), 0); + for (size_t i = 0; i < fileInfoVec.size(); i++) { + if (fileInfoVec[i].fileName.compare("Download") == 0) { + g_newDirUri = Uri(fileInfoVec[i].uri); + } + } - Uri newDirUriTest(""); result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -376,13 +396,13 @@ void OpenFileTdd(shared_ptr fahs, Uri uri, int flags, int fd) { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_OpenFileTdd"; int ret = fahs->OpenFile(uri, flags, fd); - EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "OpenFileTdd get result error, code:" << ret; + return; } + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_GE(fd, 0); - int result = fahs->Delete(uri); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + g_num++; GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_OpenFileTdd"; } @@ -402,13 +422,18 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0007, testing::ext::T Uri newFileUri(""); int flags = 0; int fd; - std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; + g_num = 0; + std::string displayName = "test1.txt"; + int result = g_fah->CreateFile(g_newDirUri, displayName, newFileUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (int j = 0; j < 4; j++) { - int result = g_fah->CreateFile(g_newDirUri, displayName[j], newFileUri); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); std::thread execthread(OpenFileTdd, g_fah, newFileUri, flags, fd); execthread.join(); } + + EXPECT_EQ(g_num, 4); + result = g_fah->Delete(newFileUri); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } @@ -541,13 +566,13 @@ void CreateFileTdd(shared_ptr fahs, Uri parent, std::string di { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_CreateFileTdd"; int ret = fahs->CreateFile(parent, displayName, newDir); - EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret < OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "CreateFileTdd get result error, code:" << ret; + return; } + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_NE(newDir.ToString(), ""); - int result = fahs->Delete(newDir); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + g_num++; GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_CreateFileTdd"; } @@ -564,12 +589,24 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0005, testing::ext: { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_CreateFile_0005"; try { - Uri newFileUri(""); - std::string displayName[4] = {"test1", "test2", "test3", "test4"}; + Uri newFileUri1(""); + Uri newFileUri2(""); + Uri newFileUri3(""); + std::string displayName1 = "test1"; + std::string displayName2 = "test2"; + int result = g_fah->Mkdir(g_newDirUri, displayName1, newFileUri1); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + result = g_fah->Mkdir(newFileUri1, displayName2, newFileUri2); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + g_num = 0; for (int j = 0; j < 4; j++) { - std::thread execthread(CreateFileTdd, g_fah, g_newDirUri, displayName[j], newFileUri); + std::thread execthread(CreateFileTdd, g_fah, newFileUri2, displayName2, newFileUri3); execthread.join(); } + EXPECT_EQ(g_num, 1); + GTEST_LOG_(INFO) << "g_newDirUri.ToString() =" << g_newDirUri.ToString() ; + result = g_fah->Delete(newFileUri1); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } @@ -702,13 +739,13 @@ void MkdirTdd(shared_ptr fahs, Uri parent, std::string display { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_MkdirTdd"; int ret = fahs->Mkdir(parent, displayName, newDir); - EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret < OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "MkdirTdd get result error, code:" << ret; + return; } + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_NE(newDir.ToString(), ""); - int result = fahs->Delete(newDir); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + g_num++; GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_MkdirTdd"; } @@ -725,12 +762,24 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0005, testing::ext::Test { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Mkdir_0005"; try { - Uri newDirUriTest(""); - std::string displayName[4] = {"test1", "test2", "test3", "test4"}; + Uri newFileUri1(""); + Uri newFileUri2(""); + Uri newFileUri3(""); + std::string displayName1 = "test1"; + std::string displayName2 = "test2"; + std::string displayName3 = "test3"; + int result = g_fah->Mkdir(g_newDirUri, displayName1, newFileUri1); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + result = g_fah->Mkdir(newFileUri1, displayName2, newFileUri2); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + g_num = 0; for (int j = 0; j < 4; j++) { - std::thread execthread(MkdirTdd, g_fah, g_newDirUri, displayName[j], newDirUriTest); + std::thread execthread(MkdirTdd, g_fah, newFileUri2, displayName3, newFileUri3); execthread.join(); } + EXPECT_EQ(g_num, 1); + result = g_fah->Delete(newFileUri1); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } @@ -876,10 +925,12 @@ void DeleteTdd(shared_ptr fahs, Uri selectFile) { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_DeleteTdd"; int ret = fahs->Delete(selectFile); - EXPECT_GE(ret, OHOS::FileAccessFwk::ERR_OK); if (ret < OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "DeleteTdd get result error, code:" << ret; + return; } + EXPECT_GE(ret, OHOS::FileAccessFwk::ERR_OK); + g_num++; GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_DeleteTdd"; } @@ -905,15 +956,17 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0005, testing::ext::Tes EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; + std::string displayName = "test1.txt"; Uri testUri2(""); + result = g_fah->CreateFile(newDirUriTest, displayName, testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + g_num = 0; for (int j = 0; j < 4; j++) { - result = g_fah->CreateFile(newDirUriTest, displayName[j], testUri); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); std::thread execthread(DeleteTdd, g_fah, testUri); execthread.join(); } + EXPECT_EQ(g_num, 1); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { @@ -1351,10 +1404,11 @@ void MoveTdd(shared_ptr fahs, Uri sourceFile, Uri targetParent { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_MoveTdd"; int ret = fahs->Move(sourceFile, targetParent, newFile); - EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "MoveTdd get result error, code:" << ret; + return; } + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_NE(newFile.ToString(), ""); GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_MoveTdd"; } @@ -1380,14 +1434,13 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0011, testing::ext::TestS result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri[4] = {Uri(""), Uri(""), Uri(""), Uri("")}; - std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; - + Uri testUri{""}; Uri testUri2(""); + std::string displayName = "test1.txt"; + result = g_fah->CreateFile(newDirUriTest1, displayName, testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (int j = 0; j < 4; j++) { - result = g_fah->CreateFile(newDirUriTest1, displayName[j], testUri[j]); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::thread execthread(MoveTdd, g_fah, testUri[j], newDirUriTest2, testUri2); + std::thread execthread(MoveTdd, g_fah, testUri, newDirUriTest2, testUri2); execthread.join(); } @@ -1586,10 +1639,11 @@ void RenameTdd(shared_ptr fahs, Uri sourceFile, std::string di { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_RenameTdd"; int ret = fahs->Rename(sourceFile, displayName, newFile); - EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "RenameTdd get result error, code:" << ret; + return; } + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_NE(newFile.ToString(), ""); GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_RenameTdd"; } @@ -1611,14 +1665,14 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0006, testing::ext::Tes int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri[4] = {Uri(""), Uri(""), Uri(""), Uri("")}; - std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; - std::string displayName1[4] = {"test11.txt", "test22.txt", "test33.txt", "test44.txt"}; + Uri testUri{""}; + std::string displayName1 = "test1.txt"; + std::string displayName2 = "test2.txt"; Uri renameUri(""); + result = g_fah->CreateFile(newDirUriTest, displayName1, testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (int j = 0; j < 4; j++) { - result = g_fah->CreateFile(newDirUriTest, displayName[j], testUri[j]); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::thread execthread(RenameTdd, g_fah, testUri[j], displayName1[j], renameUri); + std::thread execthread(RenameTdd, g_fah, testUri, displayName2, renameUri); execthread.join(); } @@ -1818,11 +1872,13 @@ void ListFileTdd(shared_ptr fahs, FileInfo fileInfo, int offse { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_ListFileTdd"; int ret = fahs->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); - EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "ListFileTdd get result error, code:" << ret; + return; } + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 1); + g_num++; GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_ListFileTdd"; } @@ -1855,12 +1911,14 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0005, testing::ext::T int64_t offset = 0; int64_t maxCount = 1000; std::vector fileInfoVec; + g_num = 0; FileFilter filter({".txt"}, {}, {}, 0, 0, false, true); for (int j = 0; j < 4; j++) { std::thread execthread(ListFileTdd, g_fah, fileInfo, offset, maxCount, filter, fileInfoVec); execthread.join(); } + EXPECT_EQ(g_num, 4); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { @@ -1883,7 +1941,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0000, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0000"; try { Uri newDirUriTest(""); - int result = g_fah->Mkdir(g_newDirUri, "Download", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1924,7 +1982,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0001, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0001"; try { Uri newDirUriTest(""); - int result = g_fah->Mkdir(g_newDirUri, "Download", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -1965,7 +2023,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0002, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0002"; try { Uri newDirUriTest(""); - int result = g_fah->Mkdir(g_newDirUri, "Download", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -2012,7 +2070,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0003, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0003"; try { Uri newDirUriTest(""); - int result = g_fah->Mkdir(g_newDirUri, "Download", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -2042,11 +2100,13 @@ void ScanFileTdd(shared_ptr fahs, FileInfo fileInfo, int offse { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFileTdd"; int ret = fahs->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); - EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "ScanFileTdd get result error, code:" << ret; + return; } + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 1); + g_num++; GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_ScanFileTdd"; } @@ -2064,7 +2124,8 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0004, testing::ext::T GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0004"; try { Uri newDirUriTest(""); - int result = g_fah->Mkdir(g_newDirUri, "Download", newDirUriTest); + GTEST_LOG_(INFO) << "g_newDirUri=" << g_newDirUri.ToString(); + int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -2078,11 +2139,13 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0004, testing::ext::T int64_t maxCount = 1000; std::vector fileInfoVec; FileFilter filter({".q1w2e3r4"}, {}, {}, 0, 0, false, true); + g_num = 0; for (int j = 0; j < 4; j++) { std::thread execthread(ScanFileTdd, g_fah, fileInfo, offset, maxCount, filter, fileInfoVec); execthread.join(); } + EXPECT_EQ(g_num, 4); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp index e3edadf8..7ef73b33 100644 --- a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp @@ -31,6 +31,7 @@ using namespace OHOS; using namespace FileAccessFwk; const int ABILITY_ID = 5003; shared_ptr g_fah = nullptr; +int g_num = 0; OHOS::Security::AccessToken::AccessTokenID g_tokenId; const int UID_TRANSFORM_TMP = 20000000; const int UID_DEFAULT = 0; @@ -394,13 +395,13 @@ void OpenFileTdd(shared_ptr fahs, Uri uri, int flags, int fd) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFileTdd"; int ret = fahs->OpenFile(uri, flags, fd); - EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "OpenFile get result error, code:" << ret; + return; } + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_GE(fd, OHOS::FileAccessFwk::ERR_OK); - ret = fahs->Delete(uri); - EXPECT_GE(ret, OHOS::FileAccessFwk::ERR_OK); + g_num++; GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_OpenFileTdd"; } @@ -424,14 +425,18 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0007, testing:: Uri parentUri(info[i].uri); Uri newFileUri(""); int flags; - int fd[4]; - std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; + int fd; + std::string displayName = "test1.txt"; + g_num = 0; + result = g_fah->CreateFile(parentUri, displayName, newFileUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); for (size_t j = 0; j< 4; j++) { - result = g_fah->CreateFile(parentUri, displayName[j], newFileUri); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::thread execthread(OpenFileTdd, g_fah, newFileUri, flags, fd[j]); + std::thread execthread(OpenFileTdd, g_fah, newFileUri, flags, fd); execthread.join(); } + EXPECT_EQ(g_num, 4); + result = g_fah->Delete(newFileUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; @@ -577,13 +582,13 @@ void CreateFileTdd(shared_ptr fahs, Uri uri, std::string displ { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFileTdd"; int ret = fahs->CreateFile(uri, displayName, newFile); - EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "CreateFileTdd get result error, code:" << ret; + return; } + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_NE(newFile.ToString(), ""); - ret = fahs->Delete(newFile); - EXPECT_GE(ret, OHOS::FileAccessFwk::ERR_OK); + g_num++; GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_CreateFileTdd"; } @@ -606,12 +611,16 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0005, testing for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newFileUri(""); - std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; + std::string displayName = "test1.txt"; + g_num = 0; for (int j = 0; j < 1; j++) { - std::thread execthread(CreateFileTdd, g_fah, parentUri, displayName[j], newFileUri); + std::thread execthread(CreateFileTdd, g_fah, parentUri, displayName, newFileUri); execthread.join(); } - GTEST_LOG_(INFO) << "CreateFile_0005 result:" << result << endl; + EXPECT_EQ(g_num, 1); + Uri newDelete(info[i].uri + "/" +displayName); + result = g_fah->Delete(newDelete); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; @@ -757,13 +766,13 @@ void MkdirTdd(shared_ptr fahs, Uri uri, std::string displayNam { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_MkdirTdd"; int ret = fahs->Mkdir(uri, displayName, newFile); - EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "MkdirTdd get result error, code:" << ret; + return; } + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_NE(newFile.ToString(), ""); - ret = fahs->Delete(newFile); - EXPECT_GE(ret, OHOS::FileAccessFwk::ERR_OK); + g_num++; GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_MkdirTdd"; } @@ -786,11 +795,16 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0005, testing::ext for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - std::string displayName[4] = {"test1", "test2", "test3", "test4"}; + std::string displayName = "test1"; + g_num = 0; for (int j = 0; j < 4; j++) { - std::thread execthread(MkdirTdd, g_fah, parentUri, displayName[j], newDirUriTest); + std::thread execthread(MkdirTdd, g_fah, parentUri, displayName, newDirUriTest); execthread.join(); } + EXPECT_EQ(g_num, 1); + Uri newDelete(info[i].uri + "/" + displayName); + result = g_fah->Delete(newDelete); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; @@ -956,10 +970,12 @@ void DeleteTdd(shared_ptr fahs, Uri selectFile) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_DeleteTdd"; int ret = fahs->Delete(selectFile); - EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "DeleteTdd get result error, code:" << ret; + return; } + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); + g_num++; GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_DeleteTdd"; } @@ -986,14 +1002,16 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0005, testing::ex EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); - std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; + std::string displayName = "test1.txt"; + result = g_fah->CreateFile(newDirUriTest, displayName, newFileUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + g_num = 0; for (int j = 0; j < 4; j++) { - result = g_fah->CreateFile(newDirUriTest, displayName[j], newFileUri); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); std::thread execthread(DeleteTdd, g_fah, newFileUri); execthread.join(); } + EXPECT_EQ(g_num, 1); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } @@ -1543,10 +1561,12 @@ void MoveTdd(shared_ptr fahs, Uri sourceFile, Uri targetParent { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_MoveTdd"; int ret = fahs->Move(sourceFile, targetParent, newFile); - EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "MoveTdd get result error, code:" << ret; + return; } + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); + g_num++; GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_MoveTdd"; } @@ -1576,16 +1596,18 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0012, testing::ext: result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri[4] = {Uri(""), Uri(""), Uri(""), Uri("")}; - std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; + Uri testUri(""); + std::string displayName = "test3.txt"; + result = g_fah->CreateFile(newDirUriTest1, displayName, testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + Uri testUri2(""); + g_num = 0; for (int j = 0; j < 4; j++) { - Uri testUri2(""); - result = g_fah->CreateFile(newDirUriTest1, displayName[j], testUri[j]); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::thread execthread(MoveTdd, g_fah, testUri[j], newDirUriTest2, testUri2); + std::thread execthread(MoveTdd, g_fah, testUri, newDirUriTest2, testUri2); execthread.join(); } + EXPECT_EQ(g_num, 1); result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1807,10 +1829,12 @@ void RenameTdd(shared_ptr fahs, Uri sourceFile, std::string di { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_RenameTdd"; int ret = fahs->Rename(sourceFile, displayName, newFile); - EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "RenameTdd get result error, code:" << ret; + return; } + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); + g_num++; GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_RenameTdd"; } @@ -1837,15 +1861,18 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0006, testing::ex EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - std::string displayName[4] = {"test1.txt", "test2.txt", "test3.txt", "test4.txt"}; + std::string displayName1 = "test1.txt"; + std::string displayName2 = "test2.txt"; Uri renameUri(""); + result = g_fah->CreateFile(newDirUriTest, displayName1, testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + g_num = 0; for (int j = 0; j < 4; j++) { - result = g_fah->CreateFile(newDirUriTest, displayName[j], testUri); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - std::thread execthread(RenameTdd, g_fah, testUri, displayName[j], renameUri); + std::thread execthread(RenameTdd, g_fah, testUri, displayName2, renameUri); execthread.join(); } + EXPECT_EQ(g_num, 1); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } @@ -2011,10 +2038,12 @@ void ListFileTdd(shared_ptr fahs, FileInfo fileInfo, int offse { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFileTdd"; int ret = fahs->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); - EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "ListFile get result error, code:" << ret; + return; } + EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); + g_num++; GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_ListFileTdd"; } @@ -2050,11 +2079,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0004, testing:: int maxCount = 1000; std::vector fileInfoVec; FileFilter filter; + g_num = 0; for (int j = 0; j < 4; j++) { std::thread execthread(ListFileTdd, g_fah, fileInfo, offset, maxCount, filter, fileInfoVec); execthread.join(); } + EXPECT_EQ(g_num, 4); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } @@ -2160,11 +2191,8 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; - result = fahs->Delete(newDirUriTest1); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - - result = fahs->Delete(newDirUriTest2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + result = fahs->Delete(documentUri); + EXPECT_LE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; -- Gitee From 7bc5e7aad3da975355aecf5b915ecec19e8cf00f Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Wed, 14 Sep 2022 09:59:02 +0800 Subject: [PATCH 110/122] =?UTF-8?q?=E5=AA=92=E4=BD=93=E5=BA=93move?= =?UTF-8?q?=E5=92=8Crename=E5=AF=B9=E5=B9=B6=E5=8F=91=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../innerkits/file_access/test/file_access_helper_test.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp index e6848f62..436e7a89 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/file_access_helper_test.cpp @@ -1410,6 +1410,7 @@ void MoveTdd(shared_ptr fahs, Uri sourceFile, Uri targetParent } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_NE(newFile.ToString(), ""); + g_num++; GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_MoveTdd"; } @@ -1444,6 +1445,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0011, testing::ext::TestS execthread.join(); } + EXPECT_GE(g_num, 1); result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->Delete(newDirUriTest2); @@ -1645,6 +1647,7 @@ void RenameTdd(shared_ptr fahs, Uri sourceFile, std::string di } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_NE(newFile.ToString(), ""); + g_num++; GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_RenameTdd"; } @@ -1676,6 +1679,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0006, testing::ext::Tes execthread.join(); } + EXPECT_GE(g_num, 1); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { -- Gitee From 0aa58addfa09d5ed71db76ac7445a35aff63f2f4 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Wed, 14 Sep 2022 10:31:50 +0800 Subject: [PATCH 111/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- frameworks/innerkits/file_access/test/BUILD.gn | 12 ++++++------ ...helper_test.cpp => external_file_access_test.cpp} | 0 ...er_test.cpp => medialibrary_file_access_test.cpp} | 5 ++++- 3 files changed, 10 insertions(+), 7 deletions(-) rename frameworks/innerkits/file_access/test/{file_extension_helper_test.cpp => external_file_access_test.cpp} (100%) rename frameworks/innerkits/file_access/test/{file_access_helper_test.cpp => medialibrary_file_access_test.cpp} (99%) diff --git a/frameworks/innerkits/file_access/test/BUILD.gn b/frameworks/innerkits/file_access/test/BUILD.gn index b72c8110..59e031e5 100644 --- a/frameworks/innerkits/file_access/test/BUILD.gn +++ b/frameworks/innerkits/file_access/test/BUILD.gn @@ -14,10 +14,10 @@ import("//build/test.gni") import("//foundation/filemanagement/user_file_service/filemanagement_aafwk.gni") BASE_DIR = "//foundation/filemanagement/user_file_service" -ohos_unittest("file_access_helper_test") { +ohos_unittest("medialibrary_file_access_test") { module_out_path = "filemanagement/user_file_service" - sources = [ "file_access_helper_test.cpp" ] + sources = [ "medialibrary_file_access_test.cpp" ] include_dirs = [ "//foundation/ability/ability_runtime/frameworks/kits/appkit/native/ability_runtime/context", @@ -54,10 +54,10 @@ ohos_unittest("file_access_helper_test") { ] } -ohos_unittest("file_extension_helper_test") { +ohos_unittest("external_file_access_test") { module_out_path = "filemanagement/user_file_service" - sources = [ "file_extension_helper_test.cpp" ] + sources = [ "external_file_access_test.cpp" ] include_dirs = [ "//third_party/googletest/googlemock/include/gmock", @@ -98,7 +98,7 @@ group("user_file_service_test") { testonly = true deps = [ - ":file_access_helper_test", - ":file_extension_helper_test", + ":medialibrary_file_access_test", + ":external_file_access_test", ] } diff --git a/frameworks/innerkits/file_access/test/file_extension_helper_test.cpp b/frameworks/innerkits/file_access/test/external_file_access_test.cpp similarity index 100% rename from frameworks/innerkits/file_access/test/file_extension_helper_test.cpp rename to frameworks/innerkits/file_access/test/external_file_access_test.cpp diff --git a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp similarity index 99% rename from frameworks/innerkits/file_access/test/file_access_helper_test.cpp rename to frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp index 436e7a89..87f2f5db 100644 --- a/frameworks/innerkits/file_access/test/file_access_helper_test.cpp +++ b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp @@ -179,6 +179,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0000, testing::ext::T GTEST_LOG_(INFO) << parentUri.ToString(); } + GTEST_LOG_(INFO) << "g_newDirUri=" << g_newDirUri.ToString(); bool isExist = false; g_fah->Access(g_newDirUri, isExist); if (!isExist) { @@ -201,7 +202,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0000, testing::ext::T g_newDirUri = Uri(fileInfoVec[i].uri); } } - + GTEST_LOG_(INFO) << "fileInfoVec.fileName=" << fileInfoVec[0].fileName; result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -1448,8 +1449,10 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0011, testing::ext::TestS EXPECT_GE(g_num, 1); result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + GTEST_LOG_(INFO) << "Delete-result1=" << result; result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + GTEST_LOG_(INFO) << "Delete-result2=" << result; } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } -- Gitee From 6c804ecac63dde9c670784873fd192ffce5327d0 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Wed, 14 Sep 2022 10:47:21 +0800 Subject: [PATCH 112/122] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=90=8E=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E5=90=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../test/external_file_access_test.cpp | 606 ++++++++-------- .../test/medialibrary_file_access_test.cpp | 664 +++++++++--------- 2 files changed, 635 insertions(+), 635 deletions(-) diff --git a/frameworks/innerkits/file_access/test/external_file_access_test.cpp b/frameworks/innerkits/file_access/test/external_file_access_test.cpp index 7ef73b33..f1a9f2e6 100644 --- a/frameworks/innerkits/file_access/test/external_file_access_test.cpp +++ b/frameworks/innerkits/file_access/test/external_file_access_test.cpp @@ -155,17 +155,17 @@ public: }; /** - * @tc.number: user_file_service_file_extension_helper_OpenFile_0000 - * @tc.name: file_extension_helper_OpenFile_0000 + * @tc.number: user_file_service_external_file_access_OpenFile_0000 + * @tc.name: external_file_access_OpenFile_0000 * @tc.desc: Test function of OpenFile interface for SUCCESS. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0000"; try { vector info; @@ -180,7 +180,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0000, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); - result = g_fah->CreateFile(newDirUriTest1, "file_extension_helper_OpenFile_0000.txt", newFileUri); + result = g_fah->CreateFile(newDirUriTest1, "external_file_access_OpenFile_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; @@ -195,21 +195,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0000, testing:: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_OpenFile_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0000"; } /** - * @tc.number: user_file_service_file_extension_helper_OpenFile_0001 - * @tc.name: file_extension_helper_OpenFile_0001 + * @tc.number: user_file_service_external_file_access_OpenFile_0001 + * @tc.name: external_file_access_OpenFile_0001 * @tc.desc: Test function of OpenFile interface for ERROR which Uri is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0001, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0001, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0001"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0001"; try { Uri uri(""); int fd; @@ -219,21 +219,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0001, testing:: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_OpenFile_0001"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0001"; } /** - * @tc.number: user_file_service_file_extension_helper_OpenFile_0002 - * @tc.name: file_extension_helper_OpenFile_0002 + * @tc.number: user_file_service_external_file_access_OpenFile_0002 + * @tc.name: external_file_access_OpenFile_0002 * @tc.desc: Test function of OpenFile interface for ERROR which Uri is absolute path. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0002, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0002, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0002"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0002"; try { vector info; int result = g_fah->GetRoots(info); @@ -241,10 +241,10 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0002, testing:: for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newFileUri(""); - result = g_fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0002.txt", newFileUri); + result = g_fah->CreateFile(parentUri, "external_file_access_OpenFile_0002.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri uri("storage/media/100/local/files/Download/file_extension_helper_OpenFile_0002.txt"); + Uri uri("storage/media/100/local/files/Download/external_file_access_OpenFile_0002.txt"); int fd; result = g_fah->OpenFile(uri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); @@ -256,21 +256,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0002, testing:: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_OpenFile_0002"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0002"; } /** - * @tc.number: user_file_service_file_extension_helper_OpenFile_0003 - * @tc.name: file_extension_helper_OpenFile_0003 + * @tc.number: user_file_service_external_file_access_OpenFile_0003 + * @tc.name: external_file_access_OpenFile_0003 * @tc.desc: Test function of OpenFile interface for ERROR which Uri is special symbols. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0003, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0003, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0003"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0003"; try { Uri uri("~!@#$%^&*()_"); int fd; @@ -280,21 +280,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0003, testing:: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_OpenFile_0003"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0003"; } /** - * @tc.number: user_file_service_file_extension_helper_OpenFile_0004 - * @tc.name: file_extension_helper_OpenFile_0004 + * @tc.number: user_file_service_external_file_access_OpenFile_0004 + * @tc.name: external_file_access_OpenFile_0004 * @tc.desc: Test function of OpenFile interface for ERROR which flag is -1. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0004, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0004, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0004"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0004"; try { vector info; int result = g_fah->GetRoots(info); @@ -302,7 +302,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0004, testing:: for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newFileUri(""); - result = g_fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0004.txt", newFileUri); + result = g_fah->CreateFile(parentUri, "external_file_access_OpenFile_0004.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; @@ -316,21 +316,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0004, testing:: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_OpenFile_0004"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0004"; } /** - * @tc.number: user_file_service_file_extension_helper_OpenFile_0005 - * @tc.name: file_extension_helper_OpenFile_0005 + * @tc.number: user_file_service_external_file_access_OpenFile_0005 + * @tc.name: external_file_access_OpenFile_0005 * @tc.desc: Test function of OpenFile interface for SUCCESS which flag is 1. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0005, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0005, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0005"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0005"; try { vector info; int result = g_fah->GetRoots(info); @@ -338,7 +338,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0005, testing:: for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newFileUri(""); - result = g_fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0005.txt", newFileUri); + result = g_fah->CreateFile(parentUri, "external_file_access_OpenFile_0005.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; @@ -352,21 +352,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0005, testing:: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_OpenFile_0005"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0005"; } /** - * @tc.number: user_file_service_file_extension_helper_OpenFile_0006 - * @tc.name: file_extension_helper_OpenFile_0006 + * @tc.number: user_file_service_external_file_access_OpenFile_0006 + * @tc.name: external_file_access_OpenFile_0006 * @tc.desc: Test function of OpenFile interface for SUCCESS which flag is 2. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0006, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0006, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0006"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0006"; try { vector info; int result = g_fah->GetRoots(info); @@ -374,7 +374,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0006, testing:: for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newFileUri(""); - result = g_fah->CreateFile(parentUri, "file_extension_helper_OpenFile_0006.txt", newFileUri); + result = g_fah->CreateFile(parentUri, "external_file_access_OpenFile_0006.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; @@ -388,12 +388,12 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0006, testing:: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_OpenFile_0006"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0006"; } void OpenFileTdd(shared_ptr fahs, Uri uri, int flags, int fd) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFileTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFileTdd"; int ret = fahs->OpenFile(uri, flags, fd); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "OpenFile get result error, code:" << ret; @@ -402,21 +402,21 @@ void OpenFileTdd(shared_ptr fahs, Uri uri, int flags, int fd) EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_GE(fd, OHOS::FileAccessFwk::ERR_OK); g_num++; - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_OpenFileTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFileTdd"; } /** - * @tc.number: user_file_service_file_extension_helper_OpenFile_0007 - * @tc.name: file_extension_helper_OpenFile_0007 + * @tc.number: user_file_service_external_file_access_OpenFile_0007 + * @tc.name: external_file_access_OpenFile_0007 * @tc.desc: Test function of OpenFile interface for SUCCESS which Concurrent. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0007, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0007, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_OpenFile_0007"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0007"; try { vector info; int result = g_fah->GetRoots(info); @@ -441,21 +441,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_OpenFile_0007, testing:: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_OpenFile_0007"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0007"; } /** - * @tc.number: user_file_service_file_extension_helper_CreateFile_0000 - * @tc.name: file_extension_helper_CreateFile_0000 + * @tc.number: user_file_service_external_file_access_CreateFile_0000 + * @tc.name: external_file_access_CreateFile_0000 * @tc.desc: Test function of CreateFile interface for SUCCESS. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_CreateFile_0000"; try { vector info; int result = g_fah->GetRoots(info); @@ -463,7 +463,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0000, testing for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newFileUri(""); - result = g_fah->CreateFile(parentUri, "file_extension_helper_CreateFile_0000.txt", newFileUri); + result = g_fah->CreateFile(parentUri, "external_file_access_CreateFile_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0000 result:" << result << endl; @@ -473,93 +473,93 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0000, testing } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_CreateFile_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0000"; } /** - * @tc.number: user_file_service_file_extension_helper_CreateFile_0001 - * @tc.name: file_extension_helper_CreateFile_0001 + * @tc.number: user_file_service_external_file_access_CreateFile_0001 + * @tc.name: external_file_access_CreateFile_0001 * @tc.desc: Test function of CreateFile interface for ERROR which parentUri is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0001, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0001, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0001"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_CreateFile_0001"; try { Uri newFileUri(""); Uri parentUri(""); - int result = g_fah->CreateFile(parentUri, "file_extension_helper_CreateFile_0001.txt", newFileUri); + int result = g_fah->CreateFile(parentUri, "external_file_access_CreateFile_0001.txt", newFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0001 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_CreateFile_0001"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0001"; } /** - * @tc.number: user_file_service_file_extension_helper_CreateFile_0002 - * @tc.name: file_extension_helper_CreateFile_0002 + * @tc.number: user_file_service_external_file_access_CreateFile_0002 + * @tc.name: external_file_access_CreateFile_0002 * @tc.desc: Test function of CreateFile interface for ERROR which parentUri is absolute path. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0002, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0002, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0002"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_CreateFile_0002"; try { Uri newFileUri(""); Uri parentUri("storage/media/100/local/files/Download"); - int result = g_fah->CreateFile(parentUri, "file_extension_helper_CreateFile_0002.txt", newFileUri); + int result = g_fah->CreateFile(parentUri, "external_file_access_CreateFile_0002.txt", newFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0002 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_CreateFile_0002"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0002"; } /** - * @tc.number: user_file_service_file_extension_helper_CreateFile_0003 - * @tc.name: file_extension_helper_CreateFile_0003 + * @tc.number: user_file_service_external_file_access_CreateFile_0003 + * @tc.name: external_file_access_CreateFile_0003 * @tc.desc: Test function of CreateFile interface for ERROR which parentUri is special symbols. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0003, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0003, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0002"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_CreateFile_0002"; try { Uri newFileUri(""); Uri parentUri("~!@#$%^&*()_"); - int result = g_fah->CreateFile(parentUri, "file_extension_helper_CreateFile_0003.txt", newFileUri); + int result = g_fah->CreateFile(parentUri, "external_file_access_CreateFile_0003.txt", newFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0003 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_CreateFile_0003"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0003"; } /** - * @tc.number: user_file_service_file_extension_helper_CreateFile_0004 - * @tc.name: file_extension_helper_CreateFile_0004 + * @tc.number: user_file_service_external_file_access_CreateFile_0004 + * @tc.name: external_file_access_CreateFile_0004 * @tc.desc: Test function of CreateFile interface for ERROR which displayName is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0004, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0004, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0004"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_CreateFile_0004"; try { vector info; int result = g_fah->GetRoots(info); @@ -575,12 +575,12 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0004, testing } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_CreateFile_0004"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0004"; } void CreateFileTdd(shared_ptr fahs, Uri uri, std::string displayName, Uri newFile) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFileTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_CreateFileTdd"; int ret = fahs->CreateFile(uri, displayName, newFile); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "CreateFileTdd get result error, code:" << ret; @@ -589,21 +589,21 @@ void CreateFileTdd(shared_ptr fahs, Uri uri, std::string displ EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_NE(newFile.ToString(), ""); g_num++; - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_CreateFileTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFileTdd"; } /** - * @tc.number: user_file_service_file_extension_helper_CreateFile_0005 - * @tc.name: file_extension_helper_CreateFile_0005 + * @tc.number: user_file_service_external_file_access_CreateFile_0005 + * @tc.name: external_file_access_CreateFile_0005 * @tc.desc: Test function of CreateFile interface for ERROR which Concurrent. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0005, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0005, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_CreateFile_0005"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_CreateFile_0005"; try { vector info; int result = g_fah->GetRoots(info); @@ -625,21 +625,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_CreateFile_0005, testing } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_CreateFile_0005"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0005"; } /** - * @tc.number: user_file_service_file_extension_helper_Mkdir_0000 - * @tc.name: file_extension_helper_Mkdir_0000 + * @tc.number: user_file_service_external_file_access_Mkdir_0000 + * @tc.name: external_file_access_Mkdir_0000 * @tc.desc: Test function of Mkdir interface for SUCCESS. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Mkdir_0000"; try { vector info; int result = g_fah->GetRoots(info); @@ -647,7 +647,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0000, testing::ext for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newDirUriTest(""); - result = g_fah->Mkdir(parentUri, "file_extension_helper_Mkdir_0000", newDirUriTest); + result = g_fah->Mkdir(parentUri, "external_file_access_Mkdir_0000", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0000 result:" << result << endl; @@ -657,93 +657,93 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0000, testing::ext } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Mkdir_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0000"; } /** - * @tc.number: user_file_service_file_extension_helper_Mkdir_0001 - * @tc.name: file_extension_helper_Mkdir_0001 + * @tc.number: user_file_service_external_file_access_Mkdir_0001 + * @tc.name: external_file_access_Mkdir_0001 * @tc.desc: Test function of Mkdir interface for ERROR which parentUri is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0001, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0001, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0001"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Mkdir_0001"; try { Uri newDirUriTest(""); Uri parentUri(""); - int result = g_fah->Mkdir(parentUri, "file_extension_helper_Mkdir_0001", newDirUriTest); + int result = g_fah->Mkdir(parentUri, "external_file_access_Mkdir_0001", newDirUriTest); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0001 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Mkdir_0001"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0001"; } /** - * @tc.number: user_file_service_file_extension_helper_Mkdir_0002 - * @tc.name: file_extension_helper_Mkdir_0002 + * @tc.number: user_file_service_external_file_access_Mkdir_0002 + * @tc.name: external_file_access_Mkdir_0002 * @tc.desc: Test function of Mkdir interface for ERROR which parentUri is absolute path. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0002, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0002, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0002"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Mkdir_0002"; try { Uri newDirUriTest(""); Uri parentUri("storage/media/100/local/files/Download"); - int result = g_fah->Mkdir(parentUri, "file_extension_helper_Mkdir_0002", newDirUriTest); + int result = g_fah->Mkdir(parentUri, "external_file_access_Mkdir_0002", newDirUriTest); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0002 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Mkdir_0002"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0002"; } /** - * @tc.number: user_file_service_file_extension_helper_Mkdir_0003 - * @tc.name: file_extension_helper_Mkdir_0003 + * @tc.number: user_file_service_external_file_access_Mkdir_0003 + * @tc.name: external_file_access_Mkdir_0003 * @tc.desc: Test function of Mkdir interface for ERROR which parentUri is special symbols. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0003, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0003, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0002"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Mkdir_0002"; try { Uri newDirUriTest(""); Uri parentUri("~!@#$%^&*()_"); - int result = g_fah->Mkdir(parentUri, "file_extension_helper_Mkdir_0003", newDirUriTest); + int result = g_fah->Mkdir(parentUri, "external_file_access_Mkdir_0003", newDirUriTest); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0003 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Mkdir_0003"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0003"; } /** - * @tc.number: user_file_service_file_extension_helper_Mkdir_0004 - * @tc.name: file_extension_helper_Mkdir_0004 + * @tc.number: user_file_service_external_file_access_Mkdir_0004 + * @tc.name: external_file_access_Mkdir_0004 * @tc.desc: Test function of Mkdir interface for ERROR which displayName is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0004, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0004, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0004"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Mkdir_0004"; try { vector info; int result = g_fah->GetRoots(info); @@ -759,12 +759,12 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0004, testing::ext } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Mkdir_0004"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0004"; } void MkdirTdd(shared_ptr fahs, Uri uri, std::string displayName, Uri newFile) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_MkdirTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_MkdirTdd"; int ret = fahs->Mkdir(uri, displayName, newFile); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "MkdirTdd get result error, code:" << ret; @@ -773,21 +773,21 @@ void MkdirTdd(shared_ptr fahs, Uri uri, std::string displayNam EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_NE(newFile.ToString(), ""); g_num++; - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_MkdirTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_MkdirTdd"; } /** - * @tc.number: user_file_service_file_extension_helper_Mkdir_0005 - * @tc.name: file_extension_helper_Mkdir_0005 + * @tc.number: user_file_service_external_file_access_Mkdir_0005 + * @tc.name: external_file_access_Mkdir_0005 * @tc.desc: Test function of Mkdir interface for SUCCESS which Concurrent. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0005, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0005, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Mkdir_0005"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Mkdir_0005"; try { vector info; int result = g_fah->GetRoots(info); @@ -809,21 +809,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Mkdir_0005, testing::ext } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Mkdir_0005"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0005"; } /** - * @tc.number: user_file_service_file_extension_helper_Delete_0000 - * @tc.name: file_extension_helper_Delete_0000 + * @tc.number: user_file_service_external_file_access_Delete_0000 + * @tc.name: external_file_access_Delete_0000 * @tc.desc: Test function of Delete interface for SUCCESS which delete file. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Delete_0000"; try { vector info; int result = g_fah->GetRoots(info); @@ -835,7 +835,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0000, testing::ex EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); - result = g_fah->CreateFile(newDirUriTest, "file_extension_helper_Delete_0000.txt", newFileUri); + result = g_fah->CreateFile(newDirUriTest, "external_file_access_Delete_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->Delete(newFileUri); @@ -848,21 +848,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0000, testing::ex } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Delete_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0000"; } /** - * @tc.number: user_file_service_file_extension_helper_Delete_0001 - * @tc.name: file_extension_helper_Delete_0001 + * @tc.number: user_file_service_external_file_access_Delete_0001 + * @tc.name: external_file_access_Delete_0001 * @tc.desc: Test function of Delete interface for SUCCESS which delete folder. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0001, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0001, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0001"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Delete_0001"; try { vector info; int result = g_fah->GetRoots(info); @@ -880,21 +880,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0001, testing::ex } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Delete_0001"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0001"; } /** - * @tc.number: user_file_service_file_extension_helper_Delete_0002 - * @tc.name: file_extension_helper_Delete_0002 + * @tc.number: user_file_service_external_file_access_Delete_0002 + * @tc.name: external_file_access_Delete_0002 * @tc.desc: Test function of Delete interface for ERROR which selectFileUri is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0002, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0002, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0002"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Delete_0002"; try { Uri selectFileUri(""); int result = g_fah->Delete(selectFileUri); @@ -903,21 +903,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0002, testing::ex } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Delete_0002"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0002"; } /** - * @tc.number: user_file_service_file_extension_helper_Delete_0003 - * @tc.name: file_extension_helper_Delete_0003 + * @tc.number: user_file_service_external_file_access_Delete_0003 + * @tc.name: external_file_access_Delete_0003 * @tc.desc: Test function of Delete interface for ERROR which selectFileUri is absolute path. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0003, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0003, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0003"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Delete_0003"; try { vector info; int result = g_fah->GetRoots(info); @@ -940,21 +940,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0003, testing::ex } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Delete_0003"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0003"; } /** - * @tc.number: user_file_service_file_extension_helper_Delete_0004 - * @tc.name: file_extension_helper_Delete_0004 + * @tc.number: user_file_service_external_file_access_Delete_0004 + * @tc.name: external_file_access_Delete_0004 * @tc.desc: Test function of Delete interface for ERROR which selectFileUri is special symbols. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0004, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0004, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0004"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Delete_0004"; try { Uri selectFileUri("!@#$%^&*()"); int result = g_fah->Delete(selectFileUri); @@ -963,12 +963,12 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0004, testing::ex } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Delete_0004"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0004"; } void DeleteTdd(shared_ptr fahs, Uri selectFile) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_DeleteTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_DeleteTdd"; int ret = fahs->Delete(selectFile); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "DeleteTdd get result error, code:" << ret; @@ -976,21 +976,21 @@ void DeleteTdd(shared_ptr fahs, Uri selectFile) } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); g_num++; - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_DeleteTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_DeleteTdd"; } /** - * @tc.number: user_file_service_file_extension_helper_Delete_0005 - * @tc.name: file_extension_helper_Delete_0005 + * @tc.number: user_file_service_external_file_access_Delete_0005 + * @tc.name: external_file_access_Delete_0005 * @tc.desc: Test function of Delete interface for SUCCESS which Concurrent. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0005, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0005, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Delete_0005"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Delete_0005"; try { vector info; int result = g_fah->GetRoots(info); @@ -1018,21 +1018,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Delete_0005, testing::ex } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Delete_0005"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0005"; } /** - * @tc.number: user_file_service_file_extension_helper_Move_0000 - * @tc.name: file_extension_helper_Move_0000 + * @tc.number: user_file_service_external_file_access_Move_0000 + * @tc.name: external_file_access_Move_0000 * @tc.desc: Test function of Move interface for SUCCESS which move file. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0000"; try { vector info; int result = g_fah->GetRoots(info); @@ -1065,21 +1065,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0000, testing::ext: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Move_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0000"; } /** - * @tc.number: user_file_service_file_extension_helper_Move_0001 - * @tc.name: file_extension_helper_Move_0001 + * @tc.number: user_file_service_external_file_access_Move_0001 + * @tc.name: external_file_access_Move_0001 * @tc.desc: Test function of Move interface for SUCCESS which move folder. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0001, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0001, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0001"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0001"; try { vector info; int result = g_fah->GetRoots(info); @@ -1109,21 +1109,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0001, testing::ext: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Move_0001"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0001"; } /** - * @tc.number: user_file_service_file_extension_helper_Move_0002 - * @tc.name: file_extension_helper_Move_0002 + * @tc.number: user_file_service_external_file_access_Move_0002 + * @tc.name: external_file_access_Move_0002 * @tc.desc: Test function of Move interface for ERROR which sourceFileUri is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0002, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0002, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0002"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0002"; try { vector info; int result = g_fah->GetRoots(info); @@ -1146,21 +1146,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0002, testing::ext: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Move_0002"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0002"; } /** - * @tc.number: user_file_service_file_extension_helper_Move_0003 - * @tc.name: file_extension_helper_Move_0003 + * @tc.number: user_file_service_external_file_access_Move_0003 + * @tc.name: external_file_access_Move_0003 * @tc.desc: Test function of Move interface for ERROR which sourceFileUri is absolute path. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0003, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0003, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0003"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0003"; try { vector info; int result = g_fah->GetRoots(info); @@ -1194,21 +1194,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0003, testing::ext: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Move_0003"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0003"; } /** - * @tc.number: user_file_service_file_extension_helper_Move_0004 - * @tc.name: file_extension_helper_Move_0004 + * @tc.number: user_file_service_external_file_access_Move_0004 + * @tc.name: external_file_access_Move_0004 * @tc.desc: Test function of Move interface for ERROR which sourceFileUri is special symbols. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0004, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0004, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0004"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0004"; try { vector info; int result = g_fah->GetRoots(info); @@ -1231,21 +1231,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0004, testing::ext: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Move_0004"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0004"; } /** - * @tc.number: user_file_service_file_extension_helper_Move_0005 - * @tc.name: file_extension_helper_Move_0005 + * @tc.number: user_file_service_external_file_access_Move_0005 + * @tc.name: external_file_access_Move_0005 * @tc.desc: Test function of Move interface for ERROR which targetParentUri is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0005, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0005, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0005"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0005"; try { vector info; int result = g_fah->GetRoots(info); @@ -1272,21 +1272,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0005, testing::ext: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Move_0005"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0005"; } /** - * @tc.number: user_file_service_file_extension_helper_Move_0006 - * @tc.name: file_extension_helper_Move_0006 + * @tc.number: user_file_service_external_file_access_Move_0006 + * @tc.name: external_file_access_Move_0006 * @tc.desc: Test function of Move interface for ERROR which targetParentUri is absolute path. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0006, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0006, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0006"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0006"; try { vector info; int result = g_fah->GetRoots(info); @@ -1320,21 +1320,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0006, testing::ext: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Move_0006"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0006"; } /** - * @tc.number: user_file_service_file_extension_helper_Move_0007 - * @tc.name: file_extension_helper_Move_0007 + * @tc.number: user_file_service_external_file_access_Move_0007 + * @tc.name: external_file_access_Move_0007 * @tc.desc: Test function of Move interface for ERROR which targetParentUri is special symbols. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0007, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0007, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0007"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0007"; try { vector info; int result = g_fah->GetRoots(info); @@ -1368,21 +1368,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0007, testing::ext: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Move_0007"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0007"; } /** - * @tc.number: user_file_service_file_extension_helper_Move_0008 - * @tc.name: file_extension_helper_Move_0008 + * @tc.number: user_file_service_external_file_access_Move_0008 + * @tc.name: external_file_access_Move_0008 * @tc.desc: Test function of Move interface for SUCCESS which move empty folder. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0008, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0008, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0008"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0008"; try { vector info; int result = g_fah->GetRoots(info); @@ -1408,21 +1408,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0008, testing::ext: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Move_0008"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0008"; } /** - * @tc.number: user_file_service_file_extension_helper_Move_0009 - * @tc.name: file_extension_helper_Move_0009 + * @tc.number: user_file_service_external_file_access_Move_0009 + * @tc.name: external_file_access_Move_0009 * @tc.desc: Test function of Move interface for SUCCESS which move more file in folder. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0009, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0009, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0009"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0009"; try { vector info; int result = g_fah->GetRoots(info); @@ -1455,21 +1455,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0009, testing::ext: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Move_0009"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0009"; } /** - * @tc.number: user_file_service_file_extension_helper_Move_0010 - * @tc.name: file_extension_helper_Move_0010 + * @tc.number: user_file_service_external_file_access_Move_0010 + * @tc.name: external_file_access_Move_0010 * @tc.desc: Test function of Move interface for SUCCESS which move Multilevel directory folder. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0010, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0010, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0010"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0010"; try { vector info; int result = g_fah->GetRoots(info); @@ -1502,21 +1502,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0010, testing::ext: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Move_0010"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0010"; } /** - * @tc.number: user_file_service_file_extension_helper_Move_0011 - * @tc.name: file_extension_helper_Move_0011 + * @tc.number: user_file_service_external_file_access_Move_0011 + * @tc.name: external_file_access_Move_0011 * @tc.desc: Test function of Move interface for SUCCESS which move other equipment file. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0011, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0011, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0011"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0011"; try { vector info; int result = g_fah->GetRoots(info); @@ -1554,12 +1554,12 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0011, testing::ext: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Move_0011"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0011"; } void MoveTdd(shared_ptr fahs, Uri sourceFile, Uri targetParent, Uri newFile) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_MoveTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_MoveTdd"; int ret = fahs->Move(sourceFile, targetParent, newFile); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "MoveTdd get result error, code:" << ret; @@ -1567,21 +1567,21 @@ void MoveTdd(shared_ptr fahs, Uri sourceFile, Uri targetParent } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); g_num++; - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_MoveTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_MoveTdd"; } /** - * @tc.number: user_file_service_file_extension_helper_Move_0012 - * @tc.name: file_extension_helper_Move_0012 + * @tc.number: user_file_service_external_file_access_Move_0012 + * @tc.name: external_file_access_Move_0012 * @tc.desc: Test function of Move interface for SUCCESS which Concurrent. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0012, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0012, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Move_0012"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Move_0012"; try { vector info; int result = g_fah->GetRoots(info); @@ -1617,21 +1617,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Move_0012, testing::ext: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Move_0012"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0012"; } /** - * @tc.number: user_file_service_file_extension_helper_Rename_0000 - * @tc.name: file_extension_helper_Rename_0000 + * @tc.number: user_file_service_external_file_access_Rename_0000 + * @tc.name: external_file_access_Rename_0000 * @tc.desc: Test function of Rename interface for SUCCESS which rename file. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Rename_0000"; try { vector info; int result = g_fah->GetRoots(info); @@ -1657,21 +1657,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0000, testing::ex } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Rename_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0000"; } /** - * @tc.number: user_file_service_file_extension_helper_Rename_0001 - * @tc.name: file_extension_helper_Rename_0001 + * @tc.number: user_file_service_external_file_access_Rename_0001 + * @tc.name: external_file_access_Rename_0001 * @tc.desc: Test function of Rename interface for SUCCESS which rename folder. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0001, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0001, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0001"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Rename_0001"; try { vector info; int result = g_fah->GetRoots(info); @@ -1693,21 +1693,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0001, testing::ex } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Rename_0001"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0001"; } /** - * @tc.number: user_file_service_file_extension_helper_Rename_0002 - * @tc.name: file_extension_helper_Rename_0002 + * @tc.number: user_file_service_external_file_access_Rename_0002 + * @tc.name: external_file_access_Rename_0002 * @tc.desc: Test function of Rename interface for ERROR which sourceFileUri is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0002, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0002, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0002"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Rename_0002"; try { Uri renameUri(""); Uri sourceFileUri(""); @@ -1717,21 +1717,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0002, testing::ex } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Rename_0002"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0002"; } /** - * @tc.number: user_file_service_file_extension_helper_Rename_0003 - * @tc.name: file_extension_helper_Rename_0003 + * @tc.number: user_file_service_external_file_access_Rename_0003 + * @tc.name: external_file_access_Rename_0003 * @tc.desc: Test function of Rename interface for ERROR which sourceFileUri is absolute path. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0003, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0003, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0003"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Rename_0003"; try { vector info; int result = g_fah->GetRoots(info); @@ -1758,21 +1758,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0003, testing::ex } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Rename_0003"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0003"; } /** - * @tc.number: user_file_service_file_extension_helper_Rename_0004 - * @tc.name: file_extension_helper_Rename_0004 + * @tc.number: user_file_service_external_file_access_Rename_0004 + * @tc.name: external_file_access_Rename_0004 * @tc.desc: Test function of Rename interface for ERROR which sourceFileUri is special symbols. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0004, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0004, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0004"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Rename_0004"; try { Uri renameUri(""); Uri sourceFileUri("~!@#$%^&*()_"); @@ -1782,21 +1782,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0004, testing::ex } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Rename_0004"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0004"; } /** - * @tc.number: user_file_service_file_extension_helper_Rename_0005 - * @tc.name: file_extension_helper_Rename_0005 + * @tc.number: user_file_service_external_file_access_Rename_0005 + * @tc.name: external_file_access_Rename_0005 * @tc.desc: Test function of Rename interface for ERROR which displayName is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0005, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0005, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0005"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Rename_0005"; try { vector info; int result = g_fah->GetRoots(info); @@ -1822,12 +1822,12 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0005, testing::ex } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Rename_0005"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0005"; } void RenameTdd(shared_ptr fahs, Uri sourceFile, std::string displayName, Uri newFile) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_RenameTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_RenameTdd"; int ret = fahs->Rename(sourceFile, displayName, newFile); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "RenameTdd get result error, code:" << ret; @@ -1835,21 +1835,21 @@ void RenameTdd(shared_ptr fahs, Uri sourceFile, std::string di } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); g_num++; - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_RenameTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_RenameTdd"; } /** - * @tc.number: user_file_service_file_extension_helper_Rename_0006 - * @tc.name: file_extension_helper_Rename_0006 + * @tc.number: user_file_service_external_file_access_Rename_0006 + * @tc.name: external_file_access_Rename_0006 * @tc.desc: Test function of Rename interface for SUCCESS which Concurrent. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0006, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0006, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Rename_0006"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Rename_0006"; try { vector info; int result = g_fah->GetRoots(info); @@ -1879,21 +1879,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Rename_0006, testing::ex } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Rename_0006"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0006"; } /** - * @tc.number: user_file_service_file_extension_helper_ListFile_0000 - * @tc.name: file_extension_helper_ListFile_0000 + * @tc.number: user_file_service_external_file_access_ListFile_0000 + * @tc.name: external_file_access_ListFile_0000 * @tc.desc: Test function of ListFile interface for SUCCESS. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_ListFile_0000"; try { vector info; int result = g_fah->GetRoots(info); @@ -1905,7 +1905,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0000, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = g_fah->CreateFile(newDirUriTest, "file_extension_helper_ListFile_0000.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "external_file_access_ListFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); FileInfo fileInfo; @@ -1924,21 +1924,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0000, testing:: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_ListFile_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0000"; } /** - * @tc.number: user_file_service_file_extension_helper_ListFile_0001 - * @tc.name: file_extension_helper_ListFile_0001 + * @tc.number: user_file_service_external_file_access_ListFile_0001 + * @tc.name: external_file_access_ListFile_0001 * @tc.desc: Test function of ListFile interface for ERROR which Uri is nullptr. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0001, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0001, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0001"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_ListFile_0001"; try { Uri sourceFileUri(""); FileInfo fileInfo; @@ -1953,21 +1953,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0001, testing:: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_ListFile_0001"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0001"; } /** - * @tc.number: user_file_service_file_extension_helper_ListFile_0002 - * @tc.name: file_extension_helper_ListFile_0002 + * @tc.number: user_file_service_external_file_access_ListFile_0002 + * @tc.name: external_file_access_ListFile_0002 * @tc.desc: Test function of ListFile interface for ERROR which sourceFileUri is absolute path. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0002, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0002, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0002"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_ListFile_0002"; try { vector info; int result = g_fah->GetRoots(info); @@ -2000,21 +2000,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0002, testing:: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_ListFile_0002"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0002"; } /** - * @tc.number: user_file_service_file_extension_helper_ListFile_0003 - * @tc.name: file_extension_helper_ListFile_0003 + * @tc.number: user_file_service_external_file_access_ListFile_0003 + * @tc.name: external_file_access_ListFile_0003 * @tc.desc: Test function of ListFile interface for ERROR which sourceFileUri is special symbols. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0003, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0003, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0003"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_ListFile_0003"; try { Uri sourceFileUri("~!@#$%^&*()_"); FileInfo fileInfo; @@ -2030,13 +2030,13 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0003, testing:: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_ListFile_0003"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0003"; } void ListFileTdd(shared_ptr fahs, FileInfo fileInfo, int offset, int maxCount, FileFilter filter, std::vector fileInfoVec) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFileTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_ListFileTdd"; int ret = fahs->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "ListFile get result error, code:" << ret; @@ -2044,21 +2044,21 @@ void ListFileTdd(shared_ptr fahs, FileInfo fileInfo, int offse } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); g_num++; - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_ListFileTdd"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFileTdd"; } /** - * @tc.number: user_file_service_file_extension_helper_ListFile_0004 - * @tc.name: file_extension_helper_ListFile_0004 + * @tc.number: user_file_service_external_file_access_ListFile_0004 + * @tc.name: external_file_access_ListFile_0004 * @tc.desc: Test function of ListFile interface for SUCCESS which Concurrent. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0004, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0004, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_ListFile_0004"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_ListFile_0004"; try { vector info; int result = g_fah->GetRoots(info); @@ -2070,7 +2070,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0004, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = g_fah->CreateFile(newDirUriTest, "file_extension_helper_ListFile_0004.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "external_file_access_ListFile_0004.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); FileInfo fileInfo; @@ -2092,21 +2092,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_ListFile_0004, testing:: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_ListFile_0004"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0004"; } /** - * @tc.number: user_file_service_file_extension_helper_GetRoots_0000 - * @tc.name: file_extension_helper_GetRoots_0000 + * @tc.number: user_file_service_external_file_access_GetRoots_0000 + * @tc.name: external_file_access_GetRoots_0000 * @tc.desc: Test function of GetRoots interface for SUCCESS. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0387 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_GetRoots_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_GetRoots_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_GetRoots_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_GetRoots_0000"; try { vector info; int result = g_fah->GetRoots(info); @@ -2123,21 +2123,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_GetRoots_0000, testing:: } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_GetRoots_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_GetRoots_0000"; } /** - * @tc.number: user_file_service_file_extension_helper_allInterface_0000 - * @tc.name: file_extension_helper_allInterface_0000 + * @tc.number: user_file_service_external_file_access_allInterface_0000 + * @tc.name: external_file_access_allInterface_0000 * @tc.desc: Test function of allInterface interface for SUCCESS. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_allInterface_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_allInterface_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_allInterface_0000"; try { auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); @@ -2175,7 +2175,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); - result = fahs->CreateFile(newDirUriTest1, "file_extension_helper_allInterface_0000.txt", newFileUri); + result = fahs->CreateFile(newDirUriTest1, "external_file_access_allInterface_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = fahs->Rename(newFileUri, "test1.txt", newFileUri); @@ -2197,21 +2197,21 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_allInterface_0000, testi } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_allInterface_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_allInterface_0000"; } /** - * @tc.number: user_file_service_file_extension_helper_Access_0000 - * @tc.name: file_extension_helper_Access_0000 + * @tc.number: user_file_service_external_file_access_Access_0000 + * @tc.name: external_file_access_Access_0000 * @tc.desc: Test function of Access interface for SUCCESS. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, file_extension_helper_Access_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_Access_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin file_extension_helper_Access_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Access_0000"; try { uint64_t selfTokenId_ = GetSelfTokenID(); @@ -2227,7 +2227,7 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Access_0000, testing::ex EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); - result = g_fah->CreateFile(newDirUriTest, "file_extension_helper_Access_0000.txt", newFileUri); + result = g_fah->CreateFile(newDirUriTest, "external_file_access_Access_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); bool isExist = false; @@ -2251,6 +2251,6 @@ HWTEST_F(FileExtensionHelperTest, file_extension_helper_Access_0000, testing::ex } catch (...) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end file_extension_helper_Access_0000"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Access_0000"; } } // namespace \ No newline at end of file diff --git a/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp index 87f2f5db..d96686ce 100644 --- a/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp +++ b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp @@ -158,17 +158,17 @@ public: }; /** - * @tc.number: user_file_service_file_access_helper_OpenFile_0000 - * @tc.name: file_access_helper_OpenFile_0000 + * @tc.number: user_file_service_medialibrary_file_access_OpenFile_0000 + * @tc.name: medialibrary_file_access_OpenFile_0000 * @tc.desc: Test function of OpenFile interface for SUCCESS. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0000"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_OpenFile_0000"; try { vector info; int result = g_fah->GetRoots(info); @@ -207,7 +207,7 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0000, testing::ext::T EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); - result = g_fah->CreateFile(newDirUriTest, "file_access_helper_OpenFile_0000.txt", newFileUri); + result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_OpenFile_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; @@ -221,21 +221,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0000, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_OpenFile_0000"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0000"; } /** - * @tc.number: user_file_service_file_access_helper_OpenFile_0001 - * @tc.name: file_access_helper_OpenFile_0001 + * @tc.number: user_file_service_medialibrary_file_access_OpenFile_0001 + * @tc.name: medialibrary_file_access_OpenFile_0001 * @tc.desc: Test function of OpenFile interface for ERROR which Uri is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0001, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0001, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0001"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_OpenFile_0001"; try { Uri uri(""); int fd; @@ -245,27 +245,27 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0001, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_OpenFile_0001"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0001"; } /** - * @tc.number: user_file_service_file_access_helper_OpenFile_0002 - * @tc.name: file_access_helper_OpenFile_0002 + * @tc.number: user_file_service_medialibrary_file_access_OpenFile_0002 + * @tc.name: medialibrary_file_access_OpenFile_0002 * @tc.desc: Test function of OpenFile interface for ERROR which Uri is absolute path. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0002, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0002, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0002"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_OpenFile_0002"; try { Uri newFileUri(""); - int result = g_fah->CreateFile(g_newDirUri, "file_access_helper_OpenFile_0002.txt", newFileUri); + int result = g_fah->CreateFile(g_newDirUri, "medialibrary_file_access_OpenFile_0002.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri uri("storage/media/100/local/files/Download/file_access_helper_OpenFile_0002.txt"); + Uri uri("storage/media/100/local/files/Download/medialibrary_file_access_OpenFile_0002.txt"); int fd; result = g_fah->OpenFile(uri, 0, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); @@ -276,21 +276,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0002, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_OpenFile_0002"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0002"; } /** - * @tc.number: user_file_service_file_access_helper_OpenFile_0003 - * @tc.name: file_access_helper_OpenFile_0003 + * @tc.number: user_file_service_medialibrary_file_access_OpenFile_0003 + * @tc.name: medialibrary_file_access_OpenFile_0003 * @tc.desc: Test function of OpenFile interface for ERROR which Uri is special symbols. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0003, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0003, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0003"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_OpenFile_0003"; try { Uri uri("~!@#$%^&*()_"); int fd; @@ -300,24 +300,24 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0003, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_OpenFile_0003"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0003"; } /** - * @tc.number: user_file_service_file_access_helper_OpenFile_0004 - * @tc.name: file_access_helper_OpenFile_0004 + * @tc.number: user_file_service_medialibrary_file_access_OpenFile_0004 + * @tc.name: medialibrary_file_access_OpenFile_0004 * @tc.desc: Test function of OpenFile interface for ERROR which flag is -1. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0004, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0004, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0004"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_OpenFile_0004"; try { Uri newFileUri(""); - int result = g_fah->CreateFile(g_newDirUri, "file_access_helper_OpenFile_0004.txt", newFileUri); + int result = g_fah->CreateFile(g_newDirUri, "medialibrary_file_access_OpenFile_0004.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; @@ -330,24 +330,24 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0004, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_OpenFile_0004"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0004"; } /** - * @tc.number: user_file_service_file_access_helper_OpenFile_0005 - * @tc.name: file_access_helper_OpenFile_0005 + * @tc.number: user_file_service_medialibrary_file_access_OpenFile_0005 + * @tc.name: medialibrary_file_access_OpenFile_0005 * @tc.desc: Test function of OpenFile interface for SUCCESS which flag is 1. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0005, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0005, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0005"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_OpenFile_0005"; try { Uri newFileUri(""); - int result = g_fah->CreateFile(g_newDirUri, "file_access_helper_OpenFile_0005.txt", newFileUri); + int result = g_fah->CreateFile(g_newDirUri, "medialibrary_file_access_OpenFile_0005.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; @@ -360,24 +360,24 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0005, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_OpenFile_0005"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0005"; } /** - * @tc.number: user_file_service_file_access_helper_OpenFile_0006 - * @tc.name: file_access_helper_OpenFile_0006 + * @tc.number: user_file_service_medialibrary_file_access_OpenFile_0006 + * @tc.name: medialibrary_file_access_OpenFile_0006 * @tc.desc: Test function of OpenFile interface for SUCCESS which flag is 2. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0006, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0006, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0006"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_OpenFile_0006"; try { Uri newFileUri(""); - int result = g_fah->CreateFile(g_newDirUri, "file_access_helper_OpenFile_0006.txt", newFileUri); + int result = g_fah->CreateFile(g_newDirUri, "medialibrary_file_access_OpenFile_0006.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; @@ -390,12 +390,12 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0006, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_OpenFile_0006"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0006"; } void OpenFileTdd(shared_ptr fahs, Uri uri, int flags, int fd) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_OpenFileTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_OpenFileTdd"; int ret = fahs->OpenFile(uri, flags, fd); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "OpenFileTdd get result error, code:" << ret; @@ -404,21 +404,21 @@ void OpenFileTdd(shared_ptr fahs, Uri uri, int flags, int fd) EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_GE(fd, 0); g_num++; - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_OpenFileTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFileTdd"; } /** - * @tc.number: user_file_service_file_access_helper_OpenFile_0007 - * @tc.name: file_access_helper_OpenFile_0007 + * @tc.number: user_file_service_medialibrary_file_access_OpenFile_0007 + * @tc.name: medialibrary_file_access_OpenFile_0007 * @tc.desc: Test function of OpenFile interface for SUCCESS which Concurrent. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0007, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0007, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_OpenFile_0007"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_OpenFile_0007"; try { Uri newFileUri(""); int flags = 0; @@ -438,24 +438,24 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_OpenFile_0007, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_OpenFile_0007"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0007"; } /** - * @tc.number: user_file_service_file_access_helper_CreateFile_0000 - * @tc.name: file_access_helper_CreateFile_0000 + * @tc.number: user_file_service_medialibrary_file_access_CreateFile_0000 + * @tc.name: medialibrary_file_access_CreateFile_0000 * @tc.desc: Test function of CreateFile interface for SUCCESS. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_CreateFile_0000"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_CreateFile_0000"; try { Uri newFileUri(""); - int result = g_fah->CreateFile(g_newDirUri, "file_access_helper_CreateFile_0000.txt", newFileUri); + int result = g_fah->CreateFile(g_newDirUri, "medialibrary_file_access_CreateFile_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0000 result:" << result << endl; @@ -464,93 +464,93 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0000, testing::ext: } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_CreateFile_0000"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0000"; } /** - * @tc.number: user_file_service_file_access_helper_CreateFile_0001 - * @tc.name: file_access_helper_CreateFile_0001 + * @tc.number: user_file_service_medialibrary_file_access_CreateFile_0001 + * @tc.name: medialibrary_file_access_CreateFile_0001 * @tc.desc: Test function of CreateFile interface for ERROR which parentUri is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0001, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0001, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_CreateFile_0001"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_CreateFile_0001"; try { Uri newFileUri(""); Uri parentUri(""); - int result = g_fah->CreateFile(parentUri, "file_access_helper_CreateFile_0001.txt", newFileUri); + int result = g_fah->CreateFile(parentUri, "medialibrary_file_access_CreateFile_0001.txt", newFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0001 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_CreateFile_0001"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0001"; } /** - * @tc.number: user_file_service_file_access_helper_CreateFile_0002 - * @tc.name: file_access_helper_CreateFile_0002 + * @tc.number: user_file_service_medialibrary_file_access_CreateFile_0002 + * @tc.name: medialibrary_file_access_CreateFile_0002 * @tc.desc: Test function of CreateFile interface for ERROR which parentUri is absolute path. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0002, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0002, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_CreateFile_0002"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_CreateFile_0002"; try { Uri newFileUri(""); Uri parentUri("storage/media/100/local/files/Download"); - int result = g_fah->CreateFile(parentUri, "file_access_helper_CreateFile_0002.txt", newFileUri); + int result = g_fah->CreateFile(parentUri, "medialibrary_file_access_CreateFile_0002.txt", newFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0002 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_CreateFile_0002"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0002"; } /** - * @tc.number: user_file_service_file_access_helper_CreateFile_0003 - * @tc.name: file_access_helper_CreateFile_0003 + * @tc.number: user_file_service_medialibrary_file_access_CreateFile_0003 + * @tc.name: medialibrary_file_access_CreateFile_0003 * @tc.desc: Test function of CreateFile interface for ERROR which parentUri is special symbols. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0003, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0003, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_CreateFile_0002"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_CreateFile_0002"; try { Uri newFileUri(""); Uri parentUri("~!@#$%^&*()_"); - int result = g_fah->CreateFile(parentUri, "file_access_helper_CreateFile_0003.txt", newFileUri); + int result = g_fah->CreateFile(parentUri, "medialibrary_file_access_CreateFile_0003.txt", newFileUri); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0003 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_CreateFile_0003"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0003"; } /** - * @tc.number: user_file_service_file_access_helper_CreateFile_0004 - * @tc.name: file_access_helper_CreateFile_0004 + * @tc.number: user_file_service_medialibrary_file_access_CreateFile_0004 + * @tc.name: medialibrary_file_access_CreateFile_0004 * @tc.desc: Test function of CreateFile interface for ERROR which displayName is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0004, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0004, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_CreateFile_0004"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_CreateFile_0004"; try { Uri newFileUri(""); string displayName = ""; @@ -560,12 +560,12 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0004, testing::ext: } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_CreateFile_0004"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0004"; } void CreateFileTdd(shared_ptr fahs, Uri parent, std::string displayName, Uri newDir) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_CreateFileTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_CreateFileTdd"; int ret = fahs->CreateFile(parent, displayName, newDir); if (ret < OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "CreateFileTdd get result error, code:" << ret; @@ -574,21 +574,21 @@ void CreateFileTdd(shared_ptr fahs, Uri parent, std::string di EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_NE(newDir.ToString(), ""); g_num++; - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_CreateFileTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFileTdd"; } /** - * @tc.number: user_file_service_file_access_helper_CreateFile_0005 - * @tc.name: file_access_helper_CreateFile_0005 + * @tc.number: user_file_service_medialibrary_file_access_CreateFile_0005 + * @tc.name: medialibrary_file_access_CreateFile_0005 * @tc.desc: Test function of CreateFile interface for SUCCESS while Concurrent. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0005, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0005, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_CreateFile_0005"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_CreateFile_0005"; try { Uri newFileUri1(""); Uri newFileUri2(""); @@ -611,24 +611,24 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_CreateFile_0005, testing::ext: } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_CreateFile_0005"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0005"; } /** - * @tc.number: user_file_service_file_access_helper_Mkdir_0000 - * @tc.name: file_access_helper_Mkdir_0000 + * @tc.number: user_file_service_medialibrary_file_access_Mkdir_0000 + * @tc.name: medialibrary_file_access_Mkdir_0000 * @tc.desc: Test function of Mkdir interface for SUCCESS. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Mkdir_0000"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Mkdir_0000"; try { Uri newDirUriTest(""); - int result = g_fah->Mkdir(g_newDirUri, "file_access_helper_Mkdir_0000", newDirUriTest); + int result = g_fah->Mkdir(g_newDirUri, "medialibrary_file_access_Mkdir_0000", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0000 result:" << result << endl; @@ -637,93 +637,93 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0000, testing::ext::Test } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Mkdir_0000"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0000"; } /** - * @tc.number: user_file_service_file_access_helper_Mkdir_0001 - * @tc.name: file_access_helper_Mkdir_0001 + * @tc.number: user_file_service_medialibrary_file_access_Mkdir_0001 + * @tc.name: medialibrary_file_access_Mkdir_0001 * @tc.desc: Test function of Mkdir interface for ERROR which parentUri is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0001, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0001, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Mkdir_0001"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Mkdir_0001"; try { Uri newDirUriTest(""); Uri parentUri(""); - int result = g_fah->Mkdir(parentUri, "file_access_helper_Mkdir_0001", newDirUriTest); + int result = g_fah->Mkdir(parentUri, "medialibrary_file_access_Mkdir_0001", newDirUriTest); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0001 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Mkdir_0001"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0001"; } /** - * @tc.number: user_file_service_file_access_helper_Mkdir_0002 - * @tc.name: file_access_helper_Mkdir_0002 + * @tc.number: user_file_service_medialibrary_file_access_Mkdir_0002 + * @tc.name: medialibrary_file_access_Mkdir_0002 * @tc.desc: Test function of Mkdir interface for ERROR which parentUri is absolute path. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0002, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0002, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Mkdir_0002"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Mkdir_0002"; try { Uri newDirUriTest(""); Uri parentUri("storage/media/100/local/files/Download"); - int result = g_fah->Mkdir(parentUri, "file_access_helper_Mkdir_0002", newDirUriTest); + int result = g_fah->Mkdir(parentUri, "medialibrary_file_access_Mkdir_0002", newDirUriTest); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0002 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Mkdir_0002"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0002"; } /** - * @tc.number: user_file_service_file_access_helper_Mkdir_0003 - * @tc.name: file_access_helper_Mkdir_0003 + * @tc.number: user_file_service_medialibrary_file_access_Mkdir_0003 + * @tc.name: medialibrary_file_access_Mkdir_0003 * @tc.desc: Test function of Mkdir interface for ERROR which parentUri is special symbols. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0003, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0003, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Mkdir_0002"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Mkdir_0002"; try { Uri newDirUriTest(""); Uri parentUri("~!@#$%^&*()_"); - int result = g_fah->Mkdir(parentUri, "file_access_helper_Mkdir_0003", newDirUriTest); + int result = g_fah->Mkdir(parentUri, "medialibrary_file_access_Mkdir_0003", newDirUriTest); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0003 result:" << result << endl; } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Mkdir_0003"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0003"; } /** - * @tc.number: user_file_service_file_access_helper_Mkdir_0004 - * @tc.name: file_access_helper_Mkdir_0004 + * @tc.number: user_file_service_medialibrary_file_access_Mkdir_0004 + * @tc.name: medialibrary_file_access_Mkdir_0004 * @tc.desc: Test function of Mkdir interface for ERROR which displayName is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0004, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0004, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Mkdir_0004"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Mkdir_0004"; try { Uri newDirUriTest(""); string displayName = ""; @@ -733,12 +733,12 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0004, testing::ext::Test } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Mkdir_0004"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0004"; } void MkdirTdd(shared_ptr fahs, Uri parent, std::string displayName, Uri newDir) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_MkdirTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_MkdirTdd"; int ret = fahs->Mkdir(parent, displayName, newDir); if (ret < OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "MkdirTdd get result error, code:" << ret; @@ -747,21 +747,21 @@ void MkdirTdd(shared_ptr fahs, Uri parent, std::string display EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_NE(newDir.ToString(), ""); g_num++; - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_MkdirTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_MkdirTdd"; } /** - * @tc.number: user_file_service_file_access_helper_Mkdir_0005 - * @tc.name: file_access_helper_Mkdir_0005 + * @tc.number: user_file_service_medialibrary_file_access_Mkdir_0005 + * @tc.name: medialibrary_file_access_Mkdir_0005 * @tc.desc: Test function of Mkdir interface for SUCCESS which Concurrent. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0005, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0005, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Mkdir_0005"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Mkdir_0005"; try { Uri newFileUri1(""); Uri newFileUri2(""); @@ -784,28 +784,28 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Mkdir_0005, testing::ext::Test } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Mkdir_0005"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0005"; } /** - * @tc.number: user_file_service_file_access_helper_Delete_0000 - * @tc.name: file_access_helper_Delete_0000 + * @tc.number: user_file_service_medialibrary_file_access_Delete_0000 + * @tc.name: medialibrary_file_access_Delete_0000 * @tc.desc: Test function of Delete interface for SUCCESS which delete file. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0000"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Delete_0000"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); - result = g_fah->CreateFile(newDirUriTest, "file_access_helper_Delete_0000.txt", newFileUri); + result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_Delete_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->Delete(newFileUri); @@ -817,21 +817,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0000, testing::ext::Tes } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Delete_0000"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0000"; } /** - * @tc.number: user_file_service_file_access_helper_Delete_0001 - * @tc.name: file_access_helper_Delete_0001 + * @tc.number: user_file_service_medialibrary_file_access_Delete_0001 + * @tc.name: medialibrary_file_access_Delete_0001 * @tc.desc: Test function of Delete interface for SUCCESS which delete folder. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0001, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0001, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0001"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Delete_0001"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); @@ -843,21 +843,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0001, testing::ext::Tes } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Delete_0001"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0001"; } /** - * @tc.number: user_file_service_file_access_helper_Delete_0002 - * @tc.name: file_access_helper_Delete_0002 + * @tc.number: user_file_service_medialibrary_file_access_Delete_0002 + * @tc.name: medialibrary_file_access_Delete_0002 * @tc.desc: Test function of Delete interface for ERROR which selectFileUri is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0002, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0002, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0002"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Delete_0002"; try { Uri selectFileUri(""); int result = g_fah->Delete(selectFileUri); @@ -866,21 +866,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0002, testing::ext::Tes } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Delete_0002"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0002"; } /** - * @tc.number: user_file_service_file_access_helper_Delete_0003 - * @tc.name: file_access_helper_Delete_0003 + * @tc.number: user_file_service_medialibrary_file_access_Delete_0003 + * @tc.name: medialibrary_file_access_Delete_0003 * @tc.desc: Test function of Delete interface for ERROR which selectFileUri is absolute path. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0003, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0003, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0003"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Delete_0003"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); @@ -896,21 +896,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0003, testing::ext::Tes } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Delete_0003"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0003"; } /** - * @tc.number: user_file_service_file_access_helper_Delete_0004 - * @tc.name: file_access_helper_Delete_0004 + * @tc.number: user_file_service_medialibrary_file_access_Delete_0004 + * @tc.name: medialibrary_file_access_Delete_0004 * @tc.desc: Test function of Delete interface for ERROR which selectFileUri is special symbols. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0004, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0004, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0004"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Delete_0004"; try { Uri selectFileUri("!@#$%^&*()"); int result = g_fah->Delete(selectFileUri); @@ -919,12 +919,12 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0004, testing::ext::Tes } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Delete_0004"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0004"; } void DeleteTdd(shared_ptr fahs, Uri selectFile) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_DeleteTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_DeleteTdd"; int ret = fahs->Delete(selectFile); if (ret < OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "DeleteTdd get result error, code:" << ret; @@ -932,28 +932,28 @@ void DeleteTdd(shared_ptr fahs, Uri selectFile) } EXPECT_GE(ret, OHOS::FileAccessFwk::ERR_OK); g_num++; - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_DeleteTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_DeleteTdd"; } /** - * @tc.number: user_file_service_file_access_helper_Delete_0005 - * @tc.name: file_access_helper_Delete_0005 + * @tc.number: user_file_service_medialibrary_file_access_Delete_0005 + * @tc.name: medialibrary_file_access_Delete_0005 * @tc.desc: Test function of Delete interface for SUCCESS which Concurrent. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0005, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0005, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Delete_0005"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Delete_0005"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri newFileUri(""); - result = g_fah->CreateFile(newDirUriTest, "file_access_helper_Delete_0005.txt", newFileUri); + result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_Delete_0005.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); @@ -973,22 +973,22 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Delete_0005, testing::ext::Tes } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Delete_0005"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0005"; } /** - * @tc.number: user_file_service_file_access_helper_Move_0000 - * @tc.name: file_access_helper_Move_0000 + * @tc.number: user_file_service_medialibrary_file_access_Move_0000 + * @tc.name: medialibrary_file_access_Move_0000 * @tc.desc: Test function of Move interface for SUCCESS which move file. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0000"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Move_0000"; try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); @@ -1015,21 +1015,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0000, testing::ext::TestS } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Move_0000"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0000"; } /** - * @tc.number: user_file_service_file_access_helper_Move_0001 - * @tc.name: file_access_helper_Move_0001 + * @tc.number: user_file_service_medialibrary_file_access_Move_0001 + * @tc.name: medialibrary_file_access_Move_0001 * @tc.desc: Test function of Move interface for SUCCESS which move folder. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0001, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0001, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0001"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Move_0001"; try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); @@ -1055,21 +1055,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0001, testing::ext::TestS } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Move_0001"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0001"; } /** - * @tc.number: user_file_service_file_access_helper_Move_0002 - * @tc.name: file_access_helper_Move_0002 + * @tc.number: user_file_service_medialibrary_file_access_Move_0002 + * @tc.name: medialibrary_file_access_Move_0002 * @tc.desc: Test function of Move interface for ERROR which sourceFileUri is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0002, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0002, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0002"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Move_0002"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); @@ -1086,21 +1086,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0002, testing::ext::TestS } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Move_0002"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0002"; } /** - * @tc.number: user_file_service_file_access_helper_Move_0003 - * @tc.name: file_access_helper_Move_0003 + * @tc.number: user_file_service_medialibrary_file_access_Move_0003 + * @tc.name: medialibrary_file_access_Move_0003 * @tc.desc: Test function of Move interface for ERROR which sourceFileUri is absolute path. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0003, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0003, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0003"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Move_0003"; try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); @@ -1128,21 +1128,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0003, testing::ext::TestS } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Move_0003"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0003"; } /** - * @tc.number: user_file_service_file_access_helper_Move_0004 - * @tc.name: file_access_helper_Move_0004 + * @tc.number: user_file_service_medialibrary_file_access_Move_0004 + * @tc.name: medialibrary_file_access_Move_0004 * @tc.desc: Test function of Move interface for ERROR which sourceFileUri is special symbols. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0004, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0004, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0004"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Move_0004"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); @@ -1159,21 +1159,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0004, testing::ext::TestS } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Move_0004"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0004"; } /** - * @tc.number: user_file_service_file_access_helper_Move_0005 - * @tc.name: file_access_helper_Move_0005 + * @tc.number: user_file_service_medialibrary_file_access_Move_0005 + * @tc.name: medialibrary_file_access_Move_0005 * @tc.desc: Test function of Move interface for ERROR which targetParentUri is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0005, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0005, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0005"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Move_0005"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest); @@ -1194,21 +1194,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0005, testing::ext::TestS } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Move_0005"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0005"; } /** - * @tc.number: user_file_service_file_access_helper_Move_0006 - * @tc.name: file_access_helper_Move_0006 + * @tc.number: user_file_service_medialibrary_file_access_Move_0006 + * @tc.name: medialibrary_file_access_Move_0006 * @tc.desc: Test function of Move interface for ERROR which targetParentUri is absolute path. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0006, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0006, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0006"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Move_0006"; try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); @@ -1236,21 +1236,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0006, testing::ext::TestS } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Move_0006"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0006"; } /** - * @tc.number: user_file_service_file_access_helper_Move_0007 - * @tc.name: file_access_helper_Move_0007 + * @tc.number: user_file_service_medialibrary_file_access_Move_0007 + * @tc.name: medialibrary_file_access_Move_0007 * @tc.desc: Test function of Move interface for ERROR which targetParentUri is special symbols. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0007, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0007, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0007"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Move_0007"; try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); @@ -1278,21 +1278,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0007, testing::ext::TestS } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Move_0007"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0007"; } /** - * @tc.number: user_file_service_file_access_helper_Move_0008 - * @tc.name: file_access_helper_Move_0008 + * @tc.number: user_file_service_medialibrary_file_access_Move_0008 + * @tc.name: medialibrary_file_access_Move_0008 * @tc.desc: Test function of Move interface for SUCCESS which move empty folder. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0008, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0008, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0008"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Move_0008"; try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); @@ -1314,21 +1314,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0008, testing::ext::TestS } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Move_0008"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0008"; } /** - * @tc.number: user_file_service_file_access_helper_Move_0009 - * @tc.name: file_access_helper_Move_0009 + * @tc.number: user_file_service_medialibrary_file_access_Move_0009 + * @tc.name: medialibrary_file_access_Move_0009 * @tc.desc: Test function of Move interface for SUCCESS which move more file in folder. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0009, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0009, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0009"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Move_0009"; try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); @@ -1356,21 +1356,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0009, testing::ext::TestS } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Move_0009"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0009"; } /** - * @tc.number: user_file_service_file_access_helper_Move_0010 - * @tc.name: file_access_helper_Move_0010 + * @tc.number: user_file_service_medialibrary_file_access_Move_0010 + * @tc.name: medialibrary_file_access_Move_0010 * @tc.desc: Test function of Move interface for SUCCESS which move Multilevel directory folder. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0010, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0010, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0010"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Move_0010"; try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); @@ -1398,12 +1398,12 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0010, testing::ext::TestS } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Move_0010"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0010"; } void MoveTdd(shared_ptr fahs, Uri sourceFile, Uri targetParent, Uri newFile) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_MoveTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_MoveTdd"; int ret = fahs->Move(sourceFile, targetParent, newFile); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "MoveTdd get result error, code:" << ret; @@ -1412,21 +1412,21 @@ void MoveTdd(shared_ptr fahs, Uri sourceFile, Uri targetParent EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_NE(newFile.ToString(), ""); g_num++; - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_MoveTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_MoveTdd"; } /** - * @tc.number: user_file_service_file_access_helper_Move_0011 - * @tc.name: file_access_helper_Move_0011 + * @tc.number: user_file_service_medialibrary_file_access_Move_0011 + * @tc.name: medialibrary_file_access_Move_0011 * @tc.desc: Test function of Move interface for SUCCESS which Concurrent. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0011, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0011, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Move_0011"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Move_0011"; try { Uri newDirUriTest1(""); Uri newDirUriTest2(""); @@ -1456,21 +1456,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Move_0011, testing::ext::TestS } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Move_0011"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0011"; } /** - * @tc.number: user_file_service_file_access_helper_Rename_0000 - * @tc.name: file_access_helper_Rename_0000 + * @tc.number: user_file_service_medialibrary_file_access_Rename_0000 + * @tc.name: medialibrary_file_access_Rename_0000 * @tc.desc: Test function of Rename interface for SUCCESS which rename file. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0000"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Rename_0000"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); @@ -1490,21 +1490,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0000, testing::ext::Tes } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Rename_0000"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0000"; } /** - * @tc.number: user_file_service_file_access_helper_Rename_0001 - * @tc.name: file_access_helper_Rename_0001 + * @tc.number: user_file_service_medialibrary_file_access_Rename_0001 + * @tc.name: medialibrary_file_access_Rename_0001 * @tc.desc: Test function of Rename interface for SUCCESS which rename folder. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0001, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0001, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0001"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Rename_0001"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); @@ -1520,21 +1520,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0001, testing::ext::Tes } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Rename_0001"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0001"; } /** - * @tc.number: user_file_service_file_access_helper_Rename_0002 - * @tc.name: file_access_helper_Rename_0002 + * @tc.number: user_file_service_medialibrary_file_access_Rename_0002 + * @tc.name: medialibrary_file_access_Rename_0002 * @tc.desc: Test function of Rename interface for ERROR which sourceFileUri is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0002, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0002, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0002"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Rename_0002"; try { Uri renameUri(""); Uri sourceFileUri(""); @@ -1544,21 +1544,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0002, testing::ext::Tes } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Rename_0002"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0002"; } /** - * @tc.number: user_file_service_file_access_helper_Rename_0003 - * @tc.name: file_access_helper_Rename_0003 + * @tc.number: user_file_service_medialibrary_file_access_Rename_0003 + * @tc.name: medialibrary_file_access_Rename_0003 * @tc.desc: Test function of Rename interface for ERROR which sourceFileUri is absolute path. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0003, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0003, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0003"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Rename_0003"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); @@ -1579,21 +1579,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0003, testing::ext::Tes } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Rename_0003"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0003"; } /** - * @tc.number: user_file_service_file_access_helper_Rename_0004 - * @tc.name: file_access_helper_Rename_0004 + * @tc.number: user_file_service_medialibrary_file_access_Rename_0004 + * @tc.name: medialibrary_file_access_Rename_0004 * @tc.desc: Test function of Rename interface for ERROR which sourceFileUri is special symbols. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0004, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0004, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0004"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Rename_0004"; try { Uri renameUri(""); Uri sourceFileUri("~!@#$%^&*()_"); @@ -1603,21 +1603,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0004, testing::ext::Tes } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Rename_0004"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0004"; } /** - * @tc.number: user_file_service_file_access_helper_Rename_0005 - * @tc.name: file_access_helper_Rename_0005 + * @tc.number: user_file_service_medialibrary_file_access_Rename_0005 + * @tc.name: medialibrary_file_access_Rename_0005 * @tc.desc: Test function of Rename interface for ERROR which displayName is null. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0005, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0005, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0005"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Rename_0005"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); @@ -1637,12 +1637,12 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0005, testing::ext::Tes } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Rename_0005"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0005"; } void RenameTdd(shared_ptr fahs, Uri sourceFile, std::string displayName, Uri newFile) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_RenameTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_RenameTdd"; int ret = fahs->Rename(sourceFile, displayName, newFile); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "RenameTdd get result error, code:" << ret; @@ -1651,21 +1651,21 @@ void RenameTdd(shared_ptr fahs, Uri sourceFile, std::string di EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_NE(newFile.ToString(), ""); g_num++; - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_RenameTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_RenameTdd"; } /** - * @tc.number: user_file_service_file_access_helper_Rename_0006 - * @tc.name: file_access_helper_Rename_0006 + * @tc.number: user_file_service_medialibrary_file_access_Rename_0006 + * @tc.name: medialibrary_file_access_Rename_0006 * @tc.desc: Test function of Rename interface for SUCCESS which Concurrent. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0006, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0006, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_Rename_0006"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_Rename_0006"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); @@ -1688,28 +1688,28 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_Rename_0006, testing::ext::Tes } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_Rename_0006"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0006"; } /** - * @tc.number: user_file_service_file_access_helper_ListFile_0000 - * @tc.name: file_access_helper_ListFile_0000 + * @tc.number: user_file_service_medialibrary_file_access_ListFile_0000 + * @tc.name: medialibrary_file_access_ListFile_0000 * @tc.desc: Test function of ListFile interface for SUCCESS. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0000"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_ListFile_0000"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0000.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ListFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); FileInfo fileInfo; @@ -1728,21 +1728,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0000, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ListFile_0000"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0000"; } /** - * @tc.number: user_file_service_file_access_helper_ListFile_0001 - * @tc.name: file_access_helper_ListFile_0001 + * @tc.number: user_file_service_medialibrary_file_access_ListFile_0001 + * @tc.name: medialibrary_file_access_ListFile_0001 * @tc.desc: Test function of ListFile interface for ERROR which Uri is nullptr. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0001, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0001, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0001"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_ListFile_0001"; try { Uri sourceFileUri(""); FileInfo fileInfo; @@ -1758,21 +1758,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0001, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ListFile_0001"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0001"; } /** - * @tc.number: user_file_service_file_access_helper_ListFile_0002 - * @tc.name: file_access_helper_ListFile_0002 + * @tc.number: user_file_service_medialibrary_file_access_ListFile_0002 + * @tc.name: medialibrary_file_access_ListFile_0002 * @tc.desc: Test function of ListFile interface for ERROR which sourceFileUri is absolute path. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0002, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0002, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0002"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_ListFile_0002"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); @@ -1799,21 +1799,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0002, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ListFile_0002"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0002"; } /** - * @tc.number: user_file_service_file_access_helper_ListFile_0003 - * @tc.name: file_access_helper_ListFile_0003 + * @tc.number: user_file_service_medialibrary_file_access_ListFile_0003 + * @tc.name: medialibrary_file_access_ListFile_0003 * @tc.desc: Test function of ListFile interface for ERROR which sourceFileUri is special symbols. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0003, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0003, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0003"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_ListFile_0003"; try { Uri sourceFileUri("~!@#$%^&*()_"); FileInfo fileInfo; @@ -1829,31 +1829,31 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0003, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ListFile_0003"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0003"; } /** - * @tc.number: user_file_service_file_access_helper_ListFile_0004 - * @tc.name: file_access_helper_ListFile_0004 + * @tc.number: user_file_service_medialibrary_file_access_ListFile_0004 + * @tc.name: medialibrary_file_access_ListFile_0004 * @tc.desc: Test function of ListFile interface for ERROR which add filter. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000HB855 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0004, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0004, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0004"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_ListFile_0004"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri1(""); - result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0004.txt", testUri1); + result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ListFile_0004.txt", testUri1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); - result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0004.docx", testUri2); + result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ListFile_0004.docx", testUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); FileInfo fileInfo; @@ -1871,13 +1871,13 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0004, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ListFile_0004"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0004"; } void ListFileTdd(shared_ptr fahs, FileInfo fileInfo, int offset, int maxCount, FileFilter filter, std::vector fileInfoVec) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_Access_helper_ListFileTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_ListFileTdd"; int ret = fahs->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "ListFileTdd get result error, code:" << ret; @@ -1886,31 +1886,31 @@ void ListFileTdd(shared_ptr fahs, FileInfo fileInfo, int offse EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 1); g_num++; - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_ListFileTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFileTdd"; } /** - * @tc.number: user_file_service_file_access_helper_ListFile_0005 - * @tc.name: file_access_helper_ListFile_0005 + * @tc.number: user_file_service_medialibrary_file_access_ListFile_0005 + * @tc.name: medialibrary_file_access_ListFile_0005 * @tc.desc: Test function of ListFile interface for ERROR which Concurrent. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0005, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0005, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ListFile_0005"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_ListFile_0005"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri1(""); - result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0005.txt", testUri1); + result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ListFile_0005.txt", testUri1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); - result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ListFile_0005.docx", testUri2); + result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ListFile_0005.docx", testUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); FileInfo fileInfo; @@ -1931,21 +1931,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ListFile_0005, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ListFile_0005"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0005"; } /** - * @tc.number: user_file_service_file_access_helper_ScanFile_0000 - * @tc.name: file_access_helper_ScanFile_0000 + * @tc.number: user_file_service_medialibrary_file_access_ScanFile_0000 + * @tc.name: medialibrary_file_access_ScanFile_0000 * @tc.desc: Test function of ScanFile interface for SUCCESS which scan root directory with filter. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000HB866 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0000"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_ScanFile_0000"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); @@ -1953,9 +1953,9 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0000, testing::ext::T Uri testUri(""); FileInfo fileInfo; - result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.q1w2e3r4", testUri); + result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ScanFile_0000.q1w2e3r4", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ScanFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); fileInfo.uri = "datashare:///media/root"; int64_t offset = 0; @@ -1972,21 +1972,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0000, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ScanFile_0000"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0000"; } /** - * @tc.number: user_file_service_file_access_helper_ScanFile_0001 - * @tc.name: file_access_helper_ScanFile_0001 + * @tc.number: user_file_service_medialibrary_file_access_ScanFile_0001 + * @tc.name: medialibrary_file_access_ScanFile_0001 * @tc.desc: Test function of ScanFile interface for SUCCESS which scan root directory with no filter. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000HB866 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0001, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0001, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0001"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_ScanFile_0001"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); @@ -1995,9 +1995,9 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0001, testing::ext::T Uri testUri(""); FileInfo fileInfo; fileInfo.uri = "datashare:///media/root"; - result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0001.q1w2e3r4", testUri); + result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ScanFile_0001.q1w2e3r4", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0001.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ScanFile_0001.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int64_t offset = 0; int64_t maxCount = 1000; @@ -2013,32 +2013,32 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0001, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ScanFile_0001"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0001"; } /** - * @tc.number: user_file_service_file_access_helper_ScanFile_0002 - * @tc.name: file_access_helper_ScanFile_0002 + * @tc.number: user_file_service_medialibrary_file_access_ScanFile_0002 + * @tc.name: medialibrary_file_access_ScanFile_0002 * @tc.desc: Test function of ScanFile interface for SUCCESS which self created directory with filter. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000HB866 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0002, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0002, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0002"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_ScanFile_0002"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0002.q1w2e3r4", testUri); + result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ScanFile_0002.q1w2e3r4", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ScanFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.docx", testUri); + result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ScanFile_0000.docx", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); FileInfo fileInfo; fileInfo.uri = newDirUriTest.ToString(); @@ -2060,28 +2060,28 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0002, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ScanFile_0002"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0002"; } /** - * @tc.number: user_file_service_file_access_helper_ScanFile_0003 - * @tc.name: file_access_helper_ScanFile_0003 + * @tc.number: user_file_service_medialibrary_file_access_ScanFile_0003 + * @tc.name: medialibrary_file_access_ScanFile_0003 * @tc.desc: Test function of ScanFile interface for SUCCESS which self created directory with filter. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000HB866 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0003, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0003, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0003"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_ScanFile_0003"; try { Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0003.q1w2e3r4", testUri); + result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ScanFile_0003.q1w2e3r4", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); FileInfo fileInfo; fileInfo.uri = newDirUriTest.ToString(); @@ -2099,13 +2099,13 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0003, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ScanFile_0003"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0003"; } void ScanFileTdd(shared_ptr fahs, FileInfo fileInfo, int offset, int maxCount, FileFilter filter, std::vector fileInfoVec) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFileTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_ScanFileTdd"; int ret = fahs->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "ScanFileTdd get result error, code:" << ret; @@ -2114,21 +2114,21 @@ void ScanFileTdd(shared_ptr fahs, FileInfo fileInfo, int offse EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 1); g_num++; - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_Access_helper_ScanFileTdd"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFileTdd"; } /** - * @tc.number: user_file_service_file_access_helper_ScanFile_0004 - * @tc.name: file_access_helper_ScanFile_0004 + * @tc.number: user_file_service_medialibrary_file_access_ScanFile_0004 + * @tc.name: medialibrary_file_access_ScanFile_0004 * @tc.desc: Test function of ScanFile interface for SUCCESS which scan root directory with Concurrent. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000HB866 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0004, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0004, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_ScanFile_0004"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_ScanFile_0004"; try { Uri newDirUriTest(""); GTEST_LOG_(INFO) << "g_newDirUri=" << g_newDirUri.ToString(); @@ -2137,9 +2137,9 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0004, testing::ext::T Uri testUri(""); FileInfo fileInfo; - result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.q1w2e3r4", testUri); + result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ScanFile_0000.q1w2e3r4", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->CreateFile(newDirUriTest, "file_access_helper_ScanFile_0000.txt", testUri); + result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ScanFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); fileInfo.uri = "datashare:///media/root"; int64_t offset = 0; @@ -2158,21 +2158,21 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_ScanFile_0004, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_ScanFile_0004"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0004"; } /** - * @tc.number: user_file_service_file_access_helper_GetRoots_0000 - * @tc.name: file_access_helper_GetRoots_0000 + * @tc.number: user_file_service_medialibrary_file_access_GetRoots_0000 + * @tc.name: medialibrary_file_access_GetRoots_0000 * @tc.desc: Test function of GetRoots interface for SUCCESS. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, file_access_helper_GetRoots_0000, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_GetRoots_0000, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin file_access_helper_GetRoots_0000"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_GetRoots_0000"; try { uint64_t selfTokenId_ = GetSelfTokenID(); @@ -2199,6 +2199,6 @@ HWTEST_F(FileAccessHelperTest, file_access_helper_GetRoots_0000, testing::ext::T } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end file_access_helper_GetRoots_0000"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_GetRoots_0000"; } } // namespace \ No newline at end of file -- Gitee From 9836510c558b3fd19337818025b6507f4a40c362 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Wed, 14 Sep 2022 10:59:25 +0800 Subject: [PATCH 113/122] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../file_access/test/medialibrary_file_access_test.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp index d96686ce..6647d1ed 100644 --- a/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp +++ b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp @@ -179,7 +179,6 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0000, testing:: GTEST_LOG_(INFO) << parentUri.ToString(); } - GTEST_LOG_(INFO) << "g_newDirUri=" << g_newDirUri.ToString(); bool isExist = false; g_fah->Access(g_newDirUri, isExist); if (!isExist) { @@ -202,7 +201,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0000, testing:: g_newDirUri = Uri(fileInfoVec[i].uri); } } - GTEST_LOG_(INFO) << "fileInfoVec.fileName=" << fileInfoVec[0].fileName; + result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -1449,10 +1448,8 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0011, testing::ext: EXPECT_GE(g_num, 1); result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - GTEST_LOG_(INFO) << "Delete-result1=" << result; result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - GTEST_LOG_(INFO) << "Delete-result2=" << result; } catch (...) { GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; } @@ -2131,7 +2128,6 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0004, testing:: GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_ScanFile_0004"; try { Uri newDirUriTest(""); - GTEST_LOG_(INFO) << "g_newDirUri=" << g_newDirUri.ToString(); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); -- Gitee From df48d17035882992121dc2917a4c476884181182 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Wed, 14 Sep 2022 11:43:44 +0800 Subject: [PATCH 114/122] =?UTF-8?q?format=5Fcheck=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- frameworks/innerkits/file_access/test/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/innerkits/file_access/test/BUILD.gn b/frameworks/innerkits/file_access/test/BUILD.gn index 59e031e5..aa74c230 100644 --- a/frameworks/innerkits/file_access/test/BUILD.gn +++ b/frameworks/innerkits/file_access/test/BUILD.gn @@ -98,7 +98,7 @@ group("user_file_service_test") { testonly = true deps = [ - ":medialibrary_file_access_test", ":external_file_access_test", + ":medialibrary_file_access_test", ] } -- Gitee From 3bf9b04b7162481df60919305ae7c2682ffe1cac Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Wed, 14 Sep 2022 20:09:01 +0800 Subject: [PATCH 115/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9review=E6=84=8F?= =?UTF-8?q?=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../test/external_file_access_test.cpp | 159 +++++++++--------- .../test/medialibrary_file_access_test.cpp | 156 ++++++++--------- 2 files changed, 157 insertions(+), 158 deletions(-) diff --git a/frameworks/innerkits/file_access/test/external_file_access_test.cpp b/frameworks/innerkits/file_access/test/external_file_access_test.cpp index f1a9f2e6..2caec163 100644 --- a/frameworks/innerkits/file_access/test/external_file_access_test.cpp +++ b/frameworks/innerkits/file_access/test/external_file_access_test.cpp @@ -29,6 +29,8 @@ namespace { using namespace std; using namespace OHOS; using namespace FileAccessFwk; +const int32_t WRITE = 1; +const int32_t WRITE_READ = 2; const int ABILITY_ID = 5003; shared_ptr g_fah = nullptr; int g_num = 0; @@ -138,14 +140,18 @@ public: EXPECT_TRUE(sus); vector wants {want}; g_fah = FileAccessHelper::Creator(remoteObj, wants); - + if (g_fah == nullptr) { + GTEST_LOG_(INFO) << "external_file_access_test g_fah is nullptr"; + } OHOS::Security::AccessToken::AccessTokenIDEx tokenIdEx = {0}; - tokenIdEx = OHOS::Security::AccessToken::AccessTokenKit::AllocHapToken - (g_infoManagerTestInfoParms, g_infoManagerTestPolicyPrams); + tokenIdEx = OHOS::Security::AccessToken::AccessTokenKit::AllocHapToken( + g_infoManagerTestInfoParms, g_infoManagerTestPolicyPrams); g_tokenId = tokenIdEx.tokenIdExStruct.tokenID; SetSelfTokenID(g_tokenId); } - static void TearDownTestCase() { + + static void TearDownTestCase() + { g_fah->Release(); g_fah = nullptr; OHOS::Security::AccessToken::AccessTokenKit::DeleteToken(g_tokenId); @@ -167,33 +173,27 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0000, testing::e { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0000"; try { - vector info; 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); GTEST_LOG_(INFO) << parentUri.ToString(); - Uri newDirUriTest1(""); result = g_fah->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); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - int fd; - result = g_fah->OpenFile(newFileUri, 0, fd); + result = g_fah->OpenFile(newFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; - result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_OpenFile_0000 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0000"; } @@ -213,11 +213,11 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0001, testing::e try { Uri uri(""); int fd; - int result = g_fah->OpenFile(uri, 0, fd); + int result = g_fah->OpenFile(uri, WRITE_READ, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_OpenFile_0001 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0001"; } @@ -246,7 +246,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0002, testing::e Uri uri("storage/media/100/local/files/Download/external_file_access_OpenFile_0002.txt"); int fd; - result = g_fah->OpenFile(uri, 0, fd); + result = g_fah->OpenFile(uri, WRITE_READ, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0002 result:" << result << endl; @@ -254,7 +254,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0002, testing::e EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_OpenFile_0002 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0002"; } @@ -274,11 +274,11 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0003, testing::e try { Uri uri("~!@#$%^&*()_"); int fd; - int result = g_fah->OpenFile(uri, 0, fd); + int result = g_fah->OpenFile(uri, WRITE_READ, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_OpenFile_0003 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0003"; } @@ -306,7 +306,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0004, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = g_fah->OpenFile(newFileUri, -1, fd); + int flags = -1; + result = g_fah->OpenFile(newFileUri, flags, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0004 result:" << result << endl; @@ -314,7 +315,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0004, testing::e EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_OpenFile_0004 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0004"; } @@ -342,7 +343,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0005, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = g_fah->OpenFile(newFileUri, 1, fd); + result = g_fah->OpenFile(newFileUri, WRITE, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0005 result:" << result << endl; @@ -350,7 +351,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0005, testing::e EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_OpenFile_0005 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0005"; } @@ -378,7 +379,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0006, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = g_fah->OpenFile(newFileUri, 2, fd); + result = g_fah->OpenFile(newFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0006 result:" << result << endl; @@ -386,7 +387,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0006, testing::e EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_OpenFile_0006 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0006"; } @@ -430,7 +431,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0007, testing::e g_num = 0; result = g_fah->CreateFile(parentUri, displayName, newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - for (size_t j = 0; j< 4; j++) { + for (size_t j = 0; j < 4; j++) { std::thread execthread(OpenFileTdd, g_fah, newFileUri, flags, fd); execthread.join(); } @@ -439,7 +440,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0007, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_OpenFile_0007 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0007"; } @@ -471,7 +472,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0000, testing: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_CreateFile_0000 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0000"; } @@ -495,7 +496,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0001, testing: EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_CreateFile_0001 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0001"; } @@ -519,7 +520,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0002, testing: EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_CreateFile_0002 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0002"; } @@ -543,7 +544,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0003, testing: EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_CreateFile_0003 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0003"; } @@ -573,7 +574,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0004, testing: GTEST_LOG_(INFO) << "CreateFile_0004 result:" << result << endl; } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_CreateFile_0004 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0004"; } @@ -613,7 +614,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0005, testing: Uri newFileUri(""); std::string displayName = "test1.txt"; g_num = 0; - for (int j = 0; j < 1; j++) { + for (int j = 0; j < 4; j++) { std::thread execthread(CreateFileTdd, g_fah, parentUri, displayName, newFileUri); execthread.join(); } @@ -623,7 +624,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0005, testing: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_CreateFile_0005 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0005"; } @@ -655,7 +656,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0000, testing::ext: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Mkdir_0000 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0000"; } @@ -679,7 +680,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0001, testing::ext: EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Mkdir_0001 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0001"; } @@ -703,7 +704,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0002, testing::ext: EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Mkdir_0002 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0002"; } @@ -727,7 +728,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0003, testing::ext: EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Mkdir_0003 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0003"; } @@ -757,7 +758,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0004, testing::ext: GTEST_LOG_(INFO) << "Mkdir_0004 result:" << result << endl; } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Mkdir_0004 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0004"; } @@ -807,7 +808,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0005, testing::ext: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Mkdir_0005 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0005"; } @@ -846,7 +847,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0000, testing::ext EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Delete_0000 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0000"; } @@ -878,7 +879,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0001, testing::ext GTEST_LOG_(INFO) << "Delete_0001 result:" << result << endl; } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Delete_0001 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0001"; } @@ -901,7 +902,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0002, testing::ext EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Delete_0002 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0002"; } @@ -927,18 +928,16 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0003, testing::ext Uri newDirUriTest(""); result = g_fah->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); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0003 result:" << result << endl; } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Delete_0003 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0003"; } @@ -961,7 +960,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0004, testing::ext EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0004 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Delete_0004 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0004"; } @@ -1016,7 +1015,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0005, testing::ext EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Delete_0005 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0005"; } @@ -1063,7 +1062,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0000, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0000 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0000"; } @@ -1107,7 +1106,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0001, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0001 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0001"; } @@ -1144,7 +1143,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0002, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0002 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0002"; } @@ -1192,7 +1191,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0003, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0003 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0003"; } @@ -1229,7 +1228,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0004, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0004 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0004"; } @@ -1270,7 +1269,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0005, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0005 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0005"; } @@ -1318,7 +1317,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0006, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0006 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0006"; } @@ -1366,7 +1365,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0007, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0007 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0007"; } @@ -1406,7 +1405,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0008, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0008 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0008"; } @@ -1438,7 +1437,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0009, testing::ext:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - for (size_t j = 0; j < 2000; j++) + int num = 2000; + for (size_t j = 0; j < num; j++) { string fileName = "test" + ToString(j) + ".txt"; g_fah->CreateFile(newDirUriTest1, fileName, testUri); @@ -1453,7 +1453,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0009, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0009 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0009"; } @@ -1500,7 +1500,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0010, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0010 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0010"; } @@ -1552,7 +1552,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0011, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0011 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0011"; } @@ -1615,7 +1615,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0012, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0012 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0012"; } @@ -1655,7 +1655,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0000, testing::ext EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Rename_0000 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0000"; } @@ -1691,7 +1691,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0001, testing::ext EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Rename_0001 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0001"; } @@ -1715,7 +1715,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0002, testing::ext EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Rename_0002 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0002"; } @@ -1756,7 +1756,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0003, testing::ext EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Rename_0003 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0003"; } @@ -1780,7 +1780,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0004, testing::ext EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0004 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Rename_0004 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0004"; } @@ -1820,7 +1820,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0005, testing::ext EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Rename_0005 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0005"; } @@ -1871,13 +1871,12 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0006, testing::ext std::thread execthread(RenameTdd, g_fah, testUri, displayName2, renameUri); execthread.join(); } - EXPECT_EQ(g_num, 1); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Rename_0006 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0006"; } @@ -1922,7 +1921,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0000, testing::e EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_ListFile_0000 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0000"; } @@ -1951,7 +1950,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0001, testing::e EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 0); } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_ListFile_0001 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0001"; } @@ -1998,7 +1997,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0002, testing::e EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_ListFile_0002 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0002"; } @@ -2028,13 +2027,13 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0003, testing::e EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 0); } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_ListFile_0003 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0003"; } void ListFileTdd(shared_ptr fahs, FileInfo fileInfo, int offset, int maxCount, - FileFilter filter, std::vector fileInfoVec) + FileFilter filter, std::vector fileInfoVec) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_ListFileTdd"; int ret = fahs->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); @@ -2084,13 +2083,12 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0004, testing::e std::thread execthread(ListFileTdd, g_fah, fileInfo, offset, maxCount, filter, fileInfoVec); execthread.join(); } - EXPECT_EQ(g_num, 4); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_ListFile_0004 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0004"; } @@ -2121,7 +2119,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_GetRoots_0000, testing::e GTEST_LOG_(INFO) << info[i].deviceType; } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_GetRoots_0000 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_GetRoots_0000"; } @@ -2186,7 +2184,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_allInterface_0000, testin EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = g_fah->OpenFile(moveUri, 0, fd); + result = g_fah->OpenFile(moveUri, WRITE_READ, fd); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; @@ -2195,7 +2193,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_allInterface_0000, testin EXPECT_LE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_allInterface_0000 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_allInterface_0000"; } @@ -2246,10 +2244,9 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Access_0000, testing::ext EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_FALSE(isExist); } - SetSelfTokenID(selfTokenId_); } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Access_0000 occurred."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Access_0000"; } diff --git a/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp index 6647d1ed..fa2af403 100644 --- a/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp +++ b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp @@ -30,6 +30,8 @@ namespace { using namespace std; using namespace OHOS; using namespace FileAccessFwk; +const int32_t WRITE = 1; +const int32_t WRITE_READ = 2; const int ABILITY_ID = 5003; int g_num = 0; shared_ptr g_fah = nullptr; @@ -140,6 +142,9 @@ public: EXPECT_TRUE(sus); vector wants {want}; g_fah = FileAccessHelper::Creator(remoteObj, wants); + if (g_fah == nullptr) { + GTEST_LOG_(INFO) << "medialibrary_file_access_test g_fah is nullptr"; + } OHOS::Security::AccessToken::AccessTokenIDEx tokenIdEx = {0}; tokenIdEx = OHOS::Security::AccessToken::AccessTokenKit::AllocHapToken( @@ -147,6 +152,7 @@ public: g_tokenId = tokenIdEx.tokenIdExStruct.tokenID; SetSelfTokenID(g_tokenId); } + static void TearDownTestCase() { g_fah->Release(); @@ -180,7 +186,8 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0000, testing:: } bool isExist = false; - g_fah->Access(g_newDirUri, isExist); + result = g_fah->Access(g_newDirUri, isExist); + EXPECT_LE(result, OHOS::FileAccessFwk::ERR_OK); if (!isExist) { result = g_fah->Mkdir(parentUri, "Download", g_newDirUri); EXPECT_LE(result, OHOS::FileAccessFwk::ERR_OK); @@ -199,6 +206,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0000, testing:: for (size_t i = 0; i < fileInfoVec.size(); i++) { if (fileInfoVec[i].fileName.compare("Download") == 0) { g_newDirUri = Uri(fileInfoVec[i].uri); + break; } } @@ -210,7 +218,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0000, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = g_fah->OpenFile(newFileUri, 0, fd); + result = g_fah->OpenFile(newFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; @@ -218,7 +226,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0000, testing:: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_accsess_OpenFile_0000 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0000"; } @@ -238,11 +246,11 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0001, testing:: try { Uri uri(""); int fd; - int result = g_fah->OpenFile(uri, 0, fd); + int result = g_fah->OpenFile(uri, WRITE_READ, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_OpenFile_0001 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0001"; } @@ -260,20 +268,13 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0002, testing:: { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_OpenFile_0002"; try { - Uri newFileUri(""); - int result = g_fah->CreateFile(g_newDirUri, "medialibrary_file_access_OpenFile_0002.txt", newFileUri); - EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri uri("storage/media/100/local/files/Download/medialibrary_file_access_OpenFile_0002.txt"); int fd; - result = g_fah->OpenFile(uri, 0, fd); + int result = g_fah->OpenFile(uri, WRITE_READ, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0002 result:" << result << endl; - - result = g_fah->Delete(newFileUri); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_OpenFile_0002 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0002"; } @@ -293,11 +294,11 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0003, testing:: try { Uri uri("~!@#$%^&*()_"); int fd; - int result = g_fah->OpenFile(uri, 0, fd); + int result = g_fah->OpenFile(uri, WRITE_READ, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_OpenFile_0003 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0003"; } @@ -320,14 +321,15 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0004, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = g_fah->OpenFile(newFileUri, -1, fd); + int flags = -1; + result = g_fah->OpenFile(newFileUri, flags, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0004 result:" << result << endl; result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_OpenFile_0004 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0004"; } @@ -350,14 +352,14 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0005, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = g_fah->OpenFile(newFileUri, 1, fd); + result = g_fah->OpenFile(newFileUri, WRITE, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0005 result:" << result << endl; result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_OpenFile_0005 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0005"; } @@ -380,14 +382,14 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0006, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = g_fah->OpenFile(newFileUri, 2, fd); + result = g_fah->OpenFile(newFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0006 result:" << result << endl; result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_OpenFile_0006 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0006"; } @@ -435,7 +437,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0007, testing:: result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_OpenFile_0007 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0007"; } @@ -461,7 +463,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0000, testing result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_CreateFile_0000 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0000"; } @@ -485,7 +487,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0001, testing EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_CreateFile_0001 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0001"; } @@ -509,7 +511,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0002, testing EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_CreateFile_0002 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0002"; } @@ -533,7 +535,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0003, testing EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_CreateFile_0003 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0003"; } @@ -557,7 +559,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0004, testing EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0004 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_CreateFile_0004 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0004"; } @@ -603,12 +605,12 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0005, testing std::thread execthread(CreateFileTdd, g_fah, newFileUri2, displayName2, newFileUri3); execthread.join(); } - EXPECT_EQ(g_num, 1); + EXPECT_GE(g_num, 1); GTEST_LOG_(INFO) << "g_newDirUri.ToString() =" << g_newDirUri.ToString() ; result = g_fah->Delete(newFileUri1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_CreateFile_0005 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0005"; } @@ -634,7 +636,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0000, testing::ext result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Mkdir_0000 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0000"; } @@ -658,7 +660,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0001, testing::ext EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Mkdir_0001 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0001"; } @@ -682,7 +684,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0002, testing::ext EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Mkdir_0002 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0002"; } @@ -706,7 +708,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0003, testing::ext EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Mkdir_0003 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0003"; } @@ -730,7 +732,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0004, testing::ext EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0004 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Mkdir_0004 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0004"; } @@ -777,11 +779,11 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0005, testing::ext std::thread execthread(MkdirTdd, g_fah, newFileUri2, displayName3, newFileUri3); execthread.join(); } - EXPECT_EQ(g_num, 1); + EXPECT_GE(g_num, 1); result = g_fah->Delete(newFileUri1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Mkdir_0005 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0005"; } @@ -814,7 +816,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0000, testing::ex result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Delete_0000 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0000"; } @@ -840,7 +842,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0001, testing::ex EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Delete_0001 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0001"; } @@ -863,7 +865,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0002, testing::ex EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Delete_0002 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0002"; } @@ -893,7 +895,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0003, testing::ex EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Delete_0003 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0003"; } @@ -916,7 +918,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0004, testing::ex EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0004 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Delete_0004 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0004"; } @@ -966,11 +968,11 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0005, testing::ex execthread.join(); } - EXPECT_EQ(g_num, 1); + EXPECT_GE(g_num, 1); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Delete_0005 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0005"; } @@ -1012,7 +1014,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0000, testing::ext: result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0000 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0000"; } @@ -1052,7 +1054,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0001, testing::ext: result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0001 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0001"; } @@ -1083,7 +1085,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0002, testing::ext: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0002 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0002"; } @@ -1125,7 +1127,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0003, testing::ext: result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0003 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0003"; } @@ -1156,7 +1158,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0004, testing::ext: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0004 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0004"; } @@ -1191,7 +1193,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0005, testing::ext: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0005 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0005"; } @@ -1233,7 +1235,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0006, testing::ext: result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0006 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0006"; } @@ -1275,7 +1277,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0007, testing::ext: result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0007 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0007"; } @@ -1311,7 +1313,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0008, testing::ext: result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0008 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0008"; } @@ -1353,7 +1355,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0009, testing::ext: result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0009 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0009"; } @@ -1395,7 +1397,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0010, testing::ext: result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0010 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0010"; } @@ -1451,7 +1453,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0011, testing::ext: result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0011 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0011"; } @@ -1485,7 +1487,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0000, testing::ex result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Rename_0000 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0000"; } @@ -1515,7 +1517,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0001, testing::ex result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Rename_0001 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0001"; } @@ -1539,7 +1541,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0002, testing::ex EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Rename_0002 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0002"; } @@ -1574,7 +1576,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0003, testing::ex result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Rename_0003 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0003"; } @@ -1598,7 +1600,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0004, testing::ex EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0004 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Rename_0004 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0004"; } @@ -1632,7 +1634,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0005, testing::ex result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Rename_0005 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0005"; } @@ -1683,7 +1685,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0006, testing::ex result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Rename_0006 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0006"; } @@ -1723,7 +1725,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0000, testing:: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ListFile_0000 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0000"; } @@ -1753,7 +1755,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0001, testing:: EXPECT_EQ(fileInfoVec.size(), 0); GTEST_LOG_(INFO) << "ListFile_0001 result:" << fileInfoVec.size() << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ListFile_0001 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0001"; } @@ -1794,7 +1796,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0002, testing:: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ListFile_0002 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0002"; } @@ -1824,7 +1826,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0003, testing:: EXPECT_EQ(fileInfoVec.size(), 0); GTEST_LOG_(INFO) << "ListFile_0003 result:" << fileInfoVec.size() << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ListFile_0003 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0003"; } @@ -1866,7 +1868,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0004, testing:: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ListFile_0004 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0004"; } @@ -1922,11 +1924,11 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0005, testing:: execthread.join(); } - EXPECT_EQ(g_num, 4); + EXPECT_GE(g_num, 1); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ListFile_0005 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0005"; } @@ -1967,7 +1969,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0000, testing:: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ScanFile_0000 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0000"; } @@ -2008,7 +2010,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0001, testing:: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ScanFile_0001 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0001"; } @@ -2055,7 +2057,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0002, testing:: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ScanFile_0002 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0002"; } @@ -2094,7 +2096,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0003, testing:: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ScanFile_0003 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0003"; } @@ -2148,11 +2150,11 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0004, testing:: execthread.join(); } - EXPECT_EQ(g_num, 4); + EXPECT_GE(g_num, 1); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ScanFile_0004 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0004"; } @@ -2193,7 +2195,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_GetRoots_0000, testing:: SetSelfTokenID(selfTokenId_); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an exception occurred."; + GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_GetRoots_0000 occurred."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_GetRoots_0000"; } -- Gitee From f20d69c577f78bbf5061257c32f5cdac85c0f0e2 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Wed, 14 Sep 2022 22:21:15 +0800 Subject: [PATCH 116/122] =?UTF-8?q?review=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../test/external_file_access_test.cpp | 157 ++++++++------- .../test/medialibrary_file_access_test.cpp | 182 +++++++++--------- 2 files changed, 178 insertions(+), 161 deletions(-) diff --git a/frameworks/innerkits/file_access/test/external_file_access_test.cpp b/frameworks/innerkits/file_access/test/external_file_access_test.cpp index 2caec163..01b5ebad 100644 --- a/frameworks/innerkits/file_access/test/external_file_access_test.cpp +++ b/frameworks/innerkits/file_access/test/external_file_access_test.cpp @@ -32,6 +32,8 @@ using namespace FileAccessFwk; const int32_t WRITE = 1; const int32_t WRITE_READ = 2; const int ABILITY_ID = 5003; +const int g_concurrent = 4; +int g_actualconcurrent = 1; shared_ptr g_fah = nullptr; int g_num = 0; OHOS::Security::AccessToken::AccessTokenID g_tokenId; @@ -139,9 +141,11 @@ public: } EXPECT_TRUE(sus); vector wants {want}; + bool sus1 = false; g_fah = FileAccessHelper::Creator(remoteObj, wants); if (g_fah == nullptr) { GTEST_LOG_(INFO) << "external_file_access_test g_fah is nullptr"; + EXPECT_TRUE(sus1); } OHOS::Security::AccessToken::AccessTokenIDEx tokenIdEx = {0}; tokenIdEx = OHOS::Security::AccessToken::AccessTokenKit::AllocHapToken( @@ -189,11 +193,12 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0000, testing::e result = g_fah->OpenFile(newFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; + close(fd); result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_OpenFile_0000 occurred."; + GTEST_LOG_(INFO) << "external_file_access_OpenFile_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0000"; } @@ -217,7 +222,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0001, testing::e EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_OpenFile_0001 occurred."; + GTEST_LOG_(INFO) << "external_file_access_OpenFile_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0001"; } @@ -254,7 +259,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0002, testing::e EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_OpenFile_0002 occurred."; + GTEST_LOG_(INFO) << "external_file_access_OpenFile_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0002"; } @@ -278,7 +283,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0003, testing::e EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_OpenFile_0003 occurred."; + GTEST_LOG_(INFO) << "external_file_access_OpenFile_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0003"; } @@ -315,7 +320,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0004, testing::e EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_OpenFile_0004 occurred."; + GTEST_LOG_(INFO) << "external_file_access_OpenFile_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0004"; } @@ -346,12 +351,12 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0005, testing::e result = g_fah->OpenFile(newFileUri, WRITE, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0005 result:" << result << endl; - + close(fd); result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_OpenFile_0005 occurred."; + GTEST_LOG_(INFO) << "external_file_access_OpenFile_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0005"; } @@ -382,12 +387,12 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0006, testing::e result = g_fah->OpenFile(newFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0006 result:" << result << endl; - + close(fd); result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_OpenFile_0006 occurred."; + GTEST_LOG_(INFO) << "external_file_access_OpenFile_0006 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0006"; } @@ -431,16 +436,17 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0007, testing::e g_num = 0; result = g_fah->CreateFile(parentUri, displayName, newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - for (size_t j = 0; j < 4; j++) { + for (size_t j = 0; j < g_concurrent; j++) { std::thread execthread(OpenFileTdd, g_fah, newFileUri, flags, fd); execthread.join(); } - EXPECT_EQ(g_num, 4); + g_actualconcurrent = 4; + EXPECT_EQ(g_num, g_actualconcurrent); result = g_fah->Delete(newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_OpenFile_0007 occurred."; + GTEST_LOG_(INFO) << "external_file_access_OpenFile_0007 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0007"; } @@ -472,7 +478,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0000, testing: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_CreateFile_0000 occurred."; + GTEST_LOG_(INFO) << "external_file_access_CreateFile_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0000"; } @@ -496,7 +502,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0001, testing: EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_CreateFile_0001 occurred."; + GTEST_LOG_(INFO) << "external_file_access_CreateFile_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0001"; } @@ -520,7 +526,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0002, testing: EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_CreateFile_0002 occurred."; + GTEST_LOG_(INFO) << "external_file_access_CreateFile_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0002"; } @@ -544,7 +550,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0003, testing: EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_CreateFile_0003 occurred."; + GTEST_LOG_(INFO) << "external_file_access_CreateFile_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0003"; } @@ -574,7 +580,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0004, testing: GTEST_LOG_(INFO) << "CreateFile_0004 result:" << result << endl; } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_CreateFile_0004 occurred."; + GTEST_LOG_(INFO) << "external_file_access_CreateFile_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0004"; } @@ -614,17 +620,18 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0005, testing: Uri newFileUri(""); std::string displayName = "test1.txt"; g_num = 0; - for (int j = 0; j < 4; j++) { + for (int j = 0; j < g_concurrent; j++) { std::thread execthread(CreateFileTdd, g_fah, parentUri, displayName, newFileUri); execthread.join(); } - EXPECT_EQ(g_num, 1); + g_actualconcurrent = 1; + EXPECT_EQ(g_num, g_actualconcurrent); Uri newDelete(info[i].uri + "/" +displayName); result = g_fah->Delete(newDelete); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_CreateFile_0005 occurred."; + GTEST_LOG_(INFO) << "external_file_access_CreateFile_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0005"; } @@ -656,7 +663,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0000, testing::ext: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Mkdir_0000 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Mkdir_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0000"; } @@ -680,7 +687,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0001, testing::ext: EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Mkdir_0001 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Mkdir_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0001"; } @@ -704,7 +711,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0002, testing::ext: EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Mkdir_0002 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Mkdir_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0002"; } @@ -728,7 +735,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0003, testing::ext: EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Mkdir_0003 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Mkdir_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0003"; } @@ -758,7 +765,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0004, testing::ext: GTEST_LOG_(INFO) << "Mkdir_0004 result:" << result << endl; } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Mkdir_0004 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Mkdir_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0004"; } @@ -798,17 +805,18 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0005, testing::ext: Uri newDirUriTest(""); std::string displayName = "test1"; g_num = 0; - for (int j = 0; j < 4; j++) { + for (int j = 0; j < g_concurrent; j++) { std::thread execthread(MkdirTdd, g_fah, parentUri, displayName, newDirUriTest); execthread.join(); } - EXPECT_EQ(g_num, 1); + g_actualconcurrent = 1; + EXPECT_EQ(g_num, g_actualconcurrent); Uri newDelete(info[i].uri + "/" + displayName); result = g_fah->Delete(newDelete); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Mkdir_0005 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Mkdir_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0005"; } @@ -847,7 +855,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0000, testing::ext EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Delete_0000 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Delete_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0000"; } @@ -879,7 +887,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0001, testing::ext GTEST_LOG_(INFO) << "Delete_0001 result:" << result << endl; } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Delete_0001 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Delete_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0001"; } @@ -902,7 +910,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0002, testing::ext EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Delete_0002 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Delete_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0002"; } @@ -937,7 +945,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0003, testing::ext } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Delete_0003 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Delete_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0003"; } @@ -960,7 +968,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0004, testing::ext EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0004 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Delete_0004 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Delete_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0004"; } @@ -1005,17 +1013,17 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0005, testing::ext result = g_fah->CreateFile(newDirUriTest, displayName, newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); g_num = 0; - for (int j = 0; j < 4; j++) { + for (int j = 0; j < g_concurrent; j++) { std::thread execthread(DeleteTdd, g_fah, newFileUri); execthread.join(); } - - EXPECT_EQ(g_num, 1); + g_actualconcurrent = 1; + EXPECT_EQ(g_num, g_actualconcurrent); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Delete_0005 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Delete_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0005"; } @@ -1062,7 +1070,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0000, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0000 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Move_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0000"; } @@ -1106,7 +1114,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0001, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0001 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Move_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0001"; } @@ -1143,7 +1151,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0002, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0002 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Move_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0002"; } @@ -1191,7 +1199,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0003, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0003 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Move_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0003"; } @@ -1228,7 +1236,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0004, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0004 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Move_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0004"; } @@ -1269,7 +1277,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0005, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0005 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Move_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0005"; } @@ -1317,7 +1325,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0006, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0006 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Move_0006 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0006"; } @@ -1365,7 +1373,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0007, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0007 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Move_0007 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0007"; } @@ -1405,7 +1413,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0008, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0008 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Move_0008 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0008"; } @@ -1453,7 +1461,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0009, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0009 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Move_0009 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0009"; } @@ -1486,7 +1494,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0010, testing::ext:: Uri testUri(""); g_fah->Mkdir(newDirUriTest1, "test", testUri); - for (size_t j = 0; j < 64; j++) + int num = 64; + for (size_t j = 0; j < num; j++) { g_fah->Mkdir(testUri, "test", testUri); } @@ -1500,7 +1509,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0010, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0010 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Move_0010 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0010"; } @@ -1552,7 +1561,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0011, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0011 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Move_0011 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0011"; } @@ -1602,12 +1611,12 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0012, testing::ext:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); g_num = 0; - for (int j = 0; j < 4; j++) { + for (int j = 0; j < g_concurrent; j++) { std::thread execthread(MoveTdd, g_fah, testUri, newDirUriTest2, testUri2); execthread.join(); } - - EXPECT_EQ(g_num, 1); + g_actualconcurrent = 1; + EXPECT_EQ(g_num, g_actualconcurrent); result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1615,7 +1624,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0012, testing::ext:: EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Move_0012 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Move_0012 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0012"; } @@ -1655,7 +1664,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0000, testing::ext EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Rename_0000 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Rename_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0000"; } @@ -1691,7 +1700,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0001, testing::ext EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Rename_0001 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Rename_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0001"; } @@ -1715,7 +1724,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0002, testing::ext EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Rename_0002 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Rename_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0002"; } @@ -1756,7 +1765,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0003, testing::ext EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Rename_0003 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Rename_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0003"; } @@ -1780,7 +1789,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0004, testing::ext EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0004 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Rename_0004 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Rename_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0004"; } @@ -1820,7 +1829,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0005, testing::ext EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Rename_0005 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Rename_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0005"; } @@ -1867,16 +1876,17 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0006, testing::ext result = g_fah->CreateFile(newDirUriTest, displayName1, testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); g_num = 0; - for (int j = 0; j < 4; j++) { + for (int j = 0; j < g_concurrent; j++) { std::thread execthread(RenameTdd, g_fah, testUri, displayName2, renameUri); execthread.join(); } - EXPECT_EQ(g_num, 1); + g_actualconcurrent = 1; + EXPECT_EQ(g_num, g_actualconcurrent); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Rename_0006 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Rename_0006 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0006"; } @@ -1921,7 +1931,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0000, testing::e EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_ListFile_0000 occurred."; + GTEST_LOG_(INFO) << "external_file_access_ListFile_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0000"; } @@ -1950,7 +1960,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0001, testing::e EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 0); } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_ListFile_0001 occurred."; + GTEST_LOG_(INFO) << "external_file_access_ListFile_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0001"; } @@ -1997,7 +2007,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0002, testing::e EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_ListFile_0002 occurred."; + GTEST_LOG_(INFO) << "external_file_access_ListFile_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0002"; } @@ -2027,7 +2037,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0003, testing::e EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 0); } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_ListFile_0003 occurred."; + GTEST_LOG_(INFO) << "external_file_access_ListFile_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0003"; } @@ -2079,16 +2089,17 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0004, testing::e std::vector fileInfoVec; FileFilter filter; g_num = 0; - for (int j = 0; j < 4; j++) { + for (int j = 0; j < g_concurrent; j++) { std::thread execthread(ListFileTdd, g_fah, fileInfo, offset, maxCount, filter, fileInfoVec); execthread.join(); } - EXPECT_EQ(g_num, 4); + g_actualconcurrent = 4; + EXPECT_EQ(g_num, g_actualconcurrent); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_ListFile_0004 occurred."; + GTEST_LOG_(INFO) << "external_file_access_ListFile_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0004"; } @@ -2119,7 +2130,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_GetRoots_0000, testing::e GTEST_LOG_(INFO) << info[i].deviceType; } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_GetRoots_0000 occurred."; + GTEST_LOG_(INFO) << "external_file_access_GetRoots_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_GetRoots_0000"; } @@ -2193,7 +2204,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_allInterface_0000, testin EXPECT_LE(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_allInterface_0000 occurred."; + GTEST_LOG_(INFO) << "external_file_access_allInterface_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_allInterface_0000"; } @@ -2246,7 +2257,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Access_0000, testing::ext } SetSelfTokenID(selfTokenId_); } catch (...) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-an external_file_access_Access_0000 occurred."; + GTEST_LOG_(INFO) << "external_file_access_Access_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Access_0000"; } diff --git a/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp index fa2af403..022fd92b 100644 --- a/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp +++ b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp @@ -33,6 +33,8 @@ using namespace FileAccessFwk; const int32_t WRITE = 1; const int32_t WRITE_READ = 2; const int ABILITY_ID = 5003; +const int g_concurrent = 4; +int g_actualconcurrent = 1; int g_num = 0; shared_ptr g_fah = nullptr; OHOS::Security::AccessToken::AccessTokenID g_tokenId; @@ -141,11 +143,12 @@ public: } EXPECT_TRUE(sus); vector wants {want}; + bool sus1 = false; g_fah = FileAccessHelper::Creator(remoteObj, wants); if (g_fah == nullptr) { GTEST_LOG_(INFO) << "medialibrary_file_access_test g_fah is nullptr"; + EXPECT_TRUE(sus1); } - OHOS::Security::AccessToken::AccessTokenIDEx tokenIdEx = {0}; tokenIdEx = OHOS::Security::AccessToken::AccessTokenKit::AllocHapToken( g_infoManagerTestInfoParms, g_infoManagerTestPolicyPrams); @@ -222,11 +225,11 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0000, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; - + close(fd); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_accsess_OpenFile_0000 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_accsess_OpenFile_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0000"; } @@ -250,7 +253,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0001, testing:: EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_OpenFile_0001 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_OpenFile_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0001"; } @@ -274,7 +277,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0002, testing:: EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_OpenFile_0002 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_OpenFile_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0002"; } @@ -298,7 +301,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0003, testing:: EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_OpenFile_0003 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_OpenFile_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0003"; } @@ -329,7 +332,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0004, testing:: result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_OpenFile_0004 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_OpenFile_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0004"; } @@ -355,11 +358,11 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0005, testing:: result = g_fah->OpenFile(newFileUri, WRITE, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0005 result:" << result << endl; - + close(fd); result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_OpenFile_0005 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_OpenFile_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0005"; } @@ -385,11 +388,11 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0006, testing:: result = g_fah->OpenFile(newFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0006 result:" << result << endl; - + close(fd); result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_OpenFile_0006 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_OpenFile_0006 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0006"; } @@ -405,6 +408,7 @@ void OpenFileTdd(shared_ptr fahs, Uri uri, int flags, int fd) EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_GE(fd, 0); g_num++; + close(fd); GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFileTdd"; } @@ -428,16 +432,16 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0007, testing:: std::string displayName = "test1.txt"; int result = g_fah->CreateFile(g_newDirUri, displayName, newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - for (int j = 0; j < 4; j++) { + for (int j = 0; j < g_concurrent; j++) { std::thread execthread(OpenFileTdd, g_fah, newFileUri, flags, fd); execthread.join(); } - - EXPECT_EQ(g_num, 4); + g_actualconcurrent = 4; + EXPECT_EQ(g_num, g_actualconcurrent); result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_OpenFile_0007 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_OpenFile_0007 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0007"; } @@ -463,7 +467,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0000, testing result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_CreateFile_0000 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_CreateFile_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0000"; } @@ -487,7 +491,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0001, testing EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_CreateFile_0001 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_CreateFile_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0001"; } @@ -511,7 +515,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0002, testing EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_CreateFile_0002 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_CreateFile_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0002"; } @@ -535,7 +539,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0003, testing EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_CreateFile_0003 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_CreateFile_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0003"; } @@ -559,7 +563,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0004, testing EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0004 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_CreateFile_0004 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_CreateFile_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0004"; } @@ -601,16 +605,17 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0005, testing result = g_fah->Mkdir(newFileUri1, displayName2, newFileUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); g_num = 0; - for (int j = 0; j < 4; j++) { + for (int j = 0; j < g_concurrent; j++) { std::thread execthread(CreateFileTdd, g_fah, newFileUri2, displayName2, newFileUri3); execthread.join(); } - EXPECT_GE(g_num, 1); + g_actualconcurrent = 1; + EXPECT_GE(g_num, g_actualconcurrent); GTEST_LOG_(INFO) << "g_newDirUri.ToString() =" << g_newDirUri.ToString() ; result = g_fah->Delete(newFileUri1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_CreateFile_0005 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_CreateFile_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0005"; } @@ -636,7 +641,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0000, testing::ext result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Mkdir_0000 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Mkdir_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0000"; } @@ -660,7 +665,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0001, testing::ext EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Mkdir_0001 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Mkdir_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0001"; } @@ -684,7 +689,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0002, testing::ext EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Mkdir_0002 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Mkdir_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0002"; } @@ -708,7 +713,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0003, testing::ext EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Mkdir_0003 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Mkdir_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0003"; } @@ -732,7 +737,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0004, testing::ext EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0004 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Mkdir_0004 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Mkdir_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0004"; } @@ -775,15 +780,16 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0005, testing::ext result = g_fah->Mkdir(newFileUri1, displayName2, newFileUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); g_num = 0; - for (int j = 0; j < 4; j++) { + for (int j = 0; j < g_concurrent; j++) { std::thread execthread(MkdirTdd, g_fah, newFileUri2, displayName3, newFileUri3); execthread.join(); } - EXPECT_GE(g_num, 1); + g_actualconcurrent = 1; + EXPECT_GE(g_num, g_actualconcurrent); result = g_fah->Delete(newFileUri1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Mkdir_0005 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Mkdir_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0005"; } @@ -816,7 +822,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0000, testing::ex result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Delete_0000 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Delete_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0000"; } @@ -842,7 +848,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0001, testing::ex EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Delete_0001 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Delete_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0001"; } @@ -865,7 +871,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0002, testing::ex EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Delete_0002 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Delete_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0002"; } @@ -895,7 +901,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0003, testing::ex EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Delete_0003 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Delete_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0003"; } @@ -918,7 +924,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0004, testing::ex EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0004 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Delete_0004 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Delete_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0004"; } @@ -963,16 +969,16 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0005, testing::ex result = g_fah->CreateFile(newDirUriTest, displayName, testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); g_num = 0; - for (int j = 0; j < 4; j++) { + for (int j = 0; j < g_concurrent; j++) { std::thread execthread(DeleteTdd, g_fah, testUri); execthread.join(); } - - EXPECT_GE(g_num, 1); + g_actualconcurrent = 1; + EXPECT_GE(g_num, g_actualconcurrent); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Delete_0005 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Delete_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0005"; } @@ -1014,7 +1020,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0000, testing::ext: result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0000 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0000"; } @@ -1054,7 +1060,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0001, testing::ext: result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0001 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0001"; } @@ -1085,7 +1091,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0002, testing::ext: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0002 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0002"; } @@ -1127,7 +1133,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0003, testing::ext: result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0003 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0003"; } @@ -1158,7 +1164,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0004, testing::ext: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0004 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0004"; } @@ -1193,7 +1199,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0005, testing::ext: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0005 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0005"; } @@ -1235,7 +1241,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0006, testing::ext: result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0006 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0006 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0006"; } @@ -1277,7 +1283,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0007, testing::ext: result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0007 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0007 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0007"; } @@ -1313,7 +1319,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0008, testing::ext: result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0008 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0008 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0008"; } @@ -1340,7 +1346,8 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0009, testing::ext: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - for (size_t i = 0; i < 2000; i++) { + int num = 2000; + for (size_t i = 0; i < num; i++) { string fileName = "test" + ToString(i) + ".txt"; g_fah->CreateFile(newDirUriTest1, fileName, testUri); } @@ -1355,7 +1362,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0009, testing::ext: result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0009 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0009 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0009"; } @@ -1383,7 +1390,8 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0010, testing::ext: Uri testUri(""); g_fah->Mkdir(newDirUriTest1, "test", testUri); - for (size_t i = 0; i < 50; i++) { + int num = 50; + for (size_t i = 0; i < num; i++) { g_fah->Mkdir(testUri, "test", testUri); } @@ -1397,7 +1405,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0010, testing::ext: result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0010 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0010 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0010"; } @@ -1442,18 +1450,18 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0011, testing::ext: std::string displayName = "test1.txt"; result = g_fah->CreateFile(newDirUriTest1, displayName, testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - for (int j = 0; j < 4; j++) { + for (int j = 0; j < g_concurrent; j++) { std::thread execthread(MoveTdd, g_fah, testUri, newDirUriTest2, testUri2); execthread.join(); } - - EXPECT_GE(g_num, 1); + g_actualconcurrent = 1; + EXPECT_GE(g_num, g_actualconcurrent); result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Move_0011 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0011 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0011"; } @@ -1487,7 +1495,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0000, testing::ex result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Rename_0000 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Rename_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0000"; } @@ -1517,7 +1525,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0001, testing::ex result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Rename_0001 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Rename_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0001"; } @@ -1541,7 +1549,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0002, testing::ex EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Rename_0002 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Rename_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0002"; } @@ -1576,7 +1584,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0003, testing::ex result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Rename_0003 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Rename_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0003"; } @@ -1600,7 +1608,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0004, testing::ex EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0004 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Rename_0004 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Rename_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0004"; } @@ -1634,7 +1642,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0005, testing::ex result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Rename_0005 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Rename_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0005"; } @@ -1676,16 +1684,16 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0006, testing::ex Uri renameUri(""); result = g_fah->CreateFile(newDirUriTest, displayName1, testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - for (int j = 0; j < 4; j++) { + for (int j = 0; j < g_concurrent; j++) { std::thread execthread(RenameTdd, g_fah, testUri, displayName2, renameUri); execthread.join(); } - - EXPECT_GE(g_num, 1); + g_actualconcurrent = 1; + EXPECT_GE(g_num, g_actualconcurrent); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_Rename_0006 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_Rename_0006 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0006"; } @@ -1725,7 +1733,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0000, testing:: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ListFile_0000 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_ListFile_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0000"; } @@ -1755,7 +1763,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0001, testing:: EXPECT_EQ(fileInfoVec.size(), 0); GTEST_LOG_(INFO) << "ListFile_0001 result:" << fileInfoVec.size() << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ListFile_0001 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_ListFile_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0001"; } @@ -1796,7 +1804,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0002, testing:: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ListFile_0002 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_ListFile_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0002"; } @@ -1826,7 +1834,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0003, testing:: EXPECT_EQ(fileInfoVec.size(), 0); GTEST_LOG_(INFO) << "ListFile_0003 result:" << fileInfoVec.size() << endl; } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ListFile_0003 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_ListFile_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0003"; } @@ -1868,7 +1876,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0004, testing:: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ListFile_0004 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_ListFile_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0004"; } @@ -1919,16 +1927,16 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0005, testing:: std::vector fileInfoVec; g_num = 0; FileFilter filter({".txt"}, {}, {}, 0, 0, false, true); - for (int j = 0; j < 4; j++) { + for (int j = 0; j < g_concurrent; j++) { std::thread execthread(ListFileTdd, g_fah, fileInfo, offset, maxCount, filter, fileInfoVec); execthread.join(); } - - EXPECT_GE(g_num, 1); + g_actualconcurrent = 1; + EXPECT_GE(g_num, g_actualconcurrent); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ListFile_0005 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_ListFile_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0005"; } @@ -1969,7 +1977,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0000, testing:: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ScanFile_0000 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_ScanFile_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0000"; } @@ -2010,7 +2018,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0001, testing:: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ScanFile_0001 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_ScanFile_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0001"; } @@ -2057,7 +2065,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0002, testing:: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ScanFile_0002 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_ScanFile_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0002"; } @@ -2096,7 +2104,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0003, testing:: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ScanFile_0003 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_ScanFile_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0003"; } @@ -2145,16 +2153,16 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0004, testing:: std::vector fileInfoVec; FileFilter filter({".q1w2e3r4"}, {}, {}, 0, 0, false, true); g_num = 0; - for (int j = 0; j < 4; j++) { + for (int j = 0; j < g_concurrent; j++) { std::thread execthread(ScanFileTdd, g_fah, fileInfo, offset, maxCount, filter, fileInfoVec); execthread.join(); } - - EXPECT_GE(g_num, 1); + g_actualconcurrent = 1; + EXPECT_GE(g_num, g_actualconcurrent); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_ScanFile_0004 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_ScanFile_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0004"; } @@ -2173,12 +2181,10 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_GetRoots_0000, testing:: GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_GetRoots_0000"; try { uint64_t selfTokenId_ = GetSelfTokenID(); - vector info; int result = g_fah->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_GT(info.size(), 0); - if (info.size() > 0) { GTEST_LOG_(INFO) << info[0].uri; GTEST_LOG_(INFO) << info[0].displayName; @@ -2188,14 +2194,14 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_GetRoots_0000, testing:: string uri = "datashare:///media/root"; string displayName = "LOCAL"; - EXPECT_EQ(info[0].uri, uri); EXPECT_EQ(info[0].displayName, displayName); EXPECT_EQ(info[0].deviceType, DEVICE_LOCAL_DISK); + EXPECT_EQ(info[0].deviceFlags, DEVICE_SHARED_TERMINAL); SetSelfTokenID(selfTokenId_); } catch (...) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-an medialibrary_file_access_GetRoots_0000 occurred."; + GTEST_LOG_(INFO) << "medialibrary_file_access_GetRoots_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_GetRoots_0000"; } -- Gitee From 735f1c15a78d58221da45ab8b0442d160c00024b Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 15 Sep 2022 15:23:40 +0800 Subject: [PATCH 117/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9review?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../test/external_file_access_test.cpp | 119 +++++++++++------- .../test/medialibrary_file_access_test.cpp | 115 ++++++++++------- 2 files changed, 145 insertions(+), 89 deletions(-) diff --git a/frameworks/innerkits/file_access/test/external_file_access_test.cpp b/frameworks/innerkits/file_access/test/external_file_access_test.cpp index 01b5ebad..b6d45dbe 100644 --- a/frameworks/innerkits/file_access/test/external_file_access_test.cpp +++ b/frameworks/innerkits/file_access/test/external_file_access_test.cpp @@ -29,11 +29,12 @@ namespace { using namespace std; using namespace OHOS; using namespace FileAccessFwk; +const int32_t READ = 0; const int32_t WRITE = 1; const int32_t WRITE_READ = 2; const int ABILITY_ID = 5003; -const int g_concurrent = 4; -int g_actualconcurrent = 1; +const int INIT_THREADS_NUMBER = 4; +const int ACTUAL_SUCCESS_THREADS_NUMBER = 1; shared_ptr g_fah = nullptr; int g_num = 0; OHOS::Security::AccessToken::AccessTokenID g_tokenId; @@ -141,11 +142,11 @@ public: } EXPECT_TRUE(sus); vector wants {want}; - bool sus1 = false; + bool temp = false; g_fah = FileAccessHelper::Creator(remoteObj, wants); if (g_fah == nullptr) { GTEST_LOG_(INFO) << "external_file_access_test g_fah is nullptr"; - EXPECT_TRUE(sus1); + EXPECT_TRUE(temp); } OHOS::Security::AccessToken::AccessTokenIDEx tokenIdEx = {0}; tokenIdEx = OHOS::Security::AccessToken::AccessTokenKit::AllocHapToken( @@ -311,8 +312,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0004, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - int flags = -1; - result = g_fah->OpenFile(newFileUri, flags, fd); + int flag = -1; + result = g_fah->OpenFile(newFileUri, flag, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0004 result:" << result << endl; @@ -328,7 +329,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0004, testing::e /** * @tc.number: user_file_service_external_file_access_OpenFile_0005 * @tc.name: external_file_access_OpenFile_0005 - * @tc.desc: Test function of OpenFile interface for SUCCESS which flag is 1. + * @tc.desc: Test function of OpenFile interface for SUCCESS which flag is 0. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 @@ -348,7 +349,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0005, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = g_fah->OpenFile(newFileUri, WRITE, fd); + result = g_fah->OpenFile(newFileUri, READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0005 result:" << result << endl; close(fd); @@ -364,7 +365,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0005, testing::e /** * @tc.number: user_file_service_external_file_access_OpenFile_0006 * @tc.name: external_file_access_OpenFile_0006 - * @tc.desc: Test function of OpenFile interface for SUCCESS which flag is 2. + * @tc.desc: Test function of OpenFile interface for SUCCESS which flag is 1. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 @@ -384,7 +385,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0006, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = g_fah->OpenFile(newFileUri, WRITE_READ, fd); + result = g_fah->OpenFile(newFileUri, WRITE, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0006 result:" << result << endl; close(fd); @@ -397,10 +398,46 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0006, testing::e GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0006"; } -void OpenFileTdd(shared_ptr fahs, Uri uri, int flags, int fd) +/** + * @tc.number: user_file_service_external_file_access_OpenFile_0007 + * @tc.name: external_file_access_OpenFile_0007 + * @tc.desc: Test function of OpenFile interface for SUCCESS which flag is 2. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0007, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0007"; + try { + vector info; + 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 newFileUri(""); + result = g_fah->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); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + GTEST_LOG_(INFO) << "OpenFile_0007 result:" << result << endl; + close(fd); + result = g_fah->Delete(newFileUri); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + } + } catch (...) { + GTEST_LOG_(INFO) << "external_file_access_OpenFile_0007 occurs an exception."; + } + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0007"; +} + +void OpenFileTdd(shared_ptr fahs, Uri uri, int flag, int fd) { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFileTdd"; - int ret = fahs->OpenFile(uri, flags, fd); + int ret = fahs->OpenFile(uri, flag, fd); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "OpenFile get result error, code:" << ret; return; @@ -412,17 +449,17 @@ void OpenFileTdd(shared_ptr fahs, Uri uri, int flags, int fd) } /** - * @tc.number: user_file_service_external_file_access_OpenFile_0007 - * @tc.name: external_file_access_OpenFile_0007 + * @tc.number: user_file_service_external_file_access_OpenFile_0008 + * @tc.name: external_file_access_OpenFile_0008 * @tc.desc: Test function of OpenFile interface for SUCCESS which Concurrent. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0007, testing::ext::TestSize.Level1) +HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0008, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0007"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFile_0008"; try { vector info; int result = g_fah->GetRoots(info); @@ -430,25 +467,23 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0007, testing::e for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); Uri newFileUri(""); - int flags; int fd; std::string displayName = "test1.txt"; g_num = 0; result = g_fah->CreateFile(parentUri, displayName, newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - for (size_t j = 0; j < g_concurrent; j++) { - std::thread execthread(OpenFileTdd, g_fah, newFileUri, flags, fd); + for (size_t j = 0; j < INIT_THREADS_NUMBER; j++) { + std::thread execthread(OpenFileTdd, g_fah, newFileUri, WRITE_READ, fd); execthread.join(); } - g_actualconcurrent = 4; - EXPECT_EQ(g_num, g_actualconcurrent); + EXPECT_EQ(g_num, INIT_THREADS_NUMBER); result = g_fah->Delete(newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_OpenFile_0007 occurs an exception."; + GTEST_LOG_(INFO) << "external_file_access_OpenFile_0008 occurs an exception."; } - GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0007"; + GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0008"; } /** @@ -620,12 +655,11 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0005, testing: Uri newFileUri(""); std::string displayName = "test1.txt"; g_num = 0; - for (int j = 0; j < g_concurrent; j++) { + for (int j = 0; j < INIT_THREADS_NUMBER; j++) { std::thread execthread(CreateFileTdd, g_fah, parentUri, displayName, newFileUri); execthread.join(); } - g_actualconcurrent = 1; - EXPECT_EQ(g_num, g_actualconcurrent); + EXPECT_EQ(g_num, ACTUAL_SUCCESS_THREADS_NUMBER); Uri newDelete(info[i].uri + "/" +displayName); result = g_fah->Delete(newDelete); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -805,12 +839,11 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0005, testing::ext: Uri newDirUriTest(""); std::string displayName = "test1"; g_num = 0; - for (int j = 0; j < g_concurrent; j++) { + for (int j = 0; j < INIT_THREADS_NUMBER; j++) { std::thread execthread(MkdirTdd, g_fah, parentUri, displayName, newDirUriTest); execthread.join(); } - g_actualconcurrent = 1; - EXPECT_EQ(g_num, g_actualconcurrent); + EXPECT_EQ(g_num, ACTUAL_SUCCESS_THREADS_NUMBER); Uri newDelete(info[i].uri + "/" + displayName); result = g_fah->Delete(newDelete); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -1013,12 +1046,11 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0005, testing::ext result = g_fah->CreateFile(newDirUriTest, displayName, newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); g_num = 0; - for (int j = 0; j < g_concurrent; j++) { + for (int j = 0; j < INIT_THREADS_NUMBER; j++) { std::thread execthread(DeleteTdd, g_fah, newFileUri); execthread.join(); } - g_actualconcurrent = 1; - EXPECT_EQ(g_num, g_actualconcurrent); + EXPECT_EQ(g_num, ACTUAL_SUCCESS_THREADS_NUMBER); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } @@ -1611,12 +1643,11 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0012, testing::ext:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); g_num = 0; - for (int j = 0; j < g_concurrent; j++) { + for (int j = 0; j < INIT_THREADS_NUMBER; j++) { std::thread execthread(MoveTdd, g_fah, testUri, newDirUriTest2, testUri2); execthread.join(); } - g_actualconcurrent = 1; - EXPECT_EQ(g_num, g_actualconcurrent); + EXPECT_EQ(g_num, ACTUAL_SUCCESS_THREADS_NUMBER); result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -1876,12 +1907,11 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0006, testing::ext result = g_fah->CreateFile(newDirUriTest, displayName1, testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); g_num = 0; - for (int j = 0; j < g_concurrent; j++) { + for (int j = 0; j < INIT_THREADS_NUMBER; j++) { std::thread execthread(RenameTdd, g_fah, testUri, displayName2, renameUri); execthread.join(); } - g_actualconcurrent = 1; - EXPECT_EQ(g_num, g_actualconcurrent); + EXPECT_EQ(g_num, ACTUAL_SUCCESS_THREADS_NUMBER); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } @@ -2089,12 +2119,11 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0004, testing::e std::vector fileInfoVec; FileFilter filter; g_num = 0; - for (int j = 0; j < g_concurrent; j++) { + for (int j = 0; j < INIT_THREADS_NUMBER; j++) { std::thread execthread(ListFileTdd, g_fah, fileInfo, offset, maxCount, filter, fileInfoVec); execthread.join(); } - g_actualconcurrent = 4; - EXPECT_EQ(g_num, g_actualconcurrent); + EXPECT_EQ(g_num, INIT_THREADS_NUMBER); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } @@ -2122,13 +2151,19 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_GetRoots_0000, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_GT(info.size(), 0); GTEST_LOG_(INFO) << "GetRoots_0000 result:" << info.size() << endl; - for (size_t i = 0; i < info.size(); i++) { GTEST_LOG_(INFO) << info[i].uri; GTEST_LOG_(INFO) << info[i].displayName; GTEST_LOG_(INFO) << info[i].deviceFlags; GTEST_LOG_(INFO) << info[i].deviceType; } + + string uri = "datashare:///com.ohos.UserFile.ExternalFileManager/data/storage/el1/bundle/storage_daemon"; + string displayName = "shared_disk"; + EXPECT_EQ(info[0].uri, uri); + EXPECT_EQ(info[0].displayName, displayName); + EXPECT_EQ(info[0].deviceType, DEVICE_SHARED_DISK); + EXPECT_EQ(info[0].deviceFlags, DEVICE_FLAG_SUPPORTS_READ | DEVICE_FLAG_SUPPORTS_WRITE); } catch (...) { GTEST_LOG_(INFO) << "external_file_access_GetRoots_0000 occurs an exception."; } diff --git a/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp index 022fd92b..734f5553 100644 --- a/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp +++ b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp @@ -30,11 +30,12 @@ namespace { using namespace std; using namespace OHOS; using namespace FileAccessFwk; +const int32_t READ = 0; const int32_t WRITE = 1; const int32_t WRITE_READ = 2; const int ABILITY_ID = 5003; -const int g_concurrent = 4; -int g_actualconcurrent = 1; +const int INIT_THREADS_NUMBER = 4; +const int ACTUAL_SUCCESS_THREADS_NUMBER = 1; int g_num = 0; shared_ptr g_fah = nullptr; OHOS::Security::AccessToken::AccessTokenID g_tokenId; @@ -143,11 +144,11 @@ public: } EXPECT_TRUE(sus); vector wants {want}; - bool sus1 = false; + bool temp = false; g_fah = FileAccessHelper::Creator(remoteObj, wants); if (g_fah == nullptr) { - GTEST_LOG_(INFO) << "medialibrary_file_access_test g_fah is nullptr"; - EXPECT_TRUE(sus1); + GTEST_LOG_(INFO) << "external_file_access_test g_fah is nullptr"; + EXPECT_TRUE(temp); } OHOS::Security::AccessToken::AccessTokenIDEx tokenIdEx = {0}; tokenIdEx = OHOS::Security::AccessToken::AccessTokenKit::AllocHapToken( @@ -324,8 +325,8 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0004, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - int flags = -1; - result = g_fah->OpenFile(newFileUri, flags, fd); + int flag = -1; + result = g_fah->OpenFile(newFileUri, flag, fd); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0004 result:" << result << endl; @@ -340,7 +341,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0004, testing:: /** * @tc.number: user_file_service_medialibrary_file_access_OpenFile_0005 * @tc.name: medialibrary_file_access_OpenFile_0005 - * @tc.desc: Test function of OpenFile interface for SUCCESS which flag is 1. + * @tc.desc: Test function of OpenFile interface for SUCCESS which flag is 0. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 @@ -353,9 +354,8 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0005, testing:: Uri newFileUri(""); int result = g_fah->CreateFile(g_newDirUri, "medialibrary_file_access_OpenFile_0005.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - int fd; - result = g_fah->OpenFile(newFileUri, WRITE, fd); + result = g_fah->OpenFile(newFileUri, READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0005 result:" << result << endl; close(fd); @@ -370,7 +370,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0005, testing:: /** * @tc.number: user_file_service_medialibrary_file_access_OpenFile_0006 * @tc.name: medialibrary_file_access_OpenFile_0006 - * @tc.desc: Test function of OpenFile interface for SUCCESS which flag is 2. + * @tc.desc: Test function of OpenFile interface for SUCCESS which flag is 1. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 @@ -385,7 +385,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0006, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int fd; - result = g_fah->OpenFile(newFileUri, WRITE_READ, fd); + result = g_fah->OpenFile(newFileUri, WRITE, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0006 result:" << result << endl; close(fd); @@ -397,10 +397,40 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0006, testing:: GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0006"; } -void OpenFileTdd(shared_ptr fahs, Uri uri, int flags, int fd) +/** + * @tc.number: user_file_service_medialibrary_file_access_OpenFile_0007 + * @tc.name: medialibrary_file_access_OpenFile_0007 + * @tc.desc: Test function of OpenFile interface for SUCCESS which flag is 2. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: SR000H0386 + */ +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0007, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_OpenFile_0007"; + try { + Uri newFileUri(""); + int result = g_fah->CreateFile(g_newDirUri, "medialibrary_file_access_OpenFile_0007.txt", newFileUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + + int fd; + result = g_fah->OpenFile(newFileUri, WRITE_READ, fd); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + GTEST_LOG_(INFO) << "OpenFile_0007 result:" << result << endl; + close(fd); + result = g_fah->Delete(newFileUri); + EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + } catch (...) { + GTEST_LOG_(INFO) << "medialibrary_file_access_OpenFile_0007 occurs an exception."; + } + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0007"; +} + +void OpenFileTdd(shared_ptr fahs, Uri uri, int flag, int fd) { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_OpenFileTdd"; - int ret = fahs->OpenFile(uri, flags, fd); + int ret = fahs->OpenFile(uri, flag, fd); if (ret != OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << "OpenFileTdd get result error, code:" << ret; return; @@ -413,37 +443,35 @@ void OpenFileTdd(shared_ptr fahs, Uri uri, int flags, int fd) } /** - * @tc.number: user_file_service_medialibrary_file_access_OpenFile_0007 - * @tc.name: medialibrary_file_access_OpenFile_0007 + * @tc.number: user_file_service_medialibrary_file_access_OpenFile_0008 + * @tc.name: medialibrary_file_access_OpenFile_0008 * @tc.desc: Test function of OpenFile interface for SUCCESS which Concurrent. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: SR000H0386 */ -HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0007, testing::ext::TestSize.Level1) +HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0008, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_OpenFile_0007"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_OpenFile_0008"; try { Uri newFileUri(""); - int flags = 0; int fd; g_num = 0; std::string displayName = "test1.txt"; int result = g_fah->CreateFile(g_newDirUri, displayName, newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - for (int j = 0; j < g_concurrent; j++) { - std::thread execthread(OpenFileTdd, g_fah, newFileUri, flags, fd); + for (int j = 0; j < INIT_THREADS_NUMBER; j++) { + std::thread execthread(OpenFileTdd, g_fah, newFileUri, WRITE_READ, fd); execthread.join(); } - g_actualconcurrent = 4; - EXPECT_EQ(g_num, g_actualconcurrent); + EXPECT_EQ(g_num, INIT_THREADS_NUMBER); result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_OpenFile_0007 occurs an exception."; + GTEST_LOG_(INFO) << "medialibrary_file_access_OpenFile_0008 occurs an exception."; } - GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0007"; + GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0008"; } /** @@ -605,12 +633,11 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0005, testing result = g_fah->Mkdir(newFileUri1, displayName2, newFileUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); g_num = 0; - for (int j = 0; j < g_concurrent; j++) { + for (int j = 0; j < INIT_THREADS_NUMBER; j++) { std::thread execthread(CreateFileTdd, g_fah, newFileUri2, displayName2, newFileUri3); execthread.join(); } - g_actualconcurrent = 1; - EXPECT_GE(g_num, g_actualconcurrent); + EXPECT_GE(g_num, ACTUAL_SUCCESS_THREADS_NUMBER); GTEST_LOG_(INFO) << "g_newDirUri.ToString() =" << g_newDirUri.ToString() ; result = g_fah->Delete(newFileUri1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); @@ -780,12 +807,11 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0005, testing::ext result = g_fah->Mkdir(newFileUri1, displayName2, newFileUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); g_num = 0; - for (int j = 0; j < g_concurrent; j++) { + for (int j = 0; j < INIT_THREADS_NUMBER; j++) { std::thread execthread(MkdirTdd, g_fah, newFileUri2, displayName3, newFileUri3); execthread.join(); } - g_actualconcurrent = 1; - EXPECT_GE(g_num, g_actualconcurrent); + EXPECT_GE(g_num, ACTUAL_SUCCESS_THREADS_NUMBER); result = g_fah->Delete(newFileUri1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { @@ -969,12 +995,11 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0005, testing::ex result = g_fah->CreateFile(newDirUriTest, displayName, testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); g_num = 0; - for (int j = 0; j < g_concurrent; j++) { + for (int j = 0; j < INIT_THREADS_NUMBER; j++) { std::thread execthread(DeleteTdd, g_fah, testUri); execthread.join(); } - g_actualconcurrent = 1; - EXPECT_GE(g_num, g_actualconcurrent); + EXPECT_GE(g_num, ACTUAL_SUCCESS_THREADS_NUMBER); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { @@ -1450,12 +1475,11 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0011, testing::ext: std::string displayName = "test1.txt"; result = g_fah->CreateFile(newDirUriTest1, displayName, testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - for (int j = 0; j < g_concurrent; j++) { + for (int j = 0; j < INIT_THREADS_NUMBER; j++) { std::thread execthread(MoveTdd, g_fah, testUri, newDirUriTest2, testUri2); execthread.join(); } - g_actualconcurrent = 1; - EXPECT_GE(g_num, g_actualconcurrent); + EXPECT_GE(g_num, ACTUAL_SUCCESS_THREADS_NUMBER); result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->Delete(newDirUriTest2); @@ -1684,12 +1708,11 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0006, testing::ex Uri renameUri(""); result = g_fah->CreateFile(newDirUriTest, displayName1, testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - for (int j = 0; j < g_concurrent; j++) { + for (int j = 0; j < INIT_THREADS_NUMBER; j++) { std::thread execthread(RenameTdd, g_fah, testUri, displayName2, renameUri); execthread.join(); } - g_actualconcurrent = 1; - EXPECT_GE(g_num, g_actualconcurrent); + EXPECT_GE(g_num, ACTUAL_SUCCESS_THREADS_NUMBER); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { @@ -1927,12 +1950,11 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0005, testing:: std::vector fileInfoVec; g_num = 0; FileFilter filter({".txt"}, {}, {}, 0, 0, false, true); - for (int j = 0; j < g_concurrent; j++) { + for (int j = 0; j < INIT_THREADS_NUMBER; j++) { std::thread execthread(ListFileTdd, g_fah, fileInfo, offset, maxCount, filter, fileInfoVec); execthread.join(); } - g_actualconcurrent = 1; - EXPECT_GE(g_num, g_actualconcurrent); + EXPECT_GE(g_num, ACTUAL_SUCCESS_THREADS_NUMBER); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { @@ -2153,12 +2175,11 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0004, testing:: std::vector fileInfoVec; FileFilter filter({".q1w2e3r4"}, {}, {}, 0, 0, false, true); g_num = 0; - for (int j = 0; j < g_concurrent; j++) { + for (int j = 0; j < INIT_THREADS_NUMBER; j++) { std::thread execthread(ScanFileTdd, g_fah, fileInfo, offset, maxCount, filter, fileInfoVec); execthread.join(); } - g_actualconcurrent = 1; - EXPECT_GE(g_num, g_actualconcurrent); + EXPECT_GE(g_num, ACTUAL_SUCCESS_THREADS_NUMBER); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { @@ -2197,7 +2218,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_GetRoots_0000, testing:: EXPECT_EQ(info[0].uri, uri); EXPECT_EQ(info[0].displayName, displayName); EXPECT_EQ(info[0].deviceType, DEVICE_LOCAL_DISK); - EXPECT_EQ(info[0].deviceFlags, DEVICE_SHARED_TERMINAL); + EXPECT_EQ(info[0].deviceFlags, DEVICE_FLAG_SUPPORTS_READ | DEVICE_FLAG_SUPPORTS_WRITE); SetSelfTokenID(selfTokenId_); } catch (...) { -- Gitee From 37c30b1ffadf3a3c3d8f3bbdd84231a9901232d7 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 15 Sep 2022 17:35:28 +0800 Subject: [PATCH 118/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9review?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../test/external_file_access_test.cpp | 356 +++++++----------- .../test/medialibrary_file_access_test.cpp | 276 +++++--------- 2 files changed, 220 insertions(+), 412 deletions(-) diff --git a/frameworks/innerkits/file_access/test/external_file_access_test.cpp b/frameworks/innerkits/file_access/test/external_file_access_test.cpp index b6d45dbe..47d86af5 100644 --- a/frameworks/innerkits/file_access/test/external_file_access_test.cpp +++ b/frameworks/innerkits/file_access/test/external_file_access_test.cpp @@ -121,7 +121,6 @@ public: static void SetUpTestCase(void) { cout << "FileExtensionHelperTest code test" << endl; - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); AAFwk::Want want; @@ -145,7 +144,7 @@ public: bool temp = false; g_fah = FileAccessHelper::Creator(remoteObj, wants); if (g_fah == nullptr) { - GTEST_LOG_(INFO) << "external_file_access_test g_fah is nullptr"; + GTEST_LOG_(ERROR) << "external_file_access_test g_fah is nullptr"; EXPECT_TRUE(temp); } OHOS::Security::AccessToken::AccessTokenIDEx tokenIdEx = {0}; @@ -196,10 +195,10 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0000, testing::e GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; close(fd); result = g_fah->Delete(newDirUriTest1); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_OpenFile_0000 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_OpenFile_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0000"; } @@ -223,7 +222,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0001, testing::e EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_OpenFile_0001 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_OpenFile_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0001"; } @@ -249,18 +248,16 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0002, testing::e Uri newFileUri(""); result = g_fah->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); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0002 result:" << result << endl; - result = g_fah->Delete(newFileUri); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_OpenFile_0002 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_OpenFile_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0002"; } @@ -284,7 +281,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0003, testing::e EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_OpenFile_0003 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_OpenFile_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0003"; } @@ -310,18 +307,16 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0004, testing::e Uri newFileUri(""); result = g_fah->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); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0004 result:" << result << endl; - result = g_fah->Delete(newFileUri); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_OpenFile_0004 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_OpenFile_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0004"; } @@ -347,17 +342,16 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0005, testing::e Uri newFileUri(""); result = g_fah->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); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0005 result:" << result << endl; close(fd); result = g_fah->Delete(newFileUri); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_OpenFile_0005 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_OpenFile_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0005"; } @@ -383,17 +377,16 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0006, testing::e Uri newFileUri(""); result = g_fah->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); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0006 result:" << result << endl; close(fd); result = g_fah->Delete(newFileUri); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_OpenFile_0006 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_OpenFile_0006 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0006"; } @@ -419,17 +412,16 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0007, testing::e Uri newFileUri(""); result = g_fah->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); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0007 result:" << result << endl; close(fd); result = g_fah->Delete(newFileUri); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_OpenFile_0007 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_OpenFile_0007 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0007"; } @@ -439,12 +431,13 @@ void OpenFileTdd(shared_ptr fahs, Uri uri, int flag, int fd) GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_OpenFileTdd"; int ret = fahs->OpenFile(uri, flag, fd); if (ret != OHOS::FileAccessFwk::ERR_OK) { - GTEST_LOG_(INFO) << "OpenFile get result error, code:" << ret; + GTEST_LOG_(ERROR) << "OpenFile get result error, code:" << ret; return; } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); EXPECT_GE(fd, OHOS::FileAccessFwk::ERR_OK); g_num++; + close(fd); GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFileTdd"; } @@ -481,7 +474,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_OpenFile_0008, testing::e EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_OpenFile_0008 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_OpenFile_0008 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_OpenFile_0008"; } @@ -508,12 +501,11 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0000, testing: result = g_fah->CreateFile(parentUri, "external_file_access_CreateFile_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0000 result:" << result << endl; - result = g_fah->Delete(newFileUri); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_CreateFile_0000 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_CreateFile_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0000"; } @@ -537,7 +529,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0001, testing: EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_CreateFile_0001 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_CreateFile_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0001"; } @@ -561,7 +553,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0002, testing: EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_CreateFile_0002 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_CreateFile_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0002"; } @@ -585,7 +577,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0003, testing: EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_CreateFile_0003 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_CreateFile_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0003"; } @@ -615,7 +607,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0004, testing: GTEST_LOG_(INFO) << "CreateFile_0004 result:" << result << endl; } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_CreateFile_0004 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_CreateFile_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0004"; } @@ -625,7 +617,7 @@ void CreateFileTdd(shared_ptr fahs, Uri uri, std::string displ GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_CreateFileTdd"; int ret = fahs->CreateFile(uri, displayName, newFile); if (ret != OHOS::FileAccessFwk::ERR_OK) { - GTEST_LOG_(INFO) << "CreateFileTdd get result error, code:" << ret; + GTEST_LOG_(ERROR) << "CreateFileTdd get result error, code:" << ret; return; } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); @@ -665,7 +657,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_CreateFile_0005, testing: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_CreateFile_0005 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_CreateFile_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_CreateFile_0005"; } @@ -692,12 +684,11 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0000, testing::ext: result = g_fah->Mkdir(parentUri, "external_file_access_Mkdir_0000", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0000 result:" << result << endl; - result = g_fah->Delete(newDirUriTest); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Mkdir_0000 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Mkdir_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0000"; } @@ -721,7 +712,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0001, testing::ext: EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Mkdir_0001 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Mkdir_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0001"; } @@ -745,7 +736,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0002, testing::ext: EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Mkdir_0002 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Mkdir_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0002"; } @@ -769,7 +760,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0003, testing::ext: EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Mkdir_0003 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Mkdir_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0003"; } @@ -799,7 +790,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0004, testing::ext: GTEST_LOG_(INFO) << "Mkdir_0004 result:" << result << endl; } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Mkdir_0004 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Mkdir_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0004"; } @@ -809,7 +800,7 @@ void MkdirTdd(shared_ptr fahs, Uri uri, std::string displayNam GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_MkdirTdd"; int ret = fahs->Mkdir(uri, displayName, newFile); if (ret != OHOS::FileAccessFwk::ERR_OK) { - GTEST_LOG_(INFO) << "MkdirTdd get result error, code:" << ret; + GTEST_LOG_(ERROR) << "MkdirTdd get result error, code:" << ret; return; } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); @@ -849,7 +840,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Mkdir_0005, testing::ext: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Mkdir_0005 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Mkdir_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Mkdir_0005"; } @@ -875,20 +866,17 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0000, testing::ext Uri newDirUriTest(""); result = g_fah->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); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newFileUri); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0000 result:" << result << endl; - result = g_fah->Delete(newDirUriTest); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Delete_0000 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Delete_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0000"; } @@ -914,13 +902,12 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0001, testing::ext Uri newDirUriTest(""); result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newDirUriTest); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0001 result:" << result << endl; } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Delete_0001 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Delete_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0001"; } @@ -943,7 +930,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0002, testing::ext EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Delete_0002 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Delete_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0002"; } @@ -973,12 +960,12 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0003, testing::ext result = g_fah->Delete(selectFileUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->Delete(newDirUriTest); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0003 result:" << result << endl; } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Delete_0003 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Delete_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0003"; } @@ -1001,7 +988,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0004, testing::ext EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0004 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Delete_0004 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Delete_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0004"; } @@ -1011,7 +998,7 @@ void DeleteTdd(shared_ptr fahs, Uri selectFile) GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_DeleteTdd"; int ret = fahs->Delete(selectFile); if (ret != OHOS::FileAccessFwk::ERR_OK) { - GTEST_LOG_(INFO) << "DeleteTdd get result error, code:" << ret; + GTEST_LOG_(ERROR) << "DeleteTdd get result error, code:" << ret; return; } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); @@ -1040,7 +1027,6 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0005, testing::ext Uri newDirUriTest(""); result = g_fah->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); @@ -1052,10 +1038,10 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0005, testing::ext } EXPECT_EQ(g_num, ACTUAL_SUCCESS_THREADS_NUMBER); result = g_fah->Delete(newDirUriTest); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Delete_0005 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Delete_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Delete_0005"; } @@ -1082,27 +1068,22 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0000, testing::ext:: Uri newDirUriTest2(""); result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); 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(""); result = g_fah->Move(testUri, newDirUriTest2, testUri2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0000 result:" << result << endl; - result = g_fah->Delete(newDirUriTest1); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->Delete(newDirUriTest2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Move_0000 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Move_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0000"; } @@ -1129,24 +1110,20 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0001, testing::ext:: Uri newDirUriTest2(""); result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); 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(""); result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0001 result:" << result << endl; - result = g_fah->Delete(newDirUriTest2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Move_0001 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Move_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0001"; } @@ -1172,18 +1149,16 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0002, testing::ext:: Uri newDirUriTest(""); result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); Uri sourceFileUri(""); result = g_fah->Move(sourceFileUri, newDirUriTest, testUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0002 result:" << result << endl; - result = g_fah->Delete(newDirUriTest); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Move_0002 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Move_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0002"; } @@ -1210,28 +1185,23 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0003, testing::ext:: Uri newDirUriTest2(""); result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); 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(""); Uri sourceFileUri("storage/media/100/local/files/Download/test1/test.txt"); result = g_fah->Move(sourceFileUri, newDirUriTest2, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0003 result:" << result << endl; - result = g_fah->Delete(newDirUriTest1); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->Delete(newDirUriTest2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Move_0003 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Move_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0003"; } @@ -1257,18 +1227,16 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0004, testing::ext:: Uri newDirUriTest(""); result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); Uri sourceFileUri("~!@#$%^&*()_"); result = g_fah->Move(sourceFileUri, newDirUriTest, testUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0004 result:" << result << endl; - result = g_fah->Delete(newDirUriTest); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Move_0004 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Move_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0004"; } @@ -1294,22 +1262,19 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0005, testing::ext:: Uri newDirUriTest(""); result = g_fah->Mkdir(parentUri, "test1", newDirUriTest); 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(""); Uri targetParentUri(""); result = g_fah->Move(testUri, targetParentUri, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0005 result:" << result << endl; - result = g_fah->Delete(newDirUriTest); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Move_0005 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Move_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0005"; } @@ -1336,28 +1301,23 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0006, testing::ext:: Uri newDirUriTest2(""); result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); 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(""); Uri targetParentUri("storage/media/100/local/files/Download/test2"); result = g_fah->Move(testUri, targetParentUri, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0006 result:" << result << endl; - result = g_fah->Delete(newDirUriTest1); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->Delete(newDirUriTest2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Move_0006 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Move_0006 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0006"; } @@ -1384,28 +1344,23 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0007, testing::ext:: Uri newDirUriTest2(""); result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); 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(""); Uri targetParentUri("~!@#$^%&*()_"); result = g_fah->Move(testUri, targetParentUri, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0007 result:" << result << endl; - result = g_fah->Delete(newDirUriTest1); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->Delete(newDirUriTest2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Move_0007 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Move_0007 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0007"; } @@ -1432,20 +1387,17 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0008, testing::ext:: Uri newDirUriTest2(""); result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0008 result:" << result << endl; - result = g_fah->Delete(newDirUriTest2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Move_0008 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Move_0008 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0008"; } @@ -1472,28 +1424,24 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0009, testing::ext:: Uri newDirUriTest2(""); result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); int num = 2000; - for (size_t j = 0; j < num; j++) - { + for (size_t j = 0; j < num; j++) { string fileName = "test" + ToString(j) + ".txt"; - g_fah->CreateFile(newDirUriTest1, fileName, testUri); + result = g_fah->CreateFile(newDirUriTest1, fileName, testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } - Uri testUri2(""); result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0009 result:" << result << endl; - result = g_fah->Delete(newDirUriTest2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Move_0009 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Move_0009 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0009"; } @@ -1520,28 +1468,27 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0010, testing::ext:: Uri newDirUriTest2(""); result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); - g_fah->Mkdir(newDirUriTest1, "test", testUri); + result = g_fah->Mkdir(newDirUriTest1, "test", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int num = 64; for (size_t j = 0; j < num; j++) { - g_fah->Mkdir(testUri, "test", testUri); + result = g_fah->Mkdir(testUri, "test", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } - Uri testUri2(""); result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0010 result:" << result << endl; result = g_fah->Delete(newDirUriTest2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Move_0010 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Move_0010 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0010"; } @@ -1568,32 +1515,27 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0011, testing::ext:: Uri newDirUriTest2(""); result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); - g_fah->CreateFile(newDirUriTest1, "test.txt", testUri); - + result = g_fah->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); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Move(testUri, newDirUriTest2, testUri); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->Move(testUri, newDirUriTest1, testUri); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0011 result:" << result << endl; - result = g_fah->Delete(newDirUriTest2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } result = g_fah->Delete(newDirUriTest1); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Move_0011 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Move_0011 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0011"; } @@ -1603,7 +1545,7 @@ void MoveTdd(shared_ptr fahs, Uri sourceFile, Uri targetParent GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_MoveTdd"; int ret = fahs->Move(sourceFile, targetParent, newFile); if (ret != OHOS::FileAccessFwk::ERR_OK) { - GTEST_LOG_(INFO) << "MoveTdd get result error, code:" << ret; + GTEST_LOG_(ERROR) << "MoveTdd get result error, code:" << ret; return; } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); @@ -1633,10 +1575,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0012, testing::ext:: Uri newDirUriTest2(""); result = g_fah->Mkdir(parentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->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); @@ -1649,13 +1589,12 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0012, testing::ext:: } EXPECT_EQ(g_num, ACTUAL_SUCCESS_THREADS_NUMBER); result = g_fah->Delete(newDirUriTest1); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->Delete(newDirUriTest2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Move_0012 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Move_0012 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Move_0012"; } @@ -1681,21 +1620,18 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0000, testing::ext Uri newDirUriTest(""); result = g_fah->Mkdir(parentUri, "test", newDirUriTest); 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 renameUri(""); result = g_fah->Rename(testUri, "test2.txt", renameUri); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0000 result:" << result << endl; - result = g_fah->Delete(newDirUriTest); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Rename_0000 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Rename_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0000"; } @@ -1721,17 +1657,15 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0001, testing::ext Uri newDirUriTest(""); result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri renameUri(""); result = g_fah->Rename(newDirUriTest, "testRename", renameUri); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0001 result:" << result << endl; - result = g_fah->Delete(renameUri); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Rename_0001 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Rename_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0001"; } @@ -1755,7 +1689,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0002, testing::ext EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Rename_0002 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Rename_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0002"; } @@ -1781,11 +1715,9 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0003, testing::ext Uri newDirUriTest(""); result = g_fah->Mkdir(parentUri, "test", newDirUriTest); 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 renameUri(""); Uri sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); result = g_fah->Rename(sourceFileUri, "testRename.txt", renameUri); @@ -1793,10 +1725,10 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0003, testing::ext GTEST_LOG_(INFO) << "Rename_0003 result:" << result << endl; result = g_fah->Delete(newDirUriTest); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Rename_0003 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Rename_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0003"; } @@ -1820,7 +1752,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0004, testing::ext EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0004 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Rename_0004 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Rename_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0004"; } @@ -1846,21 +1778,19 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0005, testing::ext Uri newDirUriTest(""); result = g_fah->Mkdir(parentUri, "test", newDirUriTest); 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 renameUri(""); result = g_fah->Rename(testUri, "", renameUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0005 result:" << result << endl; result = g_fah->Delete(newDirUriTest); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Rename_0005 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Rename_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0005"; } @@ -1870,7 +1800,7 @@ void RenameTdd(shared_ptr fahs, Uri sourceFile, std::string di GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_RenameTdd"; int ret = fahs->Rename(sourceFile, displayName, newFile); if (ret != OHOS::FileAccessFwk::ERR_OK) { - GTEST_LOG_(INFO) << "RenameTdd get result error, code:" << ret; + GTEST_LOG_(ERROR) << "RenameTdd get result error, code:" << ret; return; } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); @@ -1899,7 +1829,6 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0006, testing::ext Uri newDirUriTest(""); result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); std::string displayName1 = "test1.txt"; std::string displayName2 = "test2.txt"; @@ -1913,10 +1842,10 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0006, testing::ext } EXPECT_EQ(g_num, ACTUAL_SUCCESS_THREADS_NUMBER); result = g_fah->Delete(newDirUriTest); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Rename_0006 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Rename_0006 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Rename_0006"; } @@ -1942,11 +1871,9 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0000, testing::e Uri newDirUriTest(""); result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); result = g_fah->CreateFile(newDirUriTest, "external_file_access_ListFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - FileInfo fileInfo; fileInfo.uri = newDirUriTest.ToString(); int64_t offset = 0; @@ -1955,13 +1882,12 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0000, testing::e FileFilter filter; result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_GT(fileInfoVec.size(), 0); - + EXPECT_GT(fileInfoVec.size(), OHOS::FileAccessFwk::ERR_OK); result = g_fah->Delete(newDirUriTest); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_ListFile_0000 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_ListFile_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0000"; } @@ -1988,9 +1914,9 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0001, testing::e FileFilter filter; int result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_EQ(fileInfoVec.size(), 0); + EXPECT_EQ(fileInfoVec.size(), OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_ListFile_0001 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_ListFile_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0001"; } @@ -2016,11 +1942,9 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0002, testing::e Uri newDirUriTest(""); result = g_fah->Mkdir(parentUri, "test", newDirUriTest); 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 sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); FileInfo fileInfo; fileInfo.uri = sourceFileUri.ToString(); @@ -2031,13 +1955,12 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0002, testing::e FileFilter filter; result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_EQ(fileInfoVec.size(), 0); - + EXPECT_EQ(fileInfoVec.size(), OHOS::FileAccessFwk::ERR_OK); result = g_fah->Delete(newDirUriTest); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_ListFile_0002 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_ListFile_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0002"; } @@ -2065,9 +1988,9 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0003, testing::e FileFilter filter; int result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_EQ(fileInfoVec.size(), 0); + EXPECT_EQ(fileInfoVec.size(), OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_ListFile_0003 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_ListFile_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0003"; } @@ -2078,7 +2001,7 @@ void ListFileTdd(shared_ptr fahs, FileInfo fileInfo, int offse GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_ListFileTdd"; int ret = fahs->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); if (ret != OHOS::FileAccessFwk::ERR_OK) { - GTEST_LOG_(INFO) << "ListFile get result error, code:" << ret; + GTEST_LOG_(ERROR) << "ListFile get result error, code:" << ret; return; } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); @@ -2107,11 +2030,9 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0004, testing::e Uri newDirUriTest(""); result = g_fah->Mkdir(parentUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); result = g_fah->CreateFile(newDirUriTest, "external_file_access_ListFile_0004.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - FileInfo fileInfo; fileInfo.uri = newDirUriTest.ToString(); int offset = 0; @@ -2125,10 +2046,10 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_ListFile_0004, testing::e } EXPECT_EQ(g_num, INIT_THREADS_NUMBER); result = g_fah->Delete(newDirUriTest); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_ListFile_0004 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_ListFile_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_ListFile_0004"; } @@ -2149,7 +2070,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_GetRoots_0000, testing::e vector info; int result = g_fah->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_GT(info.size(), 0); + EXPECT_GT(info.size(), OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "GetRoots_0000 result:" << info.size() << endl; for (size_t i = 0; i < info.size(); i++) { GTEST_LOG_(INFO) << info[i].uri; @@ -2157,7 +2078,6 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_GetRoots_0000, testing::e GTEST_LOG_(INFO) << info[i].deviceFlags; GTEST_LOG_(INFO) << info[i].deviceType; } - string uri = "datashare:///com.ohos.UserFile.ExternalFileManager/data/storage/el1/bundle/storage_daemon"; string displayName = "shared_disk"; EXPECT_EQ(info[0].uri, uri); @@ -2165,7 +2085,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_GetRoots_0000, testing::e EXPECT_EQ(info[0].deviceType, DEVICE_SHARED_DISK); EXPECT_EQ(info[0].deviceFlags, DEVICE_FLAG_SUPPORTS_READ | DEVICE_FLAG_SUPPORTS_WRITE); } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_GetRoots_0000 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_GetRoots_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_GetRoots_0000"; } @@ -2191,7 +2111,6 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_allInterface_0000, testin setuid(UID_DEFAULT); EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); shared_ptr fahs = FileAccessHelper::Creator(remoteObj, wants); - vector info; int result = g_fah->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -2199,7 +2118,6 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_allInterface_0000, testin Uri parentUri(info[i].uri); string uri = parentUri.ToString(); GTEST_LOG_(INFO) << uri; - string document = uri + "/Documents"; Uri documentUri(document); bool isExist = false; @@ -2209,37 +2127,29 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_allInterface_0000, testin result = fahs->Mkdir(parentUri, "Documents", documentUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } - Uri newDirUriTest1(""); Uri newDirUriTest2(""); result = fahs->Mkdir(documentUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fahs->Mkdir(documentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri newFileUri(""); result = fahs->CreateFile(newDirUriTest1, "external_file_access_allInterface_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = fahs->Rename(newFileUri, "test1.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri moveUri(""); result = fahs->Move(newFileUri, newDirUriTest2, moveUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - int fd; result = g_fah->OpenFile(moveUri, WRITE_READ, fd); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; - result = fahs->Delete(documentUri); - EXPECT_LE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_allInterface_0000 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_allInterface_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_allInterface_0000"; } @@ -2265,34 +2175,28 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Access_0000, testing::ext for (size_t i = 0; i < info.size(); i++) { Uri parentUri(info[i].uri); GTEST_LOG_(INFO) << parentUri.ToString(); - Uri newDirUriTest(""); result = g_fah->Mkdir(parentUri, "test1", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri newFileUri(""); result = g_fah->CreateFile(newDirUriTest, "external_file_access_Access_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - bool isExist = false; result = g_fah->Access(newDirUriTest, isExist); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_TRUE(isExist); - result = g_fah->Access(newFileUri, isExist); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_TRUE(isExist); - result = g_fah->Delete(newDirUriTest); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->Access(newDirUriTest, isExist); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_FALSE(isExist); } SetSelfTokenID(selfTokenId_); } catch (...) { - GTEST_LOG_(INFO) << "external_file_access_Access_0000 occurs an exception."; + GTEST_LOG_(ERROR) << "external_file_access_Access_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileExtensionHelperTest-end external_file_access_Access_0000"; } diff --git a/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp index 734f5553..44b0a067 100644 --- a/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp +++ b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp @@ -123,7 +123,6 @@ public: static void SetUpTestCase(void) { cout << "FileAccessHelperTest code test" << endl; - auto saManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); auto remoteObj = saManager->GetSystemAbility(ABILITY_ID); AAFwk::Want want; @@ -147,7 +146,7 @@ public: bool temp = false; g_fah = FileAccessHelper::Creator(remoteObj, wants); if (g_fah == nullptr) { - GTEST_LOG_(INFO) << "external_file_access_test g_fah is nullptr"; + GTEST_LOG_(ERROR) << "external_file_access_test g_fah is nullptr"; EXPECT_TRUE(temp); } OHOS::Security::AccessToken::AccessTokenIDEx tokenIdEx = {0}; @@ -156,7 +155,6 @@ public: g_tokenId = tokenIdEx.tokenIdExStruct.tokenID; SetSelfTokenID(g_tokenId); } - static void TearDownTestCase() { g_fah->Release(); @@ -184,11 +182,10 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0000, testing:: int result = g_fah->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri parentUri(""); - if (info.size() > 0) { + if (info.size() > OHOS::FileAccessFwk::ERR_OK) { parentUri = Uri(info[0].uri + "/file"); - GTEST_LOG_(INFO) << parentUri.ToString(); + GTEST_LOG_(ERROR) << parentUri.ToString(); } - bool isExist = false; result = g_fah->Access(g_newDirUri, isExist); EXPECT_LE(result, OHOS::FileAccessFwk::ERR_OK); @@ -196,7 +193,6 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0000, testing:: result = g_fah->Mkdir(parentUri, "Download", g_newDirUri); EXPECT_LE(result, OHOS::FileAccessFwk::ERR_OK); } - Uri newDirUriTest("datashare:///media/root/file"); FileInfo fileInfo; fileInfo.uri = newDirUriTest.ToString(); @@ -206,31 +202,27 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0000, testing:: FileFilter filter; result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_GE(fileInfoVec.size(), 0); + EXPECT_GE(fileInfoVec.size(), OHOS::FileAccessFwk::ERR_OK); for (size_t i = 0; i < fileInfoVec.size(); i++) { if (fileInfoVec[i].fileName.compare("Download") == 0) { g_newDirUri = Uri(fileInfoVec[i].uri); break; } } - result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri newFileUri(""); result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_OpenFile_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - int fd; result = g_fah->OpenFile(newFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - GTEST_LOG_(INFO) << "OpenFile_0000 result:" << result << endl; close(fd); result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_accsess_OpenFile_0000 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_accsess_OpenFile_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0000"; } @@ -254,7 +246,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0001, testing:: EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_OpenFile_0001 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_OpenFile_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0001"; } @@ -278,7 +270,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0002, testing:: EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_OpenFile_0002 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_OpenFile_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0002"; } @@ -302,7 +294,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0003, testing:: EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_OpenFile_0003 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_OpenFile_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0003"; } @@ -323,17 +315,15 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0004, testing:: Uri newFileUri(""); int result = g_fah->CreateFile(g_newDirUri, "medialibrary_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); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "OpenFile_0004 result:" << result << endl; - result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_OpenFile_0004 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_OpenFile_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0004"; } @@ -362,7 +352,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0005, testing:: result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_OpenFile_0005 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_OpenFile_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0005"; } @@ -383,7 +373,6 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0006, testing:: Uri newFileUri(""); int result = g_fah->CreateFile(g_newDirUri, "medialibrary_file_access_OpenFile_0006.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - int fd; result = g_fah->OpenFile(newFileUri, WRITE, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -392,7 +381,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0006, testing:: result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_OpenFile_0006 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_OpenFile_0006 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0006"; } @@ -413,7 +402,6 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0007, testing:: Uri newFileUri(""); int result = g_fah->CreateFile(g_newDirUri, "medialibrary_file_access_OpenFile_0007.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - int fd; result = g_fah->OpenFile(newFileUri, WRITE_READ, fd); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -422,7 +410,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0007, testing:: result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_OpenFile_0007 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_OpenFile_0007 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0007"; } @@ -432,11 +420,11 @@ void OpenFileTdd(shared_ptr fahs, Uri uri, int flag, int fd) GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_OpenFileTdd"; int ret = fahs->OpenFile(uri, flag, fd); if (ret != OHOS::FileAccessFwk::ERR_OK) { - GTEST_LOG_(INFO) << "OpenFileTdd get result error, code:" << ret; + GTEST_LOG_(ERROR) << "OpenFileTdd get result error, code:" << ret; return; } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); - EXPECT_GE(fd, 0); + EXPECT_GE(fd, OHOS::FileAccessFwk::ERR_OK); g_num++; close(fd); GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFileTdd"; @@ -469,7 +457,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_OpenFile_0008, testing:: result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_OpenFile_0008 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_OpenFile_0008 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_OpenFile_0008"; } @@ -491,11 +479,10 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0000, testing int result = g_fah->CreateFile(g_newDirUri, "medialibrary_file_access_CreateFile_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0000 result:" << result << endl; - result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_CreateFile_0000 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_CreateFile_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0000"; } @@ -519,7 +506,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0001, testing EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_CreateFile_0001 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_CreateFile_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0001"; } @@ -543,7 +530,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0002, testing EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_CreateFile_0002 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_CreateFile_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0002"; } @@ -567,7 +554,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0003, testing EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_CreateFile_0003 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_CreateFile_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0003"; } @@ -591,7 +578,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0004, testing EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "CreateFile_0004 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_CreateFile_0004 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_CreateFile_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0004"; } @@ -601,7 +588,7 @@ void CreateFileTdd(shared_ptr fahs, Uri parent, std::string di GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_CreateFileTdd"; int ret = fahs->CreateFile(parent, displayName, newDir); if (ret < OHOS::FileAccessFwk::ERR_OK) { - GTEST_LOG_(INFO) << "CreateFileTdd get result error, code:" << ret; + GTEST_LOG_(ERROR) << "CreateFileTdd get result error, code:" << ret; return; } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); @@ -642,7 +629,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_CreateFile_0005, testing result = g_fah->Delete(newFileUri1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_CreateFile_0005 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_CreateFile_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_CreateFile_0005"; } @@ -664,11 +651,10 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0000, testing::ext int result = g_fah->Mkdir(g_newDirUri, "medialibrary_file_access_Mkdir_0000", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0000 result:" << result << endl; - result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Mkdir_0000 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Mkdir_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0000"; } @@ -692,7 +678,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0001, testing::ext EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Mkdir_0001 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Mkdir_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0001"; } @@ -716,7 +702,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0002, testing::ext EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Mkdir_0002 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Mkdir_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0002"; } @@ -740,7 +726,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0003, testing::ext EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Mkdir_0003 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Mkdir_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0003"; } @@ -764,7 +750,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0004, testing::ext EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Mkdir_0004 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Mkdir_0004 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Mkdir_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0004"; } @@ -774,7 +760,7 @@ void MkdirTdd(shared_ptr fahs, Uri parent, std::string display GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_MkdirTdd"; int ret = fahs->Mkdir(parent, displayName, newDir); if (ret < OHOS::FileAccessFwk::ERR_OK) { - GTEST_LOG_(INFO) << "MkdirTdd get result error, code:" << ret; + GTEST_LOG_(ERROR) << "MkdirTdd get result error, code:" << ret; return; } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); @@ -815,7 +801,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Mkdir_0005, testing::ext result = g_fah->Delete(newFileUri1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Mkdir_0005 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Mkdir_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Mkdir_0005"; } @@ -836,19 +822,16 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0000, testing::ex Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri newFileUri(""); result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_Delete_0000.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newFileUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0000 result:" << result << endl; - result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Delete_0000 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Delete_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0000"; } @@ -869,12 +852,11 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0001, testing::ex Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0001 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Delete_0001 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Delete_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0001"; } @@ -897,7 +879,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0002, testing::ex EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Delete_0002 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Delete_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0002"; } @@ -918,16 +900,14 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0003, testing::ex Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri selectFileUri("storage/media/100/local/files/Download/test"); result = g_fah->Delete(selectFileUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0003 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Delete_0003 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Delete_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0003"; } @@ -950,7 +930,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0004, testing::ex EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0004 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Delete_0004 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Delete_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0004"; } @@ -960,7 +940,7 @@ void DeleteTdd(shared_ptr fahs, Uri selectFile) GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_DeleteTdd"; int ret = fahs->Delete(selectFile); if (ret < OHOS::FileAccessFwk::ERR_OK) { - GTEST_LOG_(INFO) << "DeleteTdd get result error, code:" << ret; + GTEST_LOG_(ERROR) << "DeleteTdd get result error, code:" << ret; return; } EXPECT_GE(ret, OHOS::FileAccessFwk::ERR_OK); @@ -984,11 +964,9 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0005, testing::ex Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri newFileUri(""); result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_Delete_0005.txt", newFileUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); std::string displayName = "test1.txt"; Uri testUri2(""); @@ -1003,7 +981,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0005, testing::ex result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Delete_0005 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Delete_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0005"; } @@ -1026,26 +1004,21 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0000, testing::ext: Uri newDirUriTest2(""); int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); 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(""); result = g_fah->Move(testUri, newDirUriTest2, testUri2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0000 result:" << result << endl; - result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0000 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Move_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0000"; } @@ -1067,25 +1040,21 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0001, testing::ext: Uri newDirUriTest2(""); int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); 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(""); result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0001 result:" << result << endl; - result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0001 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Move_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0001"; } @@ -1106,17 +1075,15 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0002, testing::ext: Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); Uri sourceFileUri(""); result = g_fah->Move(sourceFileUri, newDirUriTest, testUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0002 result:" << result << endl; - result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0002 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Move_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0002"; } @@ -1138,27 +1105,22 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0003, testing::ext: Uri newDirUriTest2(""); int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); 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(""); Uri sourceFileUri("storage/media/100/local/files/Download/test1/test.txt"); result = g_fah->Move(sourceFileUri, newDirUriTest2, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0003 result:" << result << endl; - result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0003 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Move_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0003"; } @@ -1185,11 +1147,10 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0004, testing::ext: result = g_fah->Move(sourceFileUri, newDirUriTest, testUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0004 result:" << result << endl; - result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0004 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Move_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0004"; } @@ -1210,21 +1171,18 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0005, testing::ext: Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest); 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(""); Uri targetParentUri(""); result = g_fah->Move(testUri, targetParentUri, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0005 result:" << result << endl; - result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0005 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Move_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0005"; } @@ -1246,27 +1204,22 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0006, testing::ext: Uri newDirUriTest2(""); int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); 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(""); Uri targetParentUri("storage/media/100/local/files/Download/test2"); result = g_fah->Move(testUri, targetParentUri, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0006 result:" << result << endl; - result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0006 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Move_0006 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0006"; } @@ -1288,27 +1241,22 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0007, testing::ext: Uri newDirUriTest2(""); int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); 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(""); Uri targetParentUri("~!@#$^%&*()_"); result = g_fah->Move(testUri, targetParentUri, testUri2); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0007 result:" << result << endl; - result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0007 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Move_0007 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0007"; } @@ -1330,21 +1278,18 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0008, testing::ext: Uri newDirUriTest2(""); int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri2(""); result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0008 result:" << result << endl; - result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0008 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Move_0008 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0008"; } @@ -1366,28 +1311,25 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0009, testing::ext: Uri newDirUriTest2(""); int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); int num = 2000; for (size_t i = 0; i < num; i++) { string fileName = "test" + ToString(i) + ".txt"; - g_fah->CreateFile(newDirUriTest1, fileName, testUri); + result = g_fah->CreateFile(newDirUriTest1, fileName, testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } - Uri testUri2(""); result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0009 result:" << result << endl; - result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0009 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Move_0009 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0009"; } @@ -1409,28 +1351,26 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0010, testing::ext: Uri newDirUriTest2(""); int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); - g_fah->Mkdir(newDirUriTest1, "test", testUri); + result = g_fah->Mkdir(newDirUriTest1, "test", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); int num = 50; for (size_t i = 0; i < num; i++) { - g_fah->Mkdir(testUri, "test", testUri); + result = g_fah->Mkdir(testUri, "test", testUri); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } - Uri testUri2(""); result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); - EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); + EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0010 result:" << result << endl; - result = g_fah->Delete(newDirUriTest1); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0010 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Move_0010 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0010"; } @@ -1440,7 +1380,7 @@ void MoveTdd(shared_ptr fahs, Uri sourceFile, Uri targetParent GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_MoveTdd"; int ret = fahs->Move(sourceFile, targetParent, newFile); if (ret != OHOS::FileAccessFwk::ERR_OK) { - GTEST_LOG_(INFO) << "MoveTdd get result error, code:" << ret; + GTEST_LOG_(ERROR) << "MoveTdd get result error, code:" << ret; return; } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); @@ -1466,10 +1406,8 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0011, testing::ext: Uri newDirUriTest2(""); int result = g_fah->Mkdir(g_newDirUri, "test1", newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri{""}; Uri testUri2(""); std::string displayName = "test1.txt"; @@ -1485,7 +1423,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0011, testing::ext: result = g_fah->Delete(newDirUriTest2); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Move_0011 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Move_0011 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Move_0011"; } @@ -1506,20 +1444,17 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0000, testing::ex Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); 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 renameUri(""); result = g_fah->Rename(testUri, "test2.txt", renameUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0000 result:" << result << endl; - result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Rename_0000 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Rename_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0000"; } @@ -1540,16 +1475,14 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0001, testing::ex Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri renameUri(""); result = g_fah->Rename(newDirUriTest, "testRename", renameUri); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0001 result:" << result << endl; - result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Rename_0001 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Rename_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0001"; } @@ -1573,7 +1506,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0002, testing::ex EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0002 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Rename_0002 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Rename_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0002"; } @@ -1594,21 +1527,18 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0003, testing::ex Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); 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 renameUri(""); Uri sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); result = g_fah->Rename(sourceFileUri, "testRename.txt", renameUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0003 result:" << result << endl; - result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Rename_0003 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Rename_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0003"; } @@ -1632,7 +1562,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0004, testing::ex EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0004 result:" << result << endl; } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Rename_0004 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Rename_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0004"; } @@ -1653,20 +1583,17 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0005, testing::ex Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); 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 renameUri(""); result = g_fah->Rename(testUri, "", renameUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0005 result:" << result << endl; - result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Rename_0005 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Rename_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0005"; } @@ -1676,7 +1603,7 @@ void RenameTdd(shared_ptr fahs, Uri sourceFile, std::string di GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_RenameTdd"; int ret = fahs->Rename(sourceFile, displayName, newFile); if (ret != OHOS::FileAccessFwk::ERR_OK) { - GTEST_LOG_(INFO) << "RenameTdd get result error, code:" << ret; + GTEST_LOG_(ERROR) << "RenameTdd get result error, code:" << ret; return; } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); @@ -1701,7 +1628,6 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0006, testing::ex Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri{""}; std::string displayName1 = "test1.txt"; std::string displayName2 = "test2.txt"; @@ -1716,7 +1642,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Rename_0006, testing::ex result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_Rename_0006 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_Rename_0006 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Rename_0006"; } @@ -1737,11 +1663,9 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0000, testing:: Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ListFile_0000.txt", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - FileInfo fileInfo; fileInfo.uri = newDirUriTest.ToString(); int64_t offset = 0; @@ -1750,13 +1674,12 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0000, testing:: FileFilter filter; result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_GT(fileInfoVec.size(), 0); + EXPECT_GT(fileInfoVec.size(), OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "ListFile_0000 result:" << fileInfoVec.size() << endl; - result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_ListFile_0000 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_ListFile_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0000"; } @@ -1783,10 +1706,10 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0001, testing:: FileFilter filter({}, {}, {}, 0, 0, false, false); int result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_EQ(fileInfoVec.size(), 0); + EXPECT_EQ(fileInfoVec.size(), OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "ListFile_0001 result:" << fileInfoVec.size() << endl; } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_ListFile_0001 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_ListFile_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0001"; } @@ -1807,11 +1730,9 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0002, testing:: Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); 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 sourceFileUri("storage/media/100/local/files/Download/test/test.txt"); FileInfo fileInfo; fileInfo.uri = sourceFileUri.ToString(); @@ -1821,13 +1742,12 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0002, testing:: FileFilter filter({}, {}, {}, 0, 0, false, false); result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_EQ(fileInfoVec.size(), 0); + EXPECT_EQ(fileInfoVec.size(), OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "ListFile_0002 result:" << fileInfoVec.size() << endl; - result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_ListFile_0002 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_ListFile_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0002"; } @@ -1854,10 +1774,10 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0003, testing:: FileFilter filter; int result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_NE(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_EQ(fileInfoVec.size(), 0); + EXPECT_EQ(fileInfoVec.size(), OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "ListFile_0003 result:" << fileInfoVec.size() << endl; } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_ListFile_0003 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_ListFile_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0003"; } @@ -1878,14 +1798,12 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0004, testing:: Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri1(""); result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ListFile_0004.txt", testUri1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ListFile_0004.docx", testUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - FileInfo fileInfo; fileInfo.uri = newDirUriTest.ToString(); int64_t offset = 0; @@ -1895,11 +1813,10 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0004, testing:: result = g_fah->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 1); - result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_ListFile_0004 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_ListFile_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0004"; } @@ -1910,7 +1827,7 @@ void ListFileTdd(shared_ptr fahs, FileInfo fileInfo, int offse GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_ListFileTdd"; int ret = fahs->ListFile(fileInfo, offset, maxCount, filter, fileInfoVec); if (ret != OHOS::FileAccessFwk::ERR_OK) { - GTEST_LOG_(INFO) << "ListFileTdd get result error, code:" << ret; + GTEST_LOG_(ERROR) << "ListFileTdd get result error, code:" << ret; return; } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); @@ -1935,14 +1852,12 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0005, testing:: Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri1(""); result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ListFile_0005.txt", testUri1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri2(""); result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ListFile_0005.docx", testUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - FileInfo fileInfo; fileInfo.uri = newDirUriTest.ToString(); int64_t offset = 0; @@ -1958,7 +1873,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ListFile_0005, testing:: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_ListFile_0005 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_ListFile_0005 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ListFile_0005"; } @@ -1979,7 +1894,6 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0000, testing:: Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); FileInfo fileInfo; result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ScanFile_0000.q1w2e3r4", testUri); @@ -1995,11 +1909,10 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0000, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_GE(fileInfoVec.size(), 1); GTEST_LOG_(INFO) << "ScanFile_0000 result:" << fileInfoVec.size() << endl; - result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_ScanFile_0000 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_ScanFile_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0000"; } @@ -2020,7 +1933,6 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0001, testing:: Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); FileInfo fileInfo; fileInfo.uri = "datashare:///media/root"; @@ -2036,11 +1948,10 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0001, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_GE(fileInfoVec.size(), 2); GTEST_LOG_(INFO) << "ScanFile_0000 result:" << fileInfoVec.size() << endl; - result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_ScanFile_0001 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_ScanFile_0001 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0001"; } @@ -2061,7 +1972,6 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0002, testing:: Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ScanFile_0002.q1w2e3r4", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -2082,12 +1992,11 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0002, testing:: result = g_fah->ScanFile(fileInfo, offset, maxCount, filter1, fileInfoVec); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 2); - GTEST_LOG_(INFO) << "ScanFile_0002 result:" << fileInfoVec.size() << endl; result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_ScanFile_0002 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_ScanFile_0002 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0002"; } @@ -2108,7 +2017,6 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0003, testing:: Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ScanFile_0003.q1w2e3r4", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -2122,11 +2030,10 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0003, testing:: EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_EQ(fileInfoVec.size(), 1); GTEST_LOG_(INFO) << "ScanFile_0003 result:" << fileInfoVec.size() << endl; - result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_ScanFile_0003 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_ScanFile_0003 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0003"; } @@ -2137,7 +2044,7 @@ void ScanFileTdd(shared_ptr fahs, FileInfo fileInfo, int offse GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_ScanFileTdd"; int ret = fahs->ScanFile(fileInfo, offset, maxCount, filter, fileInfoVec); if (ret != OHOS::FileAccessFwk::ERR_OK) { - GTEST_LOG_(INFO) << "ScanFileTdd get result error, code:" << ret; + GTEST_LOG_(ERROR) << "ScanFileTdd get result error, code:" << ret; return; } EXPECT_EQ(ret, OHOS::FileAccessFwk::ERR_OK); @@ -2162,7 +2069,6 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0004, testing:: Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); FileInfo fileInfo; result = g_fah->CreateFile(newDirUriTest, "medialibrary_file_access_ScanFile_0000.q1w2e3r4", testUri); @@ -2183,7 +2089,7 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_ScanFile_0004, testing:: result = g_fah->Delete(newDirUriTest); EXPECT_GE(result, OHOS::FileAccessFwk::ERR_OK); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_ScanFile_0004 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_ScanFile_0004 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_ScanFile_0004"; } @@ -2201,28 +2107,26 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_GetRoots_0000, testing:: { GTEST_LOG_(INFO) << "FileAccessHelperTest-begin medialibrary_file_access_GetRoots_0000"; try { - uint64_t selfTokenId_ = GetSelfTokenID(); + uint64_t selfTokenId = GetSelfTokenID(); vector info; int result = g_fah->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - EXPECT_GT(info.size(), 0); - if (info.size() > 0) { + EXPECT_GT(info.size(), OHOS::FileAccessFwk::ERR_OK); + if (info.size() > OHOS::FileAccessFwk::ERR_OK) { GTEST_LOG_(INFO) << info[0].uri; GTEST_LOG_(INFO) << info[0].displayName; GTEST_LOG_(INFO) << info[0].deviceType; GTEST_LOG_(INFO) << info[0].deviceFlags; } - string uri = "datashare:///media/root"; string displayName = "LOCAL"; EXPECT_EQ(info[0].uri, uri); EXPECT_EQ(info[0].displayName, displayName); EXPECT_EQ(info[0].deviceType, DEVICE_LOCAL_DISK); EXPECT_EQ(info[0].deviceFlags, DEVICE_FLAG_SUPPORTS_READ | DEVICE_FLAG_SUPPORTS_WRITE); - - SetSelfTokenID(selfTokenId_); + SetSelfTokenID(selfTokenId); } catch (...) { - GTEST_LOG_(INFO) << "medialibrary_file_access_GetRoots_0000 occurs an exception."; + GTEST_LOG_(ERROR) << "medialibrary_file_access_GetRoots_0000 occurs an exception."; } GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_GetRoots_0000"; } -- Gitee From 1d737168f4c2df630ab2da1f91677946e469cc5e Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 15 Sep 2022 18:04:38 +0800 Subject: [PATCH 119/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../innerkits/file_access/test/external_file_access_test.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/innerkits/file_access/test/external_file_access_test.cpp b/frameworks/innerkits/file_access/test/external_file_access_test.cpp index 47d86af5..06f5dad9 100644 --- a/frameworks/innerkits/file_access/test/external_file_access_test.cpp +++ b/frameworks/innerkits/file_access/test/external_file_access_test.cpp @@ -2167,7 +2167,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Access_0000, testing::ext { GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Access_0000"; try { - uint64_t selfTokenId_ = GetSelfTokenID(); + uint64_t selfTokenId = GetSelfTokenID(); vector info; int result = g_fah->GetRoots(info); @@ -2194,7 +2194,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Access_0000, testing::ext EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); EXPECT_FALSE(isExist); } - SetSelfTokenID(selfTokenId_); + SetSelfTokenID(selfTokenId); } catch (...) { GTEST_LOG_(ERROR) << "external_file_access_Access_0000 occurs an exception."; } -- Gitee From c67505e5f32223e39b3ad6f323ae859e8199549a Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Thu, 15 Sep 2022 21:13:45 +0800 Subject: [PATCH 120/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9review?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../file_access/test/external_file_access_test.cpp | 13 ++++--------- .../test/medialibrary_file_access_test.cpp | 11 ++++++----- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/frameworks/innerkits/file_access/test/external_file_access_test.cpp b/frameworks/innerkits/file_access/test/external_file_access_test.cpp index 06f5dad9..e887d07a 100644 --- a/frameworks/innerkits/file_access/test/external_file_access_test.cpp +++ b/frameworks/innerkits/file_access/test/external_file_access_test.cpp @@ -153,7 +153,6 @@ public: g_tokenId = tokenIdEx.tokenIdExStruct.tokenID; SetSelfTokenID(g_tokenId); } - static void TearDownTestCase() { g_fah->Release(); @@ -963,7 +962,6 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Delete_0003, testing::ext EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Delete_0003 result:" << result << endl; } - } catch (...) { GTEST_LOG_(ERROR) << "external_file_access_Delete_0003 occurs an exception."; } @@ -1427,8 +1425,9 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0009, testing::ext:: result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - int num = 2000; - for (size_t j = 0; j < num; j++) { + //Number of files created + int createfilenumbers = 2000; + for (size_t j = 0; j < createfilenumbers; j++) { string fileName = "test" + ToString(j) + ".txt"; result = g_fah->CreateFile(newDirUriTest1, fileName, testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -1473,6 +1472,7 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0010, testing::ext:: Uri testUri(""); result = g_fah->Mkdir(newDirUriTest1, "test", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); + //Create multi-level directory int num = 64; for (size_t j = 0; j < num; j++) { @@ -1483,7 +1483,6 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0010, testing::ext:: result = g_fah->Move(newDirUriTest1, newDirUriTest2, testUri2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Move_0010 result:" << result << endl; - result = g_fah->Delete(newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } @@ -1530,7 +1529,6 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0011, testing::ext:: result = g_fah->Delete(newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } - result = g_fah->Delete(newDirUriTest1); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } @@ -1723,7 +1721,6 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0003, testing::ext result = g_fah->Rename(sourceFileUri, "testRename.txt", renameUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0003 result:" << result << endl; - result = g_fah->Delete(newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } @@ -1785,7 +1782,6 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Rename_0005, testing::ext result = g_fah->Rename(testUri, "", renameUri); EXPECT_LT(result, OHOS::FileAccessFwk::ERR_OK); GTEST_LOG_(INFO) << "Rename_0005 result:" << result << endl; - result = g_fah->Delete(newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } @@ -2168,7 +2164,6 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Access_0000, testing::ext GTEST_LOG_(INFO) << "FileExtensionHelperTest-begin external_file_access_Access_0000"; try { uint64_t selfTokenId = GetSelfTokenID(); - vector info; int result = g_fah->GetRoots(info); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); diff --git a/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp index 44b0a067..f13b8912 100644 --- a/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp +++ b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp @@ -1141,7 +1141,6 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0004, testing::ext: Uri newDirUriTest(""); int result = g_fah->Mkdir(g_newDirUri, "test", newDirUriTest); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - Uri testUri(""); Uri sourceFileUri("~!@#$%^&*()_"); result = g_fah->Move(sourceFileUri, newDirUriTest, testUri); @@ -1314,8 +1313,9 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0009, testing::ext: result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - int num = 2000; - for (size_t i = 0; i < num; i++) { + //Number of files created + int createfilenumbers = 2000; + for (size_t i = 0; i < createfilenumbers; i++) { string fileName = "test" + ToString(i) + ".txt"; result = g_fah->CreateFile(newDirUriTest1, fileName, testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -1356,8 +1356,9 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0010, testing::ext: Uri testUri(""); result = g_fah->Mkdir(newDirUriTest1, "test", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - int num = 50; - for (size_t i = 0; i < num; i++) { + //Create multi-level directory + int createdirectorynumber = 50; + for (size_t i = 0; i < createdirectorynumber; i++) { result = g_fah->Mkdir(testUri, "test", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } -- Gitee From 33cf1910f4bcb5c2d68559facab6119240584bd4 Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Fri, 16 Sep 2022 10:30:41 +0800 Subject: [PATCH 121/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9review?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../file_access/test/external_file_access_test.cpp | 6 ++---- .../file_access/test/medialibrary_file_access_test.cpp | 8 ++------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/frameworks/innerkits/file_access/test/external_file_access_test.cpp b/frameworks/innerkits/file_access/test/external_file_access_test.cpp index e887d07a..8dec497a 100644 --- a/frameworks/innerkits/file_access/test/external_file_access_test.cpp +++ b/frameworks/innerkits/file_access/test/external_file_access_test.cpp @@ -1425,7 +1425,6 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0009, testing::ext:: result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - //Number of files created int createfilenumbers = 2000; for (size_t j = 0; j < createfilenumbers; j++) { string fileName = "test" + ToString(j) + ".txt"; @@ -1472,9 +1471,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0010, testing::ext:: Uri testUri(""); result = g_fah->Mkdir(newDirUriTest1, "test", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - //Create multi-level directory - int num = 64; - for (size_t j = 0; j < num; j++) + int createdirectorynumbers = 64; + for (size_t j = 0; j < createdirectorynumbers; j++) { result = g_fah->Mkdir(testUri, "test", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); diff --git a/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp index f13b8912..d3770077 100644 --- a/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp +++ b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp @@ -25,7 +25,6 @@ #include "file_access_helper.h" #include "iservice_registry.h" - namespace { using namespace std; using namespace OHOS; @@ -986,7 +985,6 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Delete_0005, testing::ex GTEST_LOG_(INFO) << "FileAccessHelperTest-end medialibrary_file_access_Delete_0005"; } - /** * @tc.number: user_file_service_medialibrary_file_access_Move_0000 * @tc.name: medialibrary_file_access_Move_0000 @@ -1313,7 +1311,6 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0009, testing::ext: result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - //Number of files created int createfilenumbers = 2000; for (size_t i = 0; i < createfilenumbers; i++) { string fileName = "test" + ToString(i) + ".txt"; @@ -1356,9 +1353,8 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0010, testing::ext: Uri testUri(""); result = g_fah->Mkdir(newDirUriTest1, "test", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - //Create multi-level directory - int createdirectorynumber = 50; - for (size_t i = 0; i < createdirectorynumber; i++) { + int createdirectorynumbers = 50; + for (size_t i = 0; i < createdirectorynumbers; i++) { result = g_fah->Mkdir(testUri, "test", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } -- Gitee From b2d60115fbfba3778cf250eda802d94b14d7d00f Mon Sep 17 00:00:00 2001 From: onexiaomin Date: Fri, 16 Sep 2022 10:57:13 +0800 Subject: [PATCH 122/122] =?UTF-8?q?=E4=BF=AE=E6=94=B9review,=E5=B1=80?= =?UTF-8?q?=E9=83=A8=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: onexiaomin --- .../file_access/test/external_file_access_test.cpp | 8 ++++---- .../file_access/test/medialibrary_file_access_test.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frameworks/innerkits/file_access/test/external_file_access_test.cpp b/frameworks/innerkits/file_access/test/external_file_access_test.cpp index 8dec497a..85a3c1cd 100644 --- a/frameworks/innerkits/file_access/test/external_file_access_test.cpp +++ b/frameworks/innerkits/file_access/test/external_file_access_test.cpp @@ -1425,8 +1425,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0009, testing::ext:: result = g_fah->Mkdir(parentUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - int createfilenumbers = 2000; - for (size_t j = 0; j < createfilenumbers; j++) { + int fileNumbers = 2000; + for (size_t j = 0; j < fileNumbers; j++) { string fileName = "test" + ToString(j) + ".txt"; result = g_fah->CreateFile(newDirUriTest1, fileName, testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -1471,8 +1471,8 @@ HWTEST_F(FileExtensionHelperTest, external_file_access_Move_0010, testing::ext:: Uri testUri(""); result = g_fah->Mkdir(newDirUriTest1, "test", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - int createdirectorynumbers = 64; - for (size_t j = 0; j < createdirectorynumbers; j++) + int directoryNumbers = 64; + for (size_t j = 0; j < directoryNumbers; j++) { result = g_fah->Mkdir(testUri, "test", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); diff --git a/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp index d3770077..d364930d 100644 --- a/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp +++ b/frameworks/innerkits/file_access/test/medialibrary_file_access_test.cpp @@ -1311,8 +1311,8 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0009, testing::ext: result = g_fah->Mkdir(g_newDirUri, "test2", newDirUriTest2); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); Uri testUri(""); - int createfilenumbers = 2000; - for (size_t i = 0; i < createfilenumbers; i++) { + int fileNumbers = 2000; + for (size_t i = 0; i < fileNumbers; i++) { string fileName = "test" + ToString(i) + ".txt"; result = g_fah->CreateFile(newDirUriTest1, fileName, testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); @@ -1353,8 +1353,8 @@ HWTEST_F(FileAccessHelperTest, medialibrary_file_access_Move_0010, testing::ext: Uri testUri(""); result = g_fah->Mkdir(newDirUriTest1, "test", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); - int createdirectorynumbers = 50; - for (size_t i = 0; i < createdirectorynumbers; i++) { + int directoryNumbers = 50; + for (size_t i = 0; i < directoryNumbers; i++) { result = g_fah->Mkdir(testUri, "test", testUri); EXPECT_EQ(result, OHOS::FileAccessFwk::ERR_OK); } -- Gitee