diff --git a/backup.gni b/backup.gni index 3b07587daed90cb5f72e23289b33596f1e44f92c..a23d5e191ca18bb3b2f01128632e6bd9f06bef2e 100644 --- a/backup.gni +++ b/backup.gni @@ -41,7 +41,8 @@ backup_mock_src = [ "$path_backup_mock/module_ipc/service_reverse_proxy_mock.cpp", "$path_backup_mock/module_ipc/service_stub_mock.cpp", "$path_backup_mock/module_ipc/svc_backup_connection_mock.cpp", - "$path_backup_mock/module_ipc/svc_extension_proxy_mock.cpp", + "$path_backup_mock/module_ipc/extension_proxy_mock.cpp", + "$path_backup_mock/module_ipc/extension_type_mock.cpp", ] backup_mock_session_manager_src = [ "$path_backup_mock/module_ipc/svc_session_manager_mock.cpp" ] @@ -55,6 +56,7 @@ backup_mock_service_src = [ "$path_backup_mock/module_ipc/service_mock.cpp" ] backup_mock_utils_include = [ "$path_backup_mock/utils_mock/include" ] backup_mock_proxy_src = [ "$path_backup_mock/backup_kit_inner/service_proxy_mock.cpp", + "$path_backup_mock/module_ipc/extension_type_mock.cpp", "$path_backup_mock/utils_mock/src/utils_mock_global_variable.cpp", "$path_backup/frameworks/native/backup_kit_inner/src/b_file_info.cpp", ] diff --git a/bundle.json b/bundle.json index d81e5f73a9067cf8bbc51de3e9539ff9991670e6..3bda61564731dedd8ff83da6daed4a01863007e3 100644 --- a/bundle.json +++ b/bundle.json @@ -138,17 +138,13 @@ "header_files": [ "backup_kit_inner.h", "impl/b_incremental_backup_session.h", - "impl/b_incremental_data.h", + "impl/backup_incremental_data.h", "impl/b_incremental_restore_session.h", "impl/b_session_restore.h", "impl/b_session_restore_async.h", - "impl/b_file_info.h", - "impl/service_proxy.h", - "impl/b_session_backup.h", - "impl/i_service_ipc_interface_code.h", - "impl/i_service_reverse_ipc_interface_code.h", - "impl/i_service.h", - "impl/i_service_reverse.h" + "impl/backup_file_info.h", + "impl/service_client.h", + "impl/b_session_backup.h" ] } }, diff --git a/frameworks/native/backup_ext/BUILD.gn b/frameworks/native/backup_ext/BUILD.gn index ec60d87cd3bd9daefbf3ce130e531ec2dbe684c4..6a0a7ebcce3174f32e55d1efeefb2bec31daac95 100644 --- a/frameworks/native/backup_ext/BUILD.gn +++ b/frameworks/native/backup_ext/BUILD.gn @@ -33,7 +33,6 @@ ohos_shared_library("backup_extension_ability_native") { "src/ext_backup_js.cpp", "src/ext_backup_loader.cpp", "src/ext_extension.cpp", - "src/ext_extension_stub.cpp", "src/sub_ext_extension.cpp", "src/tar_file.cpp", "src/untar_file.cpp", @@ -50,10 +49,12 @@ ohos_shared_library("backup_extension_ability_native") { "${path_ability_runtime}/services/common/include", "${path_ability_runtime}/interfaces/kits/napi/aafwk/inner/napi_common", "${path_ability_runtime}/interfaces/kits/native/appkit/ability_runtime", + "${path_backup}/services/backup_sa/include/module_ipc", ] deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner_ipc", "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", "${path_backup}/utils:backup_utils", "${path_jsoncpp}:jsoncpp", diff --git a/frameworks/native/backup_ext/include/ext_extension.h b/frameworks/native/backup_ext/include/ext_extension.h index db933dad2a0667de58fc464f371a91820fa26af8..3544d0fe5e97a42683fc636b7dacf8e9c28c41b4 100644 --- a/frameworks/native/backup_ext/include/ext_extension.h +++ b/frameworks/native/backup_ext/include/ext_extension.h @@ -29,8 +29,9 @@ #include "b_json/b_report_entity.h" #include "b_radar/b_radar.h" #include "ext_backup_js.h" -#include "ext_extension_stub.h" -#include "i_service.h" +#include "extension_stub.h" +#include "service_common.h" +#include "iservice.h" #include "tar_file.h" #include "thread_pool.h" #include "timer.h" @@ -41,20 +42,23 @@ namespace OHOS::FileManagement::Backup { using CompareFilesResult = tuple, map, map>; -class BackupExtExtension : public ExtExtensionStub { +class BackupExtExtension : public ExtensionStub { public: - UniqueFd GetFileHandle(const std::string &fileName, int32_t &errCode) override; + ErrCode GetFileHandleWithUniqueFd( + const std::string& fileName, + int32_t& getFileHandleErrCode, + int32_t& fd) override; ErrCode HandleClear() override; ErrCode PublishFile(const std::string &fileName) override; ErrCode HandleBackup(bool isClearData) override; ErrCode HandleRestore(bool isClearData) override; - std::tuple GetIncrementalFileHandle(const std::string &fileName) override; + ErrCode GetIncrementalFileHandleWithUniqueFdGroup( const std::string& fileName,UniqueFdGroup& fdGroup) override; ErrCode PublishIncrementalFile(const std::string &fileName) override; - ErrCode HandleIncrementalBackup(UniqueFd incrementalFd, UniqueFd manifestFd) override; + ErrCode HandleIncrementalBackup(int32_t incrementalFd, int32_t manifestFd) override; ErrCode IncrementalOnBackup(bool isClearData) override; - std::tuple GetIncrementalBackupFileHandle() override; - ErrCode GetBackupInfo(std::string &result) override; - ErrCode UpdateFdSendRate(std::string &bundleName, int32_t sendRate) override; + ErrCode GetIncrementalBackupFileHandleWithUniqueFdGroup(UniqueFdGroup& fdGroup) override; + ErrCode GetBackupInfo(std::string & result) override; + ErrCode UpdateFdSendRate(const std::string &bundleName, int32_t sendRate) override; void AsyncTaskRestoreForUpgrade(void); void ExtClear(void); void AsyncTaskIncrementalRestoreForUpgrade(void); @@ -336,6 +340,10 @@ private: void ClearNoPermissionFiles(TarMap &pkgInfo, vector &noPermissionFiles); std::function ReportOnProcessResultCallback(wptr obj, BackupRestoreScenario scenario); + UniqueFd GetFileHandle(const std::string &fileName, int32_t &errCode); + std::tuple GetIncrementalFileHandle(const std::string &fileName); + ErrCode HandleIncrementalBackup(UniqueFd incrementalFd, UniqueFd manifestFd); + std::tuple GetIncrementalBackupFileHandle(); private: std::shared_mutex lock_; diff --git a/frameworks/native/backup_ext/include/ext_extension_stub.h b/frameworks/native/backup_ext/include/ext_extension_stub.h deleted file mode 100644 index d969b3e9b80d5b8d491ced905c02ab2c7a6a9876..0000000000000000000000000000000000000000 --- a/frameworks/native/backup_ext/include/ext_extension_stub.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_FILEMGMT_BACKUP_EXT_EXTENSION_STUB_H -#define OHOS_FILEMGMT_BACKUP_EXT_EXTENSION_STUB_H - -#include - -#include "i_extension.h" -#include "iremote_stub.h" - -namespace OHOS::FileManagement::Backup { -class ExtExtensionStub : public IRemoteStub { -public: - int OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; - -public: - ExtExtensionStub(); - ~ExtExtensionStub() = default; - -private: - ErrCode CmdGetFileHandle(MessageParcel &data, MessageParcel &reply); - ErrCode CmdHandleClear(MessageParcel &data, MessageParcel &reply); - ErrCode CmdHandleBackup(MessageParcel &data, MessageParcel &reply); - ErrCode CmdPublishFile(MessageParcel &data, MessageParcel &reply); - ErrCode CmdHandleRestore(MessageParcel &data, MessageParcel &reply); - ErrCode CmdGetIncrementalFileHandle(MessageParcel &data, MessageParcel &reply); - ErrCode CmdPublishIncrementalFile(MessageParcel &data, MessageParcel &reply); - ErrCode CmdHandleIncrementalBackup(MessageParcel &data, MessageParcel &reply); - ErrCode CmdIncrementalOnBackup(MessageParcel &data, MessageParcel &reply); - ErrCode CmdGetIncrementalBackupFileHandle(MessageParcel &data, MessageParcel &reply); - ErrCode CmdGetBackupInfo(MessageParcel &data, MessageParcel &reply); - ErrCode CmdUpdateFdSendRate(MessageParcel &data, MessageParcel &reply); - ErrCode CmdHandleUser0Backup(MessageParcel &data, MessageParcel &reply); - -private: - using ExtensionInterface = int32_t (ExtExtensionStub::*)(MessageParcel &data, MessageParcel &reply); - std::map opToInterfaceMap_; -}; -} // namespace OHOS::FileManagement::Backup - -#endif // OHOS_FILEMGMT_BACKUP_EXT_EXTENSION_STUB_H \ No newline at end of file diff --git a/frameworks/native/backup_ext/src/ext_backup.cpp b/frameworks/native/backup_ext/src/ext_backup.cpp index e75dcf5f8a792c6627b77713975cc0495c2ed649..94e4a1e76ca541a2e890d3ed9277822c283935c7 100644 --- a/frameworks/native/backup_ext/src/ext_backup.cpp +++ b/frameworks/native/backup_ext/src/ext_backup.cpp @@ -34,7 +34,8 @@ #include "ext_backup_js.h" #include "ext_extension.h" #include "filemgmt_libhilog.h" -#include "i_service.h" +#include "service_common.h" +#include "iservice.h" namespace OHOS::FileManagement::Backup { using namespace std; diff --git a/frameworks/native/backup_ext/src/ext_extension.cpp b/frameworks/native/backup_ext/src/ext_extension.cpp index 1119285af81d4ed82d7d34ba1f241f1681813c15..767733f3316ef4ed0e34066f45e78de34384879a 100644 --- a/frameworks/native/backup_ext/src/ext_extension.cpp +++ b/frameworks/native/backup_ext/src/ext_extension.cpp @@ -53,9 +53,10 @@ #include "b_utils/b_time.h" #include "filemgmt_libhilog.h" #include "hitrace_meter.h" -#include "i_service.h" +#include "service_common.h" #include "sandbox_helper.h" -#include "service_proxy.h" +#include "service_client.h" +#include "extension_type.h" #include "tar_file.h" namespace OHOS::FileManagement::Backup { @@ -239,6 +240,13 @@ static UniqueFd GetFileHandleForSpecialCloneCloud(const string &fileName) } return fd; } +ErrCode BackupExtExtension:: GetFileHandleWithUniqueFd(const std::string& fileName,int32_t& getFileHandleErrCode,int32_t& fd) +{ + return BExcepUltils::ExceptionCatcherLocked( + [&]() { UniqueFd fileHandleFd = GetFileHandle(fileName,getFileHandleErrCode); + fd= fileHandleFd.Get(); + return getFileHandleErrCode; }); +} UniqueFd BackupExtExtension::GetFileHandle(const string &fileName, int32_t &errCode) { @@ -385,6 +393,17 @@ tuple BackupExtExtension::GetIncreFileHandleForNorm return {errCode, move(fd), move(reportFd)}; } +ErrCode BackupExtExtension::GetIncrementalFileHandleWithUniqueFdGroup(const std::string& fileName,UniqueFdGroup& fdGroup) +{ + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + auto [errCode, fd, reportFd] = GetIncrementalFileHandle(fileName); + fdGroup.errCode = errCode; + fdGroup.fd = fd.Get(); + fdGroup.reportFd = reportFd.Get(); + return fdGroup.errCode; }); +} + tuple BackupExtExtension::GetIncrementalFileHandle(const string &fileName) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); @@ -400,7 +419,7 @@ tuple BackupExtExtension::GetIncrementalFileHandle( } VerifyCaller(); if (BDir::CheckFilePathInvalid(fileName)) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { throw BError(BError::Codes::EXT_BROKEN_IPC, string("Failed to AGetInstance")); } @@ -424,23 +443,24 @@ tuple BackupExtExtension::GetIncrementalFileHandle( ErrCode BackupExtExtension::HandleClear() { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - try { - HILOGI("begin clear"); - if (extension_ == nullptr) { - HILOGE("Failed to handle clear, extension is nullptr"); - return BError(BError::Codes::EXT_INVAL_ARG, "Extension is nullptr").GetCode(); - } - if (extension_->GetExtensionAction() == BConstants::ExtensionAction::INVALID) { - return BError(BError::Codes::EXT_INVAL_ARG, "Action is invalid").GetCode(); - } - VerifyCaller(); - DoClear(); - return ERR_OK; - } catch (...) { - HILOGE("Failed to handle clear"); - return BError(BError::Codes::EXT_BROKEN_IPC).GetCode(); - } + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + try { + HILOGI("begin clear"); + if (extension_ == nullptr) { + HILOGE("Failed to handle clear, extension is nullptr"); + return BError(BError::Codes::EXT_INVAL_ARG, "Extension is nullptr").GetCode(); + } + if (extension_->GetExtensionAction() == BConstants::ExtensionAction::INVALID) { + return BError(BError::Codes::EXT_INVAL_ARG, "Action is invalid").GetCode(); + } + VerifyCaller(); + DoClear(); + return ErrCode(ERR_OK); + } catch (...) { + HILOGE("Failed to handle clear"); + return BError(BError::Codes::EXT_BROKEN_IPC).GetCode(); + }}); } static ErrCode IndexFileReady(const TarMap &pkgInfo, sptr proxy) @@ -459,10 +479,10 @@ static ErrCode IndexFileReady(const TarMap &pkgInfo, sptr proxy) cache.SetExtManage(pkgInfo); cachedEntity.Persist(); close(cachedEntity.GetFd().Release()); - + int32_t fdval = UniqueFd(open(INDEX_FILE_BACKUP.data(), O_RDONLY)); ErrCode ret = - proxy->AppFileReady(string(BConstants::EXT_BACKUP_MANAGE), UniqueFd(open(INDEX_FILE_BACKUP.data(), O_RDONLY)), - ERR_OK); + proxy->AppFileReady(string(BConstants::EXT_BACKUP_MANAGE), fdval, + ERR_OK); if (SUCCEEDED(ret)) { HILOGI("The application is packaged successfully"); } else { @@ -513,7 +533,8 @@ ErrCode BackupExtExtension::BigFileReady(TarMap &bigFileInfo, sptr pro continue; } } - ret = proxy->AppFileReady(item.first, std::move(fd), errCode); + int32_t fdval = fd.Get(); + ret = proxy->AppFileReady(item.first, fdval, errCode); if (SUCCEEDED(ret)) { HILOGI("The application is packaged successfully, package name is %{public}s", item.first.c_str()); } else { @@ -532,91 +553,94 @@ ErrCode BackupExtExtension::BigFileReady(TarMap &bigFileInfo, sptr pro ErrCode BackupExtExtension::PublishFile(const std::string &fileName) { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - HILOGI("Begin publish file. fileName is %{public}s", GetAnonyPath(fileName).c_str()); - try { - if (extension_ == nullptr) { - HILOGE("Failed to publish file, extension is nullptr"); - throw BError(BError::Codes::EXT_INVAL_ARG, "Extension is nullptr"); - } - if (extension_->GetExtensionAction() != BConstants::ExtensionAction::RESTORE) { - HILOGE("Failed to publish file, action is invalid"); - throw BError(BError::Codes::EXT_INVAL_ARG, "Action is invalid"); - } - VerifyCaller(); - // 异步执行解压操作 - if (extension_->AllowToBackupRestore()) { - AsyncTaskRestore(GetIdxFileData(bundleName_), GetExtManageInfo()); - } - HILOGI("End publish file"); - return ERR_OK; - } catch (const BError &e) { - DoClear(); - return e.GetCode(); - } catch (const exception &e) { - HILOGE("Catched an unexpected low-level exception %{public}s", e.what()); - DoClear(); - return BError(BError::Codes::EXT_BROKEN_FRAMEWORK).GetCode(); - } catch (...) { - HILOGE("Unexpected exception"); - DoClear(); - return BError(BError::Codes::EXT_BROKEN_FRAMEWORK).GetCode(); - } + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGI("Begin publish file. fileName is %{public}s", GetAnonyPath(fileName).c_str()); + try { + if (extension_ == nullptr) { + HILOGE("Failed to publish file, extension is nullptr"); + throw BError(BError::Codes::EXT_INVAL_ARG, "Extension is nullptr"); + } + if (extension_->GetExtensionAction() != BConstants::ExtensionAction::RESTORE) { + HILOGE("Failed to publish file, action is invalid"); + throw BError(BError::Codes::EXT_INVAL_ARG, "Action is invalid"); + } + VerifyCaller(); + // 异步执行解压操作 + if (extension_->AllowToBackupRestore()) { + AsyncTaskRestore(GetIdxFileData(bundleName_), GetExtManageInfo()); + } + HILOGI("End publish file"); + return ErrCode(ERR_OK); + } catch (const BError &e) { + DoClear(); + return e.GetCode(); + } catch (const exception &e) { + HILOGE("Catched an unexpected low-level exception %{public}s", e.what()); + DoClear(); + return BError(BError::Codes::EXT_BROKEN_FRAMEWORK).GetCode(); + } catch (...) { + HILOGE("Unexpected exception"); + DoClear(); + return BError(BError::Codes::EXT_BROKEN_FRAMEWORK).GetCode(); + }}); } ErrCode BackupExtExtension::PublishIncrementalFile(const string &fileName) { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - HILOGI("begin publish incremental file. fileName is %{private}s", fileName.data()); - try { - if (extension_ == nullptr) { - HILOGE("Failed to publish incremental file, extension is nullptr"); - throw BError(BError::Codes::EXT_INVAL_ARG, "Extension is nullptr"); - } - if (extension_->GetExtensionAction() != BConstants::ExtensionAction::RESTORE) { - HILOGE("Failed to publish incremental file, action is invalid"); - throw BError(BError::Codes::EXT_INVAL_ARG, "Action is invalid"); - } - VerifyCaller(); - // 异步执行解压操作 - if (BackupPara::GetBackupDebugState()) { - isDebug_ = true; - } - if (extension_->AllowToBackupRestore()) { - if (extension_->SpecialVersionForCloneAndCloud()) { - HILOGI("Create task for Incremental SpecialVersion"); - AsyncTaskIncreRestoreSpecialVersion(); - } else { - HILOGI("Create task for Incremental Restore"); - AsyncTaskIncrementalRestore(); - } - } - HILOGI("End publish incremental file"); - return ERR_OK; - } catch (const BError &e) { - DoClear(); - return e.GetCode(); - } catch (const exception &e) { - HILOGE("Catched an unexpected low-level exception %{public}s", e.what()); - DoClear(); - return BError(BError::Codes::EXT_BROKEN_FRAMEWORK).GetCode(); - } catch (...) { - HILOGE("Unexpected exception"); - DoClear(); - return BError(BError::Codes::EXT_BROKEN_FRAMEWORK).GetCode(); - } + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGI("begin publish incremental file. fileName is %{private}s",fileName.data()); + try { + if (extension_ == nullptr) { + HILOGE("Failed to publish incremental file, extension is nullptr"); + throw BError(BError::Codes::EXT_INVAL_ARG, "Extension is nullptr"); + } + if (extension_->GetExtensionAction() != BConstants::ExtensionAction::RESTORE) { + HILOGE("Failed to publish incremental file, action is invalid"); + throw BError(BError::Codes::EXT_INVAL_ARG, "Action is invalid"); + } + VerifyCaller(); + // 异步执行解压操作 + if (BackupPara::GetBackupDebugState()) { + isDebug_ = true; + } + if (extension_->AllowToBackupRestore()) { + if (extension_->SpecialVersionForCloneAndCloud()) { + HILOGI("Create task for Incremental SpecialVersion"); + AsyncTaskIncreRestoreSpecialVersion(); + } else { + HILOGI("Create task for Incremental Restore"); + AsyncTaskIncrementalRestore(); + } + } + HILOGI("End publish incremental file"); + return ErrCode(ERR_OK); + } catch (const BError &e) { + DoClear(); + return e.GetCode(); + } catch (const exception &e) { + HILOGE("Catched an unexpected low-level exception %{public}s", e.what()); + DoClear(); + return BError(BError::Codes::EXT_BROKEN_FRAMEWORK).GetCode(); + } catch (...) { + HILOGE("Unexpected exception"); + DoClear(); + return BError(BError::Codes::EXT_BROKEN_FRAMEWORK).GetCode(); + }}); } ErrCode BackupExtExtension::HandleBackup(bool isClearData) { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - SetClearDataFlag(isClearData); - if (!IfAllowToBackupRestore()) { - return BError(BError::Codes::EXT_FORBID_BACKUP_RESTORE, "Application does not allow backup or restore") - .GetCode(); - } - AsyncTaskOnBackup(); - return ERR_OK; + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + SetClearDataFlag(isClearData); + if (!IfAllowToBackupRestore()) { + return BError(BError::Codes::EXT_FORBID_BACKUP_RESTORE, "Application does not allow backup or restore") + .GetCode(); + } + AsyncTaskOnBackup(); + return ErrCode(ERR_OK); }); } static bool IsUserTar(const string &tarFile, const std::vector &extManageInfo, off_t &tarFileSize) @@ -693,7 +717,8 @@ static ErrCode TarFileReady(const TarMap &tarFileInfo, sptr proxy) "TarFileReady", "tarFile", tarPath}; HiAudit::GetInstance(false).Write(auditLog); } - int ret = proxy->AppFileReady(tarName, std::move(fd), errCode); + int32_t fdval = fd.Get(); + int ret = proxy->AppFileReady(tarName, fdval, errCode); if (SUCCEEDED(ret)) { HILOGI("TarFileReady: AppFileReady success for %{public}s", tarName.c_str()); // 删除文件 @@ -776,7 +801,7 @@ int BackupExtExtension::DoBackup(TarMap &bigFileInfo, map &small return EPERM; } - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { throw BError(BError::Codes::EXT_BROKEN_BACKUP_SA, std::generic_category().message(errno)); } @@ -841,9 +866,9 @@ bool BackupExtExtension::RefreshDataSize(int64_t totalSize) HILOGI("no backup datasize, don't need to refresh"); return true; } - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { - HILOGE("Failed to obtain the ServiceProxy handle"); + HILOGE("Failed to obtain the ServiceClient handle"); return false; } HILOGI("start RefreshDatasize by ipc"); @@ -1709,9 +1734,9 @@ void BackupExtExtension::AppDone(ErrCode errCode) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); HILOGI("AppDone Begin."); - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { - HILOGE("Failed to obtain the ServiceProxy handle"); + HILOGE("Failed to obtain the ServiceClient handle"); DoClear(); return; } @@ -1724,8 +1749,8 @@ void BackupExtExtension::AppDone(ErrCode errCode) void BackupExtExtension::AppResultReport(const std::string restoreRetInfo, BackupRestoreScenario scenario, ErrCode errCode) { - auto proxy = ServiceProxy::GetInstance(); - BExcepUltils::BAssert(proxy, BError::Codes::EXT_BROKEN_IPC, "Failed to obtain the ServiceProxy handle"); + auto proxy = ServiceClient::GetInstance(); + BExcepUltils::BAssert(proxy, BError::Codes::EXT_BROKEN_IPC, "Failed to obtain the ServiceClient handle"); HILOGI("restoreRetInfo is %{public}s", restoreRetInfo.c_str()); auto ret = proxy->ServiceResultReport(restoreRetInfo, scenario, errCode); if (ret != ERR_OK) { @@ -1735,8 +1760,8 @@ void BackupExtExtension::AppResultReport(const std::string restoreRetInfo, void BackupExtExtension::StartExtTimer(bool &isExtStart) { - auto proxy = ServiceProxy::GetInstance(); - BExcepUltils::BAssert(proxy, BError::Codes::EXT_BROKEN_IPC, "Failed to obtain the ServiceProxy handle"); + auto proxy = ServiceClient::GetInstance(); + BExcepUltils::BAssert(proxy, BError::Codes::EXT_BROKEN_IPC, "Failed to obtain the ServiceClient handle"); HILOGI("Start ext timer by ipc."); auto ret = proxy->StartExtTimer(isExtStart); if (ret != ERR_OK) { @@ -1747,8 +1772,8 @@ void BackupExtExtension::StartExtTimer(bool &isExtStart) void BackupExtExtension::StartFwkTimer(bool &isFwkStart) { HILOGI("Do backup, start fwk timer begin."); - auto proxy = ServiceProxy::GetInstance(); - BExcepUltils::BAssert(proxy, BError::Codes::EXT_BROKEN_IPC, "Failed to obtain the ServiceProxy handle"); + auto proxy = ServiceClient::GetInstance(); + BExcepUltils::BAssert(proxy, BError::Codes::EXT_BROKEN_IPC, "Failed to obtain the ServiceClient handle"); HILOGI("Start fwk timer by ipc."); auto ret = proxy->StartFwkTimer(isFwkStart); if (ret != ERR_OK) { @@ -1761,9 +1786,9 @@ bool BackupExtExtension::StopExtTimer() { HILOGI("StopExtTimer start"); bool isExtStop; - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { - HILOGE("Failed to obtain the ServiceProxy handle"); + HILOGE("Failed to obtain the ServiceClient handle"); return false; } HILOGI("StopExtTimer by ipc"); @@ -1829,7 +1854,8 @@ void BackupExtExtension::AsyncTaskOnBackup() ErrCode BackupExtExtension::HandleRestore(bool isClearData) { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); try { VerifyCaller(); SetClearDataFlag(isClearData); @@ -1853,11 +1879,11 @@ ErrCode BackupExtExtension::HandleRestore(bool isClearData) HILOGI("Restore directly when upgrading."); AsyncTaskRestoreForUpgrade(); } - return ERR_OK; + return ErrCode(ERR_OK); } catch (...) { HILOGE("Failed to handle restore"); return BError(BError::Codes::EXT_BROKEN_IPC).GetCode(); - } + }}); } static bool IfEquality(const ReportFileInfo &info, const ReportFileInfo &infoAd) @@ -1896,6 +1922,14 @@ void BackupExtExtension::FillFileInfos(UniqueFd incrementalFd, allFiles.size(), smallFiles.size(), bigFiles.size()); } +ErrCode BackupExtExtension::HandleIncrementalBackup(int32_t incrementalFd, int32_t manifestFd) +{ + return BExcepUltils::ExceptionCatcherLocked( + [&]() { UniqueFd incrementalFdUnique(static_cast(incrementalFd)); + UniqueFd manifestFdUnique(static_cast(incrementalFd)); + return HandleIncrementalBackup(std::move(incrementalFdUnique),std::move(manifestFdUnique)); }); +} + ErrCode BackupExtExtension::HandleIncrementalBackup(UniqueFd incrementalFd, UniqueFd manifestFd) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); @@ -1915,14 +1949,24 @@ ErrCode BackupExtExtension::HandleIncrementalBackup(UniqueFd incrementalFd, Uniq ErrCode BackupExtExtension::IncrementalOnBackup(bool isClearData) { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - SetClearDataFlag(isClearData); - if (!IfAllowToBackupRestore()) { - return BError(BError::Codes::EXT_FORBID_BACKUP_RESTORE, "Application does not allow backup or restore") - .GetCode(); - } - AsyncTaskOnIncrementalBackup(); - return ERR_OK; + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + SetClearDataFlag(isClearData); + if (!IfAllowToBackupRestore()) { + return BError(BError::Codes::EXT_FORBID_BACKUP_RESTORE, "Application does not allow backup or restore") + .GetCode(); + } + AsyncTaskOnIncrementalBackup(); + return ErrCode(ERR_OK); }); +} + +ErrCode BackupExtExtension::GetIncrementalBackupFileHandleWithUniqueFdGroup(UniqueFdGroup& fdGroup) +{ + return BExcepUltils::ExceptionCatcherLocked( + [&]() { auto [fd, reportFd] = GetIncrementalBackupFileHandle(); + fdGroup.fd = fd.Get(); + fdGroup.reportFd = reportFd.Get(); + return BError(BError::Codes::OK).GetCode(); }); } tuple BackupExtExtension::GetIncrementalBackupFileHandle() @@ -1969,8 +2013,10 @@ ErrCode BackupExtExtension::IncrementalTarFileReady(const TarMap &bigFileInfo, WriteFile(file, srcFiles); string tarName = string(INDEX_FILE_INCREMENTAL_BACKUP).append(tarFile); - ErrCode ret = proxy->AppIncrementalFileReady(tarFile, UniqueFd(open(tarName.data(), O_RDONLY)), - UniqueFd(open(file.data(), O_RDONLY)), ERR_OK); + int32_t fd= UniqueFd(open(tarName.data(), O_RDONLY)).Get(); + int32_t manifestFd= UniqueFd(open(file.data(), O_RDONLY)).Get(); + ErrCode ret = proxy->AppIncrementalFileReady(tarFile, fd, + manifestFd, ERR_OK); if (SUCCEEDED(ret)) { HILOGI("IncrementalTarFileReady: The application is packaged successfully"); // 删除文件 @@ -2019,7 +2065,9 @@ ErrCode BackupExtExtension::IncrementalBigFileReady(TarMap &pkgInfo, } string file = GetReportFileName(string(INDEX_FILE_INCREMENTAL_BACKUP).append(item.first)); WriteFile(file, bigInfo); - ret = proxy->AppIncrementalFileReady(item.first, std::move(fd), UniqueFd(open(file.data(), O_RDONLY)), errCode); + int32_t fdval = fd.Get(); + int32_t manifestFdval = UniqueFd(open(file.data(), O_RDONLY)); + ret = proxy->AppIncrementalFileReady(item.first, fdval, manifestFdval, errCode); if (SUCCEEDED(ret)) { HILOGI("IncrementalBigFileReady: The application is packaged successfully, package name is %{public}s", item.first.c_str()); @@ -2053,9 +2101,11 @@ ErrCode BackupExtExtension::IncrementalAllFileReady(const TarMap &pkgInfo, WriteFile(file, srcFiles); UniqueFd fd(open(INDEX_FILE_BACKUP.data(), O_RDONLY)); UniqueFd manifestFd(open(file.data(), O_RDONLY)); + int32_t fdval = fd.Get(); + int32_t manifestFdval = manifestFd.Get(); ErrCode ret = - proxy->AppIncrementalFileReady(string(BConstants::EXT_BACKUP_MANAGE), std::move(fd), std::move(manifestFd), - ERR_OK); + proxy->AppIncrementalFileReady(string(BConstants::EXT_BACKUP_MANAGE), fdval, + manifestFdval, ERR_OK); if (SUCCEEDED(ret)) { HILOGI("IncrementalAllFileReady successfully"); RemoveFile(file); diff --git a/frameworks/native/backup_ext/src/ext_extension_stub.cpp b/frameworks/native/backup_ext/src/ext_extension_stub.cpp deleted file mode 100644 index 38f4ce2f3ab78ed7ead69c0f9d03c0349387178a..0000000000000000000000000000000000000000 --- a/frameworks/native/backup_ext/src/ext_extension_stub.cpp +++ /dev/null @@ -1,266 +0,0 @@ -/* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "ext_extension_stub.h" - -#include -#include - -#include "b_error/b_error.h" -#include "b_error/b_excep_utils.h" -#include "filemgmt_libhilog.h" - -namespace OHOS::FileManagement::Backup { -using namespace std; - -ExtExtensionStub::ExtExtensionStub() -{ - opToInterfaceMap_[static_cast(IExtensionInterfaceCode::CMD_GET_FILE_HANDLE)] = - &ExtExtensionStub::CmdGetFileHandle; - opToInterfaceMap_[static_cast(IExtensionInterfaceCode::CMD_HANDLE_CLAER)] = - &ExtExtensionStub::CmdHandleClear; - opToInterfaceMap_[static_cast(IExtensionInterfaceCode::CMD_HANDLE_BACKUP)] = - &ExtExtensionStub::CmdHandleBackup; - opToInterfaceMap_[static_cast(IExtensionInterfaceCode::CMD_PUBLISH_FILE)] = - &ExtExtensionStub::CmdPublishFile; - opToInterfaceMap_[static_cast(IExtensionInterfaceCode::CMD_HANDLE_RESTORE)] = - &ExtExtensionStub::CmdHandleRestore; - opToInterfaceMap_[static_cast(IExtensionInterfaceCode::CMD_GET_INCREMENTAL_FILE_HANDLE)] = - &ExtExtensionStub::CmdGetIncrementalFileHandle; - opToInterfaceMap_[static_cast(IExtensionInterfaceCode::CMD_PUBLISH_INCREMENTAL_FILE)] = - &ExtExtensionStub::CmdPublishIncrementalFile; - opToInterfaceMap_[static_cast(IExtensionInterfaceCode::CMD_HANDLE_INCREMENTAL_BACKUP)] = - &ExtExtensionStub::CmdHandleIncrementalBackup; - opToInterfaceMap_[static_cast(IExtensionInterfaceCode::CMD_GET_INCREMENTAL_BACKUP_FILE_HANDLE)] = - &ExtExtensionStub::CmdGetIncrementalBackupFileHandle; - opToInterfaceMap_[static_cast(IExtensionInterfaceCode::CMD_GET_BACKUP_INFO)] = - &ExtExtensionStub::CmdGetBackupInfo; - opToInterfaceMap_[static_cast(IExtensionInterfaceCode::CMD_INCREMENTAL_ON_BACKUP)] = - &ExtExtensionStub::CmdIncrementalOnBackup; - opToInterfaceMap_[static_cast(IExtensionInterfaceCode::CMD_UPDATE_FD_SENDRATE)] = - &ExtExtensionStub::CmdUpdateFdSendRate; - opToInterfaceMap_[static_cast(IExtensionInterfaceCode::CMD_HANDLE_USER_0_BACKUP)] = - &ExtExtensionStub::CmdHandleUser0Backup; -} - -int32_t ExtExtensionStub::OnRemoteRequest(uint32_t code, - MessageParcel &data, - MessageParcel &reply, - MessageOption &option) -{ - const std::u16string descriptor = ExtExtensionStub::GetDescriptor(); - const std::u16string remoteDescriptor = data.ReadInterfaceToken(); - if (descriptor != remoteDescriptor) { - return BError(BError::Codes::EXT_INVAL_ARG, "Invalid remote descriptor"); - } - - HILOGI("Begin to call procedure indexed %{public}u", code); - auto interfaceIndex = opToInterfaceMap_.find(code); - if (interfaceIndex == opToInterfaceMap_.end() || !interfaceIndex->second) { - HILOGE("Cannot response request %{public}d : unknown procedure", code); - return IPCObjectStub::OnRemoteRequest(code, data, reply, option); - } - - return BExcepUltils::ExceptionCatcherLocked( - [&]() { return ErrCode((this->*(interfaceIndex->second))(data, reply)); }); -} - -ErrCode ExtExtensionStub::CmdGetFileHandle(MessageParcel &data, MessageParcel &reply) -{ - string fileName; - if (!data.ReadString(fileName)) { - return BError(BError::Codes::EXT_INVAL_ARG, "Failed to receive fileName").GetCode(); - } - - int32_t errCode = ERR_OK; - UniqueFd fd = GetFileHandle(fileName, errCode); - bool fdFlag = fd < 0 ? false : true; - reply.WriteBool(fdFlag); - reply.WriteInt32(errCode); - if (fdFlag == true && !reply.WriteFileDescriptor(fd)) { - return BError(BError::Codes::EXT_BROKEN_IPC, "Failed to send out the file").GetCode(); - } - return BError(BError::Codes::OK); -} - -ErrCode ExtExtensionStub::CmdHandleClear(MessageParcel &data, MessageParcel &reply) -{ - ErrCode res = HandleClear(); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::EXT_BROKEN_IPC, ss.str()).GetCode(); - } - return BError(BError::Codes::OK); -} - -ErrCode ExtExtensionStub::CmdHandleBackup(MessageParcel &data, MessageParcel &reply) -{ - bool isClearData = true; - isClearData = data.ReadBool(); - ErrCode res = HandleBackup(isClearData); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::EXT_BROKEN_IPC, ss.str()).GetCode(); - } - return BError(BError::Codes::OK); -} - -ErrCode ExtExtensionStub::CmdPublishFile(MessageParcel &data, MessageParcel &reply) -{ - string fileName; - if (!data.ReadString(fileName)) { - return BError(BError::Codes::EXT_INVAL_ARG, "Failed to receive fileName"); - } - - ErrCode res = PublishFile(fileName); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::EXT_BROKEN_IPC, ss.str()).GetCode(); - } - return BError(BError::Codes::OK); -} - -ErrCode ExtExtensionStub::CmdHandleRestore(MessageParcel &data, MessageParcel &reply) -{ - bool isClearData = true; - isClearData = data.ReadBool(); - ErrCode res = HandleRestore(isClearData); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::EXT_BROKEN_IPC, ss.str()).GetCode(); - } - return BError(BError::Codes::OK); -} - -ErrCode ExtExtensionStub::CmdGetIncrementalFileHandle(MessageParcel &data, MessageParcel &reply) -{ - string fileName; - if (!data.ReadString(fileName)) { - return BError(BError::Codes::EXT_INVAL_ARG, "Failed to receive fileName").GetCode(); - } - - auto[errCode, fd, reportFd] = GetIncrementalFileHandle(fileName); - if (!reply.WriteInt32(errCode)) { - return BError(BError::Codes::EXT_BROKEN_IPC, "Failed to send out the file").GetCode(); - } - if (!reply.WriteFileDescriptor(fd)) { - return BError(BError::Codes::EXT_BROKEN_IPC, "Failed to send out the file").GetCode(); - } - if (!reply.WriteFileDescriptor(reportFd)) { - return BError(BError::Codes::EXT_BROKEN_IPC, "Failed to send out the file").GetCode(); - } - return BError(BError::Codes::OK); -} - -ErrCode ExtExtensionStub::CmdPublishIncrementalFile(MessageParcel &data, MessageParcel &reply) -{ - string fileName; - if (!data.ReadString(fileName)) { - return BError(BError::Codes::EXT_INVAL_ARG, "Failed to receive fileName"); - } - - ErrCode res = PublishIncrementalFile(fileName); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::EXT_BROKEN_IPC, ss.str()).GetCode(); - } - return BError(BError::Codes::OK); -} - -ErrCode ExtExtensionStub::CmdHandleIncrementalBackup(MessageParcel &data, MessageParcel &reply) -{ - UniqueFd incrementalFd(data.ReadFileDescriptor()); - UniqueFd manifestFd(data.ReadFileDescriptor()); - ErrCode res = HandleIncrementalBackup(move(incrementalFd), move(manifestFd)); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::EXT_BROKEN_IPC, ss.str()).GetCode(); - } - return BError(BError::Codes::OK); -} - -ErrCode ExtExtensionStub::CmdIncrementalOnBackup(MessageParcel &data, MessageParcel &reply) -{ - bool isClearData = true; - isClearData = data.ReadBool(); - ErrCode res = IncrementalOnBackup(isClearData); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::EXT_BROKEN_IPC, ss.str()).GetCode(); - } - return BError(BError::Codes::OK); -} - -ErrCode ExtExtensionStub::CmdGetIncrementalBackupFileHandle(MessageParcel &data, MessageParcel &reply) -{ - auto [incrementalFd, manifestFd] = GetIncrementalBackupFileHandle(); - if (!reply.WriteFileDescriptor(incrementalFd)) { - return BError(BError::Codes::EXT_BROKEN_IPC, "Failed to send out the file").GetCode(); - } - if (!reply.WriteFileDescriptor(manifestFd)) { - return BError(BError::Codes::EXT_BROKEN_IPC, "Failed to send out the file").GetCode(); - } - return BError(BError::Codes::OK); -} - -ErrCode ExtExtensionStub::CmdGetBackupInfo(MessageParcel &data, MessageParcel &reply) -{ - HILOGI("CmdGetBackupInfo Begin"); - std::string result; - int ret = GetBackupInfo(result); - if (!reply.WriteInt32(ret)) { - return BError(BError::Codes::EXT_BROKEN_IPC, "Failed to send out the ret").GetCode(); - } - if (!reply.WriteString(result)) { - return BError(BError::Codes::EXT_BROKEN_IPC, "Failed to send out the result").GetCode(); - } - return BError(BError::Codes::OK); -} - -ErrCode ExtExtensionStub::CmdUpdateFdSendRate(MessageParcel &data, MessageParcel &reply) -{ - HILOGD("CmdUpdateFdSendRate Begin"); - std::string bundleName; - if (!data.ReadString(bundleName)) { - return BError(BError::Codes::EXT_INVAL_ARG, "Failed to receive bundleName").GetCode(); - } - int32_t sendRate; - if (!data.ReadInt32(sendRate)) { - return BError(BError::Codes::EXT_INVAL_ARG, "Failed to receive sendRate").GetCode(); - } - int ret = UpdateFdSendRate(bundleName, sendRate); - if (!reply.WriteInt32(ret)) { - return BError(BError::Codes::EXT_BROKEN_IPC, "Failed to send out the ret").GetCode(); - } - return BError(BError::Codes::OK); -} - -ErrCode ExtExtensionStub::CmdHandleUser0Backup(MessageParcel &data, MessageParcel &reply) -{ - HILOGD("CmdHandleUser0Backup Begin"); - int ret = User0OnBackup(); - if (!reply.WriteInt32(ret)) { - return BError(BError::Codes::EXT_BROKEN_IPC, "Failed to send out the ret").GetCode(); - } - return BError(BError::Codes::OK); -} -} // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/frameworks/native/backup_ext/src/sub_ext_extension.cpp b/frameworks/native/backup_ext/src/sub_ext_extension.cpp index 24e2a9c110254d418bf60209a9816489a1beb764..559aba084791142ade6c720c747087e3593400c7 100644 --- a/frameworks/native/backup_ext/src/sub_ext_extension.cpp +++ b/frameworks/native/backup_ext/src/sub_ext_extension.cpp @@ -51,9 +51,9 @@ #include "b_tarball/b_tarball_factory.h" #include "filemgmt_libhilog.h" #include "hitrace_meter.h" -#include "i_service.h" +#include "service_common.h" #include "sandbox_helper.h" -#include "service_proxy.h" +#include "service_client.h" #include "tar_file.h" #include "b_anony/b_anony.h" @@ -483,7 +483,7 @@ std::function BackupExtExtension::IncOnBackupC HILOGI("Begin get IncOnBackupCallback"); return [obj](ErrCode errCode, std::string errMsg) { HILOGI("App onbackup end"); - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { throw BError(BError::Codes::EXT_BROKEN_BACKUP_SA, std::generic_category().message(errno)); } @@ -525,7 +525,7 @@ std::function BackupExtExtension::IncOnBackupE { HILOGI("Begin get HandleIncBackupEx callback"); return [obj](ErrCode errCode, const std::string backupExRetInfo) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { throw BError(BError::Codes::EXT_BROKEN_BACKUP_SA, std::generic_category().message(errno)); } @@ -575,7 +575,7 @@ std::function BackupExtExtension::IncOnBackupE void BackupExtExtension::ReportAppProcessInfo(const std::string processInfo, BackupRestoreScenario scenario) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGE("Report app process error, proxy is empty"); return; @@ -739,9 +739,9 @@ void BackupExtExtension::CloseOnProcessTimeOutTimer() void BackupExtExtension::AppIncrementalDone(ErrCode errCode) { HILOGI("Begin"); - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { - HILOGE("Failed to obtain the ServiceProxy handle"); + HILOGE("Failed to obtain the ServiceClient handle"); DoClear(); return; } @@ -753,54 +753,58 @@ void BackupExtExtension::AppIncrementalDone(ErrCode errCode) ErrCode BackupExtExtension::GetBackupInfo(std::string &result) { - auto obj = wptr(this); - auto ptr = obj.promote(); - if (ptr == nullptr) { - HILOGE("Failed to get ext extension."); - return BError(BError::Codes::EXT_INVAL_ARG, "extension getBackupInfo exception").GetCode(); - } - if (ptr->extension_ == nullptr) { - HILOGE("Failed to get extension."); - return BError(BError::Codes::EXT_INVAL_ARG, "extension getBackupInfo exception").GetCode(); - } - auto callBackup = [ptr](ErrCode errCode, const std::string result) { - if (ptr == nullptr) { - HILOGE("Failed to get ext extension."); - return; - } - HILOGI("GetBackupInfo callBackup start. errCode = %{public}d, result = %{public}s", errCode, result.c_str()); - if (errCode == ERR_OK) { - ptr->backupInfo_ = result; - } - }; - auto ret = ptr->extension_->GetBackupInfo(callBackup); - if (ret != ERR_OK) { - HILOGE("Failed to get backupInfo. err = %{public}d", ret); - return BError(BError::Codes::EXT_INVAL_ARG, "extension getBackupInfo exception").GetCode(); - } - HILOGD("backupInfo = %s", backupInfo_.c_str()); - result = backupInfo_; - backupInfo_.clear(); + return BExcepUltils::ExceptionCatcherLocked( + [&]() { auto obj = wptr(this); + auto ptr = obj.promote(); + if (ptr == nullptr) { + HILOGE("Failed to get ext extension."); + return BError(BError::Codes::EXT_INVAL_ARG, "extension getBackupInfo exception").GetCode(); + } + if (ptr->extension_ == nullptr) { + HILOGE("Failed to get extension."); + return BError(BError::Codes::EXT_INVAL_ARG, "extension getBackupInfo exception").GetCode(); + } + auto callBackup = [ptr](ErrCode errCode, const std::string result) { + if (ptr == nullptr) { + HILOGE("Failed to get ext extension."); + return; + } + HILOGI("GetBackupInfo callBackup start. errCode = %{public}d, result = %{public}s", + errCode, result.c_str()); + if (errCode == ERR_OK) { + ptr->backupInfo_ = result; + } + }; + auto ret = ptr->extension_->GetBackupInfo(callBackup); + if (ret != ERR_OK) { + HILOGE("Failed to get backupInfo. err = %{public}d", ret); + return BError(BError::Codes::EXT_INVAL_ARG, "extension getBackupInfo exception").GetCode(); + } + HILOGD("backupInfo = %s", backupInfo_.c_str()); + result = backupInfo_; + backupInfo_.clear(); - return ERR_OK; + return ErrCode(ERR_OK); }); } -ErrCode BackupExtExtension::UpdateFdSendRate(std::string &bundleName, int32_t sendRate) +ErrCode BackupExtExtension::UpdateFdSendRate(const std::string &bundleName, int32_t sendRate) { - try { - std::lock_guard lock(updateSendRateLock_); - HILOGI("Update SendRate, bundleName:%{public}s, sendRate:%{public}d", bundleName.c_str(), sendRate); - VerifyCaller(); - bundleName_ = bundleName; - sendRate_ = sendRate; - if (sendRate > 0) { - startSendFdRateCon_.notify_one(); - } - return ERR_OK; - } catch (...) { - HILOGE("Failed to UpdateFdSendRate"); - return BError(BError::Codes::EXT_BROKEN_IPC).GetCode(); - } + return BExcepUltils::ExceptionCatcherLocked( + [&]() { try { + std::lock_guard lock(updateSendRateLock_); + HILOGI("Update SendRate, bundleName:%{public}s, sendRate:%{public}d", + bundleName.c_str(), sendRate); + VerifyCaller(); + bundleName_ = bundleName; + sendRate_ = sendRate; + if (sendRate > 0) { + startSendFdRateCon_.notify_one(); + } + return ErrCode(ERR_OK); + } catch (...) { + HILOGE("Failed to UpdateFdSendRate"); + return BError(BError::Codes::EXT_BROKEN_IPC).GetCode(); + }}); } bool BackupExtExtension::SetStagingPathProperties() @@ -841,13 +845,14 @@ bool BackupExtExtension::IfAllowToBackupRestore() ErrCode BackupExtExtension::User0OnBackup() { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - if (!IfAllowToBackupRestore()) { - return BError(BError::Codes::EXT_FORBID_BACKUP_RESTORE, "Application does not allow backup or restore") - .GetCode(); - } - AsyncTaskUser0Backup(); - return ERR_OK; + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + if (!IfAllowToBackupRestore()) { + return BError(BError::Codes::EXT_FORBID_BACKUP_RESTORE, "Application does not allow backup or restore") + .GetCode(); + } + AsyncTaskUser0Backup(); + return ErrCode(ERR_OK); }); } void BackupExtExtension::AsyncTaskUser0Backup() @@ -1173,7 +1178,7 @@ int BackupExtExtension::DoIncrementalBackup(const vector if (mkdir(path.data(), S_IRWXU) && errno != EEXIST) { throw BError(errno); } - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { throw BError(BError::Codes::EXT_BROKEN_BACKUP_SA, std::generic_category().message(errno)); } diff --git a/frameworks/native/backup_kit_inner/include/service_reverse.h b/frameworks/native/backup_kit_inner/include/service_reverse.h index c196689736f4258a804428e66463d419b2727ea3..1635ecf42bbf3f27205bf6a2f39f2f2b66dea4e8 100644 --- a/frameworks/native/backup_kit_inner/include/service_reverse.h +++ b/frameworks/native/backup_kit_inner/include/service_reverse.h @@ -25,39 +25,39 @@ namespace OHOS::FileManagement::Backup { class ServiceReverse final : public ServiceReverseStub { public: - void BackupOnFileReady(std::string bundleName, std::string fileName, int fd, int32_t errCode) override; - void BackupOnBundleStarted(int32_t errCode, std::string bundleName) override; - void BackupOnResultReport(std::string result, std::string bundleName) override; - void BackupOnBundleFinished(int32_t errCode, std::string bundleName) override; - void BackupOnAllBundlesFinished(int32_t errCode) override; - void BackupOnProcessInfo(std::string bundleName, std::string processInfo) override; - void BackupOnScanningInfo(std::string scannedInfo) override; + ErrCode BackupOnFileReady(const std::string& bundleName, const std::string& fileName, int32_t fd, int32_t errCode) override; + ErrCode BackupOnBundleStarted(int32_t errCode, const std::string& bundleName) override; + ErrCode BackupOnResultReport(const std::string& result, const std::string& bundleName) override; + ErrCode BackupOnBundleFinished(int32_t errCode, const std::string& bundleName) override; + ErrCode BackupOnAllBundlesFinished(int32_t errCode) override; + ErrCode BackupOnProcessInfo(const std::string& bundleName, const std::string& processInfo) override; + ErrCode BackupOnScanningInfo(const std::string& scannedInfo) override; - void RestoreOnBundleStarted(int32_t errCode, std::string bundleName) override; - void RestoreOnBundleFinished(int32_t errCode, std::string bundleName) override; - void RestoreOnAllBundlesFinished(int32_t errCode) override; - void RestoreOnFileReady(std::string bundleName, std::string fileName, int fd, int32_t errCode) override; - void RestoreOnResultReport(std::string result, std::string bundleName, + ErrCode RestoreOnBundleStarted(int32_t errCode, const std::string& bundleName) override; + ErrCode RestoreOnBundleFinished(int32_t errCode, const std::string& bundleName) override; + ErrCode RestoreOnAllBundlesFinished(int32_t errCode) override; + ErrCode RestoreOnFileReady(const std::string& bundleName, const std::string& fileName, int fd, int32_t errCode) override; + ErrCode RestoreOnResultReport(const std::string& result, const std::string& bundleName, ErrCode errCode = 0) override; - void RestoreOnProcessInfo(std::string bundleName, std::string processInfo) override; + ErrCode RestoreOnProcessInfo(const std::string& bundleName, const std::string& processInfo) override; - void IncrementalBackupOnFileReady(std::string bundleName, std::string fileName, int fd, int manifestFd, - int32_t errCode) override; - void IncrementalBackupOnBundleStarted(int32_t errCode, std::string bundleName) override; - void IncrementalBackupOnResultReport(std::string result, std::string bundleName) override; - void IncrementalBackupOnBundleFinished(int32_t errCode, std::string bundleName) override; - void IncrementalBackupOnAllBundlesFinished(int32_t errCode) override; - void IncrementalBackupOnProcessInfo(std::string bundleName, std::string processInfo) override; - void IncrementalBackupOnScanningInfo(std::string scannedInfo) override; + ErrCode IncrementalBackupOnFileReady(const std::string& bundleName, const std::string& fileName, int fd, + int manifestFd, int32_t errCode) override; + ErrCode IncrementalBackupOnBundleStarted(int32_t errCode, const std::string& bundleName) override; + ErrCode IncrementalBackupOnResultReport(const std::string& result, const std::string& bundleName) override; + ErrCode IncrementalBackupOnBundleFinished(int32_t errCode, const std::string& bundleName) override; + ErrCode IncrementalBackupOnAllBundlesFinished(int32_t errCode) override; + ErrCode IncrementalBackupOnProcessInfo(const std::string& bundleName, const std::string& processInfo) override; + ErrCode IncrementalBackupOnScanningInfo(const std::string& scannedInfo) override; - void IncrementalRestoreOnBundleStarted(int32_t errCode, std::string bundleName) override; - void IncrementalRestoreOnBundleFinished(int32_t errCode, std::string bundleName) override; - void IncrementalRestoreOnAllBundlesFinished(int32_t errCode) override; - void IncrementalRestoreOnFileReady(std::string bundleName, std::string fileName, int fd, int manifestFd, - int32_t errCode) override; - void IncrementalRestoreOnResultReport(std::string result, std::string bundleName, - ErrCode errCode = 0) override; - void IncrementalRestoreOnProcessInfo(std::string bundleName, std::string processInfo) override; + ErrCode IncrementalRestoreOnBundleStarted(int32_t errCode, const std::string& bundleName) override; + ErrCode IncrementalRestoreOnBundleFinished(int32_t errCode, const std::string& bundleName) override; + ErrCode IncrementalRestoreOnAllBundlesFinished(int32_t errCode) override; + ErrCode IncrementalRestoreOnFileReady(const std::string& bundleName, const std::string& fileName, int fd, + int manifestFd, int32_t errCode) override; + ErrCode IncrementalRestoreOnResultReport(const std::string& result, const std::string& bundleName, + ErrCode errCode) override; + ErrCode IncrementalRestoreOnProcessInfo(const std::string& bundleName, const std::string& processInfo) override; public: ServiceReverse() = delete; diff --git a/frameworks/native/backup_kit_inner/include/service_reverse_stub.h b/frameworks/native/backup_kit_inner/include/service_reverse_stub.h deleted file mode 100644 index 53a4964aab2745439c95c63b2b0c4d823a3c0d77..0000000000000000000000000000000000000000 --- a/frameworks/native/backup_kit_inner/include/service_reverse_stub.h +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_FILEMGMT_BACKUP_SERVICE_REVERSE_STUB_H -#define OHOS_FILEMGMT_BACKUP_SERVICE_REVERSE_STUB_H - -#include - -#include "i_service_reverse.h" -#include "iremote_stub.h" - -namespace OHOS::FileManagement::Backup { -class ServiceReverseStub : public IRemoteStub { -public: - int32_t OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; - -public: - ServiceReverseStub(); - ~ServiceReverseStub() override = default; - -private: - using ServiceInterface = int32_t (ServiceReverseStub::*)(MessageParcel &data, MessageParcel &reply); - std::map opToInterfaceMap_; - - int32_t CmdBackupOnFileReady(MessageParcel &data, MessageParcel &reply); - int32_t CmdBackupOnBundleStarted(MessageParcel &data, MessageParcel &reply); - int32_t CmdBackupOnResultReport(MessageParcel &data, MessageParcel &reply); - int32_t CmdBackupOnBundleFinished(MessageParcel &data, MessageParcel &reply); - int32_t CmdBackupOnAllBundlesFinished(MessageParcel &data, MessageParcel &reply); - int32_t CmdBackupOnProcessInfo(MessageParcel &data, MessageParcel &reply); - int32_t CmdBackupOnScanningInfo(MessageParcel &data, MessageParcel &reply); - - int32_t CmdRestoreOnBundleStarted(MessageParcel &data, MessageParcel &reply); - int32_t CmdRestoreOnBundleFinished(MessageParcel &data, MessageParcel &reply); - int32_t CmdRestoreOnAllBundlesFinished(MessageParcel &data, MessageParcel &reply); - int32_t CmdRestoreOnFileReady(MessageParcel &data, MessageParcel &reply); - int32_t CmdRestoreOnResultReport(MessageParcel &data, MessageParcel &reply); - int32_t CmdRestoreOnProcessInfo(MessageParcel &data, MessageParcel &reply); - - int32_t CmdIncrementalBackupOnFileReady(MessageParcel &data, MessageParcel &reply); - int32_t CmdIncrementalBackupOnBundleStarted(MessageParcel &data, MessageParcel &reply); - int32_t CmdIncrementalBackupOnResultReport(MessageParcel &data, MessageParcel &reply); - int32_t CmdIncrementalBackupOnBundleFinished(MessageParcel &data, MessageParcel &reply); - int32_t CmdIncrementalBackupOnAllBundlesFinished(MessageParcel &data, MessageParcel &reply); - int32_t CmdIncrementalBackupOnProcessInfo(MessageParcel &data, MessageParcel &reply); - int32_t CmdIncrementalBackupOnScanningInfo(MessageParcel &data, MessageParcel &reply); - - int32_t CmdIncrementalRestoreOnBundleStarted(MessageParcel &data, MessageParcel &reply); - int32_t CmdIncrementalRestoreOnBundleFinished(MessageParcel &data, MessageParcel &reply); - int32_t CmdIncrementalRestoreOnAllBundlesFinished(MessageParcel &data, MessageParcel &reply); - int32_t CmdIncrementalRestoreOnFileReady(MessageParcel &data, MessageParcel &reply); - int32_t CmdIncrementalRestoreOnResultReport(MessageParcel &data, MessageParcel &reply); - int32_t CmdIncrementalRestoreOnProcessInfo(MessageParcel &data, MessageParcel &reply); - void ServiceReverseStubSupplement(); -}; -} // namespace OHOS::FileManagement::Backup - -#endif // OHOS_FILEMGMT_BACKUP_SERVICE_REVERSE_STUB_H diff --git a/frameworks/native/backup_kit_inner/src/b_file_info.cpp b/frameworks/native/backup_kit_inner/src/b_file_info.cpp index e068da158353a3f38d20338ec45df531f8ab4c7d..883fe89647912dc08e5adfaa626aeef969e91270 100644 --- a/frameworks/native/backup_kit_inner/src/b_file_info.cpp +++ b/frameworks/native/backup_kit_inner/src/b_file_info.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "b_file_info.h" +#include "backup_file_info.h" #include "filemgmt_libhilog.h" diff --git a/frameworks/native/backup_kit_inner/src/b_incremental_backup_session.cpp b/frameworks/native/backup_kit_inner/src/b_incremental_backup_session.cpp index 97de333ab911e4f59baa6eaa29139c5a469b73c6..bf0aea8f74a0b378a3c34f5b0704ddfc18879d96 100644 --- a/frameworks/native/backup_kit_inner/src/b_incremental_backup_session.cpp +++ b/frameworks/native/backup_kit_inner/src/b_incremental_backup_session.cpp @@ -18,7 +18,7 @@ #include "b_error/b_error.h" #include "b_radar/b_radar.h" #include "filemgmt_libhilog.h" -#include "service_proxy.h" +#include "service_client.h" #include "service_reverse.h" namespace OHOS::FileManagement::Backup { @@ -30,7 +30,7 @@ BIncrementalBackupSession::~BIncrementalBackupSession() HILOGI("Death Recipient is nullptr"); return; } - auto proxy = ServiceProxy::GetServiceProxyPointer(); + auto proxy = ServiceClient::GetServiceProxyPointer(); if (proxy == nullptr) { return; } @@ -46,14 +46,14 @@ unique_ptr BIncrementalBackupSession::Init(Callbacks try { HILOGI("Init IncrementalBackupSession Begin"); auto backup = make_unique(); - ServiceProxy::InvaildInstance(); - auto proxy = ServiceProxy::GetInstance(); + ServiceClient::InvaildInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGI("Failed to get backup service"); return nullptr; } - - int32_t res = proxy->InitIncrementalBackupSession(sptr(new ServiceReverse(callbacks))); + sptr reverse=sptr(new ServiceReverse(callbacks)); + int32_t res = proxy->InitIncrementalBackupSession(reverse); if (res != ERR_OK) { HILOGE("Failed to Backup because of %{public}d", res); AppRadar::Info info("", "", ""); @@ -76,13 +76,14 @@ unique_ptr BIncrementalBackupSession::Init(Callbacks try { HILOGI("Init IncrementalBackupSession Begin"); auto backup = make_unique(); - ServiceProxy::InvaildInstance(); - auto proxy = ServiceProxy::GetInstance(); + ServiceClient::InvaildInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGI("Failed to get backup service"); return nullptr; } - errCode = proxy->InitIncrementalBackupSession(sptr(new ServiceReverse(callbacks)), errMsg); + sptr newProxy = sptr(new ServiceReverse(callbacks)); + errCode = proxy->InitIncrementalBackupSessionWithErrMsg(newProxy, errMsg); if (errCode != ERR_OK) { HILOGE("Failed to Backup because of %{public}d", errCode); AppRadar::Info info("", "", ""); @@ -101,7 +102,7 @@ unique_ptr BIncrementalBackupSession::Init(Callbacks void BIncrementalBackupSession::RegisterBackupServiceDied(function functor) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr || !functor) { return; } @@ -111,7 +112,7 @@ void BIncrementalBackupSession::RegisterBackupServiceDied(function funct } auto callback = [functor](const wptr &obj) { - ServiceProxy::InvaildInstance(); + ServiceClient::InvaildInstance(); HILOGI("Backup service died"); functor(); }; @@ -122,12 +123,14 @@ void BIncrementalBackupSession::RegisterBackupServiceDied(function funct UniqueFd BIncrementalBackupSession::GetLocalCapabilities() { HILOGI("GetLocalCapabilities begin"); - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGE("Failed to get backup service"); return UniqueFd(-EPERM); } - UniqueFd fd = proxy->GetLocalCapabilitiesForBundleInfos(); + int32_t fdvalue=-1; + proxy->GetLocalCapabilitiesForBundleInfos(fdvalue); + UniqueFd fd(static_cast(fdvalue)); if (fd < 0) { HILOGE("Failed to get local capabilities for bundleinfos"); return UniqueFd(-EPERM); @@ -138,7 +141,7 @@ UniqueFd BIncrementalBackupSession::GetLocalCapabilities() ErrCode BIncrementalBackupSession::GetBackupDataSize(bool isPreciseScan, vector bundleNameList) { HILOGI("GetBackupDataSize Begin"); - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGE("Failed to get backup service"); return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); @@ -153,7 +156,7 @@ ErrCode BIncrementalBackupSession::GetBackupDataSize(bool isPreciseScan, vector< ErrCode BIncrementalBackupSession::AppendBundles(vector bundlesToBackup) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } @@ -174,12 +177,12 @@ ErrCode BIncrementalBackupSession::AppendBundles(vector bundle ErrCode BIncrementalBackupSession::AppendBundles(vector bundlesToBackup, std::vector infos) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } - int32_t res = proxy->AppendBundlesIncrementalBackupSession(bundlesToBackup, infos); + int32_t res = proxy->AppendBundlesIncrementalBackupSessionWithBundleInfos(bundlesToBackup, infos); if (res != ERR_OK) { std::string ss; for (const auto &bundle : bundlesToBackup) { @@ -194,7 +197,7 @@ ErrCode BIncrementalBackupSession::AppendBundles(vector bundle ErrCode BIncrementalBackupSession::Release() { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } @@ -205,7 +208,7 @@ ErrCode BIncrementalBackupSession::Release() ErrCode BIncrementalBackupSession::Cancel(std::string bundleName) { ErrCode result = BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK; - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGE("Called Cancel, failed to get proxy."); return result; diff --git a/frameworks/native/backup_kit_inner/src/b_incremental_data.cpp b/frameworks/native/backup_kit_inner/src/b_incremental_data.cpp index 571805e5186750790853c0f1b3b179432768daec..a0a5b1037044ab7b43507de46e070414110cc199 100644 --- a/frameworks/native/backup_kit_inner/src/b_incremental_data.cpp +++ b/frameworks/native/backup_kit_inner/src/b_incremental_data.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "b_incremental_data.h" +#include "backup_incremental_data.h" #include "filemgmt_libhilog.h" #include "message_parcel.h" diff --git a/frameworks/native/backup_kit_inner/src/b_incremental_restore_session.cpp b/frameworks/native/backup_kit_inner/src/b_incremental_restore_session.cpp index 97468695aba6882cf56173692dbe3bb17eb7495b..e1d207063c8190b6687cf9d1c2b07c110e92d829 100644 --- a/frameworks/native/backup_kit_inner/src/b_incremental_restore_session.cpp +++ b/frameworks/native/backup_kit_inner/src/b_incremental_restore_session.cpp @@ -18,9 +18,9 @@ #include "b_error/b_error.h" #include "b_radar/b_radar.h" #include "filemgmt_libhilog.h" -#include "service_proxy.h" +#include "service_client.h" #include "service_reverse.h" - +#include "service_common.h" namespace OHOS::FileManagement::Backup { using namespace std; @@ -30,7 +30,7 @@ BIncrementalRestoreSession::~BIncrementalRestoreSession() HILOGI("Death Recipient is nullptr"); return; } - auto proxy = ServiceProxy::GetServiceProxyPointer(); + auto proxy = ServiceClient::GetServiceProxyPointer(); if (proxy == nullptr) { return; } @@ -46,13 +46,14 @@ unique_ptr BIncrementalRestoreSession::Init(Callback try { HILOGI("Init IncrementalRestoreSession Begin"); auto restore = make_unique(); - ServiceProxy::InvaildInstance(); - auto proxy = ServiceProxy::GetInstance(); + ServiceClient::InvaildInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGI("Failed to get backup service"); return nullptr; } - int32_t res = proxy->InitRestoreSession(sptr(new ServiceReverse(callbacks))); + sptr session = sptr(new ServiceReverse(callbacks)); + int32_t res = proxy->InitRestoreSession(session); if (res != ERR_OK) { HILOGE("Failed to Restore because of %{public}d", res); AppRadar::Info info ("", "", "create restore session failed"); @@ -75,15 +76,16 @@ unique_ptr BIncrementalRestoreSession::Init(Callback try { HILOGI("Init IncrementalRestoreSession Begin"); auto restore = make_unique(); - ServiceProxy::InvaildInstance(); - auto proxy = ServiceProxy::GetInstance(); + ServiceClient::InvaildInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { errMsg = "Failed to get backup service"; errCode = BError(BError::Codes::SDK_BROKEN_IPC); HILOGE("Init IncrementalRestoreSession failed, %{public}s", errMsg.c_str()); return nullptr; } - errCode = proxy->InitRestoreSession(sptr(new ServiceReverse(callbacks)), errMsg); + sptr session = sptr(new ServiceReverse(callbacks)); + errCode = proxy->InitRestoreSessionWithErrMsg(session, errMsg); if (errCode != ERR_OK) { HILOGE("Failed to Restore because of %{public}d", errCode); AppRadar::Info info ("", "", "create restore session failed"); @@ -104,12 +106,14 @@ unique_ptr BIncrementalRestoreSession::Init(Callback UniqueFd BIncrementalRestoreSession::GetLocalCapabilities() { HILOGI("GetLocalCapabilities begin"); - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGE("Failed to get backup service"); return UniqueFd(-EPERM); } - UniqueFd fd = proxy->GetLocalCapabilitiesForBundleInfos(); + int32_t fdvalue=-1; + proxy->GetLocalCapabilitiesForBundleInfos(fdvalue); + UniqueFd fd(static_cast(fdvalue)); if (fd < 0) { HILOGE("Failed to get local capabilities for bundleinfos"); return UniqueFd(-EPERM); @@ -119,7 +123,7 @@ UniqueFd BIncrementalRestoreSession::GetLocalCapabilities() ErrCode BIncrementalRestoreSession::PublishFile(BFileInfo fileInfo) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } @@ -128,16 +132,17 @@ ErrCode BIncrementalRestoreSession::PublishFile(BFileInfo fileInfo) ErrCode BIncrementalRestoreSession::PublishSAFile(BFileInfo fileInfo, UniqueFd fd) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } - return proxy->PublishSAIncrementalFile(fileInfo, move(fd)); + int32_t fdint=fd.Get(); + return proxy->PublishSAIncrementalFile(fileInfo, fdint); } ErrCode BIncrementalRestoreSession::GetFileHandle(const string &bundleName, const string &fileName) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } @@ -147,11 +152,12 @@ ErrCode BIncrementalRestoreSession::GetFileHandle(const string &bundleName, cons ErrCode BIncrementalRestoreSession::AppendBundles(UniqueFd remoteCap, vector bundlesToRestore) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } - ErrCode res = proxy->AppendBundlesRestoreSession(move(remoteCap), bundlesToRestore); + int32_t remoteCapInt = remoteCap.Get(); + ErrCode res = proxy->AppendBundlesRestoreSessionRestoreDataWaitReady(remoteCapInt, bundlesToRestore,0,-1); if (res != ERR_OK) { std::string ss; for (const auto &bundle : bundlesToRestore) { @@ -167,11 +173,12 @@ ErrCode BIncrementalRestoreSession::AppendBundles(UniqueFd remoteCap, vector bundlesToRestore, std::vector detailInfos) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } - ErrCode res = proxy->AppendBundlesRestoreSession(move(remoteCap), bundlesToRestore, detailInfos); + int32_t remoteCapInt = remoteCap.Get(); + ErrCode res = proxy->AppendBundlesRestoreSessionRestoreDataWaitSend(remoteCapInt, bundlesToRestore, detailInfos,0,-1); if (res != ERR_OK) { std::string ss; for (const auto &bundle : bundlesToRestore) { @@ -186,7 +193,7 @@ ErrCode BIncrementalRestoreSession::AppendBundles(UniqueFd remoteCap, vector functor) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr || !functor) { return; } @@ -207,7 +214,7 @@ void BIncrementalRestoreSession::RegisterBackupServiceDied(function func auto callback = [functor](const wptr &obj) { HILOGI("Backup service died"); - ServiceProxy::InvaildInstance(); + ServiceClient::InvaildInstance(); functor(); }; deathRecipient_ = sptr(new SvcDeathRecipient(callback)); @@ -217,7 +224,7 @@ void BIncrementalRestoreSession::RegisterBackupServiceDied(function func ErrCode BIncrementalRestoreSession::Cancel(std::string bundleName) { ErrCode result = BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK; - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGE("Called Cancel, failed to get proxy."); return result; diff --git a/frameworks/native/backup_kit_inner/src/b_incremental_session_restore_async.cpp b/frameworks/native/backup_kit_inner/src/b_incremental_session_restore_async.cpp index 170a50db637afb7c6345fced6b262b52658855dd..8ef6c817d37d48fde10c95c3a9052e117037068e 100644 --- a/frameworks/native/backup_kit_inner/src/b_incremental_session_restore_async.cpp +++ b/frameworks/native/backup_kit_inner/src/b_incremental_session_restore_async.cpp @@ -19,7 +19,7 @@ #include "b_radar/b_radar.h" #include "b_resources/b_constants.h" #include "filemgmt_libhilog.h" -#include "service_proxy.h" +#include "service_client.h" #include "service_reverse.h" namespace OHOS::FileManagement::Backup { @@ -31,7 +31,7 @@ BIncrementalSessionRestoreAsync::~BIncrementalSessionRestoreAsync() HILOGE("Death Recipient is nullptr"); return; } - auto proxy = ServiceProxy::GetServiceProxyPointer(); + auto proxy = ServiceClient::GetServiceProxyPointer(); if (proxy == nullptr) { return; } @@ -47,8 +47,8 @@ shared_ptr BIncrementalSessionRestoreAsync::Ini { try { auto restore = make_shared(callbacks); - ServiceProxy::InvaildInstance(); - auto proxy = ServiceProxy::GetInstance(); + ServiceClient::InvaildInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGE("Failed to get backup service"); return nullptr; @@ -60,7 +60,8 @@ shared_ptr BIncrementalSessionRestoreAsync::Ini .onAllBundlesFinished = callbacks.onAllBundlesFinished, .onResultReport = callbacks.onResultReport, .onBackupServiceDied = callbacks.onBackupServiceDied}; - int32_t res = proxy->InitRestoreSession(sptr(new ServiceReverse(callbacksTmp))); + sptr reverse = sptr(new ServiceReverse(callbacksTmp)); + int32_t res = proxy->InitRestoreSession(reverse); if (res != ERR_OK) { HILOGE("Failed to Restore because of %{public}d", res); AppRadar::Info info ("", "", "create restore session failed"); @@ -79,16 +80,17 @@ shared_ptr BIncrementalSessionRestoreAsync::Ini ErrCode BIncrementalSessionRestoreAsync::PublishFile(BFileInfo fileInfo) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } + return proxy->PublishIncrementalFile(fileInfo); } ErrCode BIncrementalSessionRestoreAsync::GetFileHandle(const string &bundleName, const string &fileName) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } @@ -102,12 +104,13 @@ ErrCode BIncrementalSessionRestoreAsync::AppendBundles(UniqueFd remoteCap, RestoreTypeEnum restoreType, int32_t userId) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } - ErrCode res = proxy->AppendBundlesRestoreSession(move(remoteCap), bundlesToRestore, detailInfos, restoreType, - userId); + int32_t fdCode=remoteCap.Get(); + int32_t restoreTypeInt = static_cast(restoreType); + ErrCode res = proxy->AppendBundlesRestoreSessionRestoreDataWaitSend(fdCode, bundlesToRestore, detailInfos, restoreTypeInt, userId); if (res != ERR_OK) { std::string ss; for (const auto &bundle : bundlesToRestore) { @@ -125,11 +128,13 @@ ErrCode BIncrementalSessionRestoreAsync::AppendBundles(UniqueFd remoteCap, RestoreTypeEnum restoreType, int32_t userId) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } - ErrCode res = proxy->AppendBundlesRestoreSession(move(remoteCap), bundlesToRestore, restoreType, userId); + int32_t fdCode=remoteCap.Get(); + int32_t restoreTypeInt = static_cast(restoreType); + ErrCode res = proxy->AppendBundlesRestoreSessionRestoreDataWaitReady(fdCode, bundlesToRestore, restoreTypeInt, userId); if (res != ERR_OK) { std::string ss; for (const auto &bundle : bundlesToRestore) { @@ -144,17 +149,16 @@ ErrCode BIncrementalSessionRestoreAsync::AppendBundles(UniqueFd remoteCap, ErrCode BIncrementalSessionRestoreAsync::Release() { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } - return proxy->Release(); } void BIncrementalSessionRestoreAsync::RegisterBackupServiceDied(std::function functor) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr || !functor) { return; } @@ -171,7 +175,7 @@ void BIncrementalSessionRestoreAsync::RegisterBackupServiceDied(std::function BSessionBackup::Init(Callbacks callbacks) try { HILOGI("Init BackupSession Begin"); auto backup = make_unique(); - ServiceProxy::InvaildInstance(); - auto proxy = ServiceProxy::GetInstance(); + ServiceClient::InvaildInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGI("Failed to get backup service"); return nullptr; } - - int32_t res = proxy->InitBackupSession(sptr(new ServiceReverse(callbacks))); + sptrreverse=sptr(new ServiceReverse(callbacks)); + int32_t res = proxy->InitBackupSession(reverse); if (res != ERR_OK) { HILOGE("Failed to Backup because of %{public}d", res); AppRadar::Info info("", "", ""); @@ -76,13 +76,14 @@ unique_ptr BSessionBackup::Init(Callbacks callbacks, try { HILOGI("Init BackupSession Begin"); auto backup = make_unique(); - ServiceProxy::InvaildInstance(); - auto proxy = ServiceProxy::GetInstance(); + ServiceClient::InvaildInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGI("Failed to get backup service"); return nullptr; } - errCode = proxy->InitBackupSession(sptr(new ServiceReverse(callbacks)), errMsg); + sptr session = sptr(new ServiceReverse(callbacks)); + errCode = proxy->InitBackupSessionWithErrMsg(session, errMsg); if (errCode != ERR_OK) { HILOGE("Failed to Backup because of %{public}d", errCode); AppRadar::Info info("", "", ""); @@ -101,7 +102,7 @@ unique_ptr BSessionBackup::Init(Callbacks callbacks, void BSessionBackup::RegisterBackupServiceDied(std::function functor) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr || !functor) { return; } @@ -111,7 +112,7 @@ void BSessionBackup::RegisterBackupServiceDied(std::function functor) } auto callback = [functor](const wptr &obj) { - ServiceProxy::InvaildInstance(); + ServiceClient::InvaildInstance(); HILOGI("Backup service died"); functor(); }; @@ -121,7 +122,7 @@ void BSessionBackup::RegisterBackupServiceDied(std::function functor) ErrCode BSessionBackup::Start() { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } @@ -132,12 +133,14 @@ ErrCode BSessionBackup::Start() UniqueFd BSessionBackup::GetLocalCapabilities() { HILOGI("GetLocalCapabilities begin"); - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGE("Failed to get backup service"); return UniqueFd(-EPERM); } - UniqueFd fd = proxy->GetLocalCapabilitiesForBundleInfos(); + int32_t fdvalue=-1; + proxy->GetLocalCapabilitiesForBundleInfos(fdvalue); + UniqueFd fd(static_cast(fdvalue)); if (fd < 0) { HILOGE("Failed to get local capabilities for bundleinfos"); return UniqueFd(-EPERM); @@ -148,7 +151,7 @@ UniqueFd BSessionBackup::GetLocalCapabilities() ErrCode BSessionBackup::GetBackupDataSize(bool isPreciseScan, vector bundleNameList) { HILOGI("GetBackupDataSize Begin"); - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGE("Failed to get backup service"); return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); @@ -163,7 +166,7 @@ ErrCode BSessionBackup::GetBackupDataSize(bool isPreciseScan, vector bundlesToBackup) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } @@ -183,7 +186,7 @@ ErrCode BSessionBackup::AppendBundles(vector bundlesToBackup) ErrCode BSessionBackup::AppendBundles(vector bundlesToBackup, vector detailInfos) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } @@ -203,7 +206,7 @@ ErrCode BSessionBackup::AppendBundles(vector bundlesToBackup, vector ErrCode BSessionBackup::Finish() { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } @@ -213,7 +216,7 @@ ErrCode BSessionBackup::Finish() ErrCode BSessionBackup::Release() { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } @@ -224,7 +227,7 @@ ErrCode BSessionBackup::Release() ErrCode BSessionBackup::Cancel(std::string bundleName) { ErrCode result = BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK; - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGE("Called Cancel, failed to get proxy."); return result; diff --git a/frameworks/native/backup_kit_inner/src/b_session_restore.cpp b/frameworks/native/backup_kit_inner/src/b_session_restore.cpp index 21fbc125fcc9e8e41ce9380725dd1ea163d5f335..134b6e0cca45da1055769387a88afa4c4b77ad45 100644 --- a/frameworks/native/backup_kit_inner/src/b_session_restore.cpp +++ b/frameworks/native/backup_kit_inner/src/b_session_restore.cpp @@ -18,8 +18,9 @@ #include "b_error/b_error.h" #include "b_radar/b_radar.h" #include "filemgmt_libhilog.h" -#include "service_proxy.h" +#include "service_client.h" #include "service_reverse.h" +#include "iservice.h" namespace OHOS::FileManagement::Backup { using namespace std; @@ -30,7 +31,7 @@ BSessionRestore::~BSessionRestore() HILOGI("Death Recipient is nullptr"); return; } - auto proxy = ServiceProxy::GetServiceProxyPointer(); + auto proxy = ServiceClient::GetServiceProxyPointer(); if (proxy == nullptr) { return; } @@ -46,13 +47,14 @@ unique_ptr BSessionRestore::Init(Callbacks callbacks) try { HILOGI("Init RestoreSession Begin"); auto restore = make_unique(); - ServiceProxy::InvaildInstance(); - auto proxy = ServiceProxy::GetInstance(); + ServiceClient::InvaildInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGI("Failed to get backup service"); return nullptr; } - int32_t res = proxy->InitRestoreSession(new ServiceReverse(callbacks)); + sptrreverse=sptr(new ServiceReverse(callbacks)); + int32_t res = proxy->InitRestoreSession(reverse); if (res != ERR_OK) { HILOGE("Failed to Restore because of %{public}d", res); AppRadar::Info info ("", "", "create restore session failed"); @@ -72,12 +74,14 @@ unique_ptr BSessionRestore::Init(Callbacks callbacks) UniqueFd BSessionRestore::GetLocalCapabilities() { HILOGI("GetLocalCapabilities begin"); - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGE("Failed to get backup service"); return UniqueFd(-EPERM); } - UniqueFd fd = proxy->GetLocalCapabilitiesForBundleInfos(); + int32_t fdvalue=-1; + proxy->GetLocalCapabilitiesForBundleInfos(fdvalue); + UniqueFd fd(static_cast(fdvalue)); if (fd < 0) { HILOGE("Failed to get local capabilities for bundleinfos"); return UniqueFd(-EPERM); @@ -87,7 +91,8 @@ UniqueFd BSessionRestore::GetLocalCapabilities() ErrCode BSessionRestore::PublishFile(BFileInfo fileInfo) { - auto proxy = ServiceProxy::GetInstance(); + HILOGI("PublishFile begin"); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } @@ -96,7 +101,7 @@ ErrCode BSessionRestore::PublishFile(BFileInfo fileInfo) ErrCode BSessionRestore::Start() { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } @@ -106,7 +111,7 @@ ErrCode BSessionRestore::Start() ErrCode BSessionRestore::GetFileHandle(const string &bundleName, const string &fileName) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } @@ -117,11 +122,13 @@ ErrCode BSessionRestore::GetFileHandle(const string &bundleName, const string &f ErrCode BSessionRestore::AppendBundles(UniqueFd remoteCap, vector bundlesToRestore, std::vector detailInfos) { - auto proxy = ServiceProxy::GetInstance(); + HILOGI("AppendBundles begin"); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } - ErrCode res = proxy->AppendBundlesRestoreSession(move(remoteCap), bundlesToRestore, detailInfos); + int32_t remoteCapInt = remoteCap.Get(); + ErrCode res = proxy->AppendBundlesRestoreSessionRestoreDataWaitSend(remoteCapInt, bundlesToRestore, detailInfos,0,-1); if (res != ERR_OK) { std::string ss; for (const auto &bundle : bundlesToRestore) { @@ -136,11 +143,13 @@ ErrCode BSessionRestore::AppendBundles(UniqueFd remoteCap, vector bu ErrCode BSessionRestore::AppendBundles(UniqueFd remoteCap, vector bundlesToRestore) { - auto proxy = ServiceProxy::GetInstance(); + HILOGI("AppendBundles begin"); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } - ErrCode res = proxy->AppendBundlesRestoreSession(move(remoteCap), bundlesToRestore); + int32_t remoteCapInt = remoteCap.Get(); + ErrCode res = proxy->AppendBundlesRestoreSessionRestoreDataWaitReady(remoteCapInt, bundlesToRestore,0,-1); if (res != ERR_OK) { std::string ss; for (const auto &bundle : bundlesToRestore) { @@ -155,7 +164,8 @@ ErrCode BSessionRestore::AppendBundles(UniqueFd remoteCap, vector bu ErrCode BSessionRestore::Finish() { - auto proxy = ServiceProxy::GetInstance(); + HILOGI("Finish begin"); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } @@ -165,7 +175,8 @@ ErrCode BSessionRestore::Finish() ErrCode BSessionRestore::Release() { - auto proxy = ServiceProxy::GetInstance(); + HILOGI("Release begin"); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } @@ -175,7 +186,8 @@ ErrCode BSessionRestore::Release() void BSessionRestore::RegisterBackupServiceDied(std::function functor) { - auto proxy = ServiceProxy::GetInstance(); + HILOGI("RegisterBackupServiceDied begin"); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr || !functor) { return; } @@ -186,7 +198,7 @@ void BSessionRestore::RegisterBackupServiceDied(std::function functor) auto callback = [functor](const wptr &obj) { HILOGI("Backup service died"); - ServiceProxy::InvaildInstance(); + ServiceClient::InvaildInstance(); functor(); }; deathRecipient_ = sptr(new SvcDeathRecipient(callback)); @@ -195,8 +207,9 @@ void BSessionRestore::RegisterBackupServiceDied(std::function functor) ErrCode BSessionRestore::Cancel(std::string bundleName) { + HILOGI("Cancel begin"); ErrCode result = BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK; - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGE("Called Cancel, failed to get proxy."); return result; diff --git a/frameworks/native/backup_kit_inner/src/b_session_restore_async.cpp b/frameworks/native/backup_kit_inner/src/b_session_restore_async.cpp index a60c564623d7e5bf79367356e579270ffb4b0fff..92d12aea4fb3300814eca236477c6fbfffb0a231 100644 --- a/frameworks/native/backup_kit_inner/src/b_session_restore_async.cpp +++ b/frameworks/native/backup_kit_inner/src/b_session_restore_async.cpp @@ -20,7 +20,7 @@ #include "b_resources/b_constants.h" #include "b_session_restore.h" #include "filemgmt_libhilog.h" -#include "service_proxy.h" +#include "service_client.h" #include "service_reverse.h" namespace OHOS::FileManagement::Backup { @@ -32,7 +32,7 @@ BSessionRestoreAsync::~BSessionRestoreAsync() HILOGI("Death Recipient is nullptr"); return; } - auto proxy = ServiceProxy::GetServiceProxyPointer(); + auto proxy = ServiceClient::GetServiceProxyPointer(); if (proxy == nullptr) { return; } @@ -48,8 +48,8 @@ shared_ptr BSessionRestoreAsync::Init(Callbacks callbacks) { try { auto restore = make_shared(callbacks); - ServiceProxy::InvaildInstance(); - auto proxy = ServiceProxy::GetInstance(); + ServiceClient::InvaildInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGI("Failed to get backup service"); return nullptr; @@ -61,7 +61,8 @@ shared_ptr BSessionRestoreAsync::Init(Callbacks callbacks) .onResultReport = callbacks.onResultReport, .onBackupServiceDied = callbacks.onBackupServiceDied, .onProcess = callbacks.onProcess}; - int32_t res = proxy->InitRestoreSession(sptr(new ServiceReverse(callbacksTmp))); + sptr reverse = sptr(new ServiceReverse(callbacksTmp)); + int32_t res = proxy->InitRestoreSession(reverse); if (res != ERR_OK) { HILOGE("Failed to Restore because of %{public}d", res); AppRadar::Info info ("", "", "create restore session failed"); @@ -80,7 +81,7 @@ shared_ptr BSessionRestoreAsync::Init(Callbacks callbacks) ErrCode BSessionRestoreAsync::PublishFile(BFileInfo fileInfo) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } @@ -89,7 +90,7 @@ ErrCode BSessionRestoreAsync::PublishFile(BFileInfo fileInfo) ErrCode BSessionRestoreAsync::GetFileHandle(const string &bundleName, const string &fileName) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } @@ -103,12 +104,14 @@ ErrCode BSessionRestoreAsync::AppendBundles(UniqueFd remoteCap, RestoreTypeEnum restoreType, int32_t userId) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } - ErrCode res = proxy->AppendBundlesRestoreSession(move(remoteCap), bundlesToRestore, detailInfos, restoreType, - userId); + int32_t remoteCapInt = remoteCap.Get(); + int32_t restoreTypeInt = static_cast(restoreType); + ErrCode res = proxy->AppendBundlesRestoreSessionRestoreDataWaitSend(remoteCapInt, bundlesToRestore, detailInfos, + restoreTypeInt, userId); if (res != ERR_OK) { std::string ss; for (const auto &bundle : bundlesToRestore) { @@ -126,12 +129,14 @@ ErrCode BSessionRestoreAsync::AppendBundles(UniqueFd remoteCap, RestoreTypeEnum restoreType, int32_t userId) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } - ErrCode res = proxy->AppendBundlesRestoreSession(move(remoteCap), bundlesToRestore, restoreType, userId); + int32_t remoteCapInt = remoteCap.Get(); + int32_t restoreTypeInt = static_cast(restoreType); + ErrCode res = proxy->AppendBundlesRestoreSessionRestoreDataWaitReady(remoteCapInt, bundlesToRestore, restoreTypeInt, userId); if (res != ERR_OK) { std::string ss; for (const auto &bundle : bundlesToRestore) { @@ -146,7 +151,7 @@ ErrCode BSessionRestoreAsync::AppendBundles(UniqueFd remoteCap, ErrCode BSessionRestoreAsync::Release() { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { return BError(BError::Codes::SDK_BROKEN_IPC, "Failed to get backup service").GetCode(); } @@ -156,7 +161,7 @@ ErrCode BSessionRestoreAsync::Release() void BSessionRestoreAsync::RegisterBackupServiceDied(std::function functor) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr || !functor) { return; } @@ -173,7 +178,7 @@ void BSessionRestoreAsync::RegisterBackupServiceDied(std::function funct ErrCode BSessionRestoreAsync::Cancel(std::string bundleName) { ErrCode result = BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK; - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr) { HILOGE("Called Cancel, failed to get proxy."); return result; diff --git a/frameworks/native/backup_kit_inner/src/service_client.cpp b/frameworks/native/backup_kit_inner/src/service_client.cpp new file mode 100644 index 0000000000000000000000000000000000000000..b736b0bc804edc106edf212dcd920c2b357c53d3 --- /dev/null +++ b/frameworks/native/backup_kit_inner/src/service_client.cpp @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include "iremote_object.h" +#include "b_error/b_error.h" +#include "b_error/b_excep_utils.h" +#include "b_radar/b_radar.h" +#include "b_resources/b_constants.h" +#include "filemgmt_libhilog.h" +#include "iservice_registry.h" +#include "service_client.h" +#include "system_ability_definition.h" +#include "svc_death_recipient.h" +#include "hitrace_meter.h" +#include "iservice.h" + +namespace OHOS::FileManagement::Backup { +using namespace std; + + + +bool ServiceClient::CheckServiceProxy() +{ + serviceProxy_= ServiceClient::GetInstance(); + bool isNull=false; + if (serviceProxy_!=nullptr){ + isNull=true; + } + return isNull; +} + + +sptr ServiceClient::GetServiceProxyPointer() +{ + HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + return serviceProxy_; +} + +sptr ServiceClient::GetInstance() +{ + HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + unique_lock getInstanceLock(getInstanceMutex_); + unique_lock lock(proxyMutex_); + if (serviceProxy_ != nullptr) { + return serviceProxy_; + } + + auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); + if (!samgr) { + HILOGE("Get an empty samgr"); + return nullptr; + } + sptr loadCallback = sptr(new ServiceProxyLoadCallback()); + if (loadCallback == nullptr) { + HILOGE("loadCallback is nullptr."); + return nullptr; + } + int32_t ret = samgr->LoadSystemAbility(FILEMANAGEMENT_BACKUP_SERVICE_SA_ID, loadCallback); + if (ret != ERR_OK) { + HILOGE("Failed to Load systemAbility, systemAbilityId:%{private}d, ret code:%{public}d", + FILEMANAGEMENT_BACKUP_SERVICE_SA_ID, ret); + return nullptr; + } + + auto waitStatus = + loadCallback->proxyConVar_.wait_for(lock, std::chrono::milliseconds(BConstants::BACKUP_LOADSA_TIMEOUT_MS), + [loadCallback]() { return loadCallback->isLoadSuccess_.load(); }); + if (!waitStatus) { + HILOGE("Load backup sa timeout"); + AppRadar::Info info("", "", "\"reason\":\"Load backup sa timeout\""); + AppRadar::GetInstance().RecordBackupFuncRes(info, "ServiceClient::GetInstance", + AppRadar::GetInstance().GetUserId(), BizStageBackup::BIZ_STAGE_BOOT_BACKUP_SA_FAIL, + BError(BError::Codes::SA_INVAL_ARG).GetCode()); + return nullptr; + } + return serviceProxy_; +} + +void ServiceClient::InvaildInstance() +{ + HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGI("Invalid Instance"); + unique_lock lock(proxyMutex_); + serviceProxy_ = nullptr; +} + +void ServiceClient::ServiceProxyLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbilityId, + const OHOS::sptr &remoteObject) +{ + HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGI("Load backup sa success, systemAbilityId: %{public}d, remoteObject result:%{public}s", systemAbilityId, + (remoteObject != nullptr) ? "true" : "false"); + if (systemAbilityId != FILEMANAGEMENT_BACKUP_SERVICE_SA_ID || remoteObject == nullptr) { + isLoadSuccess_.store(false); + proxyConVar_.notify_one(); + return; + } + unique_lock lock(proxyMutex_); + std::string remoteDescriptor = Str16ToStr8(remoteObject->GetInterfaceDescriptor()); + HILOGE("GetInterfaceDescriptor result:%{public}s", remoteDescriptor.c_str()); + serviceProxy_ = iface_cast(remoteObject); + if (serviceProxy_ == nullptr) { + HILOGE("serviceProxy_ is nullptr"); + return; + } + auto remoteObj = serviceProxy_->AsObject(); + if (!remoteObj) { + HILOGE("Failed to get remote object"); + serviceProxy_ = nullptr; + isLoadSuccess_.store(false); + proxyConVar_.notify_one(); + return; + } + + auto callback = [](const wptr &obj) { + ServiceClient::InvaildInstance(); + HILOGE("Backup service died"); + }; + sptr deathRecipient = sptr(new SvcDeathRecipient(callback)); + remoteObj->AddDeathRecipient(deathRecipient); + isLoadSuccess_.store(true); + proxyConVar_.notify_one(); +} + +void ServiceClient::ServiceProxyLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) +{ + HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGE("Load backup sa failed, systemAbilityId:%{private}d", systemAbilityId); + unique_lock lock(proxyMutex_); + serviceProxy_ = nullptr; + isLoadSuccess_.store(false); + AppRadar::Info info("", "", "\"reason\":\"Load backup sa fail\""); + AppRadar::GetInstance().RecordBackupFuncRes(info, "ServiceProxyLoadCallback::OnLoadSystemAbilityFail", + AppRadar::GetInstance().GetUserId(), BizStageBackup::BIZ_STAGE_BOOT_BACKUP_SA_FAIL, + static_cast(BError::Codes::SA_INVAL_ARG)); + proxyConVar_.notify_one(); +} +} // namespace OHOS::FileManagement::Backup diff --git a/frameworks/native/backup_kit_inner/src/service_incremental_proxy.cpp b/frameworks/native/backup_kit_inner/src/service_incremental_proxy.cpp deleted file mode 100644 index bbb503bfaad495965cb31a54d586d65a4ae00131..0000000000000000000000000000000000000000 --- a/frameworks/native/backup_kit_inner/src/service_incremental_proxy.cpp +++ /dev/null @@ -1,417 +0,0 @@ -/* - * Copyright (c) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "service_proxy.h" - -#include "iservice_registry.h" -#include "system_ability_definition.h" - -#include "b_error/b_error.h" -#include "b_error/b_excep_utils.h" -#include "b_resources/b_constants.h" -#include "filemgmt_libhilog.h" -#include "svc_death_recipient.h" -#include "unique_fd.h" -#include "hitrace_meter.h" - -namespace OHOS::FileManagement::Backup { -using namespace std; - -ErrCode ServiceProxy::Release() -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - - MessageParcel reply; - MessageOption option; - int32_t ret = Remote()->SendRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_RELSEASE_SESSION), - data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return reply.ReadInt32(); -} - -UniqueFd ServiceProxy::GetLocalCapabilitiesIncremental(const vector &bundleNames) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - HILOGE("Failed to write descriptor"); - return UniqueFd(-EPERM); - } - - if (!WriteParcelableVector(bundleNames, data)) { - HILOGE("Failed to send the bundleNames"); - return UniqueFd(-EPERM); - } - - MessageParcel reply; - MessageOption option; - option.SetWaitTime(BConstants::IPC_MAX_WAIT_TIME); - int32_t ret = Remote()->SendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_LOCAL_CAPABILITIES_INCREMENTAL), data, reply, - option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - return UniqueFd(-ret); - } - UniqueFd fd(reply.ReadFileDescriptor()); - return UniqueFd(fd.Release()); -} - -ErrCode ServiceProxy::GetAppLocalListAndDoIncrementalBackup() -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - HILOGE("Failed to write descriptor"); - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - - MessageParcel reply; - MessageOption option; - option.SetWaitTime(BConstants::IPC_MAX_WAIT_TIME); - int32_t ret = Remote()->SendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_APP_LOCAL_LIST_AND_DO_INCREMENTAL_BACKUP), - data, reply, option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - return BError(BError::Codes::SDK_INVAL_ARG, "Received error when doing IPC").GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::InitIncrementalBackupSession(sptr remote) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - HILOGE("Failed to write descriptor"); - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - - MessageParcel reply; - MessageOption option; - - if (!remote) { - HILOGE("Empty reverse stub"); - return BError(BError::Codes::SDK_INVAL_ARG, "Empty reverse stub").GetCode(); - } - if (!data.WriteRemoteObject(remote->AsObject().GetRefPtr())) { - HILOGE("Failed to send the reverse stub"); - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the reverse stub").GetCode(); - } - - int32_t ret = Remote()->SendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_INCREMENTAL_BACKUP_SESSION), data, reply, option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - return BError(BError::Codes::SDK_INVAL_ARG, "Received error when doing IPC").GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::InitIncrementalBackupSession(sptr remote, std::string &errMsg) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - HILOGE("Failed to write descriptor"); - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - MessageParcel reply; - MessageOption option; - if (!remote) { - HILOGE("Empty reverse stub"); - return BError(BError::Codes::SDK_INVAL_ARG, "Empty reverse stub").GetCode(); - } - if (!data.WriteRemoteObject(remote->AsObject().GetRefPtr())) { - HILOGE("Failed to send the reverse stub"); - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the reverse stub").GetCode(); - } - int32_t ret = Remote()->SendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_INCREMENTAL_BACKUP_SESSION_MSG), - data, reply, option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - return BError(BError::Codes::SDK_INVAL_ARG, "Received error when doing IPC").GetCode(); - } - if (!reply.ReadString(errMsg)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to receive the errMsg").GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::AppendBundlesIncrementalBackupSession(const vector &bundlesToBackup) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - HILOGE("Failed to write descriptor"); - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - - if (!WriteParcelableVector(bundlesToBackup, data)) { - HILOGE("Failed to send the bundleNames"); - return UniqueFd(-EPERM); - } - - MessageParcel reply; - MessageOption option; - - int32_t ret = Remote()->SendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_INCREMENTAL_BACKUP_SESSION), data, - reply, option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - return BError(BError::Codes::SDK_INVAL_ARG, "Received error when doing IPC").GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::AppendBundlesIncrementalBackupSession(const vector &bundlesToBackup, - const std::vector &infos) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - HILOGE("Failed to write descriptor"); - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - - if (!WriteParcelableVector(bundlesToBackup, data)) { - HILOGE("Failed to send the bundleNames"); - return UniqueFd(-EPERM); - } - - if (!data.WriteStringVector(infos)) { - HILOGE("Failed to write infos"); - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send bundleNames").GetCode(); - } - MessageParcel reply; - MessageOption option; - - int32_t ret = Remote()->SendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_INCREMENTAL_BACKUP_SESSION_DETAILS), - data, reply, option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - return BError(BError::Codes::SDK_INVAL_ARG, "Received error when doing IPC").GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::PublishIncrementalFile(const BFileInfo &fileInfo) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - - if (!data.WriteParcelable(&fileInfo)) { - HILOGE("Failed to send the fileInfo"); - return -EPIPE; - } - - MessageParcel reply; - MessageOption option; - int32_t ret = Remote()->SendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_PUBLISH_INCREMENTAL_FILE), data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::PublishSAIncrementalFile(const BFileInfo &fileInfo, UniqueFd fd) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - - if (!data.WriteParcelable(&fileInfo)) { - HILOGE("Failed to send the fileInfo"); - return -EPIPE; - } - - if (!data.WriteFileDescriptor(fd)) { - HILOGE("Failed to send the fd"); - return -EPIPE; - } - - MessageParcel reply; - MessageOption option; - int32_t ret = Remote()->SendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_PUBLISH_SA_INCREMENTAL_FILE), data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::AppIncrementalFileReady(const std::string &fileName, UniqueFd fd, UniqueFd manifestFd, - int32_t errCode) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - - if (!data.WriteString(fileName)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the filename").GetCode(); - } - bool fdFlag = (fd < 0 || manifestFd < 0) ? false : true; - data.WriteBool(fdFlag); - if (fdFlag == true && !data.WriteFileDescriptor(fd)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the fd").GetCode(); - } - if (fdFlag == true && !data.WriteFileDescriptor(manifestFd)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the fd").GetCode(); - } - if (!data.WriteInt32(errCode)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the errCode").GetCode(); - } - - MessageParcel reply; - MessageOption option; - int32_t ret = Remote()->SendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_APP_INCREMENTAL_FILE_READY), data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::AppIncrementalDone(ErrCode errCode) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - - if (!data.WriteInt32(errCode)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the errCode").GetCode(); - } - - MessageParcel reply; - MessageOption option; - int32_t ret = Remote()->SendRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_APP_INCREMENTAL_DONE), - data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::GetIncrementalFileHandle(const std::string &bundleName, const std::string &fileName) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - - if (!data.WriteString(bundleName)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the bundleName").GetCode(); - } - if (!data.WriteString(fileName)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the fileName").GetCode(); - } - - MessageParcel reply; - MessageOption option; - int32_t ret = Remote()->SendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_INCREMENTAL_FILE_NAME), data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return ret; -} - -template -bool ServiceProxy::WriteParcelableVector(const std::vector &parcelableVector, Parcel &data) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - if (!data.WriteUint32(parcelableVector.size())) { - HILOGE("failed to WriteInt32 for parcelableVector.size()"); - return false; - } - - for (const auto &parcelable : parcelableVector) { - if (!data.WriteParcelable(&parcelable)) { - HILOGE("failed to WriteParcelable for parcelable"); - return false; - } - } - - return true; -} - -ErrCode ServiceProxy::Cancel(std::string bundleName, int32_t &result) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - if (!Remote()) { - return BError(BError::Codes::SDK_INVAL_ARG, "Remote is nullptr").GetCode(); - } - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - - if (!data.WriteString(bundleName)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the bundleName").GetCode(); - } - - MessageParcel reply; - MessageOption option; - int32_t ret = Remote()->SendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_CANCEL_BUNDLE), data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - reply.ReadInt32(result); - HILOGI("ServiceProxy Cancel end, result:%{public}d", result); - - return BError(BError::Codes::OK, "success"); -} -} // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/frameworks/native/backup_kit_inner/src/service_incremental_reverse.cpp b/frameworks/native/backup_kit_inner/src/service_incremental_reverse.cpp index 81f6ed9e691f3bd1b1624906ed581abda4933550..e2299456b598a893b9ab12e7d5acd81e30dbfac4 100644 --- a/frameworks/native/backup_kit_inner/src/service_incremental_reverse.cpp +++ b/frameworks/native/backup_kit_inner/src/service_incremental_reverse.cpp @@ -22,137 +22,155 @@ namespace OHOS::FileManagement::Backup { using namespace std; -void ServiceReverse::IncrementalBackupOnFileReady(string bundleName, string fileName, int fd, int manifestFd, +ErrCode ServiceReverse::IncrementalBackupOnFileReady(const std::string& bundleName, const std::string& fileName, int fd, int manifestFd, int32_t errCode) { if (scenario_ != Scenario::BACKUP || !callbacksIncrementalBackup_.onFileReady) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } BFileInfo bFileInfo(bundleName, fileName, 0); callbacksIncrementalBackup_.onFileReady(bFileInfo, UniqueFd(fd), UniqueFd(manifestFd), errCode); + return BError(BError::Codes::OK); } -void ServiceReverse::IncrementalBackupOnBundleStarted(int32_t errCode, string bundleName) +ErrCode ServiceReverse::IncrementalBackupOnBundleStarted(int32_t errCode, const std::string& bundleName) { if (scenario_ != Scenario::BACKUP || !callbacksIncrementalBackup_.onBundleStarted) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksIncrementalBackup_.onBundleStarted(errCode, bundleName); + return BError(BError::Codes::OK); } -void ServiceReverse::IncrementalBackupOnResultReport(std::string result, std::string bundleName) +ErrCode ServiceReverse::IncrementalBackupOnResultReport(const std::string& result, const std::string& bundleName) { if (scenario_ != Scenario::BACKUP || !callbacksIncrementalBackup_.onResultReport) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksIncrementalBackup_.onResultReport(bundleName, result); + return BError(BError::Codes::OK); } -void ServiceReverse::IncrementalBackupOnBundleFinished(int32_t errCode, string bundleName) +ErrCode ServiceReverse::IncrementalBackupOnBundleFinished(int32_t errCode, const std::string& bundleName) { if (scenario_ != Scenario::BACKUP || !callbacksIncrementalBackup_.onBundleFinished) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } HILOGI("errCode = %{public}d, bundleName = %{public}s", errCode, bundleName.c_str()); callbacksIncrementalBackup_.onBundleFinished(errCode, bundleName); + return BError(BError::Codes::OK); } -void ServiceReverse::IncrementalBackupOnAllBundlesFinished(int32_t errCode) +ErrCode ServiceReverse::IncrementalBackupOnAllBundlesFinished(int32_t errCode) { HILOGI("errCode = %{public}d", errCode); if (scenario_ != Scenario::BACKUP || !callbacksIncrementalBackup_.onAllBundlesFinished) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksIncrementalBackup_.onAllBundlesFinished(errCode); + return BError(BError::Codes::OK); } -void ServiceReverse::IncrementalBackupOnProcessInfo(std::string bundleName, std::string processInfo) +ErrCode ServiceReverse::IncrementalBackupOnProcessInfo(const std::string& bundleName, const std::string& processInfo) { HILOGI("bundleName = %{public}s", bundleName.c_str()); if (scenario_ != Scenario::BACKUP || !callbacksIncrementalBackup_.onProcess) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksIncrementalBackup_.onProcess(bundleName, processInfo); + return BError(BError::Codes::OK); } -void ServiceReverse::IncrementalBackupOnScanningInfo(std::string scannedInfo) +ErrCode ServiceReverse::IncrementalBackupOnScanningInfo(const std::string& scannedInfo) { if (scenario_ != Scenario::BACKUP || !callbacksIncrementalBackup_.onBackupSizeReport) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksIncrementalBackup_.onBackupSizeReport(scannedInfo); + return BError(BError::Codes::OK); } -void ServiceReverse::IncrementalRestoreOnBundleStarted(int32_t errCode, string bundleName) +ErrCode ServiceReverse::IncrementalRestoreOnBundleStarted(int32_t errCode, const std::string& bundleName) { if (scenario_ != Scenario::RESTORE || !callbacksIncrementalRestore_.onBundleStarted) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksIncrementalRestore_.onBundleStarted(errCode, bundleName); + return BError(BError::Codes::OK); } -void ServiceReverse::IncrementalRestoreOnBundleFinished(int32_t errCode, string bundleName) +ErrCode ServiceReverse::IncrementalRestoreOnBundleFinished(int32_t errCode, const std::string& bundleName) { if (scenario_ != Scenario::RESTORE || !callbacksIncrementalRestore_.onBundleFinished) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } HILOGI("errCode = %{public}d, bundleName = %{public}s", errCode, bundleName.c_str()); callbacksIncrementalRestore_.onBundleFinished(errCode, bundleName); + return BError(BError::Codes::OK); } -void ServiceReverse::IncrementalRestoreOnAllBundlesFinished(int32_t errCode) +ErrCode ServiceReverse::IncrementalRestoreOnAllBundlesFinished(int32_t errCode) { HILOGI("errCode = %{public}d", errCode); if (scenario_ != Scenario::RESTORE || !callbacksIncrementalRestore_.onAllBundlesFinished) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksIncrementalRestore_.onAllBundlesFinished(errCode); + return BError(BError::Codes::OK); } -void ServiceReverse::IncrementalRestoreOnFileReady(string bundleName, string fileName, int fd, int manifestFd, +ErrCode ServiceReverse::IncrementalRestoreOnFileReady(const std::string& bundleName, const std::string& fileName, int fd, int manifestFd, int32_t errCode) { + if (fd < 0 || manifestFd < 0) + { + HILOGE("Error fd or manifestFd, fd = %{public}d, manifestFd = %{public}d", fd, manifestFd); + return BError(BError::Codes::SA_INVAL_ARG); + } if (scenario_ != Scenario::RESTORE || !callbacksIncrementalRestore_.onFileReady) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } BFileInfo bFileInfo(bundleName, fileName, 0); callbacksIncrementalRestore_.onFileReady(bFileInfo, UniqueFd(fd), UniqueFd(manifestFd), errCode); + return BError(BError::Codes::OK); } -void ServiceReverse::IncrementalRestoreOnResultReport(std::string result, std::string bundleName, ErrCode errCode) +ErrCode ServiceReverse::IncrementalRestoreOnResultReport(const std::string& result, const std::string& bundleName, ErrCode errCode) { HILOGI("begin incremental restore on result report, bundleName:%{public}s", bundleName.c_str()); if (scenario_ != Scenario::RESTORE || !callbacksIncrementalRestore_.onResultReport) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksIncrementalRestore_.onResultReport(bundleName, result); if (scenario_ != Scenario::RESTORE || !callbacksIncrementalRestore_.onBundleFinished) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksIncrementalRestore_.onBundleFinished(errCode, bundleName); + return BError(BError::Codes::OK); } -void ServiceReverse::IncrementalRestoreOnProcessInfo(std::string bundleName, std::string processInfo) +ErrCode ServiceReverse::IncrementalRestoreOnProcessInfo(const std::string& bundleName, const std::string& processInfo) { HILOGI("begin incremental report processInfo, bundleName:%{public}s", bundleName.c_str()); if (scenario_ != Scenario::RESTORE || !callbacksIncrementalRestore_.onProcess) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksIncrementalRestore_.onProcess(bundleName, processInfo); + return BError(BError::Codes::OK); } ServiceReverse::ServiceReverse(BIncrementalBackupSession::Callbacks callbacks) diff --git a/frameworks/native/backup_kit_inner/src/service_proxy.cpp b/frameworks/native/backup_kit_inner/src/service_proxy.cpp deleted file mode 100644 index 187f69ef7dc5926387ecf6b1b3e9d49ba57941a9..0000000000000000000000000000000000000000 --- a/frameworks/native/backup_kit_inner/src/service_proxy.cpp +++ /dev/null @@ -1,839 +0,0 @@ -/* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include - -#include "b_error/b_error.h" -#include "b_error/b_excep_utils.h" -#include "b_radar/b_radar.h" -#include "b_resources/b_constants.h" -#include "filemgmt_libhilog.h" -#include "iservice_registry.h" -#include "service_proxy.h" -#include "system_ability_definition.h" -#include "svc_death_recipient.h" -#include "hitrace_meter.h" - -namespace OHOS::FileManagement::Backup { -using namespace std; - -ErrCode ServiceProxy::InitRestoreSession(sptr remote) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - MessageParcel reply; - MessageOption option; - - if (!remote) { - return BError(BError::Codes::SDK_INVAL_ARG, "Empty reverse stub").GetCode(); - } - if (!data.WriteRemoteObject(remote->AsObject().GetRefPtr())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the reverse stub").GetCode(); - } - - int32_t ret = Remote()->SendRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_RESTORE_SESSION), - data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::InitRestoreSession(sptr remote, std::string &errMsg) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - MessageParcel reply; - MessageOption option; - - if (!remote) { - return BError(BError::Codes::SDK_INVAL_ARG, "Empty reverse stub").GetCode(); - } - if (!data.WriteRemoteObject(remote->AsObject().GetRefPtr())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the reverse stub").GetCode(); - } - - int32_t ret = Remote()->SendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_RESTORE_SESSION_MSG), data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - if (!reply.ReadString(errMsg)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to receive the errMsg").GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::InitBackupSession(sptr remote) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - MessageParcel reply; - MessageOption option; - - if (!remote) { - return BError(BError::Codes::SDK_INVAL_ARG, "Empty reverse stub").GetCode(); - } - if (!data.WriteRemoteObject(remote->AsObject().GetRefPtr())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the reverse stub").GetCode(); - } - - int32_t ret = Remote()->SendRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_BACKUP_SESSION), - data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::InitBackupSession(sptr remote, std::string &errMsg) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - MessageParcel reply; - MessageOption option; - if (!remote) { - return BError(BError::Codes::SDK_INVAL_ARG, "Empty reverse stub").GetCode(); - } - if (!data.WriteRemoteObject(remote->AsObject().GetRefPtr())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the reverse stub").GetCode(); - } - - int32_t ret = Remote()->SendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_BACKUP_SESSION_MSG), data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - if (!reply.ReadString(errMsg)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to receive the errMsg").GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::Start() -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - - MessageParcel reply; - MessageOption option; - int32_t ret = - Remote()->SendRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_START), data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return reply.ReadInt32(); -} - -UniqueFd ServiceProxy::GetLocalCapabilities() -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - HILOGE("Failed to write descriptor"); - return UniqueFd(-EPERM); - } - - MessageParcel reply; - MessageOption option; - option.SetWaitTime(BConstants::IPC_MAX_WAIT_TIME); - int32_t ret = Remote()->SendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_LOCAL_CAPABILITIES), data, reply, option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - AppRadar::Info resInfo("", "", ""); - AppRadar::GetInstance().RecordDefaultFuncRes(resInfo, "ServiceProxy::GetLocalCapabilities", - AppRadar::GetInstance().GetUserId(), BizStageBackup::BIZ_STAGE_GET_LOCAL_CAPABILITIES_FAIL, ret); - return UniqueFd(-ret); - } - UniqueFd fd(reply.ReadFileDescriptor()); - return UniqueFd(fd.Release()); -} - -ErrCode ServiceProxy::PublishFile(const BFileInfo &fileInfo) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - - if (!data.WriteParcelable(&fileInfo)) { - HILOGE("Failed to send the fileInfo"); - return -EPIPE; - } - - MessageParcel reply; - MessageOption option; - int32_t ret = Remote()->SendRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_PUBLISH_FILE), data, - reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::AppFileReady(const string &fileName, UniqueFd fd, int32_t errCode) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - - if (!data.WriteString(fileName)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the filename").GetCode(); - } - bool fdFlag = fd < 0 ? false : true; - data.WriteBool(fdFlag); - if (fdFlag == true && !data.WriteFileDescriptor(fd)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the fd").GetCode(); - } - if (!data.WriteInt32(errCode)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the errCode").GetCode(); - } - - MessageParcel reply; - MessageOption option; - int32_t ret = Remote()->SendRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_APP_FILE_READY), data, - reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::AppDone(ErrCode errCode) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - - if (!data.WriteInt32(errCode)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the errCode").GetCode(); - } - - MessageParcel reply; - MessageOption option; - int32_t ret = - Remote()->SendRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_APP_DONE), data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::ServiceResultReport(const std::string restoreRetInfo, - BackupRestoreScenario scenario, ErrCode errCode) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - if (!data.WriteString(restoreRetInfo)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the restoreRetInfo").GetCode(); - } - if (!data.WriteInt32(static_cast(scenario))) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the scenario").GetCode(); - } - if (!data.WriteInt32(errCode)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the errCode").GetCode(); - } - MessageParcel reply; - MessageOption option; - int32_t ret = - Remote()->SendRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_RESULT_REPORT), data, reply, - option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::GetFileHandle(const string &bundleName, const string &fileName) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - - if (!data.WriteString(bundleName)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the bundleName").GetCode(); - } - if (!data.WriteString(fileName)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the fileName").GetCode(); - } - - MessageParcel reply; - MessageOption option; - option.SetFlags(MessageOption::TF_ASYNC); - int32_t ret = Remote()->SendRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_FILE_NAME), data, - reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return ret; -} - -ErrCode ServiceProxy::AppendBundlesRestoreSession(UniqueFd fd, const vector &bundleNames, - const std::vector &detailInfos, RestoreTypeEnum restoreType, int32_t userId) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - MessageParcel reply; - MessageOption option; - option.SetWaitTime(BConstants::IPC_MAX_WAIT_TIME); - - if (!data.WriteFileDescriptor(fd)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the fd").GetCode(); - } - if (!data.WriteStringVector(bundleNames)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send bundleNames").GetCode(); - } - if (!detailInfos.empty() && !data.WriteStringVector(detailInfos)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send detailInfos").GetCode(); - } - if (!data.WriteInt32(static_cast(restoreType))) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send restoreType").GetCode(); - } - if (!data.WriteInt32(userId)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send userId").GetCode(); - } - int32_t ret = Remote()->SendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_RESTORE_SESSION_DETAIL), data, reply, - option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::AppendBundlesRestoreSession(UniqueFd fd, - const vector &bundleNames, - RestoreTypeEnum restoreType, - int32_t userId) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - MessageParcel reply; - MessageOption option; - option.SetWaitTime(BConstants::IPC_MAX_WAIT_TIME); - - if (!data.WriteFileDescriptor(fd)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the fd").GetCode(); - } - if (!data.WriteStringVector(bundleNames)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send bundleNames").GetCode(); - } - if (!data.WriteInt32(static_cast(restoreType))) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send restoreType").GetCode(); - } - if (!data.WriteInt32(userId)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send userId").GetCode(); - } - - int32_t ret = Remote()->SendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_RESTORE_SESSION), data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::AppendBundlesBackupSession(const vector &bundleNames) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - MessageParcel reply; - MessageOption option; - option.SetWaitTime(BConstants::IPC_MAX_WAIT_TIME); - - if (!data.WriteStringVector(bundleNames)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send bundleNames").GetCode(); - } - - int32_t ret = Remote()->SendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_BACKUP_SESSION), data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::AppendBundlesDetailsBackupSession(const vector &bundleNames, - const vector &detailInfos) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - MessageParcel reply; - MessageOption option; - option.SetWaitTime(BConstants::IPC_MAX_WAIT_TIME); - - if (!data.WriteStringVector(bundleNames)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send bundleNames").GetCode(); - } - - if (!data.WriteStringVector(detailInfos)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send detailInfos").GetCode(); - } - - int32_t ret = Remote()->SendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_BACKUP_SESSION_DETAILS), - data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return reply.ReadInt32(); -} - -ErrCode ServiceProxy::Finish() -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - - MessageParcel reply; - MessageOption option; - int32_t ret = - Remote()->SendRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_FINISH), data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return reply.ReadInt32(); -} - -sptr ServiceProxy::GetServiceProxyPointer() -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - return serviceProxy_; -} - -sptr ServiceProxy::GetInstance() -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - unique_lock getInstanceLock(getInstanceMutex_); - unique_lock lock(proxyMutex_); - if (serviceProxy_ != nullptr) { - return serviceProxy_; - } - - auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); - if (!samgr) { - HILOGE("Get an empty samgr"); - return nullptr; - } - sptr loadCallback = sptr(new ServiceProxyLoadCallback()); - if (loadCallback == nullptr) { - HILOGE("loadCallback is nullptr."); - return nullptr; - } - int32_t ret = samgr->LoadSystemAbility(FILEMANAGEMENT_BACKUP_SERVICE_SA_ID, loadCallback); - if (ret != ERR_OK) { - HILOGE("Failed to Load systemAbility, systemAbilityId:%{private}d, ret code:%{public}d", - FILEMANAGEMENT_BACKUP_SERVICE_SA_ID, ret); - return nullptr; - } - - auto waitStatus = - loadCallback->proxyConVar_.wait_for(lock, std::chrono::milliseconds(BConstants::BACKUP_LOADSA_TIMEOUT_MS), - [loadCallback]() { return loadCallback->isLoadSuccess_.load(); }); - if (!waitStatus) { - HILOGE("Load backup sa timeout"); - AppRadar::Info info("", "", "\"reason\":\"Load backup sa timeout\""); - AppRadar::GetInstance().RecordBackupFuncRes(info, "ServiceProxy::GetInstance", - AppRadar::GetInstance().GetUserId(), BizStageBackup::BIZ_STAGE_BOOT_BACKUP_SA_FAIL, - BError(BError::Codes::SA_INVAL_ARG).GetCode()); - return nullptr; - } - return serviceProxy_; -} - -void ServiceProxy::InvaildInstance() -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - HILOGD("invalid instance"); - unique_lock lock(proxyMutex_); - serviceProxy_ = nullptr; -} - -void ServiceProxy::ServiceProxyLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbilityId, - const OHOS::sptr &remoteObject) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - HILOGI("Load backup sa success, systemAbilityId: %{private}d, remoteObject result:%{private}s", systemAbilityId, - (remoteObject != nullptr) ? "true" : "false"); - if (systemAbilityId != FILEMANAGEMENT_BACKUP_SERVICE_SA_ID || remoteObject == nullptr) { - isLoadSuccess_.store(false); - proxyConVar_.notify_one(); - return; - } - unique_lock lock(proxyMutex_); - serviceProxy_ = iface_cast(remoteObject); - if (serviceProxy_ == nullptr) { - HILOGD("serviceProxy_ is nullptr"); - return; - } - auto remoteObj = serviceProxy_->AsObject(); - if (!remoteObj) { - HILOGE("Failed to get remote object"); - serviceProxy_ = nullptr; - isLoadSuccess_.store(false); - proxyConVar_.notify_one(); - return; - } - - auto callback = [](const wptr &obj) { - ServiceProxy::InvaildInstance(); - HILOGE("Backup service died"); - }; - sptr deathRecipient = sptr(new SvcDeathRecipient(callback)); - remoteObj->AddDeathRecipient(deathRecipient); - isLoadSuccess_.store(true); - proxyConVar_.notify_one(); -} - -void ServiceProxy::ServiceProxyLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - HILOGE("Load backup sa failed, systemAbilityId:%{private}d", systemAbilityId); - unique_lock lock(proxyMutex_); - serviceProxy_ = nullptr; - isLoadSuccess_.store(false); - AppRadar::Info info("", "", "\"reason\":\"Load backup sa fail\""); - AppRadar::GetInstance().RecordBackupFuncRes(info, "ServiceProxyLoadCallback::OnLoadSystemAbilityFail", - AppRadar::GetInstance().GetUserId(), BizStageBackup::BIZ_STAGE_BOOT_BACKUP_SA_FAIL, - static_cast(BError::Codes::SA_INVAL_ARG)); - proxyConVar_.notify_one(); -} - -ErrCode ServiceProxy::GetBackupInfo(BundleName &bundleName, std::string &result) -{ - HILOGI("ServiceProxy GetBackupInfo Begin."); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - if (!data.WriteString(bundleName)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send bundleName").GetCode(); - } - MessageParcel reply; - MessageOption option; - option.SetWaitTime(BConstants::IPC_MAX_WAIT_TIME); - int32_t ret = Remote()->SendRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_BACKUP_INFO), - data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - reply.ReadString(result); - HILOGI("ServiceProxy GetBackupInfo end. result = %s", result.c_str()); - return BError(BError::Codes::OK, "success"); -} - -ErrCode ServiceProxy::UpdateTimer(BundleName &bundleName, uint32_t timeout, bool &result) -{ - HILOGI("ServiceProxy UpdateTimer Begin."); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - if (!data.WriteString(bundleName)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send bundleName").GetCode(); - } - if (!data.WriteUint32(timeout)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send timeout").GetCode(); - } - MessageParcel reply; - MessageOption option; - option.SetWaitTime(BConstants::IPC_MAX_WAIT_TIME); - int32_t ret = Remote()->SendRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_UPDATE_TIMER), - data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - reply.ReadBool(result); - HILOGI("ServiceProxy UpdateTimer end. result = %d", result); - return BError(BError::Codes::OK, "success"); -} - -ErrCode ServiceProxy::UpdateSendRate(std::string &bundleName, int32_t sendRate, bool &result) -{ - HILOGD("ServiceProxy UpdateSendRate Begin."); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - if (!data.WriteString(bundleName)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send bundleName").GetCode(); - } - if (!data.WriteInt32(sendRate)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send sendRate").GetCode(); - } - MessageParcel reply; - MessageOption option; - option.SetWaitTime(BConstants::IPC_MAX_WAIT_TIME); - int32_t ret = Remote()->SendRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_UPDATE_SENDRATE), - data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - reply.ReadBool(result); - HILOGI("ServiceProxy UpdateSendRate end. ret = %{public}d", ret); - return BError(BError::Codes::OK, "success"); -} - -ErrCode ServiceProxy::ReportAppProcessInfo(const std::string processInfo, const BackupRestoreScenario sennario) -{ - HILOGD("ServiceProxy NotifyBundleProcessInfo Begin."); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - if (!data.WriteString(processInfo)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send bundleName").GetCode(); - } - if (!data.WriteInt32(static_cast(sennario))) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the scenario").GetCode(); - } - MessageParcel reply; - MessageOption option; - option.SetWaitTime(BConstants::IPC_MAX_WAIT_TIME); - int32_t ret = Remote()-> SendRequest(static_cast( - IServiceInterfaceCode::SERVICE_CMD_REPORT_APP_PROCESS_INFO), data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - HILOGI("ServiceProxy NotifyBundleProcessInfo end. ret = %{public}d", ret); - return BError(BError::Codes::OK, "success"); -} - -ErrCode ServiceProxy::StartExtTimer(bool &isExtStart) -{ - HILOGI("ServiceProxy StartExtTimer Begin."); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - MessageParcel reply; - MessageOption option; - option.SetWaitTime(BConstants::IPC_MAX_WAIT_TIME); - int32_t ret = Remote()->SendRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_START_EXT_TIMER), - data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - reply.ReadBool(isExtStart); - HILOGI("ServiceProxy StartExtTimer end. isExtStart = %d", isExtStart); - return BError(BError::Codes::OK, "success"); -} - -ErrCode ServiceProxy::StartFwkTimer(bool &isFwkStart) -{ - HILOGI("ServiceProxy StartFwkTimer Begin."); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - MessageParcel reply; - MessageOption option; - option.SetWaitTime(BConstants::IPC_MAX_WAIT_TIME); - int32_t ret = Remote()->SendRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_START_FWK_TIMER), - data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - reply.ReadBool(isFwkStart); - HILOGI("ServiceProxy StartFwkTimer end. isFwkStart = %d", isFwkStart); - return BError(BError::Codes::OK, "success"); -} - -ErrCode ServiceProxy::StopExtTimer(bool &isExtStop) -{ - HILOGI("ServiceProxy StopExtTimer Begin."); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - MessageParcel reply; - MessageOption option; - option.SetWaitTime(BConstants::IPC_MAX_WAIT_TIME); - int32_t ret = Remote()->SendRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_STOP_EXT_TIMER), - data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - reply.ReadBool(isExtStop); - HILOGI("ServiceProxy StopExtTimer end. isExtStop = %{public}d", isExtStop); - return BError(BError::Codes::OK, "success"); -} - -ErrCode ServiceProxy::RefreshDataSize(int64_t totalSize) -{ - HILOGI("ServiceProxy RefreshDatasize Begin."); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - if (!data.WriteInt64(totalSize)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write totalSize").GetCode(); - } - MessageParcel reply; - MessageOption option; - option.SetWaitTime(BConstants::IPC_MAX_WAIT_TIME); - int32_t ret = Remote()->SendRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_REFRESH_DATA_SIZE), - data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - bool result = false; - reply.ReadBool(result); - if (!result) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to Refresh Datasize").GetCode(); - } - return BError(BError::Codes::OK, "success"); -} - -UniqueFd ServiceProxy::GetLocalCapabilitiesForBundleInfos() -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - HILOGI("ServiceProxy, start GetLocalCapabilitiesForBundleInfos"); - if (Remote() == nullptr) { - HILOGE("Remote is nullptr"); - return UniqueFd(-EPERM); - } - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - HILOGE("Failed to write descriptor"); - return UniqueFd(-EPERM); - } - - MessageParcel reply; - MessageOption option; - option.SetWaitTime(BConstants::IPC_MAX_WAIT_TIME); - int32_t ret = Remote()->SendRequest(static_cast( - IServiceInterfaceCode::SERVICE_CMD_GET_LOCAL_CAPABILITIES_FOR_BUNDLE_INFOS), data, reply, option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - } - UniqueFd fd(reply.ReadFileDescriptor()); - HILOGI("ServiceProxy, end GetLocalCapabilitiesForBundleInfos"); - return fd; -} - -ErrCode ServiceProxy::GetBackupDataSize(bool isPreciseScan, vector bundleNameList) -{ - HILOGI("ServiceProxy GetBackupDataSize Begin."); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor())) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write descriptor").GetCode(); - } - if (!data.WriteBool(isPreciseScan)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write isPreciseScan").GetCode(); - } - if (!WriteParcelableVector(bundleNameList, data)) { - return BError(BError::Codes::SDK_INVAL_ARG, "Failed to write bundleNameList").GetCode(); - } - MessageParcel reply; - MessageOption option; - option.SetWaitTime(BConstants::IPC_MAX_WAIT_TIME); - int32_t ret = Remote()->SendRequest( - static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_BACKUP_DATA_SIZE), data, reply, option); - if (ret != NO_ERROR) { - string str = "Failed to send out the request because of " + to_string(ret); - return BError(BError::Codes::SDK_INVAL_ARG, str.data()).GetCode(); - } - return BError(BError::Codes::OK, "success"); -} -} // namespace OHOS::FileManagement::Backup diff --git a/frameworks/native/backup_kit_inner/src/service_reverse.cpp b/frameworks/native/backup_kit_inner/src/service_reverse.cpp index 100a0dd09d4f7ef62b1b06b943ee4baa4b93fb83..1a44b76a51c3012b39fdd13185a395644043cac0 100644 --- a/frameworks/native/backup_kit_inner/src/service_reverse.cpp +++ b/frameworks/native/backup_kit_inner/src/service_reverse.cpp @@ -21,137 +21,150 @@ namespace OHOS::FileManagement::Backup { using namespace std; -void ServiceReverse::BackupOnFileReady(string bundleName, string fileName, int fd, int32_t errCode) +ErrCode ServiceReverse::BackupOnFileReady(const std::string& bundleName, const std::string& fileName, int fd, int32_t errCode) { if (scenario_ != Scenario::BACKUP || !callbacksBackup_.onFileReady) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } BFileInfo bFileInfo(bundleName, fileName, 0); callbacksBackup_.onFileReady(bFileInfo, UniqueFd(fd), errCode); + return BError(BError::Codes::OK); } -void ServiceReverse::BackupOnBundleStarted(int32_t errCode, string bundleName) +ErrCode ServiceReverse::BackupOnBundleStarted(int32_t errCode, const std::string& bundleName) { if (scenario_ != Scenario::BACKUP || !callbacksBackup_.onBundleStarted) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksBackup_.onBundleStarted(errCode, bundleName); + return BError(BError::Codes::OK); } -void ServiceReverse::BackupOnResultReport(std::string result, std::string bundleName) +ErrCode ServiceReverse::BackupOnResultReport(const std::string& result, const std::string& bundleName) { if (scenario_ != Scenario::BACKUP || !callbacksBackup_.onResultReport) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksBackup_.onResultReport(bundleName, result); + return BError(BError::Codes::OK); } -void ServiceReverse::BackupOnBundleFinished(int32_t errCode, string bundleName) +ErrCode ServiceReverse::BackupOnBundleFinished(int32_t errCode, const std::string& bundleName) { if (scenario_ != Scenario::BACKUP || !callbacksBackup_.onBundleFinished) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } HILOGI("errCode = %{public}d, bundleName = %{public}s", errCode, bundleName.c_str()); callbacksBackup_.onBundleFinished(errCode, bundleName); + return BError(BError::Codes::OK); } -void ServiceReverse::BackupOnAllBundlesFinished(int32_t errCode) +ErrCode ServiceReverse::BackupOnAllBundlesFinished(int32_t errCode) { HILOGI("errCode = %{public}d", errCode); if (scenario_ != Scenario::BACKUP || !callbacksBackup_.onAllBundlesFinished) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksBackup_.onAllBundlesFinished(errCode); + return BError(BError::Codes::OK); } -void ServiceReverse::BackupOnProcessInfo(std::string bundleName, std::string processInfo) +ErrCode ServiceReverse::BackupOnProcessInfo(const std::string& bundleName, const std::string& processInfo) { HILOGI("bundleName = %{public}s", bundleName.c_str()); if (scenario_ != Scenario::BACKUP || !callbacksBackup_.onProcess) { HILOGI("Error scenario or callback is nullptr"); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksBackup_.onProcess(bundleName, processInfo); + return BError(BError::Codes::OK); } -void ServiceReverse::BackupOnScanningInfo(std::string scannedInfo) +ErrCode ServiceReverse::BackupOnScanningInfo(const std::string& scannedInfo) { if (scenario_ != Scenario::BACKUP || !callbacksBackup_.onBackupSizeReport) { HILOGE("Error scenario or callback is nullptr"); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksBackup_.onBackupSizeReport(scannedInfo); + return BError(BError::Codes::OK); } -void ServiceReverse::RestoreOnBundleStarted(int32_t errCode, string bundleName) +ErrCode ServiceReverse::RestoreOnBundleStarted(int32_t errCode, const std::string& bundleName) { if (scenario_ != Scenario::RESTORE || !callbacksRestore_.onBundleStarted) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksRestore_.onBundleStarted(errCode, bundleName); + return BError(BError::Codes::OK); } -void ServiceReverse::RestoreOnBundleFinished(int32_t errCode, string bundleName) +ErrCode ServiceReverse::RestoreOnBundleFinished(int32_t errCode, const std::string& bundleName) { if (scenario_ != Scenario::RESTORE || !callbacksRestore_.onBundleFinished) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } HILOGI("errCode = %{public}d, bundleName = %{public}s", errCode, bundleName.c_str()); callbacksRestore_.onBundleFinished(errCode, bundleName); + return BError(BError::Codes::OK); } -void ServiceReverse::RestoreOnAllBundlesFinished(int32_t errCode) +ErrCode ServiceReverse::RestoreOnAllBundlesFinished(int32_t errCode) { HILOGI("errCode = %{public}d", errCode); if (scenario_ != Scenario::RESTORE || !callbacksRestore_.onAllBundlesFinished) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksRestore_.onAllBundlesFinished(errCode); + return BError(BError::Codes::OK); } -void ServiceReverse::RestoreOnFileReady(string bundleName, string fileName, int fd, int32_t errCode) +ErrCode ServiceReverse::RestoreOnFileReady(const std::string& bundleName, const std::string& fileName, int fd, int32_t errCode) { HILOGD("begin, bundleName is:%{public}s", bundleName.c_str()); if (scenario_ != Scenario::RESTORE || !callbacksRestore_.onFileReady) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } BFileInfo bFileInfo(bundleName, fileName, 0); callbacksRestore_.onFileReady(bFileInfo, UniqueFd(fd), errCode); + return BError(BError::Codes::OK); } -void ServiceReverse::RestoreOnResultReport(string result, std::string bundleName, ErrCode errCode) +ErrCode ServiceReverse::RestoreOnResultReport(const std::string& result, const std::string& bundleName, ErrCode errCode) { HILOGI("ServiceReverse RestoreOnResultReport bundle %{public}s begin with result: %{public}s", bundleName.c_str(), result.c_str()); if (scenario_ != Scenario::RESTORE || !callbacksRestore_.onResultReport) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksRestore_.onResultReport(bundleName, result); if (scenario_ != Scenario::RESTORE || !callbacksRestore_.onBundleFinished) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksRestore_.onBundleFinished(errCode, bundleName); + return BError(BError::Codes::OK); } -void ServiceReverse::RestoreOnProcessInfo(std::string bundleName, std::string processInfo) +ErrCode ServiceReverse::RestoreOnProcessInfo(const std::string& bundleName, const std::string& processInfo) { HILOGI("bundleName = %{public}s", bundleName.c_str()); if (scenario_ != Scenario::RESTORE || !callbacksRestore_.onProcess) { HILOGI("Error scenario or callback is nullptr"); - return; + return BError(BError::Codes::SA_BROKEN_IPC); } callbacksRestore_.onProcess(bundleName, processInfo); + return BError(BError::Codes::OK); } ServiceReverse::ServiceReverse(BSessionBackup::Callbacks callbacks) diff --git a/frameworks/native/backup_kit_inner/src/service_reverse_stub.cpp b/frameworks/native/backup_kit_inner/src/service_reverse_stub.cpp deleted file mode 100644 index 2fae0a24aa3980a95bbdb7700849d9f10f8720ee..0000000000000000000000000000000000000000 --- a/frameworks/native/backup_kit_inner/src/service_reverse_stub.cpp +++ /dev/null @@ -1,359 +0,0 @@ -/* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "service_reverse_stub.h" - -#include -#include - -#include "b_error/b_error.h" -#include "filemgmt_libhilog.h" - -namespace OHOS::FileManagement::Backup { -using namespace std; -const int INVALID_FD = -1; -int32_t ServiceReverseStub::OnRemoteRequest(uint32_t code, - MessageParcel &data, - MessageParcel &reply, - MessageOption &option) -{ - const std::u16string descriptor = ServiceReverseStub::GetDescriptor(); - const std::u16string remoteDescriptor = data.ReadInterfaceToken(); - if (descriptor != remoteDescriptor) { - return BError(BError::Codes::SA_INVAL_ARG, "Invalid remote descriptor"); - } - - HILOGD("Begin to call procedure indexed %{public}u", code); - auto interfaceIndex = opToInterfaceMap_.find(code); - if (interfaceIndex == opToInterfaceMap_.end() || !interfaceIndex->second) { - HILOGE("Cannot response request %{public}d : unknown procedure", code); - return IPCObjectStub::OnRemoteRequest(code, data, reply, option); - } - return (this->*(interfaceIndex->second))(data, reply); -} -void ServiceReverseStub::ServiceReverseStubSupplement() -{ - opToInterfaceMap_[static_cast( - IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_SCANNED_INFO)] = - &ServiceReverseStub::CmdIncrementalBackupOnScanningInfo; - opToInterfaceMap_[static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_RESTORE_ON_FILE_READY)] = - &ServiceReverseStub::CmdIncrementalRestoreOnFileReady; - opToInterfaceMap_[static_cast( - IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_RESTORE_ON_SUB_TASK_STARTED)] = - &ServiceReverseStub::CmdIncrementalRestoreOnBundleStarted; - opToInterfaceMap_[static_cast( - IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_RESTORE_ON_RESULT_REPORT)] = - &ServiceReverseStub::CmdIncrementalRestoreOnResultReport; - opToInterfaceMap_[static_cast( - IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_RESTORE_ON_SUB_TASK_FINISHED)] = - &ServiceReverseStub::CmdIncrementalRestoreOnBundleFinished; - opToInterfaceMap_[static_cast( - IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_RESTORE_ON_TASK_FINISHED)] = - &ServiceReverseStub::CmdIncrementalRestoreOnAllBundlesFinished; - opToInterfaceMap_[static_cast( - IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_RESTORE_ON_PROCESS_INFO)] = - &ServiceReverseStub::CmdIncrementalRestoreOnProcessInfo; -} - -ServiceReverseStub::ServiceReverseStub() -{ - opToInterfaceMap_[static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_FILE_READY)] = - &ServiceReverseStub::CmdBackupOnFileReady; - opToInterfaceMap_[static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_SUB_TASK_STARTED)] = - &ServiceReverseStub::CmdBackupOnBundleStarted; - opToInterfaceMap_[static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_RESULT_REPORT)] = - &ServiceReverseStub::CmdBackupOnResultReport; - opToInterfaceMap_[static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_SUB_TASK_FINISHED)] = - &ServiceReverseStub::CmdBackupOnBundleFinished; - opToInterfaceMap_[static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_TASK_FINISHED)] = - &ServiceReverseStub::CmdBackupOnAllBundlesFinished; - opToInterfaceMap_[static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_PROCESS_INFO)] = - &ServiceReverseStub::CmdBackupOnProcessInfo; - opToInterfaceMap_[static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_SCANNED_INFO)] = - &ServiceReverseStub::CmdBackupOnScanningInfo; - - opToInterfaceMap_[static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_FILE_READY)] = - &ServiceReverseStub::CmdRestoreOnFileReady; - opToInterfaceMap_[static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_SUB_TASK_STARTED)] = - &ServiceReverseStub::CmdRestoreOnBundleStarted; - opToInterfaceMap_[static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_RESULT_REPORT)] = - &ServiceReverseStub::CmdRestoreOnResultReport; - opToInterfaceMap_[static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_SUB_TASK_FINISHED)] = - &ServiceReverseStub::CmdRestoreOnBundleFinished; - opToInterfaceMap_[static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_TASK_FINISHED)] = - &ServiceReverseStub::CmdRestoreOnAllBundlesFinished; - opToInterfaceMap_[static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_PROCESS_INFO)] = - &ServiceReverseStub::CmdRestoreOnProcessInfo; - - opToInterfaceMap_[static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_FILE_READY)] = - &ServiceReverseStub::CmdIncrementalBackupOnFileReady; - opToInterfaceMap_[static_cast( - IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_SUB_TASK_STARTED)] = - &ServiceReverseStub::CmdIncrementalBackupOnBundleStarted; - opToInterfaceMap_[static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_RESULT_REPORT)] - = &ServiceReverseStub::CmdIncrementalBackupOnResultReport; - opToInterfaceMap_[static_cast( - IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_SUB_TASK_FINISHED)] = - &ServiceReverseStub::CmdIncrementalBackupOnBundleFinished; - opToInterfaceMap_[static_cast( - IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_TASK_FINISHED)] = - &ServiceReverseStub::CmdIncrementalBackupOnAllBundlesFinished; - opToInterfaceMap_[static_cast( - IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_PROCESS_INFO)] = - &ServiceReverseStub::CmdIncrementalBackupOnProcessInfo; - ServiceReverseStubSupplement(); -} - -int32_t ServiceReverseStub::CmdBackupOnFileReady(MessageParcel &data, MessageParcel &reply) -{ - auto bundleName = data.ReadString(); - auto fileName = data.ReadString(); - int fd = INVALID_FD; - bool fdFlag = data.ReadBool(); - if (fdFlag == true) { - fd = data.ReadFileDescriptor(); - } - int32_t errCode = data.ReadInt32(); - BackupOnFileReady(bundleName, fileName, fd, errCode); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdBackupOnResultReport(MessageParcel &data, MessageParcel &reply) -{ - std::string result = data.ReadString(); - std::string bundleName = data.ReadString(); - BackupOnResultReport(result, bundleName); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdBackupOnBundleStarted(MessageParcel &data, MessageParcel &reply) -{ - int32_t errCode = data.ReadInt32(); - auto bundleName = data.ReadString(); - BackupOnBundleStarted(errCode, bundleName); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdBackupOnBundleFinished(MessageParcel &data, MessageParcel &reply) -{ - int32_t errCode = data.ReadInt32(); - auto bundleName = data.ReadString(); - BackupOnBundleFinished(errCode, bundleName); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdBackupOnAllBundlesFinished(MessageParcel &data, MessageParcel &reply) -{ - int32_t errCode = data.ReadInt32(); - BackupOnAllBundlesFinished(errCode); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdBackupOnProcessInfo(MessageParcel &data, MessageParcel &reply) -{ - std::string bundleName = data.ReadString(); - std::string processInfo = data.ReadString(); - BackupOnProcessInfo(bundleName, processInfo); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdBackupOnScanningInfo(MessageParcel &data, MessageParcel &reply) -{ - std::string scannedInfo = data.ReadString(); - BackupOnScanningInfo(scannedInfo); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdRestoreOnBundleStarted(MessageParcel &data, MessageParcel &reply) -{ - int32_t errCode = data.ReadInt32(); - auto bundleName = data.ReadString(); - RestoreOnBundleStarted(errCode, bundleName); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdRestoreOnBundleFinished(MessageParcel &data, MessageParcel &reply) -{ - int32_t errCode = data.ReadInt32(); - auto bundleName = data.ReadString(); - RestoreOnBundleFinished(errCode, bundleName); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdRestoreOnAllBundlesFinished(MessageParcel &data, MessageParcel &reply) -{ - int32_t errCode = data.ReadInt32(); - RestoreOnAllBundlesFinished(errCode); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdRestoreOnFileReady(MessageParcel &data, MessageParcel &reply) -{ - auto bundleName = data.ReadString(); - auto fileName = data.ReadString(); - int fd = INVALID_FD; - bool fdFlag = data.ReadBool(); - if (fdFlag == true) { - fd = data.ReadFileDescriptor(); - } - int32_t errCode = data.ReadInt32(); - RestoreOnFileReady(bundleName, fileName, fd, errCode); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdRestoreOnResultReport(MessageParcel &data, MessageParcel &reply) -{ - std::string result; - if (!data.ReadString(result)) { - return BError(BError::Codes::EXT_INVAL_ARG, "Failed to read result").GetCode(); - } - std::string bundleName; - if (!data.ReadString(bundleName)) { - return BError(BError::Codes::EXT_INVAL_ARG, "Failed to read bundleName").GetCode(); - } - ErrCode errCode; - if (!data.ReadInt32(errCode)) { - return BError(BError::Codes::EXT_INVAL_ARG, "Failed to read errCode").GetCode(); - } - RestoreOnResultReport(result, bundleName, errCode); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdRestoreOnProcessInfo(MessageParcel &data, MessageParcel &reply) -{ - std::string bundleName = data.ReadString(); - std::string processInfo = data.ReadString(); - RestoreOnProcessInfo(bundleName, processInfo); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdIncrementalBackupOnFileReady(MessageParcel &data, MessageParcel &reply) -{ - auto bundleName = data.ReadString(); - auto fileName = data.ReadString(); - int fd = INVALID_FD; - int manifestFd = INVALID_FD; - bool fdFlag = data.ReadBool(); - if (fdFlag == true) { - fd = data.ReadFileDescriptor(); - manifestFd = data.ReadFileDescriptor(); - } - int32_t errCode = data.ReadInt32(); - IncrementalBackupOnFileReady(bundleName, fileName, fd, manifestFd, errCode); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdIncrementalBackupOnBundleStarted(MessageParcel &data, MessageParcel &reply) -{ - int32_t errCode = data.ReadInt32(); - auto bundleName = data.ReadString(); - IncrementalBackupOnBundleStarted(errCode, bundleName); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdIncrementalBackupOnResultReport(MessageParcel &data, MessageParcel &reply) -{ - std::string result = data.ReadString(); - std::string bundleName = data.ReadString(); - IncrementalBackupOnResultReport(result, bundleName); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdIncrementalBackupOnBundleFinished(MessageParcel &data, MessageParcel &reply) -{ - int32_t errCode = data.ReadInt32(); - auto bundleName = data.ReadString(); - IncrementalBackupOnBundleFinished(errCode, bundleName); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdIncrementalBackupOnAllBundlesFinished(MessageParcel &data, MessageParcel &reply) -{ - int32_t errCode = data.ReadInt32(); - IncrementalBackupOnAllBundlesFinished(errCode); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdIncrementalBackupOnProcessInfo(MessageParcel &data, MessageParcel &reply) -{ - std::string bundleName = data.ReadString(); - std::string processInfo = data.ReadString(); - IncrementalBackupOnProcessInfo(bundleName, processInfo); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdIncrementalBackupOnScanningInfo(MessageParcel &data, MessageParcel &reply) -{ - std::string scannedInfo = data.ReadString(); - IncrementalBackupOnScanningInfo(scannedInfo); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdIncrementalRestoreOnBundleStarted(MessageParcel &data, MessageParcel &reply) -{ - int32_t errCode = data.ReadInt32(); - auto bundleName = data.ReadString(); - IncrementalRestoreOnBundleStarted(errCode, bundleName); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdIncrementalRestoreOnBundleFinished(MessageParcel &data, MessageParcel &reply) -{ - int32_t errCode = data.ReadInt32(); - auto bundleName = data.ReadString(); - IncrementalRestoreOnBundleFinished(errCode, bundleName); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdIncrementalRestoreOnAllBundlesFinished(MessageParcel &data, MessageParcel &reply) -{ - int32_t errCode = data.ReadInt32(); - IncrementalRestoreOnAllBundlesFinished(errCode); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdIncrementalRestoreOnFileReady(MessageParcel &data, MessageParcel &reply) -{ - auto bundleName = data.ReadString(); - auto fileName = data.ReadString(); - int fd = INVALID_FD; - int manifestFd = INVALID_FD; - bool fdFlag = data.ReadBool(); - if (fdFlag == true) { - fd = data.ReadFileDescriptor(); - manifestFd = data.ReadFileDescriptor(); - } - int32_t errCode = data.ReadInt32(); - IncrementalRestoreOnFileReady(bundleName, fileName, fd, manifestFd, errCode); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdIncrementalRestoreOnResultReport(MessageParcel &data, MessageParcel &reply) -{ - auto result = data.ReadString(); - auto bundleName = data.ReadString(); - ErrCode errCode = data.ReadInt32(); - IncrementalRestoreOnResultReport(result, bundleName, errCode); - return BError(BError::Codes::OK); -} - -int32_t ServiceReverseStub::CmdIncrementalRestoreOnProcessInfo(MessageParcel &data, MessageParcel &reply) -{ - auto bundleName = data.ReadString(); - auto processInfo = data.ReadString(); - IncrementalRestoreOnProcessInfo(bundleName, processInfo); - return BError(BError::Codes::OK); -} -} // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/interfaces/inner_api/native/backup_kit_inner/BUILD.gn b/interfaces/inner_api/native/backup_kit_inner/BUILD.gn index 45fe3c878b4290e2d7057ef906c917edc01f81ca..2ceda9e2c893a339fe39e5f07e30d00bffa31444 100644 --- a/interfaces/inner_api/native/backup_kit_inner/BUILD.gn +++ b/interfaces/inner_api/native/backup_kit_inner/BUILD.gn @@ -11,14 +11,149 @@ # See the License for the specific language governing permissions and # limitations under the License. +import("//build/config/components/idl_tool/idl.gni") import("//build/ohos.gni") import("//build/ohos_var.gni") import("//foundation/filemanagement/app_file_service/backup.gni") +idl_gen_interface("backup_idl") { + sources = [ + "IExtension.idl", + "IService.idl", + "IServiceReverse.idl", + ] + sources_common = [ + "ServiceReverseType.idl", + "ExtensionType.idl", + "ServiceReverseInnerType.idl", + ] + hitrace = "HITRACE_TAG_FILEMANAGEMENT" + log_domainid = "0xD004313" + log_tag = "AppFileService" +} + +config("public_idl_config") { + include_dirs = [ + ".", + "${target_gen_dir}/", + ] +} + +ohos_source_set("backup_kit_inner_ipc") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } + output_values = get_target_outputs(":backup_idl") + + sources = [] + + sources += filter_include(output_values, [ "*.cpp" ]) + + public_configs = [ ":public_idl_config" ] + + deps = [ ":backup_idl" ] + + external_deps = [ + "c_utils:utils", + "hilog:libhilog", + "hitrace:hitrace_meter", + "ipc:ipc_core", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", + ] + + include_dirs = [ + ".", + "impl", + "${target_gen_dir}/", + ] + + part_name = "app_file_service" + + subsystem_name = "filemanagement" +} + +ohos_source_set("backup_kit_inner_ipc_type") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } + output_values = get_target_outputs(":backup_idl") + + sources = [] + + sources += filter_include(output_values, [ "*_type.cpp" ]) + + public_configs = [ ":public_idl_config" ] + + deps = [ ":backup_idl" ] + + external_deps = [ + "c_utils:utils", + "hilog:libhilog", + "hitrace:hitrace_meter", + "ipc:ipc_core", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", + ] + + include_dirs = [ + ".", + "${target_gen_dir}/", + ] + + part_name = "app_file_service" + + subsystem_name = "filemanagement" +} + +ohos_source_set("backup_kit_inner_ipc_stub") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } + output_values = get_target_outputs(":backup_idl") + + sources = [ "${target_gen_dir}/service_reverse_stub.cpp" ] + + sources += filter_include(output_values, + [ + "service_reverse_stub.cpp", + "service_reverse_stub.h", + "extension_type.cpp", + ]) + public_configs = [ ":public_idl_config" ] + + deps = [ ":backup_idl" ] + + external_deps = [ + "c_utils:utils", + "hilog:libhilog", + "hitrace:hitrace_meter", + "ipc:ipc_core", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", + ] + + include_dirs = [ + ".", + "${target_gen_dir}/", + ] + + part_name = "app_file_service" + + subsystem_name = "filemanagement" +} + config("public_config") { include_dirs = [ ".", "impl", + "${target_gen_dir}/", ] } @@ -52,11 +187,9 @@ ohos_shared_library("backup_kit_inner") { "${path_backup}/frameworks/native/backup_kit_inner/src/b_session_backup.cpp", "${path_backup}/frameworks/native/backup_kit_inner/src/b_session_restore.cpp", "${path_backup}/frameworks/native/backup_kit_inner/src/b_session_restore_async.cpp", - "${path_backup}/frameworks/native/backup_kit_inner/src/service_incremental_proxy.cpp", + "${path_backup}/frameworks/native/backup_kit_inner/src/service_client.cpp", "${path_backup}/frameworks/native/backup_kit_inner/src/service_incremental_reverse.cpp", - "${path_backup}/frameworks/native/backup_kit_inner/src/service_proxy.cpp", "${path_backup}/frameworks/native/backup_kit_inner/src/service_reverse.cpp", - "${path_backup}/frameworks/native/backup_kit_inner/src/service_reverse_stub.cpp", ] defines = [ @@ -76,7 +209,10 @@ ohos_shared_library("backup_kit_inner") { "samgr:samgr_proxy", ] - deps = [ "${path_backup}/utils:backup_utils" ] + deps = [ + ":backup_kit_inner_ipc", + "${path_backup}/utils:backup_utils", + ] cflags_cc = [ "-fdata-sections", diff --git a/interfaces/inner_api/native/backup_kit_inner/ExtensionType.idl b/interfaces/inner_api/native/backup_kit_inner/ExtensionType.idl new file mode 100644 index 0000000000000000000000000000000000000000..2cc8f3261da45181dba6b083e700fb0507a19b1a --- /dev/null +++ b/interfaces/inner_api/native/backup_kit_inner/ExtensionType.idl @@ -0,0 +1,22 @@ +/* + * 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. + */ + +package OHOS.FileManagement.Backup.ExtensionType; + +struct UniqueFdGroup { + int fd; + int reportFd; + int errCode; +}; \ No newline at end of file diff --git a/interfaces/inner_api/native/backup_kit_inner/IExtension.idl b/interfaces/inner_api/native/backup_kit_inner/IExtension.idl new file mode 100644 index 0000000000000000000000000000000000000000..d4ee3d4d6909a379e6f604e11f670315e18d00e4 --- /dev/null +++ b/interfaces/inner_api/native/backup_kit_inner/IExtension.idl @@ -0,0 +1,31 @@ +/* + * 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. + */ + +import ExtensionType; +interface OHOS.FileManagement.Backup.IExtension{ + [ipccode 1] void GetFileHandleWithUniqueFd([in] String fileName, [out] int getFileHandleErrCode, [out] int fd); + [ipccode 2] void HandleClear(); + [ipccode 3] void HandleBackup([in] boolean isClearData); + [ipccode 4] void PublishFile([in] String fileName); + [ipccode 5] void HandleRestore([in] boolean isClearData); + [ipccode 6] void GetIncrementalFileHandleWithUniqueFdGroup([in] String fileName, [out] UniqueFdGroup fdGroup); + [ipccode 7] void PublishIncrementalFile([in] String fileName); + [ipccode 8] void HandleIncrementalBackup([in] int incrementalFd, [in] int manifestFd); + [ipccode 9] void IncrementalOnBackup([in] boolean isClearData); + [ipccode 10] void GetIncrementalBackupFileHandleWithUniqueFdGroup([out] UniqueFdGroup fdGroup); + [ipccode 11] void GetBackupInfo([out] String getBackupInfoResult); + [ipccode 12] void UpdateFdSendRate([in] String bundleName, [in] int sendRate); + [ipccode 13] void User0OnBackup(); +} \ No newline at end of file diff --git a/interfaces/inner_api/native/backup_kit_inner/IService.idl b/interfaces/inner_api/native/backup_kit_inner/IService.idl new file mode 100644 index 0000000000000000000000000000000000000000..adc0707db209af689d0b329e0a97b191f5605b96 --- /dev/null +++ b/interfaces/inner_api/native/backup_kit_inner/IService.idl @@ -0,0 +1,72 @@ +/* + * 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. + */ + +package OHOS.FileManagement.Backup; +import IServiceReverse; +import ServiceReverseType; +sequenceable BackupFileInfo..OHOS.FileManagement.Backup.BFileInfo; +sequenceable BackupIncrementalData..OHOS.FileManagement.Backup.BIncrementalData; +interface OHOS.FileManagement.Backup.IService{ + [ipccode 999] void InitRestoreSession([out] IServiceReverse reverseIpcRemoteObject); + [ipccode 1] void InitRestoreSessionWithErrMsg([out] IServiceReverse reverseIpcRemoteObject, [out] String errMsg); + [ipccode 2] void InitBackupSession([out] IServiceReverse reverseIpcRemoteObject); + [ipccode 3] void InitBackupSessionWithErrMsg([out] IServiceReverse reverseIpcRemoteObject, [out] String errMsg); + [ipccode 4] void Start(); + [ipccode 5] void GetLocalCapabilitiesWithUniqueFd([out] int fd); + [ipccode 6] void GetLocalCapabilitiesForBundleInfos([out] int fd); + [ipccode 7] void PublishFile([in] BFileInfo fileInfo); + [oneway, ipccode 8] void GetFileHandle([in] String bundleName, [in] String fileName); + [ipccode 9] void AppendBundlesRestoreSessionRestoreDataWaitSend([in] int fd, + [in] String [] bundleNames, + [in] String [] detailInfos, + [in] int restoreType, + [in] int userId); + [ipccode 10] void AppendBundlesRestoreSessionRestoreDataWaitReady([in] int fd, + [in] String [] bundleNames, + [in] int restoreType, + [in] int userId); + [ipccode 11] void AppendBundlesBackupSession([in] String[] bundleNames ); + [ipccode 12] void AppendBundlesDetailsBackupSession([in] String [] bundleNames, [in] String [] bundleInfos); + [ipccode 13] void Finish(); + [ipccode 14] void Release(); + [ipccode 15] void Cancel([in] String bundleName, [out] int cancelResult); + [ipccode 16] void GetAppLocalListAndDoIncrementalBackup(); + [ipccode 17] void GetIncrementalFileHandle([in] String bundleName, [in] String fileName); + [ipccode 18] void GetBackupInfo([out] String bundleName, [out] String getBackupInfoResult); + [ipccode 19] void UpdateTimer([out] String bundleName, [in] unsigned int timeout, [out] boolean updateTimerResult); + [ipccode 20] void UpdateSendRate([out] String bundleName, [in] int sendRate, [out] boolean updateSendRateResult); + [ipccode 21] void StartExtTimer([out] boolean isExtStart); + [ipccode 22] void StartFwkTimer([out] boolean isFwkStart); + [ipccode 23] void StopExtTimer([out] boolean isExtStop); + [ipccode 24] void GetLocalCapabilitiesIncremental([in] BIncrementalData[] bundleNames, [out] int fd); + [ipccode 25] void InitIncrementalBackupSession([out] IServiceReverse reverseIpcRemoteObject); + [ipccode 26] void InitIncrementalBackupSessionWithErrMsg([out] IServiceReverse reverseIpcRemoteObject, + [out] String errMsg); + [ipccode 27] void AppendBundlesIncrementalBackupSession([in] BIncrementalData[] bundlesToBackup); + [ipccode 28] void AppendBundlesIncrementalBackupSessionWithBundleInfos([in] BIncrementalData[] bundlesToBackup, + [in]String[] bundleInfos); + [ipccode 29] void PublishIncrementalFile([in] BFileInfo fileInfo); + [ipccode 30] void PublishSAIncrementalFile([in] BFileInfo fileInfo, [in] int fd); + [ipccode 31] void AppIncrementalFileReady([in] String fileName, [in] int fd, [in] int manifestFd, + [in] int appIncrementalFileReadyErrCode); + [ipccode 32] void AppIncrementalDone([in] int appIncrementalDoneErrCode); + [ipccode 33] void ReportAppProcessInfo([in] String processInfo, [in] BackupRestoreScenario scenario); + [ipccode 34] void RefreshDataSize([in] long totalDataSize); + [ipccode 35] void AppDone([in] int appDoneErrCode); + [ipccode 36] void AppFileReady([in]String fileName, [in] int fd, [in] int appFileReadyErrCode); + [ipccode 37] void ServiceResultReport([in]String restoreRetInfo, [in] BackupRestoreScenario sennario, + [in] int serviceResultReportErrCode); + [ipccode 38] void GetBackupDataSize([in] boolean isPreciseScan,[in] BIncrementalData[] bundleNameList); + } \ No newline at end of file diff --git a/interfaces/inner_api/native/backup_kit_inner/IServiceReverse.idl b/interfaces/inner_api/native/backup_kit_inner/IServiceReverse.idl new file mode 100644 index 0000000000000000000000000000000000000000..330a97269d2196fb43217b0eebebfc679effd522 --- /dev/null +++ b/interfaces/inner_api/native/backup_kit_inner/IServiceReverse.idl @@ -0,0 +1,61 @@ +/* + * 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. + */ + +package OHOS.FileManagement.Backup; + +import ServiceReverseType; +import ServiceReverseInnerType; +interface OHOS.FileManagement.Backup.IServiceReverse{ + [ipccode 999] void BackupOnBundleStarted([in] int backupOnBundleStartedErrCode, [in] String bundleName); + [ipccode 1] void BackupOnFileReady([in] String bundleName, [in] String fileName, [in] int fd, + [in] int backupOnFileReadyErrCode); + [ipccode 2] void BackupOnResultReport([in] String myResult, [in] String bundleName); + [ipccode 3] void BackupOnBundleFinished([in] int backupOnBundleFinishedErrCode, [in] String bundleName); + [ipccode 4] void BackupOnAllBundlesFinished([in] int backupOnAllBundlesFinishedErrCode); + [ipccode 5] void BackupOnProcessInfo([in] String bundleName, [in] String processInfo); + [ipccode 6] void BackupOnScanningInfo([in] String scannedInfo); + [ipccode 7] void RestoreOnBundleStarted([in] int restoreOnBundleStartedErrCode, [in] String bundleName); + [ipccode 8] void RestoreOnFileReady([in] String bundleName, [in] String fileName, [in] int fd, + [in] int restoreOnFileReadyErrCode); + [ipccode 9] void RestoreOnResultReport([in] String myResult, [in] String bundleName, + [in] int restoreOnResultReportErrCode); + [ipccode 10] void RestoreOnBundleFinished([in] int restoreOnBundleFinishedErrCode, [in] String bundleName); + [ipccode 11] void RestoreOnAllBundlesFinished([in] int restoreOnAllBundlesFinishedErrCode); + [ipccode 12] void RestoreOnProcessInfo([in] String bundleName, [in] String processInfo); + + [ipccode 13] void IncrementalBackupOnBundleStarted([in] int incrementalBackupOnBundleStartedErrCode, + [in] String bundleName); + [ipccode 14] void IncrementalBackupOnFileReady([in] String bundleName, [in] String fileName,[in] int fd, + [in] int manifestFd, [in] int incrementalBackupOnFileReadyErrCode); + [ipccode 15] void IncrementalBackupOnResultReport([in] String myResult, [in] String bundleName); + [ipccode 16] void IncrementalBackupOnBundleFinished([in] int incrementalBackupOnBundleFinishedErrCode, + [in] String bundleName); + [ipccode 17] void IncrementalBackupOnAllBundlesFinished([in] int incrementalBackupOnAllBundlesFinishedErrCode); + [ipccode 18] void IncrementalBackupOnProcessInfo([in] String bundleName, [in] String processInfo); + [ipccode 19] void IncrementalBackupOnScanningInfo([in] String scannedInfo); + + [ipccode 20] void IncrementalRestoreOnBundleStarted([in] int incrementalRestoreOnBundleStartedErrCode, + [in] String bundleName); + [ipccode 21] void IncrementalRestoreOnFileReady([in] String bundleName, + [in] String fileName, + [in] int fd, + [in] int manifestFd, [in] int incrementalRestoreOnFileReadyErrCode); + [ipccode 22] void IncrementalRestoreOnResultReport([in] String myResult, [in] String bundleName, + [in] int incrementalRestoreOnResultReportErrCode); + [ipccode 23] void IncrementalRestoreOnBundleFinished([in] int incrementalRestoreOnBundleFinishedErrCode, + [in] String bundleName); + [ipccode 24] void IncrementalRestoreOnAllBundlesFinished([in] int incrementalRestoreOnAllBundlesFinishedErrCode); + [ipccode 25] void IncrementalRestoreOnProcessInfo( [in] String bundleName, [in] String processInfo); +} \ No newline at end of file diff --git a/interfaces/inner_api/native/backup_kit_inner/ServiceReverseInnerType.idl b/interfaces/inner_api/native/backup_kit_inner/ServiceReverseInnerType.idl new file mode 100644 index 0000000000000000000000000000000000000000..85cd436dd63cec45954c1e5d031b587b287e93d4 --- /dev/null +++ b/interfaces/inner_api/native/backup_kit_inner/ServiceReverseInnerType.idl @@ -0,0 +1,23 @@ +/* + * 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. + */ + +package OHOS.FileManagement.Backup.IServiceReverseType; + +enum Scenario { + UNDEFINED, + BACKUP, + RESTORE, + CLEAN, +}; diff --git a/interfaces/inner_api/native/backup_kit_inner/ServiceReverseType.idl b/interfaces/inner_api/native/backup_kit_inner/ServiceReverseType.idl new file mode 100644 index 0000000000000000000000000000000000000000..3e89100461cf9ae70fe242fceabbb60cf18a55fe --- /dev/null +++ b/interfaces/inner_api/native/backup_kit_inner/ServiceReverseType.idl @@ -0,0 +1,24 @@ +/* + * 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. + */ + +package OHOS.FileManagement.Backup; + +enum BackupRestoreScenario { + FULL_BACKUP = 0, + INCREMENTAL_BACKUP = 1, + FULL_RESTORE = 2, + INCREMENTAL_RESTORE = 3, +}; + diff --git a/interfaces/inner_api/native/backup_kit_inner/impl/b_incremental_backup_session.h b/interfaces/inner_api/native/backup_kit_inner/impl/b_incremental_backup_session.h index 934cb55932ecd6126b7085ffc6841d1d4097775c..339c47266ee22fa1cf2caa328f8ff22c13133ac4 100644 --- a/interfaces/inner_api/native/backup_kit_inner/impl/b_incremental_backup_session.h +++ b/interfaces/inner_api/native/backup_kit_inner/impl/b_incremental_backup_session.h @@ -20,8 +20,8 @@ #include #include -#include "b_file_info.h" -#include "b_incremental_data.h" +#include "backup_file_info.h" +#include "backup_incremental_data.h" #include "errors.h" #include "svc_death_recipient.h" #include "unique_fd.h" diff --git a/interfaces/inner_api/native/backup_kit_inner/impl/b_incremental_restore_session.h b/interfaces/inner_api/native/backup_kit_inner/impl/b_incremental_restore_session.h index 3b0e46a9c3498b43dd10d39241405d9080a2c92e..d671cebed52235551625c2ecea02a58bab148cd8 100644 --- a/interfaces/inner_api/native/backup_kit_inner/impl/b_incremental_restore_session.h +++ b/interfaces/inner_api/native/backup_kit_inner/impl/b_incremental_restore_session.h @@ -20,8 +20,8 @@ #include #include -#include "b_file_info.h" -#include "b_incremental_data.h" +#include "backup_file_info.h" +#include "backup_incremental_data.h" #include "errors.h" #include "svc_death_recipient.h" #include "unique_fd.h" diff --git a/interfaces/inner_api/native/backup_kit_inner/impl/b_incremental_session_restore_async.h b/interfaces/inner_api/native/backup_kit_inner/impl/b_incremental_session_restore_async.h index 50c47bf7b38d46e8f391efa7fcccd4c2e43fdc68..275df6f21a6a55d8ef48a3cedaedab9b32228ec9 100644 --- a/interfaces/inner_api/native/backup_kit_inner/impl/b_incremental_session_restore_async.h +++ b/interfaces/inner_api/native/backup_kit_inner/impl/b_incremental_session_restore_async.h @@ -22,9 +22,10 @@ #include #include -#include "b_file_info.h" +#include "backup_file_info.h" #include "errors.h" -#include "i_service.h" +#include "iservice.h" +#include "service_common.h" #include "svc_death_recipient.h" #include "unique_fd.h" diff --git a/interfaces/inner_api/native/backup_kit_inner/impl/b_session_backup.h b/interfaces/inner_api/native/backup_kit_inner/impl/b_session_backup.h index 0fbcb4dc26fd04246e0c79551af32dcc6da08726..fb4b06d1a5d7365d1c0357b8e6fa0b941aad6fa5 100644 --- a/interfaces/inner_api/native/backup_kit_inner/impl/b_session_backup.h +++ b/interfaces/inner_api/native/backup_kit_inner/impl/b_session_backup.h @@ -20,8 +20,8 @@ #include #include -#include "b_file_info.h" -#include "b_incremental_data.h" +#include "backup_file_info.h" +#include "backup_incremental_data.h" #include "errors.h" #include "errors.h" #include "svc_death_recipient.h" diff --git a/interfaces/inner_api/native/backup_kit_inner/impl/b_session_restore.h b/interfaces/inner_api/native/backup_kit_inner/impl/b_session_restore.h index 7aa5fdcd8fe50ad7082eaa3aefb0b0a3d3e0a4fd..7b916abf16e797b682d12957df7bf0ee824a49fc 100644 --- a/interfaces/inner_api/native/backup_kit_inner/impl/b_session_restore.h +++ b/interfaces/inner_api/native/backup_kit_inner/impl/b_session_restore.h @@ -20,7 +20,7 @@ #include #include -#include "b_file_info.h" +#include "backup_file_info.h" #include "errors.h" #include "svc_death_recipient.h" #include "unique_fd.h" diff --git a/interfaces/inner_api/native/backup_kit_inner/impl/b_session_restore_async.h b/interfaces/inner_api/native/backup_kit_inner/impl/b_session_restore_async.h index 64615acb28408e875245881ac140d6710036b6c6..02a3116014032e9cdbc49f1c538860d33cb9f95f 100644 --- a/interfaces/inner_api/native/backup_kit_inner/impl/b_session_restore_async.h +++ b/interfaces/inner_api/native/backup_kit_inner/impl/b_session_restore_async.h @@ -22,9 +22,10 @@ #include #include -#include "b_file_info.h" +#include "backup_file_info.h" #include "errors.h" -#include "i_service.h" +#include "service_common.h" +#include "iservice.h" #include "svc_death_recipient.h" #include "unique_fd.h" diff --git a/interfaces/inner_api/native/backup_kit_inner/impl/b_file_info.h b/interfaces/inner_api/native/backup_kit_inner/impl/backup_file_info.h similarity index 100% rename from interfaces/inner_api/native/backup_kit_inner/impl/b_file_info.h rename to interfaces/inner_api/native/backup_kit_inner/impl/backup_file_info.h diff --git a/interfaces/inner_api/native/backup_kit_inner/impl/b_incremental_data.h b/interfaces/inner_api/native/backup_kit_inner/impl/backup_incremental_data.h similarity index 100% rename from interfaces/inner_api/native/backup_kit_inner/impl/b_incremental_data.h rename to interfaces/inner_api/native/backup_kit_inner/impl/backup_incremental_data.h diff --git a/interfaces/inner_api/native/backup_kit_inner/impl/i_service.h b/interfaces/inner_api/native/backup_kit_inner/impl/i_service.h deleted file mode 100644 index 0108a3437f29762800d384aa2c02880987a1ba1a..0000000000000000000000000000000000000000 --- a/interfaces/inner_api/native/backup_kit_inner/impl/i_service.h +++ /dev/null @@ -1,104 +0,0 @@ -/* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_FILEMGMT_BACKUP_I_SERVICE_H -#define OHOS_FILEMGMT_BACKUP_I_SERVICE_H - -#include -#include - -#include - -#include "b_file_info.h" -#include "b_incremental_data.h" -#include "i_service_ipc_interface_code.h" -#include "i_service_reverse.h" -#include "iremote_broker.h" - -namespace OHOS::FileManagement::Backup { -const int DEFAULT_INVAL_VALUE = -1; - -typedef enum TypeRestoreTypeEnum { - RESTORE_DATA_WAIT_SEND = 0, - RESTORE_DATA_READDY = 1, -} RestoreTypeEnum; - -enum BackupRestoreScenario { - FULL_BACKUP = 0, - INCREMENTAL_BACKUP = 1, - FULL_RESTORE = 2, - INCREMENTAL_RESTORE = 3, -}; - -class IService : public IRemoteBroker { -public: - virtual ~IService() = default; - virtual ErrCode InitRestoreSession(sptr remote) = 0; - virtual ErrCode InitRestoreSession(sptr remote, std::string &errMsg) = 0; - virtual ErrCode InitBackupSession(sptr remote) = 0; - virtual ErrCode InitBackupSession(sptr remote, std::string &errMsg) = 0; - virtual ErrCode Start() = 0; - virtual UniqueFd GetLocalCapabilities() = 0; - virtual UniqueFd GetLocalCapabilitiesForBundleInfos() = 0; - virtual ErrCode PublishFile(const BFileInfo &fileInfo) = 0; - virtual ErrCode AppFileReady(const std::string &fileName, UniqueFd fd, int32_t errCode) = 0; - virtual ErrCode AppDone(ErrCode errCode) = 0; - virtual ErrCode ServiceResultReport(const std::string restoreRetInfo, - BackupRestoreScenario scenario, ErrCode errCode) = 0; - virtual ErrCode GetFileHandle(const std::string &bundleName, const std::string &fileName) = 0; - virtual ErrCode AppendBundlesRestoreSession(UniqueFd fd, - const std::vector &bundleNames, - const std::vector &detailInfos, - RestoreTypeEnum restoreType = RestoreTypeEnum::RESTORE_DATA_WAIT_SEND, - int32_t userId = DEFAULT_INVAL_VALUE) = 0; - virtual ErrCode AppendBundlesRestoreSession(UniqueFd fd, - const std::vector &bundleNames, - RestoreTypeEnum restoreType = RestoreTypeEnum::RESTORE_DATA_WAIT_SEND, - int32_t userId = DEFAULT_INVAL_VALUE) = 0; - virtual ErrCode AppendBundlesBackupSession(const std::vector &bundleNames) = 0; - virtual ErrCode AppendBundlesDetailsBackupSession(const std::vector &bundleNames, - const std::vector &bundleInfos) = 0; - virtual ErrCode Finish() = 0; - virtual ErrCode Release() = 0; - virtual ErrCode Cancel(std::string bundleName, int32_t &result) = 0; - virtual UniqueFd GetLocalCapabilitiesIncremental(const std::vector &bundleNames) = 0; - virtual ErrCode GetAppLocalListAndDoIncrementalBackup() = 0; - virtual ErrCode InitIncrementalBackupSession(sptr remotse) = 0; - virtual ErrCode InitIncrementalBackupSession(sptr remotse, std::string &errMsg) = 0; - virtual ErrCode AppendBundlesIncrementalBackupSession(const std::vector &bundlesToBackup) = 0; - virtual ErrCode AppendBundlesIncrementalBackupSession(const std::vector &bundlesToBackup, - const std::vector &bundleInfos) = 0; - - virtual ErrCode PublishIncrementalFile(const BFileInfo &fileInfo) = 0; - virtual ErrCode PublishSAIncrementalFile(const BFileInfo &fileInfo, UniqueFd fd) = 0; - virtual ErrCode AppIncrementalFileReady(const std::string &fileName, UniqueFd fd, UniqueFd manifestFd, - int32_t errCode) = 0; - virtual ErrCode AppIncrementalDone(ErrCode errCode) = 0; - virtual ErrCode GetIncrementalFileHandle(const std::string &bundleName, const std::string &fileName) = 0; - virtual ErrCode GetBackupInfo(BundleName &bundleName, std::string &result) = 0; - virtual ErrCode UpdateTimer(BundleName &bundleName, uint32_t timeout, bool &result) = 0; - virtual ErrCode UpdateSendRate(std::string &bundleName, int32_t sendRate, bool &result) = 0; - virtual ErrCode ReportAppProcessInfo(const std::string processInfo, const BackupRestoreScenario sennario) = 0; - virtual ErrCode StartExtTimer(bool &isExtStart) = 0; - virtual ErrCode StartFwkTimer(bool &isFwkStart) = 0; - virtual ErrCode StopExtTimer(bool &isExtStop) = 0; - virtual ErrCode RefreshDataSize(int64_t totalSize) = 0; - virtual ErrCode GetBackupDataSize(bool isPreciseScan, std::vector bundleNameList) = 0; - - DECLARE_INTERFACE_DESCRIPTOR(u"OHOS.Filemanagement.Backup.IService") -}; -} // namespace OHOS::FileManagement::Backup - -#endif // OHOS_FILEMGMT_BACKUP_I_SERVICE_H \ No newline at end of file diff --git a/interfaces/inner_api/native/backup_kit_inner/impl/i_service_reverse.h b/interfaces/inner_api/native/backup_kit_inner/impl/i_service_reverse.h deleted file mode 100644 index 4ca5a7621f9e4266d5d2df815c80818543d8fe06..0000000000000000000000000000000000000000 --- a/interfaces/inner_api/native/backup_kit_inner/impl/i_service_reverse.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_FILEMGMT_BACKUP_I_SERVICE_REVERSE_H -#define OHOS_FILEMGMT_BACKUP_I_SERVICE_REVERSE_H - -#include - -#include "i_service_reverse_ipc_interface_code.h" -#include "iremote_broker.h" - -namespace OHOS::FileManagement::Backup { -class IServiceReverse : public IRemoteBroker { -public: - enum class Scenario { - UNDEFINED, - BACKUP, - RESTORE, - CLEAN, - }; - -public: - virtual ~IServiceReverse() = default; - virtual void BackupOnBundleStarted(int32_t errCode, std::string bundleName) = 0; - virtual void BackupOnFileReady(std::string bundleName, std::string fileName, int fd, int32_t errCode) = 0; - virtual void BackupOnResultReport(std::string result, std::string bundleName) = 0; - virtual void BackupOnBundleFinished(int32_t errCode, std::string bundleName) = 0; - virtual void BackupOnAllBundlesFinished(int32_t errCode) = 0; - virtual void BackupOnProcessInfo(std::string bundleName, std::string processInfo) = 0; - virtual void BackupOnScanningInfo(std::string scannedInfo) = 0; - - virtual void RestoreOnBundleStarted(int32_t errCode, std::string bundleName) = 0; - virtual void RestoreOnFileReady(std::string bundleName, std::string fileName, int fd, int32_t errCode) = 0; - virtual void RestoreOnResultReport(std::string result, std::string bundleName, - ErrCode errCode = 0) = 0; - virtual void RestoreOnBundleFinished(int32_t errCode, std::string bundleName) = 0; - virtual void RestoreOnAllBundlesFinished(int32_t errCode) = 0; - virtual void RestoreOnProcessInfo(std::string bundleName, std::string processInfo) = 0; - - virtual void IncrementalBackupOnBundleStarted(int32_t errCode, std::string bundleName) = 0; - virtual void IncrementalBackupOnFileReady(std::string bundleName, std::string fileName, int fd, int manifestFd, - int32_t errCode) = 0; - virtual void IncrementalBackupOnResultReport(std::string result, std::string bundleName) = 0; - virtual void IncrementalBackupOnBundleFinished(int32_t errCode, std::string bundleName) = 0; - virtual void IncrementalBackupOnAllBundlesFinished(int32_t errCode) = 0; - virtual void IncrementalBackupOnProcessInfo(std::string bundleName, std::string processInfo) = 0; - virtual void IncrementalBackupOnScanningInfo(std::string scannedInfo) = 0; - - virtual void IncrementalRestoreOnBundleStarted(int32_t errCode, std::string bundleName) = 0; - virtual void IncrementalRestoreOnFileReady(std::string bundleName, - std::string fileName, - int fd, - int manifestFd, int32_t errCode) = 0; - virtual void IncrementalRestoreOnResultReport(std::string result, std::string bundleName, - ErrCode errCode = 0) = 0; - virtual void IncrementalRestoreOnBundleFinished(int32_t errCode, std::string bundleName) = 0; - virtual void IncrementalRestoreOnAllBundlesFinished(int32_t errCode) = 0; - virtual void IncrementalRestoreOnProcessInfo(const std::string bundleName, const std::string processInfo) = 0; - - DECLARE_INTERFACE_DESCRIPTOR(u"OHOS.FileManagement.Backup.IServiceReverse") -}; -} // namespace OHOS::FileManagement::Backup - -#endif // OHOS_FILEMGMT_BACKUP_I_SERVICE_REVERSE_H \ No newline at end of file diff --git a/services/backup_sa/include/module_ipc/svc_extension_proxy.h b/interfaces/inner_api/native/backup_kit_inner/impl/service_client.h similarity index 35% rename from services/backup_sa/include/module_ipc/svc_extension_proxy.h rename to interfaces/inner_api/native/backup_kit_inner/impl/service_client.h index dd38f936a2d9dd80175ec4d90f6ac35f33035ff5..86c12f988d0bbd391fc158d2376ca99c38a489ad 100644 --- a/services/backup_sa/include/module_ipc/svc_extension_proxy.h +++ b/interfaces/inner_api/native/backup_kit_inner/impl/service_client.h @@ -13,36 +13,46 @@ * limitations under the License. */ -#ifndef OHOS_FILEMGMT_BACKUP_SVC_EXTENSION_PROXY_H -#define OHOS_FILEMGMT_BACKUP_SVC_EXTENSION_PROXY_H +#ifndef OHOS_FILEMGMT_BACKUP_SERVICE_CLIENT_H +#define OHOS_FILEMGMT_BACKUP_SERVICE_CLIENT_H + +#include +#include +#include +#include +#include "backup_file_info.h" +#include "backup_incremental_data.h" +#include "iservice.h" +#include "system_ability_load_callback_stub.h" -#include "i_extension.h" -#include "iremote_proxy.h" -#include "unique_fd.h" namespace OHOS::FileManagement::Backup { -class SvcExtensionProxy : public IRemoteProxy { -public: - UniqueFd GetFileHandle(const std::string &fileName, int32_t &errCode) override; - ErrCode HandleClear() override; - ErrCode HandleBackup(bool isClearData) override; - ErrCode PublishFile(const std::string &fileName) override; - ErrCode HandleRestore(bool isClearData) override; - std::tuple GetIncrementalFileHandle(const std::string &fileName) override; - ErrCode PublishIncrementalFile(const std::string &fileName) override; - ErrCode HandleIncrementalBackup(UniqueFd incrementalFd, UniqueFd manifestFd) override; - ErrCode IncrementalOnBackup(bool isClearData) override; - std::tuple GetIncrementalBackupFileHandle() override; - ErrCode GetBackupInfo(std::string &result) override; - ErrCode UpdateFdSendRate(std::string &bundleName, int32_t sendRate) override; - ErrCode User0OnBackup() override; +class ServiceClient { public: - explicit SvcExtensionProxy(const sptr &remote) : IRemoteProxy(remote) {} + static sptr GetServiceProxyPointer(); + static sptr GetInstance(); + static void InvaildInstance(); + bool CheckServiceProxy(); +public: + explicit ServiceClient(); + ~ServiceClient(); +public: + class ServiceProxyLoadCallback : public SystemAbilityLoadCallbackStub { + public: + void OnLoadSystemAbilitySuccess(int32_t systemAbilityId, const sptr &remoteObject) override; + void OnLoadSystemAbilityFail(int32_t systemAbilityId) override; + + public: + std::condition_variable proxyConVar_; + std::atomic isLoadSuccess_ = {false}; + }; private: - static inline BrokerDelegator delegator_; + static inline std::mutex proxyMutex_; + static inline std::mutex getInstanceMutex_; + static inline sptr serviceProxy_ = nullptr; }; } // namespace OHOS::FileManagement::Backup -#endif // OHOS_FILEMGMT_BACKUP_SVC_EXTENSION_PROXY_H \ No newline at end of file +#endif // OHOS_FILEMGMT_BACKUP_SERVICE_CLIENT_H \ No newline at end of file diff --git a/interfaces/inner_api/native/backup_kit_inner/impl/i_extension.h b/interfaces/inner_api/native/backup_kit_inner/impl/service_common.h similarity index 34% rename from interfaces/inner_api/native/backup_kit_inner/impl/i_extension.h rename to interfaces/inner_api/native/backup_kit_inner/impl/service_common.h index 7ce72f1a3aaa28a87e7aaf04f84108617987e7ea..777552b8f77ae76db0f585e2bda28d9e52b549f6 100644 --- a/interfaces/inner_api/native/backup_kit_inner/impl/i_extension.h +++ b/interfaces/inner_api/native/backup_kit_inner/impl/service_common.h @@ -13,35 +13,18 @@ * limitations under the License. */ -#ifndef OHOS_FILEMGMT_BACKUP_I_EXTENSION_H -#define OHOS_FILEMGMT_BACKUP_I_EXTENSION_H +#ifndef OHOS_FILEMGMT_BACKUP_SERVICE_COMMON_H +#define OHOS_FILEMGMT_BACKUP_SERVICE_COMMON_H -#include "errors.h" -#include "i_extension_ipc_interface_code.h" -#include "iremote_broker.h" -#include "unique_fd.h" namespace OHOS::FileManagement::Backup { -class IExtension : public IRemoteBroker { -public: - DECLARE_INTERFACE_DESCRIPTOR(u"OHOS.FileManagement.Backup.IExtension"); +const int DEFAULT_INVAL_VALUE = -1; + + typedef enum TypeRestoreTypeEnum { + RESTORE_DATA_WAIT_SEND = 0, + RESTORE_DATA_READDY = 1, + } RestoreTypeEnum; -public: - virtual ~IExtension() = default; - virtual UniqueFd GetFileHandle(const std::string &fileName, int32_t &errCode) = 0; - virtual ErrCode HandleClear() = 0; - virtual ErrCode HandleBackup(bool isClearData) = 0; - virtual ErrCode PublishFile(const std::string &fileName) = 0; - virtual ErrCode HandleRestore(bool isClearData) = 0; - virtual std::tuple GetIncrementalFileHandle(const std::string &fileName) = 0; - virtual ErrCode PublishIncrementalFile(const std::string &fileName) = 0; - virtual ErrCode HandleIncrementalBackup(UniqueFd incrementalFd, UniqueFd manifestFd) = 0; - virtual ErrCode IncrementalOnBackup(bool isClearData) = 0; - virtual std::tuple GetIncrementalBackupFileHandle() = 0; - virtual ErrCode GetBackupInfo(std::string &result) = 0; - virtual ErrCode UpdateFdSendRate(std::string &bundleName, int32_t sendRate) = 0; - virtual ErrCode User0OnBackup() = 0; -}; } // namespace OHOS::FileManagement::Backup -#endif // OHOS_FILEMGMT_BACKUP_I_EXTENSION_H \ No newline at end of file +#endif // OHOS_FILEMGMT_BACKUP_SERVICE_COMMON_H \ No newline at end of file diff --git a/interfaces/inner_api/native/backup_kit_inner/impl/service_proxy.h b/interfaces/inner_api/native/backup_kit_inner/impl/service_proxy.h deleted file mode 100644 index 4302e07b8489bd2dd9e0f52468d2357216100306..0000000000000000000000000000000000000000 --- a/interfaces/inner_api/native/backup_kit_inner/impl/service_proxy.h +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_FILEMGMT_BACKUP_SERVICE_PROXY_H -#define OHOS_FILEMGMT_BACKUP_SERVICE_PROXY_H - -#include -#include -#include -#include - -#include "i_service.h" -#include "iremote_proxy.h" -#include "system_ability_load_callback_stub.h" - -namespace OHOS::FileManagement::Backup { -class ServiceProxy : public IRemoteProxy { -public: - ErrCode InitRestoreSession(sptr remote) override; - ErrCode InitRestoreSession(sptr remote, std::string &errMsg) override; - ErrCode InitBackupSession(sptr remote) override; - ErrCode InitBackupSession(sptr remote, std::string &errMsg) override; - ErrCode Start() override; - UniqueFd GetLocalCapabilities() override; - UniqueFd GetLocalCapabilitiesForBundleInfos() override; - ErrCode PublishFile(const BFileInfo &fileInfo) override; - ErrCode AppFileReady(const std::string &fileName, UniqueFd fd, int32_t errCode) override; - ErrCode AppDone(ErrCode errCode) override; - ErrCode ServiceResultReport(const std::string restoreRetInfo, - BackupRestoreScenario scenario, ErrCode errCode) override; - ErrCode GetFileHandle(const std::string &bundleName, const std::string &fileName) override; - ErrCode AppendBundlesRestoreSession(UniqueFd fd, - const std::vector &bundleNames, - const std::vector &detailInfos, - RestoreTypeEnum restoreType = RestoreTypeEnum::RESTORE_DATA_WAIT_SEND, - int32_t userId = DEFAULT_INVAL_VALUE) override; - ErrCode AppendBundlesRestoreSession(UniqueFd fd, - const std::vector &bundleNames, - RestoreTypeEnum restoreType = RestoreTypeEnum::RESTORE_DATA_WAIT_SEND, - int32_t userId = DEFAULT_INVAL_VALUE) override; - ErrCode AppendBundlesBackupSession(const std::vector &bundleNames) override; - ErrCode AppendBundlesDetailsBackupSession(const std::vector &bundleNames, - const std::vector &detailInfos) override; - ErrCode Finish() override; - ErrCode Release() override; - ErrCode Cancel(std::string bundleName, int32_t &result) override; - UniqueFd GetLocalCapabilitiesIncremental(const std::vector &bundleNames) override; - ErrCode GetAppLocalListAndDoIncrementalBackup() override; - ErrCode InitIncrementalBackupSession(sptr remote) override; - ErrCode InitIncrementalBackupSession(sptr remote, std::string &errMsg) override; - ErrCode AppendBundlesIncrementalBackupSession(const std::vector &bundlesToBackup) override; - ErrCode AppendBundlesIncrementalBackupSession(const std::vector &bundlesToBackup, - const std::vector &infos) override; - - ErrCode PublishIncrementalFile(const BFileInfo &fileInfo) override; - ErrCode PublishSAIncrementalFile(const BFileInfo &fileInfo, UniqueFd fd) override; - ErrCode AppIncrementalFileReady(const std::string &fileName, UniqueFd fd, UniqueFd manifestFd, - int32_t errCode) override; - ErrCode AppIncrementalDone(ErrCode errCode) override; - ErrCode GetIncrementalFileHandle(const std::string &bundleName, const std::string &fileName) override; - ErrCode GetBackupInfo(BundleName &bundleName, std::string &result) override; - ErrCode UpdateTimer(BundleName &bundleName, uint32_t timeout, bool &result) override; - ErrCode UpdateSendRate(std::string &bundleName, int32_t sendRate, bool &result) override; - ErrCode ReportAppProcessInfo(const std::string processInfo, const BackupRestoreScenario sennario) override; - ErrCode StartExtTimer(bool &isExtStart) override; - ErrCode StartFwkTimer(bool &isFwkStart) override; - ErrCode StopExtTimer(bool &isExtStop) override; - ErrCode RefreshDataSize(int64_t totalSize) override; - ErrCode GetBackupDataSize(bool isPreciseScan, std::vector bundleNameList) override; -public: - explicit ServiceProxy(const sptr &impl) : IRemoteProxy(impl) {} - ~ServiceProxy() override {} - -public: - template - bool WriteParcelableVector(const std::vector &parcelableVector, Parcel &data); - static sptr GetServiceProxyPointer(); - static sptr GetInstance(); - static void InvaildInstance(); - -public: - class ServiceProxyLoadCallback : public SystemAbilityLoadCallbackStub { - public: - void OnLoadSystemAbilitySuccess(int32_t systemAbilityId, const sptr &remoteObject) override; - void OnLoadSystemAbilityFail(int32_t systemAbilityId) override; - - public: - std::condition_variable proxyConVar_; - std::atomic isLoadSuccess_ = {false}; - }; - -private: - static inline std::mutex proxyMutex_; - static inline std::mutex getInstanceMutex_; - static inline sptr serviceProxy_ = nullptr; - static inline BrokerDelegator delegator_; -}; -} // namespace OHOS::FileManagement::Backup - -#endif // OHOS_FILEMGMT_BACKUP_SERVICE_PROXY_H \ No newline at end of file diff --git a/interfaces/kits/js/backup/parse_inc_info_from_js.h b/interfaces/kits/js/backup/parse_inc_info_from_js.h index b3856dddbe639cadca56661354eb98dbed82f655..461ce85133ff722cef61e40195f5a237941c9b22 100644 --- a/interfaces/kits/js/backup/parse_inc_info_from_js.h +++ b/interfaces/kits/js/backup/parse_inc_info_from_js.h @@ -18,7 +18,7 @@ #include #include -#include "b_incremental_data.h" +#include "backup_incremental_data.h" namespace OHOS::FileManagement::Backup { class Parse { diff --git a/interfaces/kits/js/backup/prop_n_operation.cpp b/interfaces/kits/js/backup/prop_n_operation.cpp index e4a1ef547650f74bae42049fabf77f0ec92cb097..95fb4aef5f9536584baccfeb45349feb4db1c027 100644 --- a/interfaces/kits/js/backup/prop_n_operation.cpp +++ b/interfaces/kits/js/backup/prop_n_operation.cpp @@ -15,14 +15,14 @@ #include "prop_n_operation.h" #include "b_error/b_error.h" -#include "b_incremental_data.h" +#include "backup_incremental_data.h" #include "b_resources/b_constants.h" #include "b_sa/b_sa_utils.h" #include "filemgmt_libhilog.h" #include "filemgmt_libn.h" #include "incremental_backup_data.h" #include "parse_inc_info_from_js.h" -#include "service_proxy.h" +#include "service_client.h" #include "access_token.h" #include "accesstoken_kit.h" #include "ipc_skeleton.h" @@ -39,13 +39,16 @@ static napi_value AsyncCallback(napi_env env, const NFuncArg& funcArg) auto fd = make_shared(); auto cbExec = [fd]() -> NError { HILOGI("called LocalCapabilities::AsyncCallback cbExec"); - ServiceProxy::InvaildInstance(); - auto proxy = ServiceProxy::GetInstance(); + ServiceClient::InvaildInstance(); + auto proxy = ServiceClient::GetInstance(); if (!proxy) { HILOGI("called LocalCapabilities::AsyncCallback cbExec, failed to get proxy"); return NError(errno); } - *fd = proxy->GetLocalCapabilities(); + int32_t fdNum=-1; + proxy->GetLocalCapabilitiesWithUniqueFd(fdNum); + UniqueFd fdData(static_cast(fdNum)); + *fd=std::move(fdData); HILOGI("called LocalCapabilities::AsyncCallback cbExec success"); return NError(ERRNO_NOERR); }; @@ -83,13 +86,16 @@ static napi_value AsyncDataList(napi_env env, const NFuncArg& funcArg) auto fd = make_shared(); auto cbExec = [fd, bundles { move(bundles) }]() -> NError { HILOGI("called LocalCapabilities::AsyncDataList cbExec"); - ServiceProxy::InvaildInstance(); - auto proxy = ServiceProxy::GetInstance(); + ServiceClient::InvaildInstance(); + auto proxy = ServiceClient::GetInstance(); if (!proxy) { HILOGI("called LocalCapabilities::AsyncDataList cbExec, failed to get proxy"); return NError(errno); } - *fd = proxy->GetLocalCapabilitiesIncremental(bundles); + int32_t fdValue=-1; + proxy->GetLocalCapabilitiesIncremental(bundles,fdValue); + UniqueFd fdData(static_cast(fdValue)); + *fd=std::move(fdData); return NError(ERRNO_NOERR); }; auto cbCompl = [fd](napi_env env, NError err) -> NVal { @@ -165,8 +171,8 @@ napi_value PropNOperation::DoGetBackupInfo(napi_env env, napi_callback_info info return nullptr; } - ServiceProxy::InvaildInstance(); - auto proxy = ServiceProxy::GetInstance(); + ServiceClient::InvaildInstance(); + auto proxy = ServiceClient::GetInstance(); if (!proxy) { HILOGE("called DoGetBackupInfo,failed to get proxy"); return nullptr; @@ -191,8 +197,8 @@ napi_value PropNOperation::DoGetBackupInfo(napi_env env, napi_callback_info info bool PropNOperation::UpdateSendRate(std::string &bundleName, int32_t sendRate) { bool result = false; - ServiceProxy::InvaildInstance(); - auto proxy = ServiceProxy::GetInstance(); + ServiceClient::InvaildInstance(); + auto proxy = ServiceClient::GetInstance(); if (!proxy) { HILOGE("called UpdateSendRate,failed to get proxy"); return result; @@ -208,8 +214,8 @@ bool PropNOperation::UpdateSendRate(std::string &bundleName, int32_t sendRate) bool PropNOperation::UpdateTimer(std::string &bundleName, uint32_t timeout) { bool result = false; - ServiceProxy::InvaildInstance(); - auto proxy = ServiceProxy::GetInstance(); + ServiceClient::InvaildInstance(); + auto proxy = ServiceClient::GetInstance(); if (!proxy) { HILOGE("called DoUpdateTimer,failed to get proxy"); return result; diff --git a/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp b/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp index d3a84c62883959f7b77cd28162ed044eca47881f..5f96544ddce3e9ba1cf581d975d62af8f88c729a 100644 --- a/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp @@ -20,7 +20,7 @@ #include "b_error/b_error.h" #include "b_filesystem/b_file.h" #include "b_incremental_backup_session.h" -#include "b_incremental_data.h" +#include "backup_incremental_data.h" #include "b_resources/b_constants.h" #include "b_sa/b_sa_utils.h" #include "backup_kit_inner.h" diff --git a/services/backup_sa/BUILD.gn b/services/backup_sa/BUILD.gn index 8c877bed7bf7acf436005dcaf3b355ec3aa5ce41..f7a2a84f123027397578a739f6ad7d95f01b56e0 100644 --- a/services/backup_sa/BUILD.gn +++ b/services/backup_sa/BUILD.gn @@ -34,13 +34,8 @@ ohos_shared_library("backup_sa") { "src/module_ipc/sa_backup_connection.cpp", "src/module_ipc/service.cpp", "src/module_ipc/service_incremental.cpp", - "src/module_ipc/service_incremental_reverse_proxy.cpp", - "src/module_ipc/service_reverse_proxy.cpp", - "src/module_ipc/service_stub.cpp", "src/module_ipc/sub_service.cpp", "src/module_ipc/svc_backup_connection.cpp", - "src/module_ipc/svc_extension_incremental_proxy.cpp", - "src/module_ipc/svc_extension_proxy.cpp", "src/module_ipc/svc_restore_deps_manager.cpp", "src/module_ipc/svc_session_manager.cpp", "src/module_notify/notify_work_service.cpp", @@ -59,6 +54,7 @@ ohos_shared_library("backup_sa") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner_ipc", "${path_backup}/utils:backup_utils", "${path_jsoncpp}:jsoncpp", ] diff --git a/services/backup_sa/include/module_external/bms_adapter.h b/services/backup_sa/include/module_external/bms_adapter.h index 72fd55d180718a2afc07da53f1a1d104cf07494e..69b56ada302c5f33077330dbfabfcc8a9c318835 100644 --- a/services/backup_sa/include/module_external/bms_adapter.h +++ b/services/backup_sa/include/module_external/bms_adapter.h @@ -21,7 +21,7 @@ #include "b_json/b_json_entity_caps.h" #include "bundlemgr/bundle_mgr_interface.h" -#include "b_incremental_data.h" +#include "backup_incremental_data.h" #include "istorage_manager.h" namespace OHOS::FileManagement::Backup { diff --git a/services/backup_sa/include/module_ipc/service.h b/services/backup_sa/include/module_ipc/service.h index 34a0fb99ac72055cb70ac6c560c1ab64d04a4426..a5d1fd1ea83747ee59806d2099826069f595bc53 100644 --- a/services/backup_sa/include/module_ipc/service.h +++ b/services/backup_sa/include/module_ipc/service.h @@ -23,13 +23,14 @@ #include "b_json/b_json_clear_data_config.h" #include "b_json/b_json_entity_caps.h" #include "b_json/b_json_service_disposal_config.h" -#include "i_service_reverse.h" +#include "iservice_reverse.h" #include "iremote_stub.h" #include "module_sched/sched_scheduler.h" #include "service_stub.h" #include "svc_session_manager.h" #include "system_ability.h" #include "thread_pool.h" +#include "service_reverse_inner_type.h" namespace OHOS::FileManagement::Backup { struct ExtensionMutexInfo { @@ -48,53 +49,83 @@ class Service : public SystemAbility, public ServiceStub, protected NoCopyable { // 以下都是IPC接口 public: - ErrCode InitRestoreSession(sptr remote) override; - ErrCode InitRestoreSession(sptr remote, std::string &errMsg) override; - ErrCode InitBackupSession(sptr remote) override; - ErrCode InitBackupSession(sptr remote, std::string &errMsg) override; + ErrCode InitRestoreSession(sptr& remote) override; + ErrCode InitRestoreSessionWithErrMsg(sptr& reverseIpcRemoteObject, + std::string& errMsg) override; + ErrCode InitRestoreSession(sptr& remote, std::string &errMsg); + ErrCode InitBackupSession(sptr& remote) override; + ErrCode InitBackupSessionWithErrMsg(sptr& remote, std::string &errMsg) override; ErrCode Start() override; - UniqueFd GetLocalCapabilities() override; - UniqueFd GetLocalCapabilitiesForBundleInfos() override; + ErrCode GetLocalCapabilitiesWithUniqueFd(int32_t& fd) override; + UniqueFd GetLocalCapabilities(); + ErrCode GetLocalCapabilitiesForBundleInfos(int32_t& fd) override; + UniqueFd GetLocalCapabilitiesForBundleInfos(); ErrCode PublishFile(const BFileInfo &fileInfo) override; - ErrCode AppFileReady(const std::string &fileName, UniqueFd fd, int32_t errCode) override; + ErrCode AppFileReady(const std::string &fileName, int32_t fd, int32_t errCode) override; + ErrCode AppFileReady(const std::string &fileName, UniqueFd fd, int32_t errCode); ErrCode AppDone(ErrCode errCode) override; - ErrCode ServiceResultReport(const std::string restoreRetInfo, + ErrCode ServiceResultReport(const std::string& restoreRetInfo, BackupRestoreScenario sennario, ErrCode errCode) override; ErrCode GetFileHandle(const std::string &bundleName, const std::string &fileName) override; + + ErrCode AppendBundlesRestoreSessionRestoreDataWaitSend( + int32_t fd, + const std::vector& bundleNames, + const std::vector& detailInfos, + int32_t restoreType, + int32_t userId) override; + ErrCode AppendBundlesRestoreSessionRestoreDataWaitReady( + int32_t fd, + const std::vector& bundleNames, + int32_t restoreType, + int32_t userId) override; ErrCode AppendBundlesRestoreSession(UniqueFd fd, const std::vector &bundleNames, const std::vector &bundleInfos, RestoreTypeEnum restoreType = RestoreTypeEnum::RESTORE_DATA_WAIT_SEND, - int32_t userId = DEFAULT_INVAL_VALUE) override; + int32_t userId = DEFAULT_INVAL_VALUE); ErrCode AppendBundlesRestoreSession(UniqueFd fd, const std::vector &bundleNames, RestoreTypeEnum restoreType = RestoreTypeEnum::RESTORE_DATA_WAIT_SEND, - int32_t userId = DEFAULT_INVAL_VALUE) override; + int32_t userId = DEFAULT_INVAL_VALUE); ErrCode AppendBundlesBackupSession(const std::vector &bundleNames) override; + ErrCode AppendBundlesDetailsBackupSession(const std::vector &bundleNames, const std::vector &bundleInfos) override; ErrCode Finish() override; ErrCode Release() override; - ErrCode Cancel(std::string bundleName, int32_t &result) override; - - UniqueFd GetLocalCapabilitiesIncremental(const std::vector &bundleNames) override; + ErrCode Cancel(const std::string& bundleName, int32_t &result) override; + ErrCode GetLocalCapabilitiesIncremental( + const std::vector& bundleNames, + int32_t& fd) override; + UniqueFd GetLocalCapabilitiesIncremental(const std::vector &bundleNames); ErrCode GetAppLocalListAndDoIncrementalBackup() override; - ErrCode InitIncrementalBackupSession(sptr remote) override; - ErrCode InitIncrementalBackupSession(sptr remote, std::string &errMsg) override; + ErrCode InitIncrementalBackupSession(sptr& remote) override; + ErrCode InitIncrementalBackupSessionWithErrMsg(sptr& remote, std::string &errMsg) override; ErrCode AppendBundlesIncrementalBackupSession(const std::vector &bundlesToBackup) override; + ErrCode AppendBundlesIncrementalBackupSessionWithBundleInfos( + const std::vector& bundlesToBackup, + const std::vector& bundleInfos) override; ErrCode AppendBundlesIncrementalBackupSession(const std::vector &bundlesToBackup, - const std::vector &infos) override; + const std::vector &infos); ErrCode PublishIncrementalFile(const BFileInfo &fileInfo) override; - ErrCode PublishSAIncrementalFile(const BFileInfo &fileInfo, UniqueFd fd) override; - ErrCode AppIncrementalFileReady(const std::string &fileName, UniqueFd fd, UniqueFd manifestFd, - int32_t errCode) override; + ErrCode PublishSAIncrementalFile( + const BFileInfo& fileInfo, + int32_t fd) override; + ErrCode PublishSAIncrementalFile(const BFileInfo &fileInfo, UniqueFd fd); + ErrCode AppIncrementalFileReady( + const std::string& fileName, + int32_t fd, + int32_t manifestFd, + int32_t appIncrementalFileReadyErrCode) override; + ErrCode AppIncrementalFileReady(const std::string &fileName, UniqueFd fd, UniqueFd manifestFd,int32_t errCode); ErrCode AppIncrementalDone(ErrCode errCode) override; ErrCode GetIncrementalFileHandle(const std::string &bundleName, const std::string &fileName) override; ErrCode GetBackupInfo(BundleName &bundleName, std::string &result) override; ErrCode UpdateTimer(BundleName &bundleName, uint32_t timeout, bool &result) override; ErrCode UpdateSendRate(std::string &bundleName, int32_t sendRate, bool &result) override; - ErrCode ReportAppProcessInfo(const std::string processInfo, const BackupRestoreScenario sennario) override; + ErrCode ReportAppProcessInfo(const std::string& processInfo, BackupRestoreScenario sennario) override; ErrCode StartExtTimer(bool &isExtStart) override; ErrCode StartFwkTimer(bool &isFwkStart) override; ErrCode StopExtTimer(bool &isExtStop) override; @@ -104,7 +135,7 @@ public: const ErrCode errCode, const BackupRestoreScenario sennario); void StartGetFdTask(std::string bundleName, wptr ptr); - ErrCode GetBackupDataSize(bool isPreciseScan, vector bundleNameList) override; + ErrCode GetBackupDataSize(bool isPreciseScan, const std::vector& bundleNameList) override; // 以下都是非IPC接口 public: @@ -313,7 +344,7 @@ public: string BundleNameWithUserId(const string& bundleName, const int32_t userId); std::tuple SplitBundleName(const string& bundleNameWithId); void AppendBundles(const std::vector &bundleNames); - void ReportOnBundleStarted(IServiceReverse::Scenario scenario, const std::string &bundleName); + void ReportOnBundleStarted(IServiceReverseType::Scenario scenario, const std::string &bundleName); ErrCode AppIncrementalFileReady(const std::string &bundleName, const std::string &fileName, UniqueFd fd, UniqueFd manifestFd, int32_t errCode); public: @@ -362,7 +393,7 @@ private: * * @param scenario Scenario状态 */ - ErrCode VerifyCaller(IServiceReverse::Scenario scenario); + ErrCode VerifyCaller(IServiceReverseType::Scenario scenario); /** * @brief 验证调用者并返回名称 @@ -544,7 +575,7 @@ private: */ void SetOccupySession(bool isOccupyingSession); - void ReportOnExtConnectFailed(const IServiceReverse::Scenario scenario, + void ReportOnExtConnectFailed(const IServiceReverseType::Scenario scenario, const std::string &bundleName, const ErrCode ret); void ReleaseOnException(); @@ -561,7 +592,7 @@ private: std::map> &bundleNameDetailMap, std::map &isClearDataFlags); - void TimeoutRadarReport(IServiceReverse::Scenario scenario, std::string &bundleName); + void TimeoutRadarReport(IServiceReverseType::Scenario scenario, std::string &bundleName); void OnBundleStarted(BError error, sptr session, const BundleName &bundleName); @@ -569,16 +600,16 @@ private: const vector &restoreBundleNames); void BundleBeginRadarReport(const std::string &bundleName, const ErrCode errCode, - const IServiceReverse::Scenario scenario); + const IServiceReverseType::Scenario scenario); void BundleEndRadarReport(const std::string &bundleName, ErrCode errCode, - const IServiceReverse::Scenario scenario); + const IServiceReverseType::Scenario scenario); void FileReadyRadarReport(const std::string &bundleName, const std::string &fileName, const ErrCode errCode, - const IServiceReverse::Scenario scenario); + const IServiceReverseType::Scenario scenario); void ExtensionConnectFailRadarReport(const std::string &bundleName, const ErrCode errCode, - const IServiceReverse::Scenario scenario); + const IServiceReverseType::Scenario scenario); void OnStartResRadarReport(const std::vector &bundleNameList, int32_t stage); diff --git a/services/backup_sa/include/module_ipc/service_reverse_proxy.h b/services/backup_sa/include/module_ipc/service_reverse_proxy.h deleted file mode 100644 index 7578aca3653b3d4065b9a1a5517a2c70076251b2..0000000000000000000000000000000000000000 --- a/services/backup_sa/include/module_ipc/service_reverse_proxy.h +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_FILEMGMT_BACKUP_SERVICE_REVERSE_PROXY_H -#define OHOS_FILEMGMT_BACKUP_SERVICE_REVERSE_PROXY_H - -#include "i_service_reverse.h" -#include "iremote_proxy.h" - -namespace OHOS::FileManagement::Backup { -class ServiceReverseProxy final : public IRemoteProxy, protected NoCopyable { -public: - void BackupOnBundleStarted(int32_t errCode, std::string bundleName) override; - void BackupOnFileReady(std::string bundleName, std::string fileName, int fd, int32_t errCode) override; - void BackupOnResultReport(std::string result, std::string bundleName) override; - void BackupOnBundleFinished(int32_t errCode, std::string bundleName) override; - void BackupOnAllBundlesFinished(int32_t errCode) override; - void BackupOnProcessInfo(std::string bundleName, std::string processInfo) override; - void BackupOnScanningInfo(std::string scannedInfo) override; - - void RestoreOnBundleStarted(int32_t errCode, std::string bundleName) override; - void RestoreOnFileReady(std::string bundleName, std::string fileName, int fd, int32_t errCode) override; - void RestoreOnResultReport(std::string result, std::string bundleName, - ErrCode errCode = 0) override; - void RestoreOnBundleFinished(int32_t errCode, std::string bundleName) override; - void RestoreOnAllBundlesFinished(int32_t errCode) override; - void RestoreOnProcessInfo(std::string bundleName, std::string processInfo) override; - - void IncrementalBackupOnBundleStarted(int32_t errCode, std::string bundleName) override; - void IncrementalBackupOnFileReady(std::string bundleName, std::string fileName, int fd, int manifestFd, - int32_t errCode) override; - void IncrementalBackupOnResultReport(std::string result, std::string bundleName) override; - void IncrementalBackupOnBundleFinished(int32_t errCode, std::string bundleName) override; - void IncrementalBackupOnAllBundlesFinished(int32_t errCode) override; - void IncrementalBackupOnProcessInfo(std::string bundleName, std::string processInfo) override; - void IncrementalBackupOnScanningInfo(std::string scannedInfo) override; - - void IncrementalRestoreOnBundleStarted(int32_t errCode, std::string bundleName) override; - void IncrementalRestoreOnFileReady(std::string bundleName, std::string fileName, int fd, int manifestFd, - int32_t errCode) override; - void IncrementalRestoreOnResultReport(std::string result, std::string bundleName, - ErrCode errCode = 0) override; - void IncrementalRestoreOnBundleFinished(int32_t errCode, std::string bundleName) override; - void IncrementalRestoreOnAllBundlesFinished(int32_t errCode) override; - void IncrementalRestoreOnProcessInfo(std::string bundleName, std::string processInfo) override; - -public: - explicit ServiceReverseProxy(const sptr &impl) : IRemoteProxy(impl) {} - ~ServiceReverseProxy() override = default; - -private: - static inline BrokerDelegator delegator_; -}; -} // namespace OHOS::FileManagement::Backup - -#endif // OHOS_FILEMGMT_BACKUP_SERVICE_REVERSE_PROXY_H \ No newline at end of file diff --git a/services/backup_sa/include/module_ipc/service_stub.h b/services/backup_sa/include/module_ipc/service_stub.h deleted file mode 100644 index d4484365a6e431cbb250803b347ae33a6bdc3c33..0000000000000000000000000000000000000000 --- a/services/backup_sa/include/module_ipc/service_stub.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_FILEMGMT_BACKUP_SERVICE_STUB_H -#define OHOS_FILEMGMT_BACKUP_SERVICE_STUB_H - -#include - -#include "i_service.h" -#include "iremote_stub.h" - -namespace OHOS::FileManagement::Backup { -class ServiceStub : public IRemoteStub { -public: - int32_t OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) override; - -public: - ServiceStub(); - ~ServiceStub() override = default; - -private: - using ServiceInterface = int32_t (ServiceStub::*)(MessageParcel &data, MessageParcel &reply); - std::map opToInterfaceMap_; - - int32_t CmdInitRestoreSession(MessageParcel &data, MessageParcel &reply); - int32_t CmdInitRestoreSessionMsg(MessageParcel &data, MessageParcel &reply); - int32_t CmdInitBackupSession(MessageParcel &data, MessageParcel &reply); - int32_t CmdInitBackupSessionMsg(MessageParcel &data, MessageParcel &reply); - int32_t CmdStart(MessageParcel &data, MessageParcel &reply); - int32_t CmdGetLocalCapabilities(MessageParcel &data, MessageParcel &reply); - int32_t CmdGetLocalCapabilitiesForBdInfos(MessageParcel &data, MessageParcel &reply); - int32_t CmdPublishFile(MessageParcel &data, MessageParcel &reply); - int32_t CmdAppFileReady(MessageParcel &data, MessageParcel &reply); - int32_t CmdAppDone(MessageParcel &data, MessageParcel &reply); - int32_t CmdResultReport(MessageParcel &data, MessageParcel &reply); - int32_t CmdGetFileHandle(MessageParcel &data, MessageParcel &reply); - int32_t CmdAppendBundlesRestoreSession(MessageParcel &data, MessageParcel &reply); - int32_t CmdAppendBundlesDetailsRestoreSession(MessageParcel &data, MessageParcel &reply); - int32_t CmdAppendBundlesBackupSession(MessageParcel &data, MessageParcel &reply); - int32_t CmdAppendBundlesDetailsBackupSession(MessageParcel &data, MessageParcel &reply); - int32_t CmdFinish(MessageParcel &data, MessageParcel &reply); - int32_t CmdRelease(MessageParcel &data, MessageParcel &reply); - int32_t CmdCancel(MessageParcel &data, MessageParcel &reply); - int32_t CmdGetLocalCapabilitiesIncremental(MessageParcel &data, MessageParcel &reply); - int32_t CmdGetAppLocalListAndDoIncrementalBackup(MessageParcel &data, MessageParcel &reply); - int32_t CmdInitIncrementalBackupSession(MessageParcel &data, MessageParcel &reply); - int32_t CmdInitIncrementalBackupSessionMsg(MessageParcel &data, MessageParcel &reply); - int32_t CmdAppendBundlesIncrementalBackupSession(MessageParcel &data, MessageParcel &reply); - int32_t CmdAppendBundlesDetailsIncrementalBackupSession(MessageParcel &data, MessageParcel &reply); - int32_t CmdPublishIncrementalFile(MessageParcel &data, MessageParcel &reply); - int32_t CmdPublishSAIncrementalFile(MessageParcel &data, MessageParcel &reply); - int32_t CmdAppIncrementalFileReady(MessageParcel &data, MessageParcel &reply); - int32_t CmdAppIncrementalDone(MessageParcel &data, MessageParcel &reply); - int32_t CmdGetIncrementalFileHandle(MessageParcel &data, MessageParcel &reply); - int32_t CmdGetBackupInfo(MessageParcel &data, MessageParcel &reply); - int32_t CmdUpdateTimer(MessageParcel &data, MessageParcel &reply); - int32_t CmdUpdateSendRate(MessageParcel &data, MessageParcel &reply); - int32_t CmdReportAppProcessInfo(MessageParcel &data, MessageParcel &reply); - int32_t CmdStartExtTimer(MessageParcel &data, MessageParcel &reply); - int32_t CmdStartFwkTimer(MessageParcel &data, MessageParcel &reply); - int32_t CmdStopExtTimer(MessageParcel &data, MessageParcel &reply); - int32_t CmdRefreshDataSize(MessageParcel &data, MessageParcel &reply); - int32_t CmdGetBackupDataSize(MessageParcel &data, MessageParcel &reply); - void ServiceStubSupplement(); - void ServiceStubSuppAppendBundles(); - -public: - template - bool ReadParcelableVector(std::vector &parcelableInfos, MessageParcel &data); -}; -} // namespace OHOS::FileManagement::Backup - -#endif // OHOS_FILEMGMT_BACKUP_SERVICE_STUB_H \ No newline at end of file diff --git a/services/backup_sa/include/module_ipc/svc_backup_connection.h b/services/backup_sa/include/module_ipc/svc_backup_connection.h index 8b6c2477c6b8966d77d0943a35ce5826bad7e03f..33c1c697887821af431d318db79b813c5244dc32 100644 --- a/services/backup_sa/include/module_ipc/svc_backup_connection.h +++ b/services/backup_sa/include/module_ipc/svc_backup_connection.h @@ -17,7 +17,7 @@ #define OHOS_FILEMGMT_BACKUP_SVC_BACKUP_CONNECTION_H #include "ability_connect_callback_stub.h" -#include "i_extension.h" +#include "iextension.h" namespace OHOS::FileManagement::Backup { class SvcBackupConnection : public AAFwk::AbilityConnectionStub { diff --git a/services/backup_sa/include/module_ipc/svc_restore_deps_manager.h b/services/backup_sa/include/module_ipc/svc_restore_deps_manager.h index cb83798b9109353e6a7542023014105c1996166f..d0a198256d4558cd6dd23d13762c6843793de746 100644 --- a/services/backup_sa/include/module_ipc/svc_restore_deps_manager.h +++ b/services/backup_sa/include/module_ipc/svc_restore_deps_manager.h @@ -22,7 +22,8 @@ #include #include "b_json/b_json_entity_caps.h" -#include "i_service.h" +#include "service_common.h" +#include "iservice.h" namespace OHOS::FileManagement::Backup { diff --git a/services/backup_sa/include/module_ipc/svc_session_manager.h b/services/backup_sa/include/module_ipc/svc_session_manager.h index db95db2e51fe4fa1d1cefac44b8b1cc275535aed..7decb7a1ab9e65e641dc48f3cece97f972aba29c 100644 --- a/services/backup_sa/include/module_ipc/svc_session_manager.h +++ b/services/backup_sa/include/module_ipc/svc_session_manager.h @@ -29,11 +29,12 @@ #include -#include "b_file_info.h" -#include "b_incremental_data.h" +#include "backup_file_info.h" +#include "backup_incremental_data.h" #include "b_resources/b_constants.h" -#include "i_service.h" -#include "i_service_reverse.h" +#include "service_common.h" +#include "iservice.h" +#include "iservice_reverse.h" #include "module_ipc/svc_backup_connection.h" #include "module_ipc/sa_backup_connection.h" #include "svc_death_recipient.h" @@ -80,7 +81,7 @@ class SvcSessionManager : public virtual RefBase { public: struct Impl { uint32_t clientToken {0}; - IServiceReverse::Scenario scenario {IServiceReverse::Scenario::UNDEFINED}; + IServiceReverseType::Scenario scenario {IServiceReverseType::Scenario::UNDEFINED}; std::map backupExtNameMap; sptr clientProxy; bool isBackupStart {false}; @@ -106,7 +107,7 @@ public: * * @return ErrCode 错误码 */ - ErrCode VerifyCallerAndScenario(uint32_t clientToken, IServiceReverse::Scenario scenario) const; + ErrCode VerifyCallerAndScenario(uint32_t clientToken, IServiceReverseType::Scenario scenario) const; /** * @brief 激活会话 @@ -147,10 +148,10 @@ public: /** * @brief 获取Scenario * - * @return IServiceReverse::Scenario 返回scenario + * @return IServiceReverseType::Scenario 返回scenario * @throw BError::Codes::SA_INVAL_ARG 获取异常 */ - IServiceReverse::Scenario GetScenario(); + IServiceReverseType::Scenario GetScenario(); /** * @brief 获取当前处理事务会话对应的userId diff --git a/services/backup_sa/src/module_external/bms_adapter.cpp b/services/backup_sa/src/module_external/bms_adapter.cpp index db61d1369df9f603bb34ee63e919d8b4d3da22b3..29bff99cec2383f5e3b26d4010c274f5f9bd2294 100644 --- a/services/backup_sa/src/module_external/bms_adapter.cpp +++ b/services/backup_sa/src/module_external/bms_adapter.cpp @@ -21,7 +21,7 @@ #include #include "b_error/b_error.h" -#include "b_file_info.h" +#include "backup_file_info.h" #include "b_jsonutil/b_jsonutil.h" #include "b_json/b_json_entity_extension_config.h" #include "b_resources/b_constants.h" diff --git a/services/backup_sa/src/module_ipc/service.cpp b/services/backup_sa/src/module_ipc/service.cpp index a920813304fc38ad7287bdd30d98c8b167fee814..52da1293bcea746628a5f32a95ee552d327a1fb2 100644 --- a/services/backup_sa/src/module_ipc/service.cpp +++ b/services/backup_sa/src/module_ipc/service.cpp @@ -38,11 +38,12 @@ #include #include "ability_manager_client.h" +#include "access_token.h" #include "accesstoken_kit.h" #include "b_anony/b_anony.h" #include "b_error/b_error.h" #include "b_error/b_excep_utils.h" -#include "b_file_info.h" +#include "backup_file_info.h" #include "b_hiaudit/hi_audit.h" #include "b_json/b_json_cached_entity.h" #include "b_jsonutil/b_jsonutil.h" @@ -57,7 +58,7 @@ #include "hisysevent.h" #include "hitrace_meter.h" #include "ipc_skeleton.h" -#include "access_token.h" +#include "service_reverse_inner_type.h" #include "tokenid_kit.h" #include "module_app_gallery/app_gallery_dispose_proxy.h" #include "module_external/bms_adapter.h" @@ -118,7 +119,7 @@ void Service::OnStartResRadarReport(const std::vector &bundleNameLi } void Service::BundleBeginRadarReport(const std::string &bundleName, const ErrCode errCode, - const IServiceReverse::Scenario scenario) + const IServiceReverseType::Scenario scenario) { if (errCode == ERR_OK || errCode == BError(BError::Codes::SA_BOOT_EXT_FAIL).GetCode()) { return; @@ -132,17 +133,17 @@ void Service::BundleBeginRadarReport(const std::string &bundleName, const ErrCod taskInfo.errCode = errCode; UpdateFailedBundles(bundleName, taskInfo); AppRadar::Info info(bundleName, "", ""); - if (scenario == IServiceReverse::Scenario::RESTORE) { - AppRadar::GetInstance().RecordRestoreFuncRes(info, "Service::BundleBeginRadarReport", - GetUserIdDefault(), BizStageRestore::BIZ_STAGE_APPEND_BUNDLES_FAIL, errCode); - } else if (scenario == IServiceReverse::Scenario::BACKUP) { - AppRadar::GetInstance().RecordBackupFuncRes(info, "Service::BundleBeginRadarReport", - GetUserIdDefault(), BizStageBackup::BIZ_STAGE_APPEND_BUNDLES_FAIL, errCode); + if (scenario == IServiceReverseType::Scenario::RESTORE) { + AppRadar::GetInstance().RecordRestoreFuncRes(info, "Service::BundleBeginRadarReport", GetUserIdDefault(), + BizStageRestore::BIZ_STAGE_APPEND_BUNDLES_FAIL, errCode); + } else if (scenario == IServiceReverseType::Scenario::BACKUP) { + AppRadar::GetInstance().RecordBackupFuncRes(info, "Service::BundleBeginRadarReport", GetUserIdDefault(), + BizStageBackup::BIZ_STAGE_APPEND_BUNDLES_FAIL, errCode); } } void Service::BundleEndRadarReport(const std::string &bundleName, ErrCode errCode, - const IServiceReverse::Scenario scenario) + const IServiceReverseType::Scenario scenario) { if (errCode == ERR_OK) { successBundlesNum_++; @@ -160,17 +161,17 @@ void Service::BundleEndRadarReport(const std::string &bundleName, ErrCode errCod taskInfo.errCode = errCode; UpdateFailedBundles(bundleName, taskInfo); AppRadar::Info info(bundleName, "", ""); - if (scenario == IServiceReverse::Scenario::RESTORE) { + if (scenario == IServiceReverseType::Scenario::RESTORE) { AppRadar::GetInstance().RecordRestoreFuncRes(info, "Service::BundleEndRadarReport", GetUserIdDefault(), BizStageRestore::BIZ_STAGE_EXECU_FAIL, errCode); - } else if (scenario == IServiceReverse::Scenario::BACKUP) { + } else if (scenario == IServiceReverseType::Scenario::BACKUP) { AppRadar::GetInstance().RecordBackupFuncRes(info, "Service::BundleEndRadarReport", GetUserIdDefault(), BizStageBackup::BIZ_STAGE_EXECU_FAIL, errCode); } } void Service::FileReadyRadarReport(const std::string &bundleName, const std::string &fileName, const ErrCode errCode, - const IServiceReverse::Scenario scenario) + const IServiceReverseType::Scenario scenario) { if (errCode == ERR_OK) { return; @@ -180,17 +181,17 @@ void Service::FileReadyRadarReport(const std::string &bundleName, const std::str } std::string fileNameReport = std::string("fileName:\"") + GetAnonyPath(fileName) + "\""; AppRadar::Info info(bundleName, "", fileNameReport); - if (scenario == IServiceReverse::Scenario::RESTORE) { + if (scenario == IServiceReverseType::Scenario::RESTORE) { AppRadar::GetInstance().RecordRestoreFuncRes(info, "Service::FileReadyRadarReport", GetUserIdDefault(), BizStageRestore::BIZ_STAGE_GET_FILE_HANDLE_FAIL, errCode); - } else if (scenario == IServiceReverse::Scenario::BACKUP) { + } else if (scenario == IServiceReverseType::Scenario::BACKUP) { AppRadar::GetInstance().RecordBackupFuncRes(info, "Service::FileReadyRadarReport", GetUserIdDefault(), BizStageBackup::BIZ_STAGE_DO_BACKUP, errCode); } } void Service::ExtensionConnectFailRadarReport(const std::string &bundleName, const ErrCode errCode, - const IServiceReverse::Scenario scenario) + const IServiceReverseType::Scenario scenario) { if (!IsReportBundleExecFail(bundleName)) { return; @@ -199,11 +200,11 @@ void Service::ExtensionConnectFailRadarReport(const std::string &bundleName, con std::stringstream ss; ss << "errCode:" << errCode; AppRadar::Info info(bundleName, "", ss.str()); - if (scenario == IServiceReverse::Scenario::RESTORE) { + if (scenario == IServiceReverseType::Scenario::RESTORE) { AppRadar::GetInstance().RecordRestoreFuncRes(info, "Service::ExtensionConnectFailRadarReport", GetUserIdDefault(), BizStageRestore::BIZ_STAGE_CONNECT_EXTENSION_FAIL, BError(BError::Codes::SA_BOOT_EXT_FAIL).GetCode()); - } else if (scenario == IServiceReverse::Scenario::BACKUP) { + } else if (scenario == IServiceReverseType::Scenario::BACKUP) { AppRadar::GetInstance().RecordBackupFuncRes(info, "Service::ExtensionConnectFailRadarReport", GetUserIdDefault(), BizStageBackup::BIZ_STAGE_CONNECT_EXTENSION_FAIL, BError(BError::Codes::SA_BOOT_EXT_FAIL).GetCode()); @@ -217,25 +218,31 @@ void Service::OnStart() std::vector bundleNameList; if (disposal_ != nullptr) { bundleNameList = disposal_->GetBundleNameFromConfigFile(); + HILOGI("disposal_ !=null"); + } else { + HILOGI("disposal_ ==null"); } std::vector residualBundleNameList; if (clearRecorder_ != nullptr) { residualBundleNameList = clearRecorder_->GetAllClearBundleRecords(); } if (!bundleNameList.empty() || !residualBundleNameList.empty()) { + HILOGI("!bundleNameList.empty() || !residualBundleNameList.empty() !=null"); if (!bundleNameList.empty()) { OnStartResRadarReport(bundleNameList, static_cast(BizStageBackup::BIZ_STAGE_ONSTART_DISPOSE)); + HILOGI("bundleNameList !=null"); } if (!residualBundleNameList.empty()) { OnStartResRadarReport(residualBundleNameList, static_cast(BizStageBackup::BIZ_STAGE_ONSTART_RESIDUAL)); + HILOGI("residualBundleNameList !=null"); } SetOccupySession(true); session_->Active( { .clientToken = IPCSkeleton::GetCallingTokenID(), - .scenario = IServiceReverse::Scenario::CLEAN, + .scenario = IServiceReverseType::Scenario::CLEAN, .clientProxy = nullptr, .userId = GetUserIdDefault(), .callerName = "BackupSA", @@ -274,6 +281,18 @@ void Service::OnStop() HILOGI("SA OnStop End."); } +ErrCode Service::GetLocalCapabilitiesWithUniqueFd(int32_t &fd) +{ + return BExcepUltils::ExceptionCatcherLocked( + [&]() + { + UniqueFd fdResult = GetLocalCapabilities(); + fd = fdResult.Get(); + HILOGI("get GetLocalCapabilitiesWithUniqueFd value fd=%{public}d", fd); + return fd; + }); +} + UniqueFd Service::GetLocalCapabilities() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); @@ -348,7 +367,7 @@ void Service::StopAll(const wptr &obj, bool force) ss << "}"; string resultInfo = ss.str(); AppRadar::StatInfo statInfo("", resultInfo); - IServiceReverse::Scenario scenario = session_->GetScenario(); + IServiceReverseType::Scenario scenario = session_->GetScenario(); AppRadar::GetInstance().RecordStatisticRes(statInfo, GetUserIdDefault(), scenario, successBundlesNum_.load(), fail_cnt, result); } @@ -361,8 +380,8 @@ void Service::PermissionCheckFailRadar(const std::string &info, const std::strin { std::string funcPos = "Service::"; AppRadar::Info resInfo("", "", info); - AppRadar::GetInstance().RecordDefaultFuncRes(resInfo, funcPos.append(func), - GetUserIdDefault(), BizStageBackup::BIZ_STAGE_PERMISSION_CHECK_FAIL, + AppRadar::GetInstance().RecordDefaultFuncRes(resInfo, funcPos.append(func), GetUserIdDefault(), + BizStageBackup::BIZ_STAGE_PERMISSION_CHECK_FAIL, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); } @@ -376,24 +395,24 @@ ErrCode Service::VerifyCallerAndGetCallerName(std::string &bundleName) if (Security::AccessToken::AccessTokenKit::GetHapTokenInfo(tokenCaller, hapTokenInfo) != 0) { PermissionCheckFailRadar("Get hap token info failed", "VerifyCallerAndGetCallerName"); HILOGE("Verify and get caller name failed, Get hap token info failed"); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } - std::string bundleNameIndexInfo = BJsonUtil::BuildBundleNameIndexInfo(hapTokenInfo.bundleName, - hapTokenInfo.instIndex); + std::string bundleNameIndexInfo = + BJsonUtil::BuildBundleNameIndexInfo(hapTokenInfo.bundleName, hapTokenInfo.instIndex); ErrCode ret = session_->VerifyBundleName(bundleNameIndexInfo); if (ret != ERR_OK) { HILOGE("Verify bundle name failed, bundleNameIndexInfo:%{public}s", bundleNameIndexInfo.c_str()); return ret; } bundleName = bundleNameIndexInfo; - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } else { string str = to_string(tokenCaller); HILOGE("tokenID = %{private}s", GetAnonyString(str).c_str()); std::string info = string("Invalid token type").append(to_string(tokenType)).append(string("\"}")); PermissionCheckFailRadar(info, "VerifyCallerAndGetCallerName"); HILOGE("Verify and get caller name failed, Invalid token type"); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } } @@ -449,7 +468,7 @@ ErrCode Service::VerifyCaller() return ret; } -ErrCode Service::VerifyCaller(IServiceReverse::Scenario scenario) +ErrCode Service::VerifyCaller(IServiceReverseType::Scenario scenario) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); ErrCode ret = session_->VerifyCallerAndScenario(IPCSkeleton::GetCallingTokenID(), scenario); @@ -460,39 +479,42 @@ ErrCode Service::VerifyCaller(IServiceReverse::Scenario scenario) return VerifyCaller(); } -ErrCode Service::InitRestoreSession(sptr remote) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - ErrCode ret = VerifyCaller(); - if (ret != ERR_OK) { - HILOGE("Init restore session failed, verify caller failed"); - return ret; - } - ret = session_->Active({ - .clientToken = IPCSkeleton::GetCallingTokenID(), - .scenario = IServiceReverse::Scenario::RESTORE, - .clientProxy = remote, - .userId = GetUserIdDefault(), - .callerName = GetCallerName(), - .activeTime = TimeUtils::GetCurrentTime(), - }); - if (ret == ERR_OK) { - ClearFailedBundles(); - successBundlesNum_ = 0; - ClearBundleRadarReport(); - ClearFileReadyRadarReport(); - return ret; - } - if (ret == BError(BError::Codes::SA_SESSION_CONFLICT)) { - HILOGE("Active restore session error, Already have a session"); - return ret; - } - HILOGE("Active restore session error"); - StopAll(nullptr, true); - return ret; -} - -ErrCode Service::InitBackupSession(sptr remote) +ErrCode Service::InitRestoreSession(sptr &remote) +{ + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGI("Start InitRestoreSession"); + ErrCode ret = VerifyCaller(); + if (ret != ERR_OK) { + HILOGE("Init restore session failed, verify caller failed"); + return ret; + } + ret = session_->Active({ + .clientToken = IPCSkeleton::GetCallingTokenID(), + .scenario = IServiceReverseType::Scenario::RESTORE, + .clientProxy = remote, + .userId = GetUserIdDefault(), + .callerName = GetCallerName(), + .activeTime = TimeUtils::GetCurrentTime(), + }); + if (ret == ERR_OK) { + ClearFailedBundles(); + successBundlesNum_ = 0; + ClearBundleRadarReport(); + ClearFileReadyRadarReport(); + HILOGI("End InitRestoreSession"); + return ret; + } + if (ret == BError(BError::Codes::SA_SESSION_CONFLICT)) { + HILOGE("Active restore session error, Already have a session"); + return ret; + } + HILOGE("Active restore session error"); + StopAll(nullptr, true); + return ret; }); +} + +ErrCode Service::InitBackupSession(sptr &remote) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); ErrCode ret = VerifyCaller(); @@ -505,7 +527,7 @@ ErrCode Service::InitBackupSession(sptr remote) session_->SetMemParaCurSize(oldSize); ret = session_->Active({ .clientToken = IPCSkeleton::GetCallingTokenID(), - .scenario = IServiceReverse::Scenario::BACKUP, + .scenario = IServiceReverseType::Scenario::BACKUP, .clientProxy = remote, .userId = GetUserIdDefault(), .callerName = GetCallerName(), @@ -530,18 +552,20 @@ ErrCode Service::InitBackupSession(sptr remote) ErrCode Service::Start() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGI("Service Start"); ErrCode ret = VerifyCaller(session_->GetScenario()); if (ret != ERR_OK) { HILOGE("Service start failed, Verify caller failed, ret:%{public}d", ret); return ret; } ret = session_->Start(); + HILOGI("Service Start End"); if (ret != ERR_OK) { HILOGE("Service start failed, session is invalid, ret:%{public}d", ret); return ret; } OnStartSched(); - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } static bool SpecialVersion(const string &versionName) @@ -557,11 +581,11 @@ static bool SpecialVersion(const string &versionName) void Service::OnBundleStarted(BError error, sptr session, const BundleName &bundleName) { - IServiceReverse::Scenario scenario = session->GetScenario(); - if (scenario == IServiceReverse::Scenario::RESTORE && BackupPara().GetBackupOverrideIncrementalRestore() && + IServiceReverseType::Scenario scenario = session->GetScenario(); + if (scenario == IServiceReverseType::Scenario::RESTORE && BackupPara().GetBackupOverrideIncrementalRestore() && session->ValidRestoreDataType(RestoreTypeEnum::RESTORE_DATA_WAIT_SEND)) { session->GetServiceReverseProxy()->IncrementalRestoreOnBundleStarted(error, bundleName); - } else if (scenario == IServiceReverse::Scenario::RESTORE) { + } else if (scenario == IServiceReverseType::Scenario::RESTORE) { session->GetServiceReverseProxy()->RestoreOnBundleStarted(error, bundleName); } BundleBeginRadarReport(bundleName, error.GetCode(), scenario); @@ -624,14 +648,15 @@ static vector GetRestoreBundleNames(UniqueFd fd, } void Service::HandleExceptionOnAppendBundles(sptr session, - const vector &appendBundleNames, const vector &restoreBundleNames) + const vector &appendBundleNames, + const vector &restoreBundleNames) { if (appendBundleNames.size() != restoreBundleNames.size()) { HILOGE("AppendBundleNames not equal restoreBundleNames, appendBundleNames size:%{public}zu," "restoreBundleNames size:%{public}zu", appendBundleNames.size(), restoreBundleNames.size()); for (const auto &bundleName : appendBundleNames) { auto it = find_if(restoreBundleNames.begin(), restoreBundleNames.end(), - [&bundleName](const auto &obj) { return obj == bundleName; }); + [&bundleName](const auto &obj) { return obj == bundleName; }); if (it == restoreBundleNames.end()) { HILOGE("AppendBundles failed, bundleName = %{public}s.", bundleName.c_str()); OnBundleStarted(BError(BError::Codes::SA_BUNDLE_INFO_EMPTY), session, bundleName); @@ -640,19 +665,38 @@ void Service::HandleExceptionOnAppendBundles(sptr session, } } -ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, const vector &bundleNames, - const std::vector &bundleInfos, RestoreTypeEnum restoreType, int32_t userId) +ErrCode Service::AppendBundlesRestoreSessionRestoreDataWaitSend(int32_t fd, + const std::vector &bundleNames, + const std::vector &detailInfos, + int32_t restoreType, + int32_t userId) +{ + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGI("Begin AppendBundlesRestoreSessionRestoreDataWaitSend"); + HILOGI("fd = %{public}d,restoreType = %{public}d,userId=%{public}d",fd,restoreType,userId); + UniqueFd fdUnique(static_cast(fd)); + RestoreTypeEnum restoreTypeEnum = RestoreTypeEnum::RESTORE_DATA_WAIT_SEND; + return AppendBundlesRestoreSession(std::move(fdUnique), bundleNames, detailInfos, + restoreTypeEnum, userId); }); +} + +ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, + const vector &bundleNames, + const std::vector &bundleInfos, + RestoreTypeEnum restoreType, + int32_t userId) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); HILOGI("Begin"); try { if (session_ == nullptr || isOccupyingSession_.load()) { HILOGE("AppendBundles restore session with infos error, session is empty"); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); SetUserIdAndRestoreType(restoreType, userId); - ErrCode ret = VerifyCaller(IServiceReverse::Scenario::RESTORE); + ErrCode ret = VerifyCaller(IServiceReverseType::Scenario::RESTORE); if (ret != ERR_OK) { HILOGE("AppendBundles restore session with infos error, verify caller failed, ret:%{public}d", ret); HandleExceptionOnAppendBundles(session_, bundleNames, {}); @@ -662,8 +706,8 @@ ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, const vector bundleNamesOnly; std::map isClearDataFlags; std::map> bundleNameDetailMap = - BJsonUtil::BuildBundleInfos(bundleNames, bundleInfos, bundleNamesOnly, - session_->GetSessionUserId(), isClearDataFlags); + BJsonUtil::BuildBundleInfos(bundleNames, bundleInfos, bundleNamesOnly, session_->GetSessionUserId(), + isClearDataFlags); std::string oldBackupVersion; auto restoreInfos = GetRestoreBundleNames(move(fd), session_, bundleNames, oldBackupVersion); auto restoreBundleNames = SvcRestoreDepsManager::GetInstance().GetRestoreBundleNames(restoreInfos, restoreType); @@ -671,15 +715,15 @@ ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, const vectorDecreaseSessionCnt(__PRETTY_FUNCTION__); - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } AppendBundles(restoreBundleNames); - SetCurrentSessProperties(restoreInfos, restoreBundleNames, bundleNameDetailMap, - isClearDataFlags, restoreType, oldBackupVersion); + SetCurrentSessProperties(restoreInfos, restoreBundleNames, bundleNameDetailMap, isClearDataFlags, restoreType, + oldBackupVersion); OnStartSched(); session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); HILOGI("End"); - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } catch (const BError &e) { HILOGE("Catch exception"); HandleExceptionOnAppendBundles(session_, bundleNames, {}); @@ -694,7 +738,9 @@ ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, const vector &restoreBundleInfos, - std::vector &restoreBundleNames, RestoreTypeEnum restoreType, std::string &backupVersion) + std::vector &restoreBundleNames, + RestoreTypeEnum restoreType, + std::string &backupVersion) { HILOGI("Start"); session_->SetOldBackupVersion(backupVersion); @@ -705,11 +751,11 @@ void Service::SetCurrentSessProperties(std::vector }); if (it == restoreBundleNames.end()) { HILOGE("Can not find current bundle, bundleName:%{public}s, appIndex:%{public}d", restoreInfo.name.c_str(), - restoreInfo.appIndex); + restoreInfo.appIndex); continue; } HILOGI("bundleName: %{public}s, extensionName: %{public}s", restoreInfo.name.c_str(), - restoreInfo.extensionName.c_str()); + restoreInfo.extensionName.c_str()); std::string bundleNameIndexInfo = BJsonUtil::BuildBundleNameIndexInfo(restoreInfo.name, restoreInfo.appIndex); if ((!restoreInfo.allToBackup && !SpecialVersion(restoreInfo.versionName)) || (restoreInfo.extensionName.empty() && !SAUtils::IsSABundleName(restoreInfo.name))) { @@ -730,6 +776,20 @@ void Service::SetCurrentSessProperties(std::vector } HILOGI("End"); } +ErrCode Service::AppendBundlesRestoreSessionRestoreDataWaitReady(int32_t fd, + const std::vector &bundleNames, + int32_t restoreType, + int32_t userId) +{ + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGI("Begin AppendBundlesRestoreSessionRestoreDataWaitReady"); + HILOGI("fd = %{public}d,restoreType = %{public}d,userId=%{public}d",fd,restoreType,userId); + UniqueFd fdUnique(static_cast(fd)); + RestoreTypeEnum restoreTypeEnum = RestoreTypeEnum::RESTORE_DATA_READDY; + return AppendBundlesRestoreSession(std::move(fdUnique), + bundleNames, restoreTypeEnum, userId); }); +} ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, const vector &bundleNames, @@ -740,11 +800,11 @@ ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, try { if (session_ == nullptr || isOccupyingSession_.load()) { HILOGE("AppendBundles restore session error, session is empty"); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); SetUserIdAndRestoreType(restoreType, userId); - ErrCode ret = VerifyCaller(IServiceReverse::Scenario::RESTORE); + ErrCode ret = VerifyCaller(IServiceReverseType::Scenario::RESTORE); if (ret != ERR_OK) { HILOGE("AppendBundles restore session with infos error, verify caller failed, ret:%{public}d", ret); HandleExceptionOnAppendBundles(session_, bundleNames, {}); @@ -758,13 +818,13 @@ ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, if (restoreBundleNames.empty()) { session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); HILOGW("RestoreBundleNames is empty."); - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } AppendBundles(restoreBundleNames); SetCurrentSessProperties(restoreInfos, restoreBundleNames, restoreType, oldBackupVersion); OnStartSched(); session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } catch (const BError &e) { HILOGE("Catch exception"); HandleExceptionOnAppendBundles(session_, bundleNames, {}); @@ -778,10 +838,13 @@ ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, } } -void Service::SetCurrentSessProperties(std::vector &restoreBundleInfos, +void Service::SetCurrentSessProperties( + std::vector &restoreBundleInfos, std::vector &restoreBundleNames, std::map> &bundleNameDetailMap, - std::map &isClearDataFlags, RestoreTypeEnum restoreType, std::string &backupVersion) + std::map &isClearDataFlags, + RestoreTypeEnum restoreType, + std::string &backupVersion) { HILOGI("Start"); session_->SetOldBackupVersion(backupVersion); @@ -794,7 +857,7 @@ void Service::SetCurrentSessProperties(std::vector }); if (it == restoreBundleNames.end()) { HILOGE("Can not find current bundle, bundleName:%{public}s, appIndex:%{public}d", restoreInfo.name.c_str(), - restoreInfo.appIndex); + restoreInfo.appIndex); continue; } std::string bundleNameIndexInfo = BJsonUtil::BuildBundleNameIndexInfo(restoreInfo.name, restoreInfo.appIndex); @@ -815,14 +878,14 @@ void Service::SetCurrentSessProperties(std::vector } BJsonUtil::BundleDetailInfo broadCastInfo; BJsonUtil::BundleDetailInfo uniCastInfo; - bool broadCastRet = BJsonUtil::FindBundleInfoByName(bundleNameDetailMap, bundleNameIndexInfo, BROADCAST_TYPE, - broadCastInfo); + bool broadCastRet = + BJsonUtil::FindBundleInfoByName(bundleNameDetailMap, bundleNameIndexInfo, BROADCAST_TYPE, broadCastInfo); if (broadCastRet) { bool notifyRet = DelayedSingleton::GetInstance()->NotifyBundleDetail(broadCastInfo); HILOGI("Publish event end, notify result is:%{public}d", notifyRet); } - bool uniCastRet = BJsonUtil::FindBundleInfoByName(bundleNameDetailMap, bundleNameIndexInfo, UNICAST_TYPE, - uniCastInfo); + bool uniCastRet = + BJsonUtil::FindBundleInfoByName(bundleNameDetailMap, bundleNameIndexInfo, UNICAST_TYPE, uniCastInfo); if (uniCastRet) { HILOGI("current bundle, unicast info:%{public}s", GetAnonyString(uniCastInfo.detail).c_str()); session_->SetBackupExtInfo(bundleNameIndexInfo, uniCastInfo.detail); @@ -835,97 +898,107 @@ void Service::SetCurrentSessProperties(std::vector ErrCode Service::AppendBundlesBackupSession(const vector &bundleNames) { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - try { - if (session_ == nullptr || isOccupyingSession_.load()) { - HILOGE("AppendBundles backup session error, session is empty"); - return BError(BError::Codes::SA_INVAL_ARG); - } - session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); // BundleMgrAdapter::GetBundleInfos可能耗时 - ErrCode ret = VerifyCaller(IServiceReverse::Scenario::BACKUP); - if (ret != ERR_OK) { - HILOGE("AppendBundles backup session error, verify caller failed, ret:%{public}d", ret); - HandleExceptionOnAppendBundles(session_, bundleNames, {}); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return ret; - } - auto bundleDetails = MakeDetailList(bundleNames); - auto backupInfos = BundleMgrAdapter::GetBundleInfosForAppend(bundleDetails, session_->GetSessionUserId()); - std::vector supportBackupNames = GetSupportBackupBundleNames(backupInfos, false, bundleNames); - AppendBundles(supportBackupNames); - SetCurrentBackupSessProperties(supportBackupNames, session_->GetSessionUserId(), backupInfos, false); - OnStartSched(); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return BError(BError::Codes::OK); - } catch (const BError &e) { - HILOGE("Failed, errCode = %{public}d", e.GetCode()); - HandleExceptionOnAppendBundles(session_, bundleNames, {}); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return e.GetCode(); - } catch (...) { - HILOGE("Unexpected exception"); - HandleExceptionOnAppendBundles(session_, bundleNames, {}); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return EPERM; - } + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + try { + if (session_ == nullptr || isOccupyingSession_.load()) { + HILOGE("AppendBundles backup session error, session is empty"); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); // BundleMgrAdapter::GetBundleInfos可能耗时 + ErrCode ret = VerifyCaller(IServiceReverseType::Scenario::BACKUP); + if (ret != ERR_OK) { + HILOGE("AppendBundles backup session error, verify caller failed, ret:%{public}d", ret); + HandleExceptionOnAppendBundles(session_, bundleNames, {}); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return ErrCode(ret); + } + auto bundleDetails = MakeDetailList(bundleNames); + auto backupInfos = BundleMgrAdapter::GetBundleInfosForAppend(bundleDetails, + session_->GetSessionUserId()); + std::vector supportBackupNames = GetSupportBackupBundleNames(backupInfos, + false, bundleNames); + AppendBundles(supportBackupNames); + SetCurrentBackupSessProperties(supportBackupNames, session_->GetSessionUserId(), + backupInfos, false); + OnStartSched(); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return BError(BError::Codes::OK).GetCode(); + } catch (const BError &e) { + HILOGE("Failed, errCode = %{public}d", e.GetCode()); + HandleExceptionOnAppendBundles(session_, bundleNames, {}); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return e.GetCode(); + } catch (...) { + HILOGE("Unexpected exception"); + HandleExceptionOnAppendBundles(session_, bundleNames, {}); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return EPERM; + }}); } ErrCode Service::AppendBundlesDetailsBackupSession(const vector &bundleNames, - const vector &bundleInfos) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - try { - if (session_ == nullptr || isOccupyingSession_.load()) { - HILOGE("AppendBundles backup session with infos error, session is empty"); - return BError(BError::Codes::SA_INVAL_ARG); - } - session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); // BundleMgrAdapter::GetBundleInfos可能耗时 - ErrCode ret = VerifyCaller(IServiceReverse::Scenario::BACKUP); - if (ret != ERR_OK) { - HILOGE("AppendBundles backup session with infos error, verify caller failed, ret:%{public}d", ret); - HandleExceptionOnAppendBundles(session_, bundleNames, {}); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return ret; - } - std::vector bundleNamesOnly; - std::map isClearDataFlags; - std::map> bundleNameDetailMap = - BJsonUtil::BuildBundleInfos(bundleNames, bundleInfos, bundleNamesOnly, - session_->GetSessionUserId(), isClearDataFlags); - auto bundleDetails = MakeDetailList(bundleNames); - auto backupInfos = BundleMgrAdapter::GetBundleInfosForAppend(bundleDetails, session_->GetSessionUserId()); - std::vector supportBackupNames = GetSupportBackupBundleNames(backupInfos, false, bundleNames); - AppendBundles(supportBackupNames); - HandleCurGroupBackupInfos(backupInfos, bundleNameDetailMap, isClearDataFlags); - OnStartSched(); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return BError(BError::Codes::OK); - } catch (const BError &e) { - HILOGE("Failed, errCode = %{public}d", e.GetCode()); - HandleExceptionOnAppendBundles(session_, bundleNames, {}); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return e.GetCode(); - } catch(...) { - HILOGE("Unexpected exception"); - HandleExceptionOnAppendBundles(session_, bundleNames, {}); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return EPERM; - } -} - -void Service::HandleCurGroupBackupInfos(std::vector &backupInfos, + const vector &bundleInfos) +{ + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + try { + if (session_ == nullptr || isOccupyingSession_.load()) { + HILOGE("AppendBundles backup session with infos error, session is empty"); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); // BundleMgrAdapter::GetBundleInfos可能耗时 + ErrCode ret = VerifyCaller(IServiceReverseType::Scenario::BACKUP); + if (ret != ERR_OK) { + HILOGE("AppendBundles backup session with infos error, verify caller failed, ret:%{public}d", + ret); + HandleExceptionOnAppendBundles(session_, bundleNames, {}); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return ret; + } + std::vector bundleNamesOnly; + std::map isClearDataFlags; + std::map> bundleNameDetailMap = + BJsonUtil::BuildBundleInfos(bundleNames, bundleInfos, bundleNamesOnly, + session_->GetSessionUserId(), + isClearDataFlags); + auto bundleDetails = MakeDetailList(bundleNames); + auto backupInfos = BundleMgrAdapter::GetBundleInfosForAppend(bundleDetails, + session_->GetSessionUserId()); + std::vector supportBackupNames = GetSupportBackupBundleNames(backupInfos, + false, bundleNames); + AppendBundles(supportBackupNames); + HandleCurGroupBackupInfos(backupInfos, bundleNameDetailMap, isClearDataFlags); + OnStartSched(); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return BError(BError::Codes::OK).GetCode(); + } catch (const BError &e) { + HILOGE("Failed, errCode = %{public}d", e.GetCode()); + HandleExceptionOnAppendBundles(session_, bundleNames, {}); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return e.GetCode(); + } catch (...) { + HILOGE("Unexpected exception"); + HandleExceptionOnAppendBundles(session_, bundleNames, {}); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return EPERM; + }}); +} + +void Service::HandleCurGroupBackupInfos( + std::vector &backupInfos, std::map> &bundleNameDetailMap, std::map &isClearDataFlags) { for (auto &info : backupInfos) { - HILOGI("Current backupInfo bundleName:%{public}s, extName:%{public}s, appIndex:%{public}d", - info.name.c_str(), info.extensionName.c_str(), info.appIndex); + HILOGI("Current backupInfo bundleName:%{public}s, extName:%{public}s, appIndex:%{public}d", info.name.c_str(), + info.extensionName.c_str(), info.appIndex); std::string bundleNameIndexInfo = BJsonUtil::BuildBundleNameIndexInfo(info.name, info.appIndex); SetCurrentSessProperties(info, isClearDataFlags, bundleNameIndexInfo); BJsonUtil::BundleDetailInfo uniCastInfo; if (BJsonUtil::FindBundleInfoByName(bundleNameDetailMap, bundleNameIndexInfo, UNICAST_TYPE, uniCastInfo)) { HILOGI("current bundle:%{public}s, unicast info:%{public}s, unicast info size:%{public}zu", - bundleNameIndexInfo.c_str(), GetAnonyString(uniCastInfo.detail).c_str(), uniCastInfo.detail.size()); + bundleNameIndexInfo.c_str(), GetAnonyString(uniCastInfo.detail).c_str(), uniCastInfo.detail.size()); session_->SetBackupExtInfo(bundleNameIndexInfo, uniCastInfo.detail); } session_->SetBundleUserId(bundleNameIndexInfo, session_->GetSessionUserId()); @@ -934,51 +1007,58 @@ void Service::HandleCurGroupBackupInfos(std::vector } } -ErrCode Service::ServiceResultReport(const std::string restoreRetInfo, - BackupRestoreScenario sennario, ErrCode errCode) +ErrCode Service::ServiceResultReport(const std::string& restoreRetInfo, BackupRestoreScenario sennario, ErrCode errCode) { string callerName; HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - try { - ErrCode ret = VerifyCallerAndGetCallerName(callerName); - if (ret != ERR_OK) { - HILOGE("Result report fail, bundleName:%{public}s, ret:%{public}d", callerName.c_str(), ret); - HandleCurBundleEndWork(callerName, sennario); - CallOnBundleEndByScenario(callerName, sennario, ret); - OnAllBundlesFinished(BError(BError::Codes::OK)); - return ret; - } - SendEndAppGalleryNotify(callerName); - if (sennario == BackupRestoreScenario::FULL_RESTORE) { - HandleCurBundleEndWork(callerName, sennario); - session_->GetServiceReverseProxy()->RestoreOnResultReport(restoreRetInfo, callerName, errCode); - OnAllBundlesFinished(BError(BError::Codes::OK)); - } else if (sennario == BackupRestoreScenario::INCREMENTAL_RESTORE) { - HandleCurBundleEndWork(callerName, sennario); - session_->GetServiceReverseProxy()->IncrementalRestoreOnResultReport(restoreRetInfo, callerName, errCode); - OnAllBundlesFinished(BError(BError::Codes::OK)); - } else if (sennario == BackupRestoreScenario::FULL_BACKUP) { - session_->GetServiceReverseProxy()->BackupOnResultReport(restoreRetInfo, callerName); - } else if (sennario == BackupRestoreScenario::INCREMENTAL_BACKUP) { - session_->GetServiceReverseProxy()->IncrementalBackupOnResultReport(restoreRetInfo, callerName); - } - return BError(BError::Codes::OK); - } catch (const BError &e) { - HandleCurBundleEndWork(callerName, sennario); - CallOnBundleEndByScenario(callerName, sennario, e.GetCode()); - OnAllBundlesFinished(BError(BError::Codes::OK)); - return e.GetCode(); // 任意异常产生，终止监听该任务 - } -} - -ErrCode Service::SAResultReport(const std::string bundleName, const std::string restoreRetInfo, - const ErrCode errCode, const BackupRestoreScenario sennario) + return BExcepUltils::ExceptionCatcherLocked( + [&]() { try { + HILOGI("ServiceResultReport restoreRetInfo:%{public}s, sennario :%{public}d ,errCode:%{public}d",restoreRetInfo.c_str(),sennario,errCode); + ErrCode ret = VerifyCallerAndGetCallerName(callerName); + if (ret != ERR_OK) { + HILOGE("Result report fail, bundleName:%{public}s, ret:%{public}d", + callerName.c_str(), ret); + HandleCurBundleEndWork(callerName, sennario); + CallOnBundleEndByScenario(callerName, sennario, ret); + OnAllBundlesFinished(BError(BError::Codes::OK)); + return ret; + } + SendEndAppGalleryNotify(callerName); + if (sennario == BackupRestoreScenario::FULL_RESTORE) { + HandleCurBundleEndWork(callerName, sennario); + session_->GetServiceReverseProxy()->RestoreOnResultReport(restoreRetInfo, + callerName, errCode); + OnAllBundlesFinished(BError(BError::Codes::OK)); + } else if (sennario == BackupRestoreScenario::INCREMENTAL_RESTORE) { + HandleCurBundleEndWork(callerName, sennario); + session_->GetServiceReverseProxy()->IncrementalRestoreOnResultReport(restoreRetInfo, + callerName, errCode); + OnAllBundlesFinished(BError(BError::Codes::OK)); + } else if (sennario == BackupRestoreScenario::FULL_BACKUP) { + session_->GetServiceReverseProxy()->BackupOnResultReport(restoreRetInfo, callerName); + } else if (sennario == BackupRestoreScenario::INCREMENTAL_BACKUP) { + session_->GetServiceReverseProxy()->IncrementalBackupOnResultReport(restoreRetInfo, + callerName); + } + return BError(BError::Codes::OK).GetCode(); + } catch (const BError &e) { + HandleCurBundleEndWork(callerName, sennario); + CallOnBundleEndByScenario(callerName, sennario, e.GetCode()); + OnAllBundlesFinished(BError(BError::Codes::OK)); + return e.GetCode(); // 任意异常产生，终止监听该任务 + }}); +} + +ErrCode Service::SAResultReport(const std::string bundleName, + const std::string restoreRetInfo, + const ErrCode errCode, + const BackupRestoreScenario sennario) { SADone(errCode, bundleName); if (sennario == BackupRestoreScenario::FULL_RESTORE) { - session_->GetServiceReverseProxy()->RestoreOnResultReport(restoreRetInfo, bundleName); + session_->GetServiceReverseProxy()->RestoreOnResultReport(restoreRetInfo, bundleName, ERR_OK); } else if (sennario == BackupRestoreScenario::INCREMENTAL_RESTORE) { - session_->GetServiceReverseProxy()->IncrementalRestoreOnResultReport(restoreRetInfo, bundleName); + session_->GetServiceReverseProxy()->IncrementalRestoreOnResultReport(restoreRetInfo, bundleName, ERR_OK); } else if (sennario == BackupRestoreScenario::FULL_BACKUP) { session_->GetServiceReverseProxy()->BackupOnResultReport(restoreRetInfo, bundleName); session_->GetServiceReverseProxy()->BackupOnBundleFinished(errCode, bundleName); @@ -987,19 +1067,18 @@ ErrCode Service::SAResultReport(const std::string bundleName, const std::string } OnAllBundlesFinished(BError(BError::Codes::OK)); if (sennario == BackupRestoreScenario::FULL_RESTORE || sennario == BackupRestoreScenario::INCREMENTAL_RESTORE) { - BundleEndRadarReport(bundleName, errCode, IServiceReverse::Scenario::RESTORE); + BundleEndRadarReport(bundleName, errCode, IServiceReverseType::Scenario::RESTORE); } else if (sennario == BackupRestoreScenario::FULL_BACKUP || - sennario == BackupRestoreScenario::INCREMENTAL_BACKUP) { - BundleEndRadarReport(bundleName, errCode, IServiceReverse::Scenario::BACKUP); + sennario == BackupRestoreScenario::INCREMENTAL_BACKUP) { + BundleEndRadarReport(bundleName, errCode, IServiceReverseType::Scenario::BACKUP); } - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } void Service::HandleCurBundleEndWork(std::string bundleName, const BackupRestoreScenario sennario) { try { - if (sennario != BackupRestoreScenario::FULL_RESTORE && - sennario != BackupRestoreScenario::INCREMENTAL_RESTORE) { + if (sennario != BackupRestoreScenario::FULL_RESTORE && sennario != BackupRestoreScenario::INCREMENTAL_RESTORE) { return; } if (session_->OnBundleFileReady(bundleName)) { @@ -1034,72 +1113,82 @@ void Service::HandleCurBundleEndWork(std::string bundleName, const BackupRestore ErrCode Service::LaunchBackupSAExtension(const BundleName &bundleName) { string extInfo = session_->GetBackupExtInfo(bundleName); - IServiceReverse::Scenario scenario = session_->GetScenario(); + IServiceReverseType::Scenario scenario = session_->GetScenario(); if (SAUtils::IsSABundleName(bundleName)) { auto saBackUpConnection = session_->GetSAExtConnection(bundleName); std::shared_ptr saConnection = saBackUpConnection.lock(); if (saConnection == nullptr) { HILOGE("lock sa connection ptr is nullptr"); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } - if (scenario == IServiceReverse::Scenario::BACKUP) { + if (scenario == IServiceReverseType::Scenario::BACKUP) { return saConnection->ConnectBackupSAExt(bundleName, BConstants::EXTENSION_BACKUP, extInfo); - } else if (scenario == IServiceReverse::Scenario::RESTORE) { + } else if (scenario == IServiceReverseType::Scenario::RESTORE) { return saConnection->ConnectBackupSAExt(bundleName, BConstants::EXTENSION_RESTORE, extInfo); } } - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } ErrCode Service::GetFileHandle(const string &bundleName, const string &fileName) { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - try { - if (session_ == nullptr) { - HILOGE("GetFileHandle error, session is empty"); - return BError(BError::Codes::SA_INVAL_ARG); - } - ErrCode ret = VerifyCaller(IServiceReverse::Scenario::RESTORE); - if (ret != ERR_OK) { - HILOGE("verify caller failed, bundleName:%{public}s", bundleName.c_str()); - return ret; - } - bool updateRes = SvcRestoreDepsManager::GetInstance().UpdateToRestoreBundleMap(bundleName, fileName); - if (updateRes) { - return BError(BError::Codes::OK); - } - auto action = session_->GetServiceSchedAction(bundleName); - if (action == BConstants::ServiceSchedAction::UNKNOWN) { - HILOGE("action is unknown, bundleName:%{public}s", bundleName.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); - } - if (action == BConstants::ServiceSchedAction::RUNNING) { - auto backUpConnection = session_->GetExtConnection(bundleName); - if (backUpConnection == nullptr) { - HILOGE("backUpConnection is empty, bundle:%{public}s", bundleName.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); - } - auto proxy = backUpConnection->GetBackupExtProxy(); - if (!proxy) { - HILOGE("GetFileHandle error, Extension backup Proxy is empty"); - return BError(BError::Codes::SA_INVAL_ARG); - } - int32_t errCode = 0; - UniqueFd fd = proxy->GetFileHandle(fileName, errCode); - if (errCode != ERR_OK) { - AppRadar::Info info (bundleName, "", ""); - AppRadar::GetInstance().RecordRestoreFuncRes(info, "Service::GetFileHandle", GetUserIdDefault(), - BizStageRestore::BIZ_STAGE_GET_FILE_HANDLE_FAIL, errCode); - } - session_->GetServiceReverseProxy()->RestoreOnFileReady(bundleName, fileName, move(fd), errCode); - FileReadyRadarReport(bundleName, fileName, errCode, IServiceReverse::Scenario::RESTORE); - } else { - session_->SetExtFileNameRequest(bundleName, fileName); - } - return BError(BError::Codes::OK); - } catch (const BError &e) { - return e.GetCode(); - } + return BExcepUltils::ExceptionCatcherLocked( + [&]() { + HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGI("GetFileHandle bundleName:%{public}s,fileName:%{public}s",bundleName.c_str(),fileName.c_str()); + try { + if (session_ == nullptr) { + HILOGE("GetFileHandle error, session is empty"); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + ErrCode ret = VerifyCaller(IServiceReverseType::Scenario::RESTORE); + if (ret != ERR_OK) { + HILOGE("verify caller failed, bundleName:%{public}s", bundleName.c_str()); + return ret; + } + bool updateRes = SvcRestoreDepsManager::GetInstance().UpdateToRestoreBundleMap(bundleName, + fileName); + if (updateRes) { + return BError(BError::Codes::OK).GetCode(); + } + auto action = session_->GetServiceSchedAction(bundleName); + if (action == BConstants::ServiceSchedAction::UNKNOWN) { + HILOGE("action is unknown, bundleName:%{public}s", bundleName.c_str()); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + if (action == BConstants::ServiceSchedAction::RUNNING) { + auto backUpConnection = session_->GetExtConnection(bundleName); + if (backUpConnection == nullptr) { + HILOGE("backUpConnection is empty, bundle:%{public}s", bundleName.c_str()); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + auto proxy = backUpConnection->GetBackupExtProxy(); + if (!proxy) { + HILOGE("GetFileHandle error, Extension backup Proxy is empty"); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + int32_t errCode = 0; + int32_t fdCode = 0; + proxy->GetFileHandleWithUniqueFd(fileName, errCode, fdCode); + UniqueFd fd(static_cast(fdCode)); + if (errCode != ERR_OK) { + AppRadar::Info info(bundleName, "", ""); + AppRadar::GetInstance().RecordRestoreFuncRes(info, "Service::GetFileHandle", + GetUserIdDefault(), + BizStageRestore::BIZ_STAGE_GET_FILE_HANDLE_FAIL, + errCode); + } + session_->GetServiceReverseProxy()->RestoreOnFileReady(bundleName, fileName, + move(fd), errCode); + FileReadyRadarReport(bundleName, fileName, errCode, + IServiceReverseType::Scenario::RESTORE); + } else { + session_->SetExtFileNameRequest(bundleName, fileName); + } + return BError(BError::Codes::OK).GetCode(); + } catch (const BError &e) { + return e.GetCode(); + }}); } void Service::ExtStart(const string &bundleName) @@ -1126,7 +1215,7 @@ void Service::ExtStart(const string &bundleName) void Service::StartCurBundleBackupOrRestore(const std::string &bundleName) { HILOGI("Begin handle current bundle full backup or full restore, bundleName:%{public}s", bundleName.c_str()); - IServiceReverse::Scenario scenario = session_->GetScenario(); + IServiceReverseType::Scenario scenario = session_->GetScenario(); auto backUpConnection = session_->GetExtConnection(bundleName); if (backUpConnection == nullptr) { HILOGE("Error, backUpConnection is empty, bundle:%{public}s", bundleName.c_str()); @@ -1139,7 +1228,7 @@ void Service::StartCurBundleBackupOrRestore(const std::string &bundleName) ReportOnBundleStarted(scenario, bundleName); return; } - if (scenario == IServiceReverse::Scenario::BACKUP) { + if (scenario == IServiceReverseType::Scenario::BACKUP) { auto ret = proxy->HandleBackup(session_->GetClearDataFlag(bundleName)); session_->GetServiceReverseProxy()->BackupOnBundleStarted(ret, bundleName); BundleBeginRadarReport(bundleName, ret, scenario); @@ -1148,7 +1237,7 @@ void Service::StartCurBundleBackupOrRestore(const std::string &bundleName) ClearSessionAndSchedInfo(bundleName); NoticeClientFinish(bundleName, BError(BError::Codes::SA_INVAL_ARG)); } - } else if (scenario == IServiceReverse::Scenario::RESTORE) { + } else if (scenario == IServiceReverseType::Scenario::RESTORE) { auto ret = proxy->HandleRestore(session_->GetClearDataFlag(bundleName)); session_->GetServiceReverseProxy()->RestoreOnBundleStarted(ret, bundleName); GetOldDeviceBackupVersion(); @@ -1156,7 +1245,9 @@ void Service::StartCurBundleBackupOrRestore(const std::string &bundleName) auto fileNameVec = session_->GetExtFileNameRequest(bundleName); for (const auto &fileName : fileNameVec) { int32_t errCode = 0; - UniqueFd fd = proxy->GetFileHandle(fileName, errCode); + int32_t fdCode = 0; + proxy->GetFileHandleWithUniqueFd(fileName, errCode, fdCode); + UniqueFd fd(static_cast(fdCode)); session_->GetServiceReverseProxy()->RestoreOnFileReady(bundleName, fileName, move(fd), errCode); FileReadyRadarReport(bundleName, fileName, errCode, scenario); } @@ -1175,18 +1266,19 @@ int Service::Dump(int fd, const vector &args) return 0; } -void Service::ReportOnExtConnectFailed(const IServiceReverse::Scenario scenario, - const std::string &bundleName, const ErrCode ret) +void Service::ReportOnExtConnectFailed(const IServiceReverseType::Scenario scenario, + const std::string &bundleName, + const ErrCode ret) { try { if (session_ == nullptr) { HILOGE("Report extConnectfailed error, session info is empty"); return; } - if (scenario == IServiceReverse::Scenario::BACKUP && session_->GetIsIncrementalBackup()) { + if (scenario == IServiceReverseType::Scenario::BACKUP && session_->GetIsIncrementalBackup()) { session_->GetServiceReverseProxy()->IncrementalBackupOnBundleStarted(ret, bundleName); BundleBeginRadarReport(bundleName, ret, scenario); - } else if (scenario == IServiceReverse::Scenario::RESTORE && + } else if (scenario == IServiceReverseType::Scenario::RESTORE && BackupPara().GetBackupOverrideIncrementalRestore() && session_->ValidRestoreDataType(RestoreTypeEnum::RESTORE_DATA_WAIT_SEND)) { session_->GetServiceReverseProxy()->IncrementalRestoreOnBundleStarted(ret, bundleName); @@ -1195,10 +1287,10 @@ void Service::ReportOnExtConnectFailed(const IServiceReverse::Scenario scenario, session_->GetBundleUserId(bundleName)); HILOGI("ExtConnectFailed EndRestore, code=%{public}d, bundleName=%{public}s", disposeErr, bundleName.c_str()); - } else if (scenario == IServiceReverse::Scenario::BACKUP) { + } else if (scenario == IServiceReverseType::Scenario::BACKUP) { session_->GetServiceReverseProxy()->BackupOnBundleStarted(ret, bundleName); BundleBeginRadarReport(bundleName, ret, scenario); - } else if (scenario == IServiceReverse::Scenario::RESTORE) { + } else if (scenario == IServiceReverseType::Scenario::RESTORE) { session_->GetServiceReverseProxy()->RestoreOnBundleStarted(ret, bundleName); BundleBeginRadarReport(bundleName, ret, scenario); DisposeErr disposeErr = AppGalleryDisposeProxy::GetInstance()->EndRestore(bundleName, @@ -1214,7 +1306,7 @@ void Service::ReportOnExtConnectFailed(const IServiceReverse::Scenario scenario, void Service::ExtConnectFailed(const string &bundleName, ErrCode ret) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - IServiceReverse::Scenario scenario = IServiceReverse::Scenario::UNDEFINED; + IServiceReverseType::Scenario scenario = IServiceReverseType::Scenario::UNDEFINED; try { HILOGE("begin %{public}s", bundleName.data()); scenario = session_->GetScenario(); @@ -1236,9 +1328,9 @@ void Service::StartRunningTimer(const std::string &bundleName) { auto timeoutCallback = TimeOutCallback(wptr(this), bundleName); auto scenario = session_->GetScenario(); - if (scenario == IServiceReverse::Scenario::BACKUP) { + if (scenario == IServiceReverseType::Scenario::BACKUP) { session_->StartExtTimer(bundleName, timeoutCallback); - } else if (scenario == IServiceReverse::Scenario::RESTORE) { + } else if (scenario == IServiceReverseType::Scenario::RESTORE) { session_->StartFwkTimer(bundleName, timeoutCallback); } } @@ -1312,7 +1404,7 @@ void Service::ClearSessionAndSchedInfo(const string &bundleName) void Service::HandleRestoreDepsBundle(const string &bundleName) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - if (session_->GetScenario() != IServiceReverse::Scenario::RESTORE) { + if (session_->GetScenario() != IServiceReverseType::Scenario::RESTORE) { return; } HILOGI("Begin, bundleName: %{public}s", bundleName.c_str()); @@ -1367,8 +1459,8 @@ void Service::SendStartAppGalleryNotify(const BundleName &bundleName) HILOGI("SA does not need to StartRestore"); return; } - IServiceReverse::Scenario scenario = session_->GetScenario(); - if (scenario != IServiceReverse::Scenario::RESTORE) { + IServiceReverseType::Scenario scenario = session_->GetScenario(); + if (scenario != IServiceReverseType::Scenario::RESTORE) { return; } int32_t userId = session_->GetBundleUserId(bundleName); @@ -1390,8 +1482,8 @@ void Service::SendEndAppGalleryNotify(const BundleName &bundleName) HILOGI("SA does not need to EndRestore"); return; } - IServiceReverse::Scenario scenario = session_->GetScenario(); - if (scenario != IServiceReverse::Scenario::RESTORE) { + IServiceReverseType::Scenario scenario = session_->GetScenario(); + if (scenario != IServiceReverseType::Scenario::RESTORE) { return; } int32_t userId = session_->GetBundleUserId(bundleName); @@ -1440,8 +1532,8 @@ void Service::TryToClearDispose(const BundleName &bundleName) void Service::SendErrAppGalleryNotify() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - IServiceReverse::Scenario scenario = session_->GetScenario(); - if (scenario != IServiceReverse::Scenario::RESTORE) { + IServiceReverseType::Scenario scenario = session_->GetScenario(); + if (scenario != IServiceReverseType::Scenario::RESTORE) { return; } vector bundleNameList = disposal_->GetBundleNameFromConfigFile(); @@ -1472,8 +1564,8 @@ void Service::ClearDisposalOnSaStart() void Service::DeleteDisConfigFile() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - IServiceReverse::Scenario scenario = session_->GetScenario(); - if (scenario != IServiceReverse::Scenario::RESTORE) { + IServiceReverseType::Scenario scenario = session_->GetScenario(); + if (scenario != IServiceReverseType::Scenario::RESTORE) { return; } vector bundleNameList = disposal_->GetBundleNameFromConfigFile(); @@ -1492,14 +1584,14 @@ void Service::SessionDeactive() try { HILOGI("Begin"); isInRelease_.store(true); - //清理处置状态 + // 清理处置状态 if (session_ == nullptr) { HILOGE("Session deactive error, session is empty"); return; } ErrCode ret = BError(BError::Codes::OK); std::vector bundleNameList; - if (session_->GetScenario() == IServiceReverse::Scenario::RESTORE && + if (session_->GetScenario() == IServiceReverseType::Scenario::RESTORE && session_->CleanAndCheckIfNeedWait(ret, bundleNameList)) { if (ret != ERR_OK) { isRmConfigFile_.store(false); @@ -1555,8 +1647,8 @@ std::function Service::GetBackupInfoConnectDone(wptr }; } -std::function Service::GetBackupInfoConnectDied( - wptr obj, std::string &bundleName) +std::function Service::GetBackupInfoConnectDied(wptr obj, + std::string &bundleName) { return [obj](const string &&bundleName, bool isCleanCalled) { HILOGI("GetBackupInfoConnectDied, bundleName: %{public}s", bundleName.c_str()); @@ -1573,17 +1665,17 @@ std::function Service::GetBackupInfoConnectDie ErrCode Service::ClearResidualBundleData(const std::string &bundleName) { if (session_ == nullptr) { - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } auto backUpConnection = session_->GetExtConnection(bundleName); if (backUpConnection == nullptr) { HILOGE("BackUpConnection is empty, bundle:%{public}s", bundleName.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } auto proxy = backUpConnection->GetBackupExtProxy(); if (!proxy) { HILOGE("Extension backup Proxy is empty, bundle:%{public}s", bundleName.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } // 通知ext清理 HILOGI("Current bundle will clean extension data, bundleName:%{public}s", bundleName.c_str()); @@ -1593,7 +1685,7 @@ ErrCode Service::ClearResidualBundleData(const std::string &bundleName) } ClearSessionAndSchedInfo(bundleName); // 非清理任务，需要上报 - if (session_->GetScenario() != IServiceReverse::Scenario::CLEAN) { + if (session_->GetScenario() != IServiceReverseType::Scenario::CLEAN) { OnAllBundlesFinished(BError(BError::Codes::OK)); } return res; @@ -1603,12 +1695,12 @@ ErrCode Service::GetBackupInfoCmdHandle(BundleName &bundleName, std::string &res { if (session_ == nullptr) { HILOGE("Get BackupInfo error, session is empty."); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } auto backupConnection = session_->CreateBackupConnection(bundleName); if (backupConnection == nullptr) { HILOGE("backupConnection is null. bundleName: %{public}s", bundleName.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } auto callConnected = GetBackupInfoConnectDone(wptr(this), bundleName); auto callDied = GetBackupInfoConnectDied(wptr(this), bundleName); @@ -1618,19 +1710,19 @@ ErrCode Service::GetBackupInfoCmdHandle(BundleName &bundleName, std::string &res auto ret = backupConnection->ConnectBackupExtAbility(want, GetUserIdDefault(), false); if (ret) { HILOGE("ConnectBackupExtAbility faild, bundleName:%{public}s, ret:%{public}d", bundleName.c_str(), ret); - return BError(BError::Codes::SA_BOOT_EXT_FAIL); + return BError(BError::Codes::SA_BOOT_EXT_FAIL).GetCode(); } std::unique_lock lock(getBackupInfoSyncLock_); getBackupInfoCondition_.wait_for(lock, std::chrono::seconds(CONNECT_WAIT_TIME_S)); if (isConnectDied_.load()) { HILOGE("GetBackupInfoConnectDied, please check bundleName: %{public}s", bundleName.c_str()); isConnectDied_.store(false); - return BError(BError::Codes::EXT_ABILITY_DIED); + return BError(BError::Codes::EXT_ABILITY_DIED).GetCode(); } auto proxy = backupConnection->GetBackupExtProxy(); if (!proxy) { HILOGE("Extension backup Proxy is empty."); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } ret = proxy->GetBackupInfo(result); backupConnection->DisconnectBackupExtAbility(); @@ -1639,44 +1731,46 @@ ErrCode Service::GetBackupInfoCmdHandle(BundleName &bundleName, std::string &res AppRadar::Info info(bundleName, "", "Call Ext GetBackupInfo faild"); Backup::AppRadar::GetInstance().RecordBackupFuncRes(info, "Service::GetBackupInfoCmdHandle", GetUserIdDefault(), BizStageBackup::BIZ_STAGE_GET_BACKUP_INFO_FAIL, ret); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } ErrCode Service::GetBackupInfo(BundleName &bundleName, std::string &result) { - try { - std::lock_guard lock(getBackupInfoProcLock_); - HILOGI("Service::GetBackupInfo begin."); - if (session_ == nullptr || isOccupyingSession_.load()) { - HILOGE("Get BackupInfo error, session is empty."); - return BError(BError::Codes::SA_INVAL_ARG); - } - if (session_->GetImpl().clientToken) { - return BError(BError::Codes::SA_REFUSED_ACT, "Already have an active session"); - } - session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); - auto ret = GetBackupInfoCmdHandle(bundleName, result); - HILOGI("Service::GetBackupInfo end. result: %{public}s", result.c_str()); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return ret; - } catch (...) { - HILOGE("Unexpected exception"); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return EPERM; - } + return BExcepUltils::ExceptionCatcherLocked( + [&]() { try { + std::lock_guard lock(getBackupInfoProcLock_); + HILOGI("Service::GetBackupInfo begin."); + if (session_ == nullptr || isOccupyingSession_.load()) { + HILOGE("Get BackupInfo error, session is empty."); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + if (session_->GetImpl().clientToken) { + return BError(BError::Codes::SA_REFUSED_ACT, "Already have an active session").GetCode(); + } + session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); + auto ret = GetBackupInfoCmdHandle(bundleName, result); + HILOGI("Service::GetBackupInfo end. result: %{public}s", result.c_str()); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return ret; + } catch (...) { + HILOGE("Unexpected exception"); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return EPERM; + }}); } ErrCode Service::StartExtTimer(bool &isExtStart) { - try { - HILOGI("Service::StartExtTimer begin."); + return BExcepUltils::ExceptionCatcherLocked( + [&]() { try { + HILOGI("Service::StartExtTimer begin.isExtStart is %{public}d",isExtStart); if (session_ == nullptr) { HILOGE("StartExtTimer error, session_ is nullptr."); isExtStart = false; - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); string bundleName; @@ -1691,44 +1785,45 @@ ErrCode Service::StartExtTimer(bool &isExtStart) session_->StopFwkTimer(bundleName); isExtStart = session_->StartExtTimer(bundleName, timeoutCallback); session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } catch (...) { HILOGE("Unexpected exception"); isExtStart = false; session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); return EPERM; - } + }}); } ErrCode Service::StartFwkTimer(bool &isFwkStart) { - try { - HILOGI("Service::StartFwkTimer begin."); - if (session_ == nullptr) { - HILOGE("StartFwkTimer error, session_ is nullptr."); - isFwkStart = false; - return BError(BError::Codes::SA_INVAL_ARG); - } - session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); - std::string bundleName; - ErrCode ret = VerifyCallerAndGetCallerName(bundleName); - if (ret != ERR_OK) { - HILOGE("Start fwk timer fail, get bundleName failed, ret:%{public}d", ret); - isFwkStart = false; - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return ret; - } - auto timeoutCallback = TimeOutCallback(wptr(this), bundleName); - session_->StopExtTimer(bundleName); - isFwkStart = session_->StartFwkTimer(bundleName, timeoutCallback); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return BError(BError::Codes::OK); - } catch (...) { - HILOGE("Unexpected exception"); - isFwkStart = false; - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return EPERM; - } + return BExcepUltils::ExceptionCatcherLocked( + [&]() { try { + HILOGI("Service::StartFwkTimer isFwkStart is %{public}d",isFwkStart); + if (session_ == nullptr) { + HILOGE("StartFwkTimer error, session_ is nullptr."); + isFwkStart = false; + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); + std::string bundleName; + ErrCode ret = VerifyCallerAndGetCallerName(bundleName); + if (ret != ERR_OK) { + HILOGE("Start fwk timer fail, get bundleName failed, ret:%{public}d", ret); + isFwkStart = false; + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return ret; + } + auto timeoutCallback = TimeOutCallback(wptr(this), bundleName); + session_->StopExtTimer(bundleName); + isFwkStart = session_->StartFwkTimer(bundleName, timeoutCallback); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return BError(BError::Codes::OK).GetCode(); + } catch (...) { + HILOGE("Unexpected exception"); + isFwkStart = false; + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return EPERM; + }}); } ErrCode Service::AppendBundlesClearSession(const std::vector &bundleNames) @@ -1762,7 +1857,7 @@ ErrCode Service::AppendBundlesClearSession(const std::vector &bundle } OnStartSched(); session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } catch (const BError &e) { HILOGE("Failed, errCode = %{public}d", e.GetCode()); HandleExceptionOnAppendBundles(session_, bundleNames, {}); @@ -1778,86 +1873,89 @@ ErrCode Service::AppendBundlesClearSession(const std::vector &bundle ErrCode Service::UpdateTimer(BundleName &bundleName, uint32_t timeout, bool &result) { - try { - HILOGI("Service::UpdateTimer begin."); - if (session_ == nullptr || isOccupyingSession_.load()) { - HILOGE("Update Timer error, session is empty."); - result = false; - return BError(BError::Codes::SA_INVAL_ARG); - } - session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); - ErrCode ret = VerifyCaller(); - if (ret != ERR_OK) { - HILOGE("Update timer failed, verify caller failed, bundleName:%{public}s", bundleName.c_str()); - result = false; - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return ret; - } - auto timeoutCallback = TimeOutCallback(wptr(this), bundleName); - result = session_->UpdateTimer(bundleName, timeout, timeoutCallback); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return BError(BError::Codes::OK); - } catch (...) { - HILOGE("Unexpected exception"); - result = false; - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return EPERM; - } + return BExcepUltils::ExceptionCatcherLocked( + [&]() { try { + HILOGI("Service::UpdateTimer begin."); + if (session_ == nullptr || isOccupyingSession_.load()) { + HILOGE("Update Timer error, session is empty."); + result = false; + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); + ErrCode ret = VerifyCaller(); + if (ret != ERR_OK) { + HILOGE("Update timer failed, verify caller failed, bundleName:%{public}s", + bundleName.c_str()); + result = false; + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return ret; + } + auto timeoutCallback = TimeOutCallback(wptr(this), bundleName); + result = session_->UpdateTimer(bundleName, timeout, timeoutCallback); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return BError(BError::Codes::OK).GetCode(); + } catch (...) { + HILOGE("Unexpected exception"); + result = false; + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return EPERM; + }}); } ErrCode Service::UpdateSendRate(std::string &bundleName, int32_t sendRate, bool &result) { - HILOGI("Begin, bundle name:%{public}s, sendRate is:%{public}d", bundleName.c_str(), sendRate); - if (session_ == nullptr || isOccupyingSession_.load()) { - HILOGE("Update Send Rate error, session is empty."); - result = false; - return BError(BError::Codes::SA_INVAL_ARG); - } - session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); - ErrCode ret = VerifySendRateParam(); - if (ret != ERR_OK) { - HILOGE("Verify sendRate param failed, bundleName:%{public}s", bundleName.c_str()); - result = false; - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return ret; - } - std::shared_ptr mutexPtr = GetExtensionMutex(bundleName); - if (mutexPtr == nullptr) { - result = false; - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return BError(BError::Codes::SA_INVAL_ARG, "Extension mutex ptr is null."); - } - do { - std::lock_guard lock(mutexPtr->callbackMutex); - result = true; - auto backUpConnection = session_->GetExtConnection(bundleName); - if (backUpConnection == nullptr) { - HILOGE("backUpConnection is empty, bundle:%{public}s", bundleName.c_str()); - result = false; - ret = BError(BError::Codes::SA_INVAL_ARG); - break; - } - auto proxy = backUpConnection->GetBackupExtProxy(); - if (!proxy) { - HILOGE("Update send rate fail, extension proxy is empty"); - result = false; - ret = BError(BError::Codes::SA_INVAL_ARG); - break; - } - ret = proxy->UpdateFdSendRate(bundleName, sendRate); - if (ret != NO_ERROR) { - HILOGE("Extension do updateSendRate failed, ret:%{public}d", ret); - result = false; - ret = BError(BError::Codes::EXT_BROKEN_IPC); - break; - } - } while (0); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - RemoveExtensionMutex(bundleName); - return ret; -} - -AAFwk::Want Service::CreateConnectWant (BundleName &bundleName) + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HILOGI("Begin, bundle name:%{public}s, sendRate is:%{public}d", bundleName.c_str(), sendRate); + if (session_ == nullptr || isOccupyingSession_.load()) { + HILOGE("Update Send Rate error, session is empty."); + result = false; + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); + ErrCode ret = VerifySendRateParam(); + if (ret != ERR_OK) { + HILOGE("Verify sendRate param failed, bundleName:%{public}s", bundleName.c_str()); + result = false; + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return ret; + } + std::shared_ptr mutexPtr = GetExtensionMutex(bundleName); + if (mutexPtr == nullptr) { + result = false; + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return BError(BError::Codes::SA_INVAL_ARG, "Extension mutex ptr is null.").GetCode(); + } + do { + std::lock_guard lock(mutexPtr->callbackMutex); + result = true; + auto backUpConnection = session_->GetExtConnection(bundleName); + if (backUpConnection == nullptr) { + HILOGE("backUpConnection is empty, bundle:%{public}s", bundleName.c_str()); + result = false; + ret = BError(BError::Codes::SA_INVAL_ARG); + break; + } + auto proxy = backUpConnection->GetBackupExtProxy(); + if (!proxy) { + HILOGE("Update send rate fail, extension proxy is empty"); + result = false; + ret = BError(BError::Codes::SA_INVAL_ARG); + break; + } + ret = proxy->UpdateFdSendRate(bundleName, sendRate); + if (ret != NO_ERROR) { + HILOGE("Extension do updateSendRate failed, ret:%{public}d", ret); + result = false; + ret = BError(BError::Codes::EXT_BROKEN_IPC); + break; + } + } while (0); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + RemoveExtensionMutex(bundleName); + return ret; }); +} + +AAFwk::Want Service::CreateConnectWant(BundleName &bundleName) { BConstants::ExtensionAction action = BConstants::ExtensionAction::BACKUP; AAFwk::Want want; @@ -1870,14 +1968,14 @@ AAFwk::Want Service::CreateConnectWant (BundleName &bundleName) ErrCode Service::BackupSA(std::string bundleName) { HILOGI("BackupSA begin %{public}s", bundleName.c_str()); - IServiceReverse::Scenario scenario = session_->GetScenario(); + IServiceReverseType::Scenario scenario = session_->GetScenario(); auto backUpConnection = session_->GetSAExtConnection(bundleName); std::shared_ptr saConnection = backUpConnection.lock(); if (saConnection == nullptr) { HILOGE("lock sa connection ptr is nullptr"); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } - if (scenario == IServiceReverse::Scenario::BACKUP) { + if (scenario == IServiceReverseType::Scenario::BACKUP) { auto ret = saConnection->CallBackupSA(); session_->GetServiceReverseProxy()->BackupOnBundleStarted(ret, bundleName); BundleBeginRadarReport(bundleName, ret, scenario); @@ -1887,20 +1985,22 @@ ErrCode Service::BackupSA(std::string bundleName) NoticeClientFinish(bundleName, BError(BError::Codes::EXT_ABILITY_DIED)); return BError(ret); } - } else if (scenario == IServiceReverse::Scenario::RESTORE) { + } else if (scenario == IServiceReverseType::Scenario::RESTORE) { session_->GetServiceReverseProxy()->IncrementalRestoreOnBundleStarted(BError(BError::Codes::OK), bundleName); } - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } -void Service::OnSABackup(const std::string &bundleName, const int &fd, const std::string &result, - const ErrCode &errCode) +void Service::OnSABackup(const std::string &bundleName, + const int &fd, + const std::string &result, + const ErrCode &errCode) { auto task = [bundleName, fd, result, errCode, this]() { HILOGI("OnSABackup bundleName: %{public}s, fd: %{public}d, result: %{public}s, err: %{public}d", - bundleName.c_str(), fd, result.c_str(), errCode); + bundleName.c_str(), fd, result.c_str(), errCode); session_->GetServiceReverseProxy()->BackupOnFileReady(bundleName, "", move(fd), errCode); - FileReadyRadarReport(bundleName, "", errCode, IServiceReverse::Scenario::BACKUP); + FileReadyRadarReport(bundleName, "", errCode, IServiceReverseType::Scenario::BACKUP); SAResultReport(bundleName, result, errCode, BackupRestoreScenario::FULL_BACKUP); }; threadPool_.AddTask([task]() { @@ -1915,8 +2015,8 @@ void Service::OnSABackup(const std::string &bundleName, const int &fd, const std void Service::OnSARestore(const std::string &bundleName, const std::string &result, const ErrCode &errCode) { auto task = [bundleName, result, errCode, this]() { - HILOGI("OnSARestore bundleName: %{public}s, result: %{public}s, err: %{public}d", - bundleName.c_str(), result.c_str(), errCode); + HILOGI("OnSARestore bundleName: %{public}s, result: %{public}s, err: %{public}d", bundleName.c_str(), + result.c_str(), errCode); SAResultReport(bundleName, result, errCode, BackupRestoreScenario::INCREMENTAL_RESTORE); }; threadPool_.AddTask([task]() { @@ -1937,18 +2037,18 @@ ErrCode Service::SADone(ErrCode errCode, std::string bundleName) std::shared_ptr saConnection = backupConnection.lock(); if (saConnection == nullptr) { HILOGE("lock sa connection ptr is nullptr"); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } session_->StopFwkTimer(bundleName); session_->StopExtTimer(bundleName); saConnection->DisconnectBackupSAExt(); ClearSessionAndSchedInfo(bundleName); } - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } catch (const BError &e) { ReleaseOnException(); return e.GetCode(); // 任意异常产生，终止监听该任务 - } catch(...) { + } catch (...) { HILOGE("Unexpected exception"); ReleaseOnException(); return EPERM; @@ -1957,8 +2057,8 @@ ErrCode Service::SADone(ErrCode errCode, std::string bundleName) void Service::NotifyCallerCurAppDone(ErrCode errCode, const std::string &callerName) { - IServiceReverse::Scenario scenario = session_->GetScenario(); - if (scenario == IServiceReverse::Scenario::BACKUP) { + IServiceReverseType::Scenario scenario = session_->GetScenario(); + if (scenario == IServiceReverseType::Scenario::BACKUP) { HILOGI("will notify clone data, scenario is Backup"); session_->GetServiceReverseProxy()->BackupOnBundleFinished(errCode, callerName); auto now = std::chrono::system_clock::now(); @@ -1966,50 +2066,48 @@ void Service::NotifyCallerCurAppDone(ErrCode errCode, const std::string &callerN auto ms = std::chrono::duration_cast(now.time_since_epoch()); std::stringstream strTime; strTime << (std::put_time(std::localtime(&time), "%Y-%m-%d %H:%M:%S:")) << (std::setfill('0')) - << (std::setw(INDEX)) << (ms.count() % MS_1000); - HiSysEventWrite( - OHOS::HiviewDFX::HiSysEvent::Domain::FILEMANAGEMENT, - FILE_BACKUP_EVENTS, - OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, - "PROC_NAME", "ohos.appfileservice", - "BUNDLENAME", callerName, - "PID", getpid(), - "TIME", strTime.str() - ); - } else if (scenario == IServiceReverse::Scenario::RESTORE) { + << (std::setw(INDEX)) << (ms.count() % MS_1000); + HiSysEventWrite(OHOS::HiviewDFX::HiSysEvent::Domain::FILEMANAGEMENT, FILE_BACKUP_EVENTS, + OHOS::HiviewDFX::HiSysEvent::EventType::BEHAVIOR, "PROC_NAME", "ohos.appfileservice", + "BUNDLENAME", callerName, "PID", getpid(), "TIME", strTime.str()); + } else if (scenario == IServiceReverseType::Scenario::RESTORE) { HILOGI("will notify clone data, scenario is Restore"); session_->GetServiceReverseProxy()->RestoreOnBundleFinished(errCode, callerName); } BundleEndRadarReport(callerName, errCode, scenario); } -ErrCode Service::ReportAppProcessInfo(const std::string processInfo, BackupRestoreScenario sennario) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - try { - string bundleName; - ErrCode ret = VerifyCallerAndGetCallerName(bundleName); - if (ret != ERR_OK) { - HILOGE("Report app process info failed, Get bundle name failed, ret:%{public}d", ret); - return ret; - } - if (sennario == BackupRestoreScenario::FULL_RESTORE) { - session_->GetServiceReverseProxy()->RestoreOnProcessInfo(bundleName, processInfo); - } else if (sennario == BackupRestoreScenario::INCREMENTAL_RESTORE) { - session_->GetServiceReverseProxy()->IncrementalRestoreOnProcessInfo(bundleName, processInfo); - } else if (sennario == BackupRestoreScenario::FULL_BACKUP) { - session_->GetServiceReverseProxy()->BackupOnProcessInfo(bundleName, processInfo); - } else if (sennario == BackupRestoreScenario::INCREMENTAL_BACKUP) { - session_->GetServiceReverseProxy()->IncrementalBackupOnProcessInfo(bundleName, processInfo); - } - return BError(BError::Codes::OK); - } catch (const BError &e) { - HILOGE("ReportAppProcessInfo exception"); - return e.GetCode(); - } catch (const exception &e) { - HILOGE("Catched an unexpected low-level exception %{public}s", e.what()); - return EPERM; - } +ErrCode Service::ReportAppProcessInfo(const std::string &processInfo, BackupRestoreScenario sennario) +{ + return BExcepUltils::ExceptionCatcherLocked( + [&]() + { + HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGI("Begin ReportAppProcessInfo"); + try { + string bundleName; + ErrCode ret = VerifyCallerAndGetCallerName(bundleName); + if (ret != ERR_OK) { + HILOGE("Report app process info failed, Get bundle name failed, ret:%{public}d", ret); + return ret; + } + if (sennario == BackupRestoreScenario::FULL_RESTORE) { + session_->GetServiceReverseProxy()->RestoreOnProcessInfo(bundleName, processInfo); + } else if (sennario == BackupRestoreScenario::INCREMENTAL_RESTORE) { + session_->GetServiceReverseProxy()->IncrementalRestoreOnProcessInfo(bundleName, processInfo); + } else if (sennario == BackupRestoreScenario::FULL_BACKUP) { + session_->GetServiceReverseProxy()->BackupOnProcessInfo(bundleName, processInfo); + } else if (sennario == BackupRestoreScenario::INCREMENTAL_BACKUP) { + session_->GetServiceReverseProxy()->IncrementalBackupOnProcessInfo(bundleName, processInfo); + } + return BError(BError::Codes::OK).GetCode(); + } catch (const BError &e) { + HILOGE("ReportAppProcessInfo exception"); + return e.GetCode(); + } catch (const exception &e) { + HILOGE("Catched an unexpected low-level exception %{public}s", e.what()); + return EPERM; + }}); } std::function Service::TimeOutCallback(wptr ptr, std::string bundleName) @@ -2044,7 +2142,7 @@ void Service::DoTimeout(wptr ptr, std::string bundleName) HILOGE("SessionPtr is nullptr."); return; } - IServiceReverse::Scenario scenario = sessionPtr->GetScenario(); + IServiceReverseType::Scenario scenario = sessionPtr->GetScenario(); try { std::shared_ptr mutexPtr = GetExtensionMutex(bundleName); if (mutexPtr == nullptr) { @@ -2108,8 +2206,8 @@ void Service::DelClearBundleRecord(const std::vector &bundleNames) void Service::ReleaseOnException() { if (session_->IsOnAllBundlesFinished()) { - IServiceReverse::Scenario scenario = session_->GetScenario(); - if (isInRelease_.load() && (scenario == IServiceReverse::Scenario::RESTORE)) { + IServiceReverseType::Scenario scenario = session_->GetScenario(); + if (isInRelease_.load() && (scenario == IServiceReverseType::Scenario::RESTORE)) { HILOGI("Will execute destory session info"); SessionDeactive(); } diff --git a/services/backup_sa/src/module_ipc/service_incremental.cpp b/services/backup_sa/src/module_ipc/service_incremental.cpp index b867846522e5af35d3451de5785143b58a0c6897..fd5af22c85b95eee1d9ff0365ed3fa5b6e0d7983 100644 --- a/services/backup_sa/src/module_ipc/service_incremental.cpp +++ b/services/backup_sa/src/module_ipc/service_incremental.cpp @@ -15,6 +15,8 @@ #include "module_ipc/service.h" +#include "extension_type.h" + #include #include #include @@ -66,24 +68,27 @@ const static string UNICAST_TYPE = "unicast"; ErrCode Service::Release() { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - HILOGI("KILL"); - if (session_ == nullptr) { - HILOGE("Release error, session is empty"); - return BError(BError::Codes::SA_INVAL_ARG); - } - IServiceReverse::Scenario scenario = session_->GetScenario(); - VerifyCaller(scenario); - AppRadar::Info info("", "", "call release"); - if (scenario == IServiceReverse::Scenario::RESTORE) { - AppRadar::GetInstance().RecordRestoreFuncRes(info, "Service::Release", session_->GetSessionUserId(), - BizStageRestore::BIZ_STAGE_RELEASE, ERR_OK); - } else if (scenario == IServiceReverse::Scenario::BACKUP) { - AppRadar::GetInstance().RecordBackupFuncRes(info, "Service::Release", session_->GetSessionUserId(), - BizStageBackup::BIZ_STAGE_RELEASE, ERR_OK); - } - SessionDeactive(); - return BError(BError::Codes::OK); + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGI("Begin Release"); + if (session_ == nullptr) { + HILOGE("Release error, session is empty"); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + IServiceReverseType::Scenario scenario = session_->GetScenario(); + VerifyCaller(scenario); + AppRadar::Info info("", "", "call release"); + if (scenario == IServiceReverseType::Scenario::RESTORE) { + AppRadar::GetInstance().RecordRestoreFuncRes(info, "Service::Release", + session_->GetSessionUserId(), + BizStageRestore::BIZ_STAGE_RELEASE, ERR_OK); + } else if (scenario == IServiceReverseType::Scenario::BACKUP) { + AppRadar::GetInstance().RecordBackupFuncRes(info, "Service::Release", + session_->GetSessionUserId(), + BizStageBackup::BIZ_STAGE_RELEASE, ERR_OK); + } + SessionDeactive(); + return BError(BError::Codes::OK).GetCode(); }); } std::shared_ptr Service::GetExtensionMutex(const BundleName &bundleName) @@ -112,6 +117,7 @@ void Service::RemoveExtensionMutex(const BundleName &bundleName) void Service::CreateDirIfNotExist(const std::string &path) { + HILOGI("Begin CreateDirIfNotExist, path = %{private}s", path.c_str()); if (access(path.c_str(), F_OK) != 0) { bool created = ForceCreateDirectory(path.data()); if (created) { @@ -121,6 +127,17 @@ void Service::CreateDirIfNotExist(const std::string &path) } } } +ErrCode Service:: GetLocalCapabilitiesIncremental(const std::vector& bundleNames, int32_t& fd) +{ + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGI("Begin GetLocalCapabilitiesIncremental fd = %{private}d", fd); + UniqueFd fdResult = GetLocalCapabilitiesIncremental(bundleNames); + fd = fdResult.Get(); + HILOGI("End GetLocalCapabilitiesIncremental fd = %{private}d", fd); + return BError(BError::Codes::OK).GetCode();// anytime return OK + }); +} UniqueFd Service::GetLocalCapabilitiesIncremental(const std::vector &bundleNames) { @@ -177,6 +194,7 @@ UniqueFd Service::GetLocalCapabilitiesIncremental(const std::vector ptr) { + HILOGI("Begin StartGetFdTask bundleName = %{public}s", bundleName.c_str()); auto thisPtr = ptr.promote(); if (!thisPtr) { HILOGE("this pointer is null"); @@ -231,6 +249,7 @@ void Service::StartGetFdTask(std::string bundleName, wptr ptr) void Service::RefreshBundleDataSize(const vector &newBundleInfos, std::string bundleName, wptr ptr) { + HILOGI("Begin RefreshBundleDataSize bundleName = %{public}s", bundleName.c_str()); auto thisPtr = ptr.promote(); if (!thisPtr) { HILOGE("this pointer is null"); @@ -253,82 +272,87 @@ void Service::RefreshBundleDataSize(const vector &n ErrCode Service::GetAppLocalListAndDoIncrementalBackup() { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - try { - if (session_ == nullptr || isOccupyingSession_.load()) { - HILOGE("session is nullptr"); - return BError(BError::Codes::SA_INVAL_ARG); - } - session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); - session_->SetSessionUserId(GetUserIdDefault()); - std::string bundleName; - ErrCode ret = VerifyCallerAndGetCallerName(bundleName); - if (ret != ERR_OK) { - HILOGE("Get AppLocalList failed, Get bundle failed, ret:%{public}d", ret); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return ret; - } - auto task = [this, bundleName]() { - StartGetFdTask(bundleName, wptr(this)); - }; - threadPool_.AddTask([task]() { - try { - task(); - } catch (const BError &e) { - HILOGE("GetAppLocalListAndDoIncrementalBackup failed, errCode = %{public}d", e.GetCode()); - } catch (...) { - HILOGE("Unexpected exception"); - } - }); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return BError(BError::Codes::OK); - } catch (const BError &e) { - HILOGE("GetAppLocalListAndDoIncrementalBackup failed, errCode = %{public}d", e.GetCode()); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return e.GetCode(); - } catch (...) { - HILOGE("Unexpected exception"); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return EPERM; - } + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGE("Begin GetAppLocalListAndDoIncrementalBackup"); + try { + if (session_ == nullptr || isOccupyingSession_.load()) { + HILOGE("session is nullptr"); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); + session_->SetSessionUserId(GetUserIdDefault()); + std::string bundleName; + ErrCode ret = VerifyCallerAndGetCallerName(bundleName); + if (ret != ERR_OK) { + HILOGE("Get AppLocalList failed, Get bundle failed, ret:%{public}d", ret); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return ret; + } + auto task = [this, bundleName]() { + StartGetFdTask(bundleName, wptr(this)); + }; + threadPool_.AddTask([task]() { + try { + task(); + } catch (const BError &e) { + HILOGE("GetAppLocalListAndDoIncrementalBackup failed, errCode = %{public}d", + e.GetCode()); + } catch (...) { + HILOGE("Unexpected exception"); + } + }); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return BError(BError::Codes::OK).GetCode(); + } catch (const BError &e) { + HILOGE("GetAppLocalListAndDoIncrementalBackup failed, errCode = %{public}d", e.GetCode()); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return e.GetCode(); + } catch (...) { + HILOGE("Unexpected exception"); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return EPERM; + }}); } -ErrCode Service::InitIncrementalBackupSession(sptr remote) +ErrCode Service::InitIncrementalBackupSession(sptr& remote) { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - ErrCode errCode = VerifyCaller(); - if (errCode != ERR_OK) { - HILOGE("Init incremental backup session fail, Verify caller failed, errCode:%{public}d", errCode); - return errCode; - } - if (session_ == nullptr) { - HILOGE("Init Incremental backup session error, session is empty"); - return BError(BError::Codes::SA_INVAL_ARG); - } - errCode = session_->Active({.clientToken = IPCSkeleton::GetCallingTokenID(), - .scenario = IServiceReverse::Scenario::BACKUP, - .clientProxy = remote, - .userId = GetUserIdDefault(), - .isIncrementalBackup = true, - .callerName = GetCallerName(), - .activeTime = TimeUtils::GetCurrentTime()}); - if (errCode == ERR_OK) { - ClearFailedBundles(); - successBundlesNum_ = 0; - ClearBundleRadarReport(); - ClearFileReadyRadarReport(); - return errCode; - } - if (errCode == BError(BError::Codes::SA_SESSION_CONFLICT)) { - HILOGE("Active restore session error, Already have a session"); - return errCode; - } - HILOGE("Active restore session error"); - StopAll(nullptr, true); - return errCode; + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + ErrCode errCode = VerifyCaller(); + if (errCode != ERR_OK) { + HILOGE("Init incremental backup session fail, Verify caller failed, errCode:%{public}d", + errCode); + return errCode; + } + if (session_ == nullptr) { + HILOGE("Init Incremental backup session error, session is empty"); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + errCode = session_->Active({.clientToken = IPCSkeleton::GetCallingTokenID(), + .scenario = IServiceReverseType::Scenario::BACKUP, + .clientProxy = remote, + .userId = GetUserIdDefault(), + .isIncrementalBackup = true, + .callerName = GetCallerName(), + .activeTime = TimeUtils::GetCurrentTime()}); + if (errCode == ERR_OK) { + ClearFailedBundles(); + successBundlesNum_ = 0; + ClearBundleRadarReport(); + ClearFileReadyRadarReport(); + return errCode; + } + if (errCode == BError(BError::Codes::SA_SESSION_CONFLICT)) { + HILOGE("Active restore session error, Already have a session"); + return errCode; + } + HILOGE("Active restore session error"); + StopAll(nullptr, true); + return errCode;}); } -ErrCode Service::InitIncrementalBackupSession(sptr remote, std::string &errMsg) +ErrCode Service::InitIncrementalBackupSessionWithErrMsg(sptr& remote, std::string &errMsg) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); ErrCode errCode = VerifyCaller(); @@ -341,7 +365,7 @@ ErrCode Service::InitIncrementalBackupSession(sptr remote, std: return BError(BError::Codes::SA_INVAL_ARG); } errCode = session_->Active({.clientToken = IPCSkeleton::GetCallingTokenID(), - .scenario = IServiceReverse::Scenario::BACKUP, + .scenario = IServiceReverseType::Scenario::BACKUP, .clientProxy = remote, .userId = GetUserIdDefault(), .isIncrementalBackup = true, @@ -377,42 +401,52 @@ vector Service::GetBundleNameByDetails(const std::vector &bundlesToBackup) { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - vector bundleNames; - try { - if (session_ == nullptr || isOccupyingSession_.load()) { - HILOGE("Init Incremental backup session error, session is empty"); - return BError(BError::Codes::SA_INVAL_ARG); - } - session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); // BundleMgrAdapter::GetBundleInfos可能耗时 - bundleNames = GetBundleNameByDetails(bundlesToBackup); - ErrCode ret = VerifyCaller(IServiceReverse::Scenario::BACKUP); - if (ret != ERR_OK) { - HILOGE("Append bundles incremental session failed, verify caller failed, ret:%{public}d", ret); - HandleExceptionOnAppendBundles(session_, bundleNames, {}); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return ret; - } - auto backupInfos = BundleMgrAdapter::GetBundleInfosForAppend(bundlesToBackup, - session_->GetSessionUserId()); - std::vector supportBackupNames = GetSupportBackupBundleNames(backupInfos, true, bundleNames); - AppendBundles(supportBackupNames); - SetBundleIncDataInfo(bundlesToBackup, supportBackupNames); - SetCurrentBackupSessProperties(supportBackupNames, session_->GetSessionUserId(), backupInfos, true); - OnStartSched(); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return BError(BError::Codes::OK); - } catch (const BError &e) { - HILOGE("Failed, errCode = %{public}d", e.GetCode()); - HandleExceptionOnAppendBundles(session_, bundleNames, {}); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return e.GetCode(); - } catch (...) { - HILOGE("Unexpected exception"); - HandleExceptionOnAppendBundles(session_, bundleNames, {}); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return EPERM; - } + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + vector bundleNames; + try { + if (session_ == nullptr || isOccupyingSession_.load()) { + HILOGE("Init Incremental backup session error, session is empty"); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); // BundleMgrAdapter::GetBundleInfos可能耗时 + bundleNames = GetBundleNameByDetails(bundlesToBackup); + ErrCode ret = VerifyCaller(IServiceReverseType::Scenario::BACKUP); + if (ret != ERR_OK) { + HILOGE("Append bundles incremental session failed, verify caller failed, ret:%{public}d", + ret); + HandleExceptionOnAppendBundles(session_, bundleNames, {}); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return ret; + } + auto backupInfos = BundleMgrAdapter::GetBundleInfosForAppend(bundlesToBackup, + session_->GetSessionUserId()); + std::vector supportBackupNames = GetSupportBackupBundleNames(backupInfos, true, + bundleNames); + AppendBundles(supportBackupNames); + SetBundleIncDataInfo(bundlesToBackup, supportBackupNames); + SetCurrentBackupSessProperties(supportBackupNames, session_->GetSessionUserId(), + backupInfos, true); + OnStartSched(); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return BError(BError::Codes::OK).GetCode(); + } catch (const BError &e) { + HILOGE("Failed, errCode = %{public}d", e.GetCode()); + HandleExceptionOnAppendBundles(session_, bundleNames, {}); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return e.GetCode(); + } catch (...) { + HILOGE("Unexpected exception"); + HandleExceptionOnAppendBundles(session_, bundleNames, {}); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return EPERM; + }}); +} +ErrCode Service:: AppendBundlesIncrementalBackupSessionWithBundleInfos(const std::vector& bundlesToBackup,const std::vector& bundleInfos) +{ + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + return AppendBundlesIncrementalBackupSession(bundlesToBackup, bundleInfos); }); } ErrCode Service::AppendBundlesIncrementalBackupSession(const std::vector &bundlesToBackup, @@ -423,11 +457,11 @@ ErrCode Service::AppendBundlesIncrementalBackupSession(const std::vectorIncreaseSessionCnt(__PRETTY_FUNCTION__); // BundleMgrAdapter::GetBundleInfos可能耗时 bundleNames = GetBundleNameByDetails(bundlesToBackup); - ErrCode ret = VerifyCaller(IServiceReverse::Scenario::BACKUP); + ErrCode ret = VerifyCaller(IServiceReverseType::Scenario::BACKUP); if (ret != ERR_OK) { HILOGE("Append bundles incremental session with infos failed, verify caller failed, ret:%{public}d", ret); session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); @@ -447,7 +481,7 @@ ErrCode Service::AppendBundlesIncrementalBackupSession(const std::vectorDecreaseSessionCnt(__PRETTY_FUNCTION__); - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } catch (const BError &e) { HILOGE("Failed, errCode = %{public}d", e.GetCode()); HandleExceptionOnAppendBundles(session_, bundleNames, {}); @@ -484,38 +518,49 @@ void Service::HandleCurGroupIncBackupInfos(vector & ErrCode Service::PublishIncrementalFile(const BFileInfo &fileInfo) { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - ErrCode ret = VerifyCaller(IServiceReverse::Scenario::RESTORE); - if (ret != ERR_OK) { - HILOGE("Publish incremental file failed, bundleName:%{public}s", fileInfo.owner.c_str()); - return ret; - } - HILOGI("Start get ExtConnection, bundleName:%{public}s", fileInfo.owner.c_str()); - if (!fileInfo.fileName.empty()) { - HILOGE("Forbit to use PublishIncrementalFile with fileName for App"); - return EPERM; - } - if (session_ == nullptr) { - HILOGE("session is empty, bundleName:%{public}s", fileInfo.owner.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); - } - session_->SetPublishFlag(fileInfo.owner); - auto backUpConnection = session_->GetExtConnection(fileInfo.owner); - if (backUpConnection == nullptr) { - HILOGE("backUpConnection is empty, bundle:%{public}s", fileInfo.owner.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); - } - auto proxy = backUpConnection->GetBackupExtProxy(); - if (!proxy) { - HILOGE("Publish Incremental file failed, bundleName:%{public}s", fileInfo.owner.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); - } - ret = proxy->PublishIncrementalFile(fileInfo.fileName); - if (ret != ERR_OK) { - HILOGE("Failed to publish file for backup extension, bundleName:%{public}s", fileInfo.owner.c_str()); - return ret; - } - return BError(BError::Codes::OK); + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + ErrCode ret = VerifyCaller(IServiceReverseType::Scenario::RESTORE); + if (ret != ERR_OK) { + HILOGE("Publish incremental file failed, bundleName:%{public}s", + fileInfo.owner.c_str()); + return ret; + } + HILOGI("Start get ExtConnection, bundleName:%{public}s", fileInfo.owner.c_str()); + if (!fileInfo.fileName.empty()) { + HILOGE("Forbit to use PublishIncrementalFile with fileName for App"); + return EPERM; + } + if (session_ == nullptr) { + HILOGE("session is empty, bundleName:%{public}s", fileInfo.owner.c_str()); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + session_->SetPublishFlag(fileInfo.owner); + auto backUpConnection = session_->GetExtConnection(fileInfo.owner); + if (backUpConnection == nullptr) { + HILOGE("backUpConnection is empty, bundle:%{public}s", fileInfo.owner.c_str()); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + auto proxy = backUpConnection->GetBackupExtProxy(); + if (!proxy) { + HILOGE("Publish Incremental file failed, bundleName:%{public}s", fileInfo.owner.c_str()); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + ret = proxy->PublishIncrementalFile(fileInfo.fileName); + if (ret != ERR_OK) { + HILOGE("Failed to publish file for backup extension, bundleName:%{public}s", + fileInfo.owner.c_str()); + return ret; + } + return BError(BError::Codes::OK).GetCode();}); +} + +ErrCode Service:: PublishSAIncrementalFile(const BFileInfo& fileInfo, int32_t fd) +{ + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HILOGI("Begin PublishSAIncrementalFile， %{public}d", fd); + UniqueFd uniquedParameter(static_cast(fd)); + return PublishSAIncrementalFile(fileInfo, std::move(uniquedParameter)); }); } ErrCode Service::PublishSAIncrementalFile(const BFileInfo &fileInfo, UniqueFd fd) @@ -523,14 +568,14 @@ ErrCode Service::PublishSAIncrementalFile(const BFileInfo &fileInfo, UniqueFd fd std::string bundleName = fileInfo.owner; if (!SAUtils::IsSABundleName(bundleName)) { HILOGE("Bundle name %{public}s is not sa", bundleName.c_str()); - return BError(BError::Codes::SA_EXT_ERR_CALL); + return BError(BError::Codes::SA_EXT_ERR_CALL).GetCode(); } HILOGI("Bundle name %{public}s is sa, publish sa incremental file", bundleName.c_str()); auto backupConnection = session_->GetSAExtConnection(bundleName); std::shared_ptr saConnection = backupConnection.lock(); if (saConnection == nullptr) { HILOGE("lock sa connection ptr is nullptr"); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } return saConnection->CallRestoreSA(move(fd)); } @@ -538,20 +583,24 @@ ErrCode Service::PublishSAIncrementalFile(const BFileInfo &fileInfo, UniqueFd fd ErrCode Service::AppIncrementalFileReady(const std::string &bundleName, const std::string &fileName, UniqueFd fd, UniqueFd manifestFd, int32_t errCode) { + HILOGI("Begin AppIncrementalFileReadybundleName:%{public}s, fileName:%{public}s", + bundleName.c_str(), GetAnonyPath(fileName).c_str()); HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); try { - if (session_->GetScenario() == IServiceReverse::Scenario::RESTORE) { - session_->GetServiceReverseProxy()->IncrementalRestoreOnFileReady(bundleName, fileName, move(fd), - move(manifestFd), errCode); - FileReadyRadarReport(bundleName, fileName, errCode, IServiceReverse::Scenario::RESTORE); - return BError(BError::Codes::OK); + if (session_->GetScenario() == IServiceReverseType::Scenario::RESTORE) { + session_->GetServiceReverseProxy()->IncrementalRestoreOnFileReady(bundleName, fileName, + move(fd), move(manifestFd), errCode); + FileReadyRadarReport(bundleName, fileName, errCode, + IServiceReverseType::Scenario::RESTORE); + return BError(BError::Codes::OK).GetCode(); } if (fileName == BConstants::EXT_BACKUP_MANAGE) { fd = session_->OnBundleExtManageInfo(bundleName, move(fd)); } - session_->GetServiceReverseProxy()->IncrementalBackupOnFileReady(bundleName, fileName, move(fd), + session_->GetServiceReverseProxy()->IncrementalBackupOnFileReady(bundleName, + fileName, move(fd), move(manifestFd), errCode); - FileReadyRadarReport(bundleName, fileName, errCode, IServiceReverse::Scenario::BACKUP); + FileReadyRadarReport(bundleName, fileName, errCode, IServiceReverseType::Scenario::BACKUP); if (session_->OnBundleFileReady(bundleName, fileName)) { ErrCode ret = HandleCurBundleFileReady(bundleName, fileName, true); if (ret != ERR_OK) { @@ -561,7 +610,7 @@ ErrCode Service::AppIncrementalFileReady(const std::string &bundleName, const st } } OnAllBundlesFinished(BError(BError::Codes::OK)); - return BError(BError::Codes::OK); + return ErrCode((BError::Codes::OK)); } catch (const BError &e) { HILOGE("AppIncrementalFileReady exception"); return e.GetCode(); // 任意异常产生，终止监听该任务 @@ -571,28 +620,49 @@ ErrCode Service::AppIncrementalFileReady(const std::string &bundleName, const st } } +ErrCode Service::AppIncrementalFileReady(const std::string& fileName, + int32_t fd, + int32_t manifestFd, int32_t appIncrementalFileReadyErrCode) +{ + HILOGI("Begin AppIncrementalFileReady:%{public}s, fd:%{public}d, manifestFd:%{public}d, errcode:%{public}d", + fileName.c_str(), fd, manifestFd, appIncrementalFileReadyErrCode); + return BExcepUltils::ExceptionCatcherLocked( + [&]() { if (fd < 0 || manifestFd < 0) + { + HILOGE("Error fd or manifestFd, fd = %{public}d, manifestFd = %{public}d", fd, manifestFd); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + UniqueFd fdUnique(static_cast(fd)); + UniqueFd manifestFdUnique(static_cast(manifestFd)); + return AppIncrementalFileReady(fileName,std::move(fdUnique), std::move(manifestFdUnique), + appIncrementalFileReadyErrCode); + }); +} + ErrCode Service::AppIncrementalFileReady(const std::string &fileName, UniqueFd fd, UniqueFd manifestFd, int32_t errCode) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); try { + HILOGI("Begin AppIncrementalFileReady:%{public}s, errcode:%{public}d", + fileName.c_str(), errCode); string callerName; ErrCode ret = VerifyCallerAndGetCallerName(callerName); if (ret != ERR_OK) { HILOGE("Verify caller failed, ret:%{public}d", ret); return ret; } - if (session_->GetScenario() == IServiceReverse::Scenario::RESTORE) { + if (session_->GetScenario() == IServiceReverseType::Scenario::RESTORE) { session_->GetServiceReverseProxy()->IncrementalRestoreOnFileReady(callerName, fileName, move(fd), move(manifestFd), errCode); - FileReadyRadarReport(callerName, fileName, errCode, IServiceReverse::Scenario::RESTORE); - return BError(BError::Codes::OK); + FileReadyRadarReport(callerName, fileName, errCode, IServiceReverseType::Scenario::RESTORE); + return BError(BError::Codes::OK).GetCode(); } if (fileName == BConstants::EXT_BACKUP_MANAGE) { fd = session_->OnBundleExtManageInfo(callerName, move(fd)); } session_->GetServiceReverseProxy()->IncrementalBackupOnFileReady(callerName, fileName, move(fd), move(manifestFd), errCode); - FileReadyRadarReport(callerName, fileName, errCode, IServiceReverse::Scenario::BACKUP); + FileReadyRadarReport(callerName, fileName, errCode, IServiceReverseType::Scenario::BACKUP); if (session_->OnBundleFileReady(callerName, fileName)) { ErrCode ret = HandleCurBundleFileReady(callerName, fileName, true); if (ret != ERR_OK) { @@ -602,7 +672,7 @@ ErrCode Service::AppIncrementalFileReady(const std::string &fileName, UniqueFd f } } OnAllBundlesFinished(BError(BError::Codes::OK)); - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } catch (const BError &e) { HILOGE("AppIncrementalFileReady exception"); return e.GetCode(); // 任意异常产生，终止监听该任务 @@ -614,101 +684,107 @@ ErrCode Service::AppIncrementalFileReady(const std::string &fileName, UniqueFd f ErrCode Service::AppIncrementalDone(ErrCode errCode) { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - try { - if (session_ == nullptr) { - HILOGE("AppIncrementalDone error, session is null"); - return BError(BError::Codes::SA_INVAL_ARG); - } - string callerName; - ErrCode ret = VerifyCallerAndGetCallerName(callerName); - if (ret != ERR_OK) { - HILOGE("App incremental done fail, ret:%{public}d", ret); - return ret; - } - HILOGI("Service AppIncrementalDone start, callerName is %{public}s, errCode is: %{public}d", - callerName.c_str(), errCode); - if (session_->OnBundleFileReady(callerName) || errCode != BError(BError::Codes::OK)) { - std::shared_ptr mutexPtr = GetExtensionMutex(callerName); - if (mutexPtr == nullptr) { - HILOGE("extension mutex ptr is nullptr, bundleName:%{public}s", callerName.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); - } - std::lock_guard lock(mutexPtr->callbackMutex); - ret = HandleCurAppDone(errCode, callerName, true); - if (ret != ERR_OK) { - HILOGE("Handle current app done error, bundleName:%{public}s", callerName.c_str()); - return ret; - } - } - RemoveExtensionMutex(callerName); - OnAllBundlesFinished(BError(BError::Codes::OK)); - return BError(BError::Codes::OK); - } catch (const BError &e) { - ReleaseOnException(); - HILOGE("AppIncrementalDone error, err code is:%{public}d", e.GetCode()); - return e.GetCode(); // 任意异常产生，终止监听该任务 - } catch (...) { - ReleaseOnException(); - HILOGI("Unexpected exception"); - return EPERM; - } + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + try { + if (session_ == nullptr) { + HILOGE("AppIncrementalDone error, session is null"); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + string callerName; + ErrCode ret = VerifyCallerAndGetCallerName(callerName); + if (ret != ERR_OK) { + HILOGE("App incremental done fail, ret:%{public}d", ret); + return ret; + } + HILOGI("Service AppIncrementalDone start, callerName is %{public}s, errCode is: %{public}d", + callerName.c_str(), errCode); + if (session_->OnBundleFileReady(callerName) || errCode != BError(BError::Codes::OK)) { + std::shared_ptr mutexPtr = GetExtensionMutex(callerName); + if (mutexPtr == nullptr) { + HILOGE("extension mutex ptr is nullptr, bundleName:%{public}s", callerName.c_str()); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + std::lock_guard lock(mutexPtr->callbackMutex); + ret = HandleCurAppDone(errCode, callerName, true); + if (ret != ERR_OK) { + HILOGE("Handle current app done error, bundleName:%{public}s", callerName.c_str()); + return ret; + } + } + RemoveExtensionMutex(callerName); + OnAllBundlesFinished(BError(BError::Codes::OK)); + return BError(BError::Codes::OK).GetCode(); + } catch (const BError &e) { + ReleaseOnException(); + HILOGE("AppIncrementalDone error, err code is:%{public}d", e.GetCode()); + return e.GetCode(); // 任意异常产生，终止监听该任务 + } catch (...) { + ReleaseOnException(); + HILOGI("Unexpected exception"); + return EPERM; + }}); } ErrCode Service::GetIncrementalFileHandle(const std::string &bundleName, const std::string &fileName) { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - try { - if (session_ == nullptr) { - HILOGE("GetIncrementalFileHandle error, session is empty"); - return BError(BError::Codes::SA_INVAL_ARG); - } - ErrCode ret = VerifyCaller(IServiceReverse::Scenario::RESTORE); - if (ret != ERR_OK) { - HILOGE("Error, bundleName:%{public}s, fileName:%{public}s", bundleName.c_str(), - GetAnonyPath(fileName).c_str()); - return ret; - } - auto action = session_->GetServiceSchedAction(bundleName); - if (action == BConstants::ServiceSchedAction::UNKNOWN) { - HILOGE("action is unknown, bundleName:%{public}s", bundleName.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); - } - if (action == BConstants::ServiceSchedAction::RUNNING) { - auto backUpConnection = session_->GetExtConnection(bundleName); - if (backUpConnection == nullptr) { - HILOGE("backUpConnection is empty, bundle:%{public}s", bundleName.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); - } - auto proxy = backUpConnection->GetBackupExtProxy(); - if (!proxy) { - HILOGE("GetIncrementalFileHandle failed, bundleName:%{public}s", bundleName.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); - } - auto[errCode, fd, reportFd] = proxy->GetIncrementalFileHandle(fileName); - auto err = AppIncrementalFileReady(bundleName, fileName, move(fd), move(reportFd), errCode); - if (err != ERR_OK) { - HILOGE("Failed to send file handle, bundleName:%{public}s, fileName:%{public}s", - bundleName.c_str(), GetAnonyPath(fileName).c_str()); - AppRadar::Info info (bundleName, "", ""); - AppRadar::GetInstance().RecordRestoreFuncRes(info, "Service::GetIncrementalFileHandle", - GetUserIdDefault(), BizStageRestore::BIZ_STAGE_GET_FILE_HANDLE_FAIL, err); - } - } else { - SvcRestoreDepsManager::GetInstance().UpdateToRestoreBundleMap(bundleName, fileName); - session_->SetExtFileNameRequest(bundleName, fileName); - } - return BError(BError::Codes::OK); - } catch (const BError &e) { - HILOGE("GetIncrementalFileHandle exception, bundleName:%{public}s", bundleName.c_str()); - return e.GetCode(); - } + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + try { + if (session_ == nullptr) { + HILOGE("GetIncrementalFileHandle error, session is empty"); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + ErrCode ret = VerifyCaller(IServiceReverseType::Scenario::RESTORE); + if (ret != ERR_OK) { + HILOGE("Error, bundleName:%{public}s, fileName:%{public}s", bundleName.c_str(), + GetAnonyPath(fileName).c_str()); + return ret; + } + auto action = session_->GetServiceSchedAction(bundleName); + if (action == BConstants::ServiceSchedAction::UNKNOWN) { + HILOGE("action is unknown, bundleName:%{public}s", bundleName.c_str()); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + if (action == BConstants::ServiceSchedAction::RUNNING) { + auto backUpConnection = session_->GetExtConnection(bundleName); + if (backUpConnection == nullptr) { + HILOGE("backUpConnection is empty, bundle:%{public}s", bundleName.c_str()); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + auto proxy = backUpConnection->GetBackupExtProxy(); + if (!proxy) { + HILOGE("GetIncrementalFileHandle failed, bundleName:%{public}s", bundleName.c_str()); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + UniqueFdGroup fdGroup; + proxy->GetIncrementalFileHandleWithUniqueFdGroup(fileName, fdGroup); + UniqueFd fd(static_cast(fdGroup.fd)); + UniqueFd reportFd(static_cast(fdGroup.reportFd)); + auto err = AppIncrementalFileReady(bundleName, fileName, move(fd), move(reportFd), fdGroup.errCode); + if (err != ERR_OK) { + HILOGE("Failed to send file handle, bundleName:%{public}s, fileName:%{public}s", + bundleName.c_str(), GetAnonyPath(fileName).c_str()); + AppRadar::Info info (bundleName, "", ""); + AppRadar::GetInstance().RecordRestoreFuncRes(info, "Service::GetIncrementalFileHandle", + GetUserIdDefault(), BizStageRestore::BIZ_STAGE_GET_FILE_HANDLE_FAIL, err); + } + } else { + SvcRestoreDepsManager::GetInstance().UpdateToRestoreBundleMap(bundleName, fileName); + session_->SetExtFileNameRequest(bundleName, fileName); + } + return BError(BError::Codes::OK).GetCode(); + } catch (const BError &e) { + HILOGE("GetIncrementalFileHandle exception, bundleName:%{public}s", bundleName.c_str()); + return e.GetCode(); + }}); } bool Service::IncrementalBackup(const string &bundleName) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - IServiceReverse::Scenario scenario = session_->GetScenario(); + HILOGI("Begin IncrementalBackup bundle%{public}s", bundleName.c_str()); + IServiceReverseType::Scenario scenario = session_->GetScenario(); auto backUpConnection = session_->GetExtConnection(bundleName); if (backUpConnection == nullptr) { HILOGE("backUpConnection is empty, bundle:%{public}s", bundleName.c_str()); @@ -723,17 +799,17 @@ bool Service::IncrementalBackup(const string &bundleName) NoticeClientFinish(bundleName, BError(BError::Codes::EXT_ABILITY_DIED)); return true; } - if (scenario == IServiceReverse::Scenario::BACKUP && session_->GetIsIncrementalBackup()) { + if (scenario == IServiceReverseType::Scenario::BACKUP && session_->GetIsIncrementalBackup()) { auto ret = proxy->IncrementalOnBackup(session_->GetClearDataFlag(bundleName)); session_->GetServiceReverseProxy()->IncrementalBackupOnBundleStarted(ret, bundleName); - BundleBeginRadarReport(bundleName, ret, IServiceReverse::Scenario::BACKUP); + BundleBeginRadarReport(bundleName, ret, IServiceReverseType::Scenario::BACKUP); if (ret) { SendEndAppGalleryNotify(bundleName); ClearSessionAndSchedInfo(bundleName); NoticeClientFinish(bundleName, BError(BError::Codes::EXT_ABILITY_DIED)); } return true; - } else if (scenario == IServiceReverse::Scenario::RESTORE && BackupPara().GetBackupOverrideIncrementalRestore() && + } else if (scenario == IServiceReverseType::Scenario::RESTORE && BackupPara().GetBackupOverrideIncrementalRestore() && session_->ValidRestoreDataType(RestoreTypeEnum::RESTORE_DATA_WAIT_SEND)) { auto ret = proxy->HandleRestore(session_->GetClearDataFlag(bundleName)); session_->GetServiceReverseProxy()->IncrementalRestoreOnBundleStarted(ret, bundleName); @@ -742,11 +818,14 @@ bool Service::IncrementalBackup(const string &bundleName) HILOGE("Failed to get backupVersion of old device"); } HILOGD("backupVersion of old device = %{public}s", oldBackupVersion.c_str()); - BundleBeginRadarReport(bundleName, ret, IServiceReverse::Scenario::RESTORE); + BundleBeginRadarReport(bundleName, ret, IServiceReverseType::Scenario::RESTORE); auto fileNameVec = session_->GetExtFileNameRequest(bundleName); for (const auto &fileName : fileNameVec) { - auto[errCode, fd, reportFd] = proxy->GetIncrementalFileHandle(fileName); - ret = AppIncrementalFileReady(bundleName, fileName, move(fd), move(reportFd), errCode); + UniqueFdGroup fdGroup; + proxy->GetIncrementalFileHandleWithUniqueFdGroup(fileName,fdGroup); + UniqueFd fd(static_cast(fdGroup.fd)); + UniqueFd reportFd(static_cast(fdGroup.reportFd)); + ret = AppIncrementalFileReady(bundleName, fileName, move(fd), move(reportFd),fdGroup.errCode); if (ret) { HILOGE("Failed to send file handle %{public}s", GetAnonyString(fileName).c_str()); } @@ -758,8 +837,10 @@ bool Service::IncrementalBackup(const string &bundleName) void Service::NotifyCallerCurAppIncrementDone(ErrCode errCode, const std::string &callerName) { - IServiceReverse::Scenario scenario = session_->GetScenario(); - if (scenario == IServiceReverse::Scenario::BACKUP) { + HILOGI("Begin NotifyCallerCurAppIncrementDone errCode = %{public}d, callerName = %{public}s", + errCode, callerName.c_str()); + IServiceReverseType::Scenario scenario = session_->GetScenario(); + if (scenario == IServiceReverseType::Scenario::BACKUP) { HILOGI("will notify clone data, scenario is incremental backup"); session_->GetServiceReverseProxy()->IncrementalBackupOnBundleFinished(errCode, callerName); BundleEndRadarReport(callerName, errCode, scenario); @@ -776,7 +857,7 @@ void Service::NotifyCallerCurAppIncrementDone(ErrCode errCode, const std::string "PROC_NAME", "ohos.appfileservice", "BUNDLENAME", callerName, "PID", getpid(), "TIME", strTime.str() ); - } else if (scenario == IServiceReverse::Scenario::RESTORE) { + } else if (scenario == IServiceReverseType::Scenario::RESTORE) { HILOGI("will notify clone data, scenario is Restore"); session_->GetServiceReverseProxy()->IncrementalRestoreOnBundleFinished(errCode, callerName); BundleEndRadarReport(callerName, errCode, scenario); @@ -785,6 +866,7 @@ void Service::NotifyCallerCurAppIncrementDone(ErrCode errCode, const std::string void Service::SendUserIdToApp(string &bundleName, int32_t userId) { + HILOGI("Begin SendUserIdToApp bundleName%{public}s, userId%{public}d", bundleName.c_str(), userId); if (session_ == nullptr) { HILOGI("session_ is nullptr"); return; @@ -852,6 +934,7 @@ void Service::SetBundleIncDataInfo(const std::vector& bundlesT void Service::CancelTask(std::string bundleName, wptr ptr) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGI("Begin CancelTask bundleName%{public}s", bundleName.c_str()); auto thisPtr = ptr.promote(); if (!thisPtr) { HILOGE("this pointer is null"); @@ -885,9 +968,9 @@ void Service::CancelTask(std::string bundleName, wptr ptr) session->StopExtTimer(bundleName); backUpConnection->DisconnectBackupExtAbility(); thisPtr->ClearSessionAndSchedInfo(bundleName); - IServiceReverse::Scenario scenario = session->GetScenario(); - if ((scenario == IServiceReverse::Scenario::BACKUP && session->GetIsIncrementalBackup()) || - (scenario == IServiceReverse::Scenario::RESTORE && + IServiceReverseType::Scenario scenario = session->GetScenario(); + if ((scenario == IServiceReverseType::Scenario::BACKUP && session->GetIsIncrementalBackup()) || + (scenario == IServiceReverseType::Scenario::RESTORE && session->ValidRestoreDataType(RestoreTypeEnum::RESTORE_DATA_WAIT_SEND))) { thisPtr->NotifyCallerCurAppIncrementDone(BError(BError::Codes::OK), bundleName); } else { @@ -898,51 +981,53 @@ void Service::CancelTask(std::string bundleName, wptr ptr) thisPtr->OnAllBundlesFinished(BError(BError::Codes::OK)); } -ErrCode Service::Cancel(std::string bundleName, int32_t &result) +ErrCode Service::Cancel(const std::string& bundleName, int32_t &result) { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - HILOGI("Begin, bundle name:%{public}s", bundleName.c_str()); - if (session_ == nullptr) { - HILOGE("Cancel error, session is null"); - return BError(BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK); - } - IServiceReverse::Scenario scenario = session_->GetScenario(); - ErrCode ret = VerifyCaller(scenario); - if (ret != ERR_OK) { - HILOGE("Verify caller failed, bundleName:%{public}s, scenario:%{public}d", bundleName.c_str(), scenario); - return BError(BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK); - } - auto impl = session_->GetImpl(); - auto it = impl.backupExtNameMap.find(bundleName); - if (it == impl.backupExtNameMap.end()) { - result = BError::BackupErrorCode::E_CANCEL_NO_TASK; - return BError(BError::Codes::OK); - } - auto action = session_->GetServiceSchedAction(bundleName); - if (action == BConstants::ServiceSchedAction::UNKNOWN) { - HILOGE("action is unknown, bundleName:%{public}s", bundleName.c_str()); - result = BError::BackupErrorCode::E_CANCEL_NO_TASK; - return BError(BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK); - } - auto task = [this, bundleName]() { - try { - CancelTask(bundleName, wptr(this)); - } catch (const BError &e) { - HILOGE("CancelTask failed, errCode = %{public}d", e.GetCode()); - } catch (...) { - HILOGE("Unexpected exception"); - } - }; - if (action == BConstants::ServiceSchedAction::RUNNING) { - threadPool_.AddTask(task); - result = BError(BError::Codes::OK); - return BError(BError::Codes::OK); - } - if (action == BConstants::ServiceSchedAction::CLEAN) { - result = BError::BackupErrorCode::E_CANCEL_NO_TASK; - } else { - result = BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK; - } - return BError(BError::Codes::OK); + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGI("Begin, bundle name:%{public}s", bundleName.c_str()); + if (session_ == nullptr) { + HILOGE("Cancel error, session is null"); + return ErrCode(BError(BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK)); + } + IServiceReverseType::Scenario scenario = session_->GetScenario(); + ErrCode ret = VerifyCaller(scenario); + if (ret != ERR_OK) { + HILOGE("Verify caller failed, bundleName:%{public}s, scenario:%{public}d", + bundleName.c_str(), scenario); + return ErrCode(BError(BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK)); + } + auto impl = session_->GetImpl(); + auto it = impl.backupExtNameMap.find(bundleName); + if (it == impl.backupExtNameMap.end()) { + result = BError::BackupErrorCode::E_CANCEL_NO_TASK; + return BError(BError::Codes::OK).GetCode(); + } + auto action = session_->GetServiceSchedAction(bundleName); + if (action == BConstants::ServiceSchedAction::UNKNOWN) { + HILOGE("action is unknown, bundleName:%{public}s", bundleName.c_str()); + result = BError::BackupErrorCode::E_CANCEL_NO_TASK; + return ErrCode(BError(BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK)); + } + auto task = [this, bundleName]() { + try { + CancelTask(bundleName, wptr(this)); + } catch (const BError &e) { + HILOGE("CancelTask failed, errCode = %{public}d", e.GetCode()); + } catch (...) { + HILOGE("Unexpected exception"); + } + }; + if (action == BConstants::ServiceSchedAction::RUNNING) { + threadPool_.AddTask(task); + result = BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); + } + if (action == BConstants::ServiceSchedAction::CLEAN) { + result = BError::BackupErrorCode::E_CANCEL_NO_TASK; + } else { + result = BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK; + } + return BError(BError::Codes::OK).GetCode(); }); } } // namespace OHOS::FileManagement::Backup diff --git a/services/backup_sa/src/module_ipc/service_incremental_reverse_proxy.cpp b/services/backup_sa/src/module_ipc/service_incremental_reverse_proxy.cpp deleted file mode 100644 index 57e412c92c862ca7f41048a2ec2a0d82b570f0c4..0000000000000000000000000000000000000000 --- a/services/backup_sa/src/module_ipc/service_incremental_reverse_proxy.cpp +++ /dev/null @@ -1,274 +0,0 @@ -/* - * Copyright (c) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "module_ipc/service_reverse_proxy.h" - -#include "b_error/b_error.h" -#include "b_error/b_excep_utils.h" -#include "filemgmt_libhilog.h" -#include "module_app_gallery/app_gallery_dispose_proxy.h" - -namespace OHOS::FileManagement::Backup { -using namespace std; - -void ServiceReverseProxy::IncrementalBackupOnFileReady(string bundleName, string fileName, int fd, int manifestFd, - int32_t errCode) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - bool fdFlag = true; - if (fd < 0 || manifestFd < 0) { - fdFlag = false; - } - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteString(bundleName) || - !data.WriteString(fileName) || !data.WriteBool(fdFlag) || - (fdFlag == true && (!data.WriteFileDescriptor(fd) || !data.WriteFileDescriptor(manifestFd))) || - !data.WriteInt32(errCode)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_FILE_READY), data, reply, - option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::IncrementalBackupOnBundleStarted(int32_t errCode, string bundleName) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteInt32(errCode) || !data.WriteString(bundleName)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - }; - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_SUB_TASK_STARTED), data, - reply, option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::IncrementalBackupOnResultReport(std::string result, std::string bundleName) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteString(result) || !data.WriteString(bundleName)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - }; - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_RESULT_REPORT), data, - reply, option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::IncrementalBackupOnBundleFinished(int32_t errCode, string bundleName) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteInt32(errCode) || !data.WriteString(bundleName)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_SUB_TASK_FINISHED), data, - reply, option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::IncrementalBackupOnAllBundlesFinished(int32_t errCode) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteInt32(errCode)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_TASK_FINISHED), data, - reply, option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::IncrementalBackupOnProcessInfo(std::string bundleName, std::string processInfo) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteString(bundleName) || !data.WriteString(processInfo)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_PROCESS_INFO), data, - reply, option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::IncrementalBackupOnScanningInfo(std::string scannedInfo) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteString(scannedInfo)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_SCANNED_INFO), data, - reply, option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::IncrementalRestoreOnBundleStarted(int32_t errCode, string bundleName) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteInt32(errCode) || !data.WriteString(bundleName)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_RESTORE_ON_SUB_TASK_STARTED), data, - reply, option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::IncrementalRestoreOnBundleFinished(int32_t errCode, string bundleName) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteInt32(errCode) || !data.WriteString(bundleName)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_RESTORE_ON_SUB_TASK_FINISHED), - data, reply, option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::IncrementalRestoreOnAllBundlesFinished(int32_t errCode) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteInt32(errCode)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_RESTORE_ON_TASK_FINISHED), data, - reply, option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::IncrementalRestoreOnResultReport(std::string result, - std::string bundleName, ErrCode errCode) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteString(result) || - !data.WriteString(bundleName) || !data.WriteInt32(errCode)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_RESTORE_ON_RESULT_REPORT), data, - reply, option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::IncrementalRestoreOnFileReady(string bundleName, string fileName, int fd, int manifestFd, - int32_t errCode) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - bool fdFlag = (fd < 0 || manifestFd < 0) ? false : true; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteString(bundleName) || - !data.WriteString(fileName) || !data.WriteBool(fdFlag) || - (fdFlag == true && (!data.WriteFileDescriptor(fd) || !data.WriteFileDescriptor(manifestFd))) || - !data.WriteInt32(errCode)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_RESTORE_ON_FILE_READY), data, - reply, option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::IncrementalRestoreOnProcessInfo(std::string bundleName, std::string processInfo) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteString(bundleName) || !data.WriteString(processInfo)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_RESTORE_ON_PROCESS_INFO), data, - reply, option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} -} // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/services/backup_sa/src/module_ipc/service_reverse_proxy.cpp b/services/backup_sa/src/module_ipc/service_reverse_proxy.cpp deleted file mode 100644 index 2d2dbab3691e26e870e2a75fcc33bd267fb89de2..0000000000000000000000000000000000000000 --- a/services/backup_sa/src/module_ipc/service_reverse_proxy.cpp +++ /dev/null @@ -1,259 +0,0 @@ -/* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "module_ipc/service_reverse_proxy.h" - -#include "b_error/b_error.h" -#include "b_error/b_excep_utils.h" -#include "filemgmt_libhilog.h" - -namespace OHOS::FileManagement::Backup { -using namespace std; - -void ServiceReverseProxy::BackupOnFileReady(string bundleName, string fileName, int fd, int32_t errCode) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - bool fdFlag = fd < 0 ? false : true; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteString(bundleName) || !data.WriteString(fileName) || - !data.WriteBool(fdFlag) || (fdFlag == true && !data.WriteFileDescriptor(fd)) || !data.WriteInt32(errCode)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_FILE_READY), data, reply, option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::BackupOnBundleStarted(int32_t errCode, string bundleName) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteInt32(errCode) || !data.WriteString(bundleName)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - }; - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_SUB_TASK_STARTED), data, reply, - option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::BackupOnResultReport(std::string result, std::string bundleName) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteString(result) || !data.WriteString(bundleName)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - }; - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_RESULT_REPORT), data, reply, - option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::BackupOnBundleFinished(int32_t errCode, string bundleName) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteInt32(errCode) || !data.WriteString(bundleName)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_SUB_TASK_FINISHED), data, reply, - option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::BackupOnAllBundlesFinished(int32_t errCode) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteInt32(errCode)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_TASK_FINISHED), data, reply, option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::BackupOnProcessInfo(std::string bundleName, std::string processInfo) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteString(bundleName) || !data.WriteString(processInfo)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_PROCESS_INFO), data, reply, option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::BackupOnScanningInfo(std::string scannedInfo) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteString(scannedInfo)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_SCANNED_INFO), data, - reply, option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::RestoreOnBundleStarted(int32_t errCode, string bundleName) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteInt32(errCode) || !data.WriteString(bundleName)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_SUB_TASK_STARTED), data, reply, - option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::RestoreOnBundleFinished(int32_t errCode, string bundleName) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteInt32(errCode) || !data.WriteString(bundleName)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_SUB_TASK_FINISHED), data, reply, - option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::RestoreOnAllBundlesFinished(int32_t errCode) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteInt32(errCode)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_TASK_FINISHED), data, reply, - option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::RestoreOnFileReady(string bundleName, string fileName, int fd, int32_t errCode) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - bool fdFlag = fd < 0 ? false : true; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteString(bundleName) || !data.WriteString(fileName) || - !data.WriteBool(fdFlag) || (fdFlag == true && !data.WriteFileDescriptor(fd)) || !data.WriteInt32(errCode)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_FILE_READY), data, reply, option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::RestoreOnResultReport(string result, std::string bundleName, ErrCode errCode) -{ - HILOGI("ServiceReverseProxy::RestoreOnResultReport Begin with result: %s", result.c_str()); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteString(result) || - !data.WriteString(bundleName) || !data.WriteInt32(errCode)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_RESULT_REPORT), data, reply, - option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} - -void ServiceReverseProxy::RestoreOnProcessInfo(std::string bundleName, std::string processInfo) -{ - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteString(bundleName) || !data.WriteString(processInfo)) { - throw BError(BError::Codes::SA_BROKEN_IPC); - } - - MessageParcel reply; - MessageOption option; - if (int err = Remote()->SendRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_PROCESS_INFO), data, reply, option); - err != ERR_OK) { - throw BError(BError::Codes::SA_BROKEN_IPC, to_string(err)); - } -} -} // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/services/backup_sa/src/module_ipc/sub_service.cpp b/services/backup_sa/src/module_ipc/sub_service.cpp index ac779fa9b4e742f525404ccfb61a37f4f9c8427f..97a8e824bf96959200d40634a1e6b8627616fdc4 100644 --- a/services/backup_sa/src/module_ipc/sub_service.cpp +++ b/services/backup_sa/src/module_ipc/sub_service.cpp @@ -36,7 +36,7 @@ #include "b_anony/b_anony.h" #include "b_error/b_error.h" #include "b_error/b_excep_utils.h" -#include "b_file_info.h" +#include "backup_file_info.h" #include "b_hiaudit/hi_audit.h" #include "b_json/b_json_cached_entity.h" #include "b_jsonutil/b_jsonutil.h" @@ -82,11 +82,11 @@ void Service::AppendBundles(const std::vector &bundleNames) } } -void Service::ReportOnBundleStarted(IServiceReverse::Scenario scenario, const std::string &bundleName) +void Service::ReportOnBundleStarted(IServiceReverseType::Scenario scenario, const std::string &bundleName) { - if (scenario == IServiceReverse::Scenario::BACKUP) { + if (scenario == IServiceReverseType::Scenario::BACKUP) { session_->GetServiceReverseProxy()->BackupOnBundleStarted(BError(BError::Codes::SA_INVAL_ARG), bundleName); - } else if (scenario == IServiceReverse::Scenario::RESTORE) { + } else if (scenario == IServiceReverseType::Scenario::RESTORE) { session_->GetServiceReverseProxy()->RestoreOnBundleStarted(BError(BError::Codes::SA_INVAL_ARG), bundleName); } } @@ -163,7 +163,7 @@ bool Service::IsReportFileReadyFail(const std::string &bundleName) return true; } -void Service::TimeoutRadarReport(IServiceReverse::Scenario scenario, std::string &bundleName) +void Service::TimeoutRadarReport(IServiceReverseType::Scenario scenario, std::string &bundleName) { if (!IsReportBundleExecFail(bundleName)) { return; @@ -173,11 +173,11 @@ void Service::TimeoutRadarReport(IServiceReverse::Scenario scenario, std::string if (session_->GetTimeoutValue(bundleName) == 0) { errCode = BError::BackupErrorCode::E_FORCE_TIMEOUT; } - if (scenario == IServiceReverse::Scenario::BACKUP) { + if (scenario == IServiceReverseType::Scenario::BACKUP) { AppRadar::Info info(bundleName, "", "on backup timeout"); AppRadar::GetInstance().RecordBackupFuncRes(info, "Service::TimeOutCallback", GetUserIdDefault(), BizStageBackup::BIZ_STAGE_ON_BACKUP, errCode); - } else if (scenario == IServiceReverse::Scenario::RESTORE) { + } else if (scenario == IServiceReverseType::Scenario::RESTORE) { AppRadar::Info info(bundleName, "", "on restore timeout"); AppRadar::GetInstance().RecordRestoreFuncRes(info, "Service::TimeOutCallback", GetUserIdDefault(), BizStageRestore::BIZ_STAGE_ON_RESTORE, errCode); @@ -186,61 +186,81 @@ void Service::TimeoutRadarReport(IServiceReverse::Scenario scenario, std::string ErrCode Service::Finish() { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - try { - ErrCode ret = VerifyCaller(session_->GetScenario()); - if (ret != ERR_OK) { - HILOGE("Failde to Finish, verify caller failed, ret:%{public}d", ret); - ReleaseOnException(); - return ret; - } - ret = session_->Finish(); - if (ret != ERR_OK) { - HILOGE("Failde to Finish, session finish failed, ret:%{public}d", ret); - ReleaseOnException(); - return ret; - } - OnAllBundlesFinished(BError(BError::Codes::OK)); - return BError(BError::Codes::OK); - } catch (const BError &e) { - ReleaseOnException(); - HILOGE("Failde to Finish"); - return e.GetCode(); - } + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGE("Begin Finish"); + try { + ErrCode ret = VerifyCaller(session_->GetScenario()); + if (ret != ERR_OK) { + HILOGE("Failde to Finish, verify caller failed, ret:%{public}d", ret); + ReleaseOnException(); + return ret; + } + ret = session_->Finish(); + if (ret != ERR_OK) { + HILOGE("Failde to Finish, session finish failed, ret:%{public}d", ret); + ReleaseOnException(); + return ret; + } + OnAllBundlesFinished(BError(BError::Codes::OK)); + return BError(BError::Codes::OK).GetCode(); + } catch (const BError &e) { + ReleaseOnException(); + HILOGE("Failde to Finish"); + return e.GetCode(); + }}); } ErrCode Service::PublishFile(const BFileInfo &fileInfo) { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - if (session_ == nullptr) { - HILOGE("PublishFile error, session is empty"); - return BError(BError::Codes::SA_INVAL_ARG); - } - ErrCode ret = VerifyCaller(IServiceReverse::Scenario::RESTORE); - if (ret != ERR_OK) { - HILOGE("PublishFile error, verify caller by scenario failed, ret:%{public}d", ret); - return ret; - } - if (!fileInfo.fileName.empty()) { - HILOGE("Forbit to use publishFile with fileName for App"); - return EPERM; - } - auto backUpConnection = session_->GetExtConnection(fileInfo.owner); - if (backUpConnection == nullptr) { - HILOGE("backUpConnection is empty, bundle:%{public}s", fileInfo.owner.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); - } - auto proxy = backUpConnection->GetBackupExtProxy(); - if (!proxy) { - HILOGE("PublishFile error, Extension backup Proxy is empty"); - return BError(BError::Codes::SA_INVAL_ARG); - } - ret = proxy->PublishFile(fileInfo.fileName); - if (ret != ERR_OK) { - HILOGE("Failed to publish file for backup extension, ret:%{public}d", ret); - return ret; - } - return BError(BError::Codes::OK); + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + if (session_ == nullptr) { + HILOGE("PublishFile error, session is empty"); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + ErrCode ret = VerifyCaller(IServiceReverseType::Scenario::RESTORE); + if (ret != ERR_OK) { + HILOGE("PublishFile error, verify caller by scenario failed, ret:%{public}d", ret); + return ret; + } + if (!fileInfo.fileName.empty()) { + HILOGE("Forbit to use publishFile with fileName for App"); + return EPERM; + } + auto backUpConnection = session_->GetExtConnection(fileInfo.owner); + if (backUpConnection == nullptr) { + HILOGE("backUpConnection is empty, bundle:%{public}s", fileInfo.owner.c_str()); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + auto proxy = backUpConnection->GetBackupExtProxy(); + if (!proxy) { + HILOGE("PublishFile error, Extension backup Proxy is empty"); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + ret = proxy->PublishFile(fileInfo.fileName); + if (ret != ERR_OK) { + HILOGE("Failed to publish file for backup extension, ret:%{public}d", ret); + return ret; + } + return BError(BError::Codes::OK).GetCode(); }); +} + +ErrCode Service::AppFileReady( const std::string &fileName, + int32_t fd, int32_t errCode) +{ + return BExcepUltils::ExceptionCatcherLocked( + [&]() + { + HILOGI("fileName =%{public}s, fd = %{public}d, errCode = %{public}d",fileName.c_str(), fd,errCode); + UniqueFd fdUnique(static_cast(fd)); + if (fd < 0) + { + HILOGE("Error fd, fd = %{public}d", fd); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + return AppFileReady(fileName, std::move(fdUnique), errCode); + }); } ErrCode Service::AppFileReady(const string &fileName, UniqueFd fd, int32_t errCode) @@ -249,7 +269,7 @@ ErrCode Service::AppFileReady(const string &fileName, UniqueFd fd, int32_t errCo try { if (session_ == nullptr) { HILOGE("AppFileReady error, session is empty"); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } string callerName; ErrCode ret = VerifyCallerAndGetCallerName(callerName); @@ -259,7 +279,7 @@ ErrCode Service::AppFileReady(const string &fileName, UniqueFd fd, int32_t errCo } if (fileName.find('/') != string::npos) { HILOGE("AppFileReady error, filename is not valid, fileName:%{public}s", GetAnonyPath(fileName).c_str()); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } if (fileName == BConstants::EXT_BACKUP_MANAGE) { fd = session_->OnBundleExtManageInfo(callerName, move(fd)); @@ -275,7 +295,7 @@ ErrCode Service::AppFileReady(const string &fileName, UniqueFd fd, int32_t errCo } } OnAllBundlesFinished(BError(BError::Codes::OK)); - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } catch (const BError &e) { return e.GetCode(); // 任意异常产生，终止监听该任务 } catch (...) { @@ -286,61 +306,63 @@ ErrCode Service::AppFileReady(const string &fileName, UniqueFd fd, int32_t errCo ErrCode Service::AppDone(ErrCode errCode) { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - try { - if (session_ == nullptr) { - HILOGE("App finish error, session info is empty"); - return BError(BError::Codes::SA_INVAL_ARG); - } - string callerName; - ErrCode ret = VerifyCallerAndGetCallerName(callerName); - if (ret != ERR_OK) { - HILOGE("App done failed, Get bundle name failed, ret:%{public}d", ret); - return ret; - } - HILOGI("Begin, callerName is: %{public}s, errCode: %{public}d", callerName.c_str(), errCode); - if (session_->OnBundleFileReady(callerName) || errCode != BError(BError::Codes::OK)) { - std::shared_ptr mutexPtr = GetExtensionMutex(callerName); - if (mutexPtr == nullptr) { - HILOGE("extension mutex ptr is nullptr, bundleName:%{public}s", callerName.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); - } - std::lock_guard lock(mutexPtr->callbackMutex); - ret = HandleCurAppDone(errCode, callerName, false); - if (ret != ERR_OK) { - HILOGE("Handle current app done error, bundleName:%{public}s", callerName.c_str()); - return ret; - } - } - RemoveExtensionMutex(callerName); - OnAllBundlesFinished(BError(BError::Codes::OK)); - return BError(BError::Codes::OK); - } catch (const BError &e) { - ReleaseOnException(); - HILOGE("AppDone error, err code is: %{public}d", e.GetCode()); - return e.GetCode(); // 任意异常产生，终止监听该任务 - } catch (...) { - HILOGE("Unexpected exception"); - ReleaseOnException(); - return EPERM; - } + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGI("AppDone errCode =%{public}d",errCode); + try { + if (session_ == nullptr) { + HILOGE("App finish error, session info is empty"); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + string callerName; + ErrCode ret = VerifyCallerAndGetCallerName(callerName); + if (ret != ERR_OK) { + HILOGE("App done failed, Get bundle name failed, ret:%{public}d", ret); + return ret; + } + HILOGI("Begin, callerName is: %{public}s, errCode: %{public}d", callerName.c_str(), errCode); + if (session_->OnBundleFileReady(callerName) || errCode != BError(BError::Codes::OK)) { + std::shared_ptr mutexPtr = GetExtensionMutex(callerName); + if (mutexPtr == nullptr) { + HILOGE("extension mutex ptr is nullptr, bundleName:%{public}s", callerName.c_str()); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + std::lock_guard lock(mutexPtr->callbackMutex); + ret = HandleCurAppDone(errCode, callerName, false); + if (ret != ERR_OK) { + HILOGE("Handle current app done error, bundleName:%{public}s", callerName.c_str()); + return ret; + } + } + RemoveExtensionMutex(callerName); + OnAllBundlesFinished(BError(BError::Codes::OK)); + return BError(BError::Codes::OK).GetCode(); + } catch (const BError &e) { + ReleaseOnException(); + HILOGE("AppDone error, err code is: %{public}d", e.GetCode()); + return e.GetCode(); // 任意异常产生，终止监听该任务 + } catch (...) { + HILOGE("Unexpected exception"); + ReleaseOnException(); + return EPERM; + }}); } ErrCode Service::LaunchBackupExtension(const BundleName &bundleName) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); HILOGI("begin %{public}s", bundleName.data()); - IServiceReverse::Scenario scenario = session_->GetScenario(); + IServiceReverseType::Scenario scenario = session_->GetScenario(); BConstants::ExtensionAction action; - if (scenario == IServiceReverse::Scenario::BACKUP || scenario == IServiceReverse::Scenario::CLEAN) { + if (scenario == IServiceReverseType::Scenario::BACKUP || scenario == IServiceReverseType::Scenario::CLEAN) { action = BConstants::ExtensionAction::BACKUP; - } else if (scenario == IServiceReverse::Scenario::RESTORE) { + } else if (scenario == IServiceReverseType::Scenario::RESTORE) { action = BConstants::ExtensionAction::RESTORE; } else { action = BConstants::ExtensionAction::INVALID; HILOGE("Launch current bundle backupExtension failed, action is unknown, bundleName:%{public}s", bundleName.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } if (SAUtils::IsSABundleName(bundleName)) { return LaunchBackupSAExtension(bundleName); @@ -350,25 +372,25 @@ ErrCode Service::LaunchBackupExtension(const BundleName &bundleName) auto backUpConnection = session_->GetExtConnection(bundleName); if (backUpConnection == nullptr) { HILOGE("LaunchBackupExtension error, backUpConnection is empty"); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } if (backUpConnection->IsExtAbilityConnected() && !backUpConnection->WaitDisconnectDone()) { HILOGE("LaunchBackupExtension error, WaitDisconnectDone failed"); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } BConstants::ServiceSchedAction bundleAction = session_->GetServiceSchedAction(bundleName); if (bundleAction == BConstants::ServiceSchedAction::UNKNOWN) { HILOGE("action is unknown, bundleName:%{public}s", bundleName.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } ErrCode ret = backUpConnection->ConnectBackupExtAbility(want, session_->GetSessionUserId(), bundleAction == BConstants::ServiceSchedAction::CLEAN); if (ret != ERR_OK) { HILOGE("ConnectBackupExtAbility failed, bundleName:%{public}s, ret:%{public}d", bundleName.c_str(), ret); ExtensionConnectFailRadarReport(bundleName, ret, scenario); - return BError(BError::Codes::SA_BOOT_EXT_FAIL); + return BError(BError::Codes::SA_BOOT_EXT_FAIL).GetCode(); } - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } void Service::SetWant(AAFwk::Want &want, const BundleName &bundleName, const BConstants::ExtensionAction &action) @@ -414,7 +436,7 @@ std::vector Service::GetSupportBackupBundleNames(vectorSetBundleDataSize(bundleName, totalDataSize); - HILOGI("RefreshDataSize, bundleName:%{public}s ,datasize = %{public}" PRId64 "", - bundleName.c_str(), totalDataSize); - return BError(BError::Codes::OK); - } catch (const BError &e) { - return e.GetCode(); - } + return BExcepUltils::ExceptionCatcherLocked( + [&]() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + try { + if (session_ == nullptr) { + HILOGE("session is nullptr"); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + std::string bundleName; + ErrCode ret = VerifyCallerAndGetCallerName(bundleName); + if (ret != ERR_OK) { + HILOGE("Refresh data size failed, bundleName:%{public}s, ret:%{public}d", + bundleName.c_str(), ret); + return ret; + } + session_->SetBundleDataSize(bundleName, totalDataSize); + HILOGI("RefreshDataSize, bundleName:%{public}s ,datasize = %{public}" PRId64 "", + bundleName.c_str(), totalDataSize); + return BError(BError::Codes::OK).GetCode(); + } catch (const BError &e) { + return e.GetCode(); + }}); } @@ -485,31 +509,32 @@ void Service::HandleNotSupportBundleNames(const std::vector &srcBun ErrCode Service::StopExtTimer(bool &isExtStop) { - try { - HILOGI("Service::StopExtTimer begin."); - if (session_ == nullptr) { - HILOGE("StopExtTimer error, session_ is nullptr."); - isExtStop = false; - return BError(BError::Codes::SA_INVAL_ARG); - } - session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); - string bundleName; - ErrCode ret = VerifyCallerAndGetCallerName(bundleName); - if (ret != ERR_OK) { - HILOGE("Stop extension error, ret:%{public}d", ret); - isExtStop = false; - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return ret; - } - isExtStop = session_->StopExtTimer(bundleName); - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return BError(BError::Codes::OK); - } catch (...) { - HILOGE("Unexpected exception"); - isExtStop = false; - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return EPERM; - } + return BExcepUltils::ExceptionCatcherLocked( + [&]() { try { + HILOGI("Service::StopExtTimer begin."); + if (session_ == nullptr) { + HILOGE("StopExtTimer error, session_ is nullptr."); + isExtStop = false; + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); + string bundleName; + ErrCode ret = VerifyCallerAndGetCallerName(bundleName); + if (ret != ERR_OK) { + HILOGE("Stop extension error, ret:%{public}d", ret); + isExtStop = false; + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return ret; + } + isExtStop = session_->StopExtTimer(bundleName); + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return BError(BError::Codes::OK).GetCode(); + } catch (...) { + HILOGE("Unexpected exception"); + isExtStop = false; + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return EPERM; + }}); } void Service::ClearFailedBundles() @@ -613,15 +638,15 @@ void Service::NoticeClientFinish(const string &bundleName, ErrCode errCode) HILOGI("begin %{public}s", bundleName.c_str()); try { auto scenario = session_->GetScenario(); - if (scenario == IServiceReverse::Scenario::BACKUP && session_->GetIsIncrementalBackup()) { + if (scenario == IServiceReverseType::Scenario::BACKUP && session_->GetIsIncrementalBackup()) { session_->GetServiceReverseProxy()->IncrementalBackupOnBundleFinished(errCode, bundleName); - } else if (scenario == IServiceReverse::Scenario::RESTORE && + } else if (scenario == IServiceReverseType::Scenario::RESTORE && BackupPara().GetBackupOverrideIncrementalRestore() && session_->ValidRestoreDataType(RestoreTypeEnum::RESTORE_DATA_WAIT_SEND)) { session_->GetServiceReverseProxy()->IncrementalRestoreOnBundleFinished(errCode, bundleName); - } else if (scenario == IServiceReverse::Scenario::BACKUP) { + } else if (scenario == IServiceReverseType::Scenario::BACKUP) { session_->GetServiceReverseProxy()->BackupOnBundleFinished(errCode, bundleName); - } else if (scenario == IServiceReverse::Scenario::RESTORE) { + } else if (scenario == IServiceReverseType::Scenario::RESTORE) { session_->GetServiceReverseProxy()->RestoreOnBundleFinished(errCode, bundleName); }; BundleEndRadarReport(bundleName, errCode, scenario); @@ -643,20 +668,20 @@ void Service::OnAllBundlesFinished(ErrCode errCode) HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); HILOGI("called begin."); if (session_->IsOnAllBundlesFinished()) { - IServiceReverse::Scenario scenario = session_->GetScenario(); - if (isInRelease_.load() && (scenario == IServiceReverse::Scenario::RESTORE)) { + IServiceReverseType::Scenario scenario = session_->GetScenario(); + if (isInRelease_.load() && (scenario == IServiceReverseType::Scenario::RESTORE)) { HILOGI("Will destory session info"); SessionDeactive(); } - if (scenario == IServiceReverse::Scenario::BACKUP && session_->GetIsIncrementalBackup()) { + if (scenario == IServiceReverseType::Scenario::BACKUP && session_->GetIsIncrementalBackup()) { session_->GetServiceReverseProxy()->IncrementalBackupOnAllBundlesFinished(errCode); - } else if (scenario == IServiceReverse::Scenario::RESTORE && + } else if (scenario == IServiceReverseType::Scenario::RESTORE && BackupPara().GetBackupOverrideIncrementalRestore() && session_->ValidRestoreDataType(RestoreTypeEnum::RESTORE_DATA_WAIT_SEND)) { session_->GetServiceReverseProxy()->IncrementalRestoreOnAllBundlesFinished(errCode); - } else if (scenario == IServiceReverse::Scenario::BACKUP) { + } else if (scenario == IServiceReverseType::Scenario::BACKUP) { session_->GetServiceReverseProxy()->BackupOnAllBundlesFinished(errCode); - } else if (scenario == IServiceReverse::Scenario::RESTORE) { + } else if (scenario == IServiceReverseType::Scenario::RESTORE) { session_->GetServiceReverseProxy()->RestoreOnAllBundlesFinished(errCode); } if (!BackupPara().GetBackupOverrideBackupSARelease()) { @@ -674,12 +699,12 @@ ErrCode Service::VerifySendRateParam() HILOGE("Update send rate fail, verify caller failed, ret:%{public}d", ret); return ret; } - IServiceReverse::Scenario scenario = session_ -> GetScenario(); - if (scenario != IServiceReverse::Scenario::BACKUP) { + IServiceReverseType::Scenario scenario = session_ -> GetScenario(); + if (scenario != IServiceReverseType::Scenario::BACKUP) { HILOGE("This method is applicable to the backup scenario"); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } ErrCode Service::HandleCurBundleFileReady(const std::string &bundleName, const std::string &fileName, bool isIncBackup) @@ -687,12 +712,12 @@ ErrCode Service::HandleCurBundleFileReady(const std::string &bundleName, const s auto backUpConnection = session_->GetExtConnection(bundleName); if (backUpConnection == nullptr) { HILOGE("AppFileReady error, backUpConnection is empty, bundleName:%{public}s", bundleName.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } auto proxy = backUpConnection->GetBackupExtProxy(); if (!proxy) { HILOGE("AppFileReady error, Extension backup Proxy is empty, bundleName:%{public}s", bundleName.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } // 通知extension清空缓存 proxy->HandleClear(); @@ -703,7 +728,7 @@ ErrCode Service::HandleCurBundleFileReady(const std::string &bundleName, const s if (isIncBackup) { session_->GetServiceReverseProxy()->IncrementalBackupOnBundleFinished(BError(BError::Codes::OK), bundleName); - BundleEndRadarReport(bundleName, BError(BError::Codes::OK), IServiceReverse::Scenario::BACKUP); + BundleEndRadarReport(bundleName, BError(BError::Codes::OK), IServiceReverseType::Scenario::BACKUP); } else { session_->GetServiceReverseProxy()->BackupOnBundleFinished(BError(BError::Codes::OK), bundleName); BundleEndRadarReport(bundleName, BError(BError::Codes::OK), session_->GetScenario()); @@ -711,7 +736,7 @@ ErrCode Service::HandleCurBundleFileReady(const std::string &bundleName, const s // 断开extension backUpConnection->DisconnectBackupExtAbility(); ClearSessionAndSchedInfo(bundleName); - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } ErrCode Service::HandleCurAppDone(ErrCode errCode, const std::string &bundleName, bool isIncBackup) @@ -719,12 +744,12 @@ ErrCode Service::HandleCurAppDone(ErrCode errCode, const std::string &bundleName auto backUpConnection = session_->GetExtConnection(bundleName); if (backUpConnection == nullptr) { HILOGE("App finish error, backUpConnection is empty, bundleName:%{public}s", bundleName.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } auto proxy = backUpConnection->GetBackupExtProxy(); if (!proxy) { HILOGE("App finish error, extension backup Proxy is empty, bundleName:%{public}s", bundleName.c_str()); - return BError(BError::Codes::SA_INVAL_ARG); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); } proxy->HandleClear(); session_->StopFwkTimer(bundleName); @@ -741,7 +766,7 @@ ErrCode Service::HandleCurAppDone(ErrCode errCode, const std::string &bundleName bundleName.c_str(), errCode); NotifyCallerCurAppDone(errCode, bundleName); } - return BError(BError::Codes::OK); + return BError(BError::Codes::OK).GetCode(); } std::string Service::GetCallerName() @@ -774,8 +799,16 @@ std::string Service::GetCallerName() } return callerName; } + ErrCode Service::InitRestoreSessionWithErrMsg(sptr& remote, std::string &errMsg) + { + return BExcepUltils::ExceptionCatcherLocked( + [&]() { + HILOGI("Start InitRestoreSessionWithErrMsg,Msg :%{public}s",errMsg.c_str()); + return InitRestoreSession(remote, errMsg); + }); + } -ErrCode Service::InitRestoreSession(sptr remote, std::string &errMsg) +ErrCode Service::InitRestoreSession(sptr& remote, std::string &errMsg) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); ErrCode ret = VerifyCaller(); @@ -785,7 +818,7 @@ ErrCode Service::InitRestoreSession(sptr remote, std::string &e } ret = session_->Active({ .clientToken = IPCSkeleton::GetCallingTokenID(), - .scenario = IServiceReverse::Scenario::RESTORE, + .scenario = IServiceReverseType::Scenario::RESTORE, .clientProxy = remote, .userId = GetUserIdDefault(), .callerName = GetCallerName(), @@ -810,42 +843,54 @@ ErrCode Service::InitRestoreSession(sptr remote, std::string &e return ret; } -ErrCode Service::InitBackupSession(sptr remote, std::string &errMsg) +ErrCode Service::InitBackupSessionWithErrMsg(sptr& remote, std::string &errMsg) { - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - ErrCode ret = VerifyCaller(); - if (ret != ERR_OK) { - HILOGE("Init full backup session fail, verify caller failed"); - return ret; - } - int32_t oldSize = StorageMgrAdapter::UpdateMemPara(BConstants::BACKUP_VFS_CACHE_PRESSURE); - HILOGI("InitBackupSession oldSize %{public}d", oldSize); - session_->SetMemParaCurSize(oldSize); - ret = session_->Active({ - .clientToken = IPCSkeleton::GetCallingTokenID(), - .scenario = IServiceReverse::Scenario::BACKUP, - .clientProxy = remote, - .userId = GetUserIdDefault(), - .callerName = GetCallerName(), - .activeTime = TimeUtils::GetCurrentTime(), - }); - if (ret == ERR_OK) { - ClearFailedBundles(); - successBundlesNum_ = 0; - ClearBundleRadarReport(); - ClearFileReadyRadarReport(); - return ret; - } - if (ret == BError(BError::Codes::SA_SESSION_CONFLICT)) { - errMsg = BJsonUtil::BuildInitSessionErrInfo(session_->GetSessionUserId(), - session_->GetSessionCallerName(), - session_->GetSessionActiveTime()); - HILOGE("Active backup session error, Already have a session"); - return ret; - } - HILOGE("Active backup session error"); - StopAll(nullptr, true); - return ret; + return BExcepUltils::ExceptionCatcherLocked( + [&]() { + HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGI("Start InitBackupSessionWithErrMsg,Msg :%{public}s",errMsg.c_str()); + ErrCode ret = VerifyCaller(); + if (ret != ERR_OK) { + HILOGE("Init full backup session fail, verify caller failed"); + return ret; + } + int32_t oldSize = StorageMgrAdapter::UpdateMemPara(BConstants::BACKUP_VFS_CACHE_PRESSURE); + HILOGI("InitBackupSession oldSize %{public}d", oldSize); + session_->SetMemParaCurSize(oldSize); + ret = session_->Active({ + .clientToken = IPCSkeleton::GetCallingTokenID(), + .scenario = IServiceReverseType::Scenario::BACKUP, + .clientProxy = remote, + .userId = GetUserIdDefault(), + .callerName = GetCallerName(), + .activeTime = TimeUtils::GetCurrentTime(), + }); + if (ret == ERR_OK) { + ClearFailedBundles(); + successBundlesNum_ = 0; + ClearBundleRadarReport(); + ClearFileReadyRadarReport(); + return ret; + } + if (ret == BError(BError::Codes::SA_SESSION_CONFLICT)) { + errMsg = BJsonUtil::BuildInitSessionErrInfo(session_->GetSessionUserId(), + session_->GetSessionCallerName(), + session_->GetSessionActiveTime()); + HILOGE("Active backup session error, Already have a session"); + return ret; + } + HILOGE("Active backup session error"); + StopAll(nullptr, true); + return ret; }); +} + +ErrCode Service::GetLocalCapabilitiesForBundleInfos(int32_t &fd) +{ + return BExcepUltils::ExceptionCatcherLocked( + [&]() { UniqueFd uniqueFd= GetLocalCapabilitiesForBundleInfos(); + HILOGI("get GetLocalCapabilitiesForBundleInfos value"); + fd= uniqueFd.Get(); + return fd; }); } UniqueFd Service::GetLocalCapabilitiesForBundleInfos() @@ -914,28 +959,31 @@ void Service::CallOnBundleEndByScenario(const std::string &bundleName, BackupRes } } -ErrCode Service::GetBackupDataSize(bool isPreciseScan, vector bundleNameList) +ErrCode Service::GetBackupDataSize(bool isPreciseScan, const std::vector& bundleNameList) { - try { - HILOGI("start GetBackupDataSize"); - if (session_ == nullptr || onScanning_.load()) { - HILOGE("GetBackupDataSize error 1.session is nullptr 2.onScanning_ = %{public}d", onScanning_.load()); - return BError(BError::Codes::SA_INVAL_ARG); - } - session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); - onScanning_.store(true); - ErrCode ret = VerifyCaller(); - if (ret != ERR_OK) { - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return BError(BError::Codes::SA_INVAL_ARG, "verify caller failed"); - } - BundleMgrAdapter::CreatBackupEnv(bundleNameList, GetUserIdDefault()); - CyclicSendScannedInfo(isPreciseScan, bundleNameList); - return BError(BError::Codes::OK); - } catch (...) { - session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); - return BError(BError::Codes::SA_INVAL_ARG); - } + return BExcepUltils::ExceptionCatcherLocked( + [&]() { try { + HILOGI("start GetBackupDataSize"); + if (session_ == nullptr || onScanning_.load()) { + HILOGE("GetBackupDataSize error 1.session is nullptr 2.onScanning_ = %{public}d", + onScanning_.load()); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } + session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); + onScanning_.store(true); + ErrCode ret = VerifyCaller(); + if (ret != ERR_OK) { + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return BError(BError::Codes::SA_INVAL_ARG, "verify caller failed").GetCode(); + } + BundleMgrAdapter::CreatBackupEnv(bundleNameList, GetUserIdDefault()); + CyclicSendScannedInfo(isPreciseScan, bundleNameList); + return BError(BError::Codes::OK).GetCode(); + } catch (...) { + session_->DecreaseSessionCnt(__PRETTY_FUNCTION__); + return BError(BError::Codes::SA_INVAL_ARG).GetCode(); + } }); + } void Service::CyclicSendScannedInfo(bool isPreciseScan, vector bundleNameList) @@ -1127,7 +1175,7 @@ void Service::SendScannedInfo(const string&scannendInfos, sptrGetScenario() == IServiceReverse::Scenario::BACKUP && session->GetIsIncrementalBackup()) { + if (session->GetScenario() == IServiceReverseType::Scenario::BACKUP && session->GetIsIncrementalBackup()) { HILOGI("this is incremental backup sending info"); session->GetServiceReverseProxy()->IncrementalBackupOnScanningInfo(scannendInfos); return; diff --git a/services/backup_sa/src/module_ipc/svc_backup_connection.cpp b/services/backup_sa/src/module_ipc/svc_backup_connection.cpp index 7dc6d5eecb0f91ca6fd159f26b2c994270c13b0f..58bdb61583facaf12e4f6783289b0e50e7df5290 100644 --- a/services/backup_sa/src/module_ipc/svc_backup_connection.cpp +++ b/services/backup_sa/src/module_ipc/svc_backup_connection.cpp @@ -21,7 +21,7 @@ #include "ability_manager_client.h" #include "filemgmt_libhilog.h" #include "hisysevent.h" -#include "module_ipc/svc_extension_proxy.h" +#include "extension_proxy.h" #include "module_ipc/svc_session_manager.h" namespace OHOS::FileManagement::Backup { @@ -40,7 +40,7 @@ void SvcBackupConnection::OnAbilityConnectDone(const AppExecFwk::ElementName &el HILOGE("Failed to ability connect done, remote is nullptr"); return; } - backupProxy_ = iface_cast(remoteObject); + backupProxy_ = iface_cast(remoteObject); if (backupProxy_ == nullptr) { HILOGE("Failed to ability connect done, backupProxy_ is nullptr"); return; diff --git a/services/backup_sa/src/module_ipc/svc_extension_incremental_proxy.cpp b/services/backup_sa/src/module_ipc/svc_extension_incremental_proxy.cpp deleted file mode 100644 index c29b0e72b97fcb2584cb6eaba098c7b1751942ca..0000000000000000000000000000000000000000 --- a/services/backup_sa/src/module_ipc/svc_extension_incremental_proxy.cpp +++ /dev/null @@ -1,173 +0,0 @@ -/* - * Copyright (c) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "module_ipc/svc_extension_proxy.h" - -#include "b_error/b_error.h" -#include "b_error/b_excep_utils.h" -#include "filemgmt_libhilog.h" -#include "iservice_registry.h" -#include "system_ability_definition.h" -#include "hitrace_meter.h" - -namespace OHOS::FileManagement::Backup { -using namespace std; - -std::tuple SvcExtensionProxy::GetIncrementalFileHandle(const string &fileName) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - HILOGD("Start"); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - data.WriteInterfaceToken(GetDescriptor()); - - if (!data.WriteString(fileName)) { - BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the fileName"); - return {ErrCode(EPERM), UniqueFd(-1), UniqueFd(-1)}; - } - - MessageParcel reply; - MessageOption option; - int32_t ret = Remote()->SendRequest(static_cast(IExtensionInterfaceCode::CMD_GET_INCREMENTAL_FILE_HANDLE), - data, reply, option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - return {ErrCode(ret), UniqueFd(-1), UniqueFd(-1)}; - } - - HILOGD("Successful"); - ErrCode err(reply.ReadInt32()); - UniqueFd fd(reply.ReadFileDescriptor()); - UniqueFd reportFd(reply.ReadFileDescriptor()); - return {err, move(fd), move(reportFd)}; -} - -ErrCode SvcExtensionProxy::PublishIncrementalFile(const string &fileName) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - HILOGD("Start"); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - data.WriteInterfaceToken(GetDescriptor()); - - if (!data.WriteString(fileName)) { - BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the fileName"); - return ErrCode(EPERM); - } - - MessageParcel reply; - MessageOption option; - int32_t ret = Remote()->SendRequest(static_cast(IExtensionInterfaceCode::CMD_PUBLISH_INCREMENTAL_FILE), - data, reply, option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - return ErrCode(ret); - } - - HILOGD("Successful"); - return reply.ReadInt32(); -} - -ErrCode SvcExtensionProxy::HandleIncrementalBackup(UniqueFd incrementalFd, UniqueFd manifestFd) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - HILOGD("Start"); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - data.WriteInterfaceToken(GetDescriptor()); - - data.WriteFileDescriptor(incrementalFd); - data.WriteFileDescriptor(manifestFd); - - MessageParcel reply; - MessageOption option; - int32_t ret = Remote()->SendRequest(static_cast(IExtensionInterfaceCode::CMD_HANDLE_INCREMENTAL_BACKUP), - data, reply, option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - return ErrCode(ret); - } - - HILOGD("Successful"); - return reply.ReadInt32(); -} - -ErrCode SvcExtensionProxy::IncrementalOnBackup(bool isClearData) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - HILOGD("Start"); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteBool(isClearData)) { - return BError(BError::Codes::SDK_INVAL_ARG, "build param fail."); - } - - MessageParcel reply; - MessageOption option; - int32_t ret = Remote()->SendRequest(static_cast(IExtensionInterfaceCode::CMD_INCREMENTAL_ON_BACKUP), - data, reply, option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - return ErrCode(ret); - } - - HILOGD("Successful"); - return BError(BError::Codes::OK); -} - -ErrCode SvcExtensionProxy::User0OnBackup() -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - HILOGD("Start"); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - data.WriteInterfaceToken(GetDescriptor()); - - MessageParcel reply; - MessageOption option; - int32_t ret = Remote()->SendRequest(static_cast(IExtensionInterfaceCode::CMD_HANDLE_USER_0_BACKUP), - data, reply, option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - return ErrCode(ret); - } - - HILOGD("Successful"); - return reply.ReadInt32(); -} - -tuple SvcExtensionProxy::GetIncrementalBackupFileHandle() -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - HILOGD("Start"); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - data.WriteInterfaceToken(GetDescriptor()); - - MessageParcel reply; - MessageOption option; - int32_t ret = Remote()->SendRequest( - static_cast(IExtensionInterfaceCode::CMD_GET_INCREMENTAL_BACKUP_FILE_HANDLE), data, reply, option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - return {UniqueFd(-1), UniqueFd(-1)}; - } - - HILOGD("Successful"); - UniqueFd incrementalFd(reply.ReadFileDescriptor()); - UniqueFd manifestFd(reply.ReadFileDescriptor()); - return {move(incrementalFd), move(manifestFd)}; -} -} // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/services/backup_sa/src/module_ipc/svc_extension_proxy.cpp b/services/backup_sa/src/module_ipc/svc_extension_proxy.cpp deleted file mode 100644 index ce2bfcc36b75865ade94bba5f7cac9cd889af247..0000000000000000000000000000000000000000 --- a/services/backup_sa/src/module_ipc/svc_extension_proxy.cpp +++ /dev/null @@ -1,215 +0,0 @@ -/* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "module_ipc/svc_extension_proxy.h" - -#include "b_error/b_error.h" -#include "b_error/b_excep_utils.h" -#include "filemgmt_libhilog.h" -#include "iservice_registry.h" -#include "system_ability_definition.h" -#include "hitrace_meter.h" - -namespace OHOS::FileManagement::Backup { -using namespace std; -const int INVALID_FD = -1; - -UniqueFd SvcExtensionProxy::GetFileHandle(const string &fileName, int32_t &errCode) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - HILOGI("Start"); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - data.WriteInterfaceToken(GetDescriptor()); - - if (!data.WriteString(fileName)) { - BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the fileName"); - return UniqueFd(-1); - } - - MessageParcel reply; - MessageOption option; - int32_t ret = - Remote()->SendRequest(static_cast(IExtensionInterfaceCode::CMD_GET_FILE_HANDLE), data, reply, option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - return UniqueFd(-ret); - } - - HILOGI("Successful"); - bool fdFlag = reply.ReadBool(); - errCode = reply.ReadInt32(); - UniqueFd fd = UniqueFd(INVALID_FD); - if (fdFlag == true) { - fd = UniqueFd(reply.ReadFileDescriptor()); - } - return UniqueFd(fd.Release()); -} - -ErrCode SvcExtensionProxy::HandleClear() -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - HILOGI("Start"); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - data.WriteInterfaceToken(GetDescriptor()); - - MessageParcel reply; - MessageOption option; - int32_t ret = - Remote()->SendRequest(static_cast(IExtensionInterfaceCode::CMD_HANDLE_CLAER), data, reply, option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - return ErrCode(ret); - } - - HILOGI("Successful"); - return reply.ReadInt32(); -} - -ErrCode SvcExtensionProxy::HandleBackup(bool isClearData) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - HILOGI("Start"); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteBool(isClearData)) { - return BError(BError::Codes::SDK_INVAL_ARG, "build param fail."); - } - - MessageParcel reply; - MessageOption option; - int32_t ret = - Remote()->SendRequest(static_cast(IExtensionInterfaceCode::CMD_HANDLE_BACKUP), data, reply, option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - return ErrCode(ret); - } - - HILOGI("Successful"); - return reply.ReadInt32(); -} - -ErrCode SvcExtensionProxy::PublishFile(const string &fileName) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - HILOGI("Start"); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - data.WriteInterfaceToken(GetDescriptor()); - - if (!data.WriteString(fileName)) { - BError(BError::Codes::SDK_INVAL_ARG, "Failed to send the fileName"); - return ErrCode(EPERM); - } - - MessageParcel reply; - MessageOption option; - int32_t ret = - Remote()->SendRequest(static_cast(IExtensionInterfaceCode::CMD_PUBLISH_FILE), data, reply, option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - return ErrCode(ret); - } - - HILOGD("Successful"); - return reply.ReadInt32(); -} - -ErrCode SvcExtensionProxy::HandleRestore(bool isClearData) -{ - HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - HILOGI("Start"); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - if (!data.WriteInterfaceToken(GetDescriptor()) || !data.WriteBool(isClearData)) { - return BError(BError::Codes::SDK_INVAL_ARG, "build param fail."); - } - - MessageParcel reply; - MessageOption option; - int32_t ret = - Remote()->SendRequest(static_cast(IExtensionInterfaceCode::CMD_HANDLE_RESTORE), data, reply, option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - return ErrCode(ret); - } - - HILOGI("Successful"); - return reply.ReadInt32(); -} - -ErrCode SvcExtensionProxy::GetBackupInfo(std::string &result) -{ - HILOGD("SvcExtensionProxy::GetBackupInfo begin."); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - data.WriteInterfaceToken(GetDescriptor()); - - MessageParcel reply; - MessageOption option; - int32_t ret = - Remote()->SendRequest(static_cast(IExtensionInterfaceCode::CMD_GET_BACKUP_INFO), data, reply, option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - return ErrCode(ret); - } - if (!reply.ReadInt32(ret)) { - HILOGE("fail to ReadInt32 ret"); - return ErrCode(ret); - } - if (ret != NO_ERROR) { - HILOGE("ret is not NO_ERROR. ret = %d", ret); - return ErrCode(ret); - } - if (!reply.ReadString(result)) { - HILOGE("fail to ReadInt32 ret"); - return ErrCode(ret); - } - HILOGI("SvcExtensionProxy::GetBackupInfo end. result: %s", result.c_str()); - return ret; -} - -ErrCode SvcExtensionProxy::UpdateFdSendRate(std::string &bundleName, int32_t sendRate) -{ - HILOGD("SvcExtensionProxy::UpdateFdSendRate begin."); - BExcepUltils::BAssert(Remote(), BError::Codes::SDK_INVAL_ARG, "Remote is nullptr"); - MessageParcel data; - data.WriteInterfaceToken(GetDescriptor()); - if (!data.WriteString(bundleName)) { - BError(BError::Codes::SDK_INVAL_ARG, "Failed to send bundleName"); - return ErrCode(EPERM); - } - if (!data.WriteInt32(sendRate)) { - BError(BError::Codes::SDK_INVAL_ARG, "Failed to send sendRate"); - return ErrCode(EPERM); - } - MessageParcel reply; - MessageOption option; - int32_t ret = - Remote()->SendRequest(static_cast(IExtensionInterfaceCode::CMD_UPDATE_FD_SENDRATE), data, reply, - option); - if (ret != NO_ERROR) { - HILOGE("Received error %{public}d when doing IPC", ret); - return ErrCode(ret); - } - if (!reply.ReadInt32(ret)) { - HILOGE("fail to read ret, ret is %{public}d", ret); - return ErrCode(ret); - } - HILOGI("SvcExtensionProxy::UpdateFdSendRate end."); - return ret; -} -} // namespace OHOS::FileManagement::Backup diff --git a/services/backup_sa/src/module_ipc/svc_session_manager.cpp b/services/backup_sa/src/module_ipc/svc_session_manager.cpp index 44002f2d4c42a9e13ecb24a47e40e05b23195740..ddea580185b4a3f4bf636beece1fdc9290671859 100644 --- a/services/backup_sa/src/module_ipc/svc_session_manager.cpp +++ b/services/backup_sa/src/module_ipc/svc_session_manager.cpp @@ -24,7 +24,7 @@ #include "b_anony/b_anony.h" #include "b_error/b_error.h" -#include "b_file_info.h" +#include "backup_file_info.h" #include "b_json/b_json_entity_caps.h" #include "b_json/b_json_entity_ext_manage.h" #include "b_radar/b_radar.h" @@ -39,7 +39,7 @@ namespace OHOS::FileManagement::Backup { using namespace std; -ErrCode SvcSessionManager::VerifyCallerAndScenario(uint32_t clientToken, IServiceReverse::Scenario scenario) const +ErrCode SvcSessionManager::VerifyCallerAndScenario(uint32_t clientToken, IServiceReverseType::Scenario scenario) const { shared_lock lock(lock_); if (impl_.scenario != scenario) { @@ -87,7 +87,7 @@ ErrCode SvcSessionManager::Active(Impl newImpl, bool isOccupyingSession) HILOGE("Active session fail, No caller token was specified"); return BError(BError::Codes::SA_INVAL_ARG); } - if (!isOccupyingSession && newImpl.scenario == IServiceReverse::Scenario::UNDEFINED) { + if (!isOccupyingSession && newImpl.scenario == IServiceReverseType::Scenario::UNDEFINED) { HILOGE("Active session fail, No scenario was specified"); return BError(BError::Codes::SA_INVAL_ARG); } @@ -122,10 +122,10 @@ ErrCode SvcSessionManager::Deactive(const wptr &remoteInAction, b deathRecipient_ = nullptr; AppRadar::Info info("", "", "deactive session success"); - if (impl_.scenario == IServiceReverse::Scenario::RESTORE) { + if (impl_.scenario == IServiceReverseType::Scenario::RESTORE) { AppRadar::GetInstance().RecordRestoreFuncRes(info, "SvcSessionManager::Deactive", impl_.userId, BizStageRestore::BIZ_STAGE_DEACTIVE_SESSION, ERR_OK); - } else if (impl_.scenario == IServiceReverse::Scenario::BACKUP) { + } else if (impl_.scenario == IServiceReverseType::Scenario::BACKUP) { AppRadar::GetInstance().RecordBackupFuncRes(info, "SvcSessionManager::Deactive", impl_.userId, BizStageBackup::BIZ_STAGE_DEACTIVE_SESSION, ERR_OK); } @@ -161,12 +161,12 @@ sptr SvcSessionManager::GetServiceReverseProxy() return impl_.clientProxy; } -IServiceReverse::Scenario SvcSessionManager::GetScenario() +IServiceReverseType::Scenario SvcSessionManager::GetScenario() { shared_lock lock(lock_); if (!impl_.clientToken) { HILOGE("Get scenario failed, No caller token was specified"); - return IServiceReverse::Scenario::UNDEFINED; + return IServiceReverseType::Scenario::UNDEFINED; } return impl_.scenario; } @@ -215,10 +215,10 @@ bool SvcSessionManager::OnBundleFileReady(const string &bundleName, const string return false; } // 判断是否结束 通知EXTENTION清理资源 TOOL应用完成备份 - if (impl_.scenario == IServiceReverse::Scenario::RESTORE || SAUtils::IsSABundleName(bundleName)) { + if (impl_.scenario == IServiceReverseType::Scenario::RESTORE || SAUtils::IsSABundleName(bundleName)) { it->second.isBundleFinished = true; return true; - } else if (impl_.scenario == IServiceReverse::Scenario::BACKUP) { + } else if (impl_.scenario == IServiceReverseType::Scenario::BACKUP) { if (!fileName.empty() && fileName != BConstants::EXT_BACKUP_MANAGE) { auto ret = it->second.fileNameInfo.emplace(fileName); if (!ret.second) { @@ -244,7 +244,7 @@ UniqueFd SvcSessionManager::OnBundleExtManageInfo(const string &bundleName, Uniq HILOGE("No caller token was specified, bundleName:%{public}s", bundleName.c_str()); return UniqueFd(-EPERM); } - if (impl_.scenario != IServiceReverse::Scenario::BACKUP) { + if (impl_.scenario != IServiceReverseType::Scenario::BACKUP) { HILOGE("Invalid Scenario, bundleName:%{public}s", bundleName.c_str()); return UniqueFd(-EPERM); } @@ -434,10 +434,10 @@ ErrCode SvcSessionManager::InitClient(Impl &newImpl) deathRecipient_ = sptr(new SvcDeathRecipient(callback)); remoteObj->AddDeathRecipient(deathRecipient_); AppRadar::Info info("", "", "active session success"); - if (newImpl.scenario == IServiceReverse::Scenario::RESTORE) { + if (newImpl.scenario == IServiceReverseType::Scenario::RESTORE) { AppRadar::GetInstance().RecordRestoreFuncRes(info, "SvcSessionManager::InitClient", newImpl.userId, BizStageRestore::BIZ_STAGE_ACTIVE_SESSION, ERR_OK); - } else if (newImpl.scenario == IServiceReverse::Scenario::BACKUP) { + } else if (newImpl.scenario == IServiceReverseType::Scenario::BACKUP) { AppRadar::GetInstance().RecordBackupFuncRes(info, "SvcSessionManager::InitClient", newImpl.userId, BizStageBackup::BIZ_STAGE_ACTIVE_SESSION, ERR_OK); } @@ -468,7 +468,7 @@ std::set SvcSessionManager::GetExtFileNameRequest(const std::string return std::set(); } - if (impl_.scenario != IServiceReverse::Scenario::RESTORE) { + if (impl_.scenario != IServiceReverseType::Scenario::RESTORE) { HILOGE("Invalid Scenario, bundleName:%{public}s", bundleName.c_str()); return std::set(); } @@ -716,7 +716,7 @@ bool SvcSessionManager::IsOnAllBundlesFinished() return false; } bool isAllBundlesFinished = !impl_.backupExtNameMap.size(); - if (impl_.scenario == IServiceReverse::Scenario::RESTORE) { + if (impl_.scenario == IServiceReverseType::Scenario::RESTORE) { bool isAllBundlesRestored = SvcRestoreDepsManager::GetInstance().IsAllBundlesRestored(); isAllBundlesFinished = (isAllBundlesFinished && isAllBundlesRestored); } @@ -746,7 +746,7 @@ bool SvcSessionManager::NeedToUnloadService() return false; } bool isNeedToUnloadService = (!impl_.backupExtNameMap.size() && (sessionCnt_.load() <= 0)); - if (impl_.scenario == IServiceReverse::Scenario::RESTORE) { + if (impl_.scenario == IServiceReverseType::Scenario::RESTORE) { bool isAllBundlesRestored = SvcRestoreDepsManager::GetInstance().IsAllBundlesRestored(); isNeedToUnloadService = (isNeedToUnloadService && isAllBundlesRestored); } diff --git a/services/backup_sa/src/module_sched/sched_scheduler.cpp b/services/backup_sa/src/module_sched/sched_scheduler.cpp index 5c8b5de7a58f9c8294a19690e129761ea8376874..ebdf00c284ae8e221fb35c7aee26ce25197da34e 100644 --- a/services/backup_sa/src/module_sched/sched_scheduler.cpp +++ b/services/backup_sa/src/module_sched/sched_scheduler.cpp @@ -40,16 +40,16 @@ namespace OHOS::FileManagement::Backup { using namespace std; -void ExtDiedClearFailRadarReport(const string& bundleName, IServiceReverse::Scenario scenario, ErrCode res) +void ExtDiedClearFailRadarReport(const string& bundleName, IServiceReverseType::Scenario scenario, ErrCode res) { if (res == ERR_OK) { return; } AppRadar::Info info(bundleName, "", ""); - if (scenario == IServiceReverse::Scenario::RESTORE) { + if (scenario == IServiceReverseType::Scenario::RESTORE) { AppRadar::GetInstance().RecordRestoreFuncRes(info, "SchedScheduler::ExecutingQueueTasks", AppRadar::GetInstance().GetUserId(), BizStageRestore::BIZ_STAGE_EXTENSION_ABNORMAL_EXIT_CLEAR_FAIL, res); - } else if (scenario == IServiceReverse::Scenario::BACKUP) { + } else if (scenario == IServiceReverseType::Scenario::BACKUP) { AppRadar::GetInstance().RecordBackupFuncRes(info, "SchedScheduler::ExecutingQueueTasks", AppRadar::GetInstance().GetUserId(), BizStageBackup::BIZ_STAGE_EXTENSION_ABNORMAL_EXIT_CLEAR_FAIL, res); } @@ -240,7 +240,7 @@ void SchedScheduler::StartExecuteBundleTask(const std::string &bundleName, BCons } else if (action == BConstants::ServiceSchedAction::CLEAN) { HILOGI("Current bundle %{public}s process is cleaning", bundleName.data()); ErrCode res = reversePtr_->ClearResidualBundleData(bundleName); - IServiceReverse::Scenario scenario = sessionPtr_->GetScenario(); + IServiceReverseType::Scenario scenario = sessionPtr_->GetScenario(); ExtDiedClearFailRadarReport(bundleName, scenario, res); } } diff --git a/test/fuzztest/backupext_fuzzer/BUILD.gn b/test/fuzztest/backupext_fuzzer/BUILD.gn index 81a738ccaeb8f5d1d6a1d3b033f6251551ff3b07..66f9093fd745048acd80380a91109b28e1598f66 100644 --- a/test/fuzztest/backupext_fuzzer/BUILD.gn +++ b/test/fuzztest/backupext_fuzzer/BUILD.gn @@ -41,7 +41,6 @@ ohos_fuzztest("BackupExtFuzzTest") { "${path_backup}/frameworks/native/backup_ext/src/ext_backup_js.cpp", "${path_backup}/frameworks/native/backup_ext/src/ext_backup_loader.cpp", "${path_backup}/frameworks/native/backup_ext/src/ext_extension.cpp", - "${path_backup}/frameworks/native/backup_ext/src/ext_extension_stub.cpp", "${path_backup}/frameworks/native/backup_ext/src/sub_ext_extension.cpp", "${path_backup}/frameworks/native/backup_ext/src/tar_file.cpp", "${path_backup}/frameworks/native/backup_ext/src/untar_file.cpp", diff --git a/test/fuzztest/backupext_fuzzer/backupext_fuzzer.cpp b/test/fuzztest/backupext_fuzzer/backupext_fuzzer.cpp index 9cb7b8d55edb28275638e5d2eaca7577abc88384..f2fa082674c4f7fc835b5296eb4b96f51ac1cfab 100644 --- a/test/fuzztest/backupext_fuzzer/backupext_fuzzer.cpp +++ b/test/fuzztest/backupext_fuzzer/backupext_fuzzer.cpp @@ -47,7 +47,7 @@ bool OnRemoteRequestFuzzTest(shared_ptr extension, const uin int pos = 0; uint32_t code = TypeCast(data, &pos); - msg.WriteInterfaceToken(ExtExtensionStub::GetDescriptor()); + msg.WriteInterfaceToken(ExtensionStub::GetDescriptor()); msg.WriteBuffer(data + pos, size - pos); msg.RewindRead(0); @@ -160,127 +160,6 @@ bool SetCreatorFuzzTest(shared_ptr backup, const uint8_t *data, size_ backup->SetCreator(creator); return true; } - -bool CmdGetFileHandleFuzzTest(shared_ptr extension, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - msg.WriteString(string(reinterpret_cast(data), size)); - extension->CmdGetFileHandle(msg, reply); - return true; -} - -bool CmdHandleClearFuzzTest(shared_ptr extension, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - msg.WriteBuffer(data, size); - extension->CmdHandleClear(msg, reply); - return true; -} - -bool CmdHandleBackupFuzzTest(shared_ptr extension, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(bool)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - msg.WriteBool(*reinterpret_cast(data)); - extension->CmdHandleBackup(msg, reply); - return true; -} - -bool CmdPublishFileFuzzTest(shared_ptr extension, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - msg.WriteString(string(reinterpret_cast(data), size)); - extension->CmdPublishFile(msg, reply); - return true; -} - -bool CmdHandleRestoreFuzzTest(shared_ptr extension, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(bool)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - msg.WriteBool(*reinterpret_cast(data)); - extension->CmdHandleRestore(msg, reply); - return true; -} - -bool CmdGetIncrementalFileHandleFuzzTest(shared_ptr extension, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - msg.WriteString(string(reinterpret_cast(data), size)); - extension->CmdGetIncrementalFileHandle(msg, reply); - return true; -} - -bool CmdPublishIncrementalFileFuzzTest(shared_ptr extension, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - msg.WriteString(string(reinterpret_cast(data), size)); - extension->CmdPublishIncrementalFile(msg, reply); - return true; -} - -bool CmdHandleIncrementalBackupFuzzTest(shared_ptr extension, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int) + sizeof(int)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - int pos = 0; - int incrementalFd = TypeCast(data, &pos); - int manifestFd = TypeCast(data + pos); - msg.WriteFileDescriptor(incrementalFd); - msg.WriteFileDescriptor(manifestFd); - extension->CmdPublishIncrementalFile(msg, reply); - return true; -} - -bool CmdIncrementalOnBackupFuzzTest(shared_ptr extension, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(bool)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - msg.WriteBool(*reinterpret_cast(data)); - extension->CmdIncrementalOnBackup(msg, reply); - return true; -} - -bool CmdGetIncrementalBackupFileHandleFuzzTest(shared_ptr extension, const uint8_t *data, - size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - msg.WriteBuffer(data, size); - extension->CmdGetIncrementalBackupFileHandle(msg, reply); - return true; -} } // namespace OHOS /* Fuzzer entry point */ @@ -303,21 +182,5 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) OHOS::RestoreDataReadyFuzzTest(extBackup, data, size); OHOS::InvokeAppExtMethodFuzzTest(extBackup, data, size); OHOS::SetCreatorFuzzTest(extBackup, data, size); - - try { - OHOS::CmdGetFileHandleFuzzTest(extension, data, size); - OHOS::CmdHandleClearFuzzTest(extension, data, size); - OHOS::CmdHandleBackupFuzzTest(extension, data, size); - OHOS::CmdPublishFileFuzzTest(extension, data, size); - OHOS::CmdHandleRestoreFuzzTest(extension, data, size); - OHOS::CmdGetIncrementalFileHandleFuzzTest(extension, data, size); - OHOS::CmdPublishIncrementalFileFuzzTest(extension, data, size); - OHOS::CmdHandleIncrementalBackupFuzzTest(extension, data, size); - OHOS::CmdIncrementalOnBackupFuzzTest(extension, data, size); - OHOS::CmdGetIncrementalBackupFileHandleFuzzTest(extension, data, size); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return 0; } diff --git a/test/fuzztest/backupsa_fuzzer/BUILD.gn b/test/fuzztest/backupsa_fuzzer/BUILD.gn index 2335ebb8f24953391533182a3ec681a46988c5f3..3db3c922c4d3337905e7fa365774588a56a155c4 100644 --- a/test/fuzztest/backupsa_fuzzer/BUILD.gn +++ b/test/fuzztest/backupsa_fuzzer/BUILD.gn @@ -36,6 +36,7 @@ ohos_fuzztest("BackupSaFuzzTest") { deps = [ "${app_file_service_path}/services/backup_sa:backup_sa", + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner_ipc_stub", "${path_backup}/utils:backup_utils", ] diff --git a/test/fuzztest/backupsa_fuzzer/backupsa_fuzzer.cpp b/test/fuzztest/backupsa_fuzzer/backupsa_fuzzer.cpp index a811dcc08f2edf70376e2308d13bc88e6435dfdb..3c3eebbfbc9fe0831bd1cb64e1095837f95c9840 100644 --- a/test/fuzztest/backupsa_fuzzer/backupsa_fuzzer.cpp +++ b/test/fuzztest/backupsa_fuzzer/backupsa_fuzzer.cpp @@ -35,10 +35,13 @@ constexpr size_t U32_AT_SIZE = 4; constexpr uint8_t MAX_CALL_TRANSACTION = 24; constexpr int32_t SERVICE_ID = 5203; -uint32_t GetU32Data(const char* ptr) +template +T TypeCast(const uint8_t *data, int *pos = nullptr) { - // 将第0个数字左移24位，将第1个数字左移16位，将第2个数字左移8位，第3个数字不左移 - return (ptr[0] << 24) | (ptr[1] << 16) | (ptr[2] << 8) | (ptr[3]); + if (pos) { + *pos += sizeof(T); + } + return *(reinterpret_cast(data)); } bool BackupSaFuzzTest(const uint8_t *data, size_t size) @@ -48,10 +51,7 @@ bool BackupSaFuzzTest(const uint8_t *data, size_t size) } sptr service = sptr(new Service(SERVICE_ID)); - uint32_t code = GetU32Data(reinterpret_cast(data)); - if (code == 0) { - return true; - } + uint32_t code = TypeCast(data); MessageParcel datas; datas.WriteInterfaceToken(ServiceStub::GetDescriptor()); datas.WriteBuffer(reinterpret_cast(data + U32_AT_SIZE), size - U32_AT_SIZE); diff --git a/test/fuzztest/backupsaanother_fuzzer/backupsaanother_fuzzer.cpp b/test/fuzztest/backupsaanother_fuzzer/backupsaanother_fuzzer.cpp index ca438cd7c37e8b25ce7e376856c2cbe157de3755..06d5bfc24f57ca4dd4a6a1f680858e4f1f4bec36 100644 --- a/test/fuzztest/backupsaanother_fuzzer/backupsaanother_fuzzer.cpp +++ b/test/fuzztest/backupsaanother_fuzzer/backupsaanother_fuzzer.cpp @@ -54,7 +54,7 @@ bool CmdGetFileHandleFuzzTest(const uint8_t *data, size_t size) MessageOption option; sptr service(new Service(SERVICE_ID)); - service->OnRemoteRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_FILE_NAME), + service->OnRemoteRequest(static_cast(IServiceIpcCode::COMMAND_GET_FILE_HANDLE), datas, reply, option); service = nullptr; return true; @@ -79,7 +79,7 @@ bool CmdAppendBundlesBackupSessionFuzzTest(const uint8_t *data, size_t size) MessageOption option; sptr service(new Service(SERVICE_ID)); - uint32_t code = static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_BACKUP_SESSION); + uint32_t code = static_cast(IServiceIpcCode::COMMAND_APPEND_BUNDLES_BACKUP_SESSION); service->OnRemoteRequest(code, datas, reply, option); service = nullptr; return true; @@ -95,7 +95,7 @@ bool CmdReleaseFuzzTest(const uint8_t *data, size_t size) MessageOption option; sptr service(new Service(SERVICE_ID)); - uint32_t code = static_cast(IServiceInterfaceCode::SERVICE_CMD_RELSEASE_SESSION); + uint32_t code = static_cast(IServiceIpcCode::COMMAND_RELEASE); service->OnRemoteRequest(code, datas, reply, option); service = nullptr; return true; @@ -152,7 +152,7 @@ bool CmdGetLocalCapabilitiesIncrementalFuzzTest(const uint8_t *data, size_t size MessageOption option; sptr service(new Service(SERVICE_ID)); - uint32_t code = static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_LOCAL_CAPABILITIES_INCREMENTAL); + uint32_t code = static_cast(IServiceIpcCode::COMMAND_GET_LOCAL_CAPABILITIES_INCREMENTAL); service->OnRemoteRequest(code, datas, reply, option); service = nullptr; return true; @@ -168,7 +168,7 @@ bool CmdInitIncrementalBackupSessionFuzzTest(const uint8_t *data, size_t size) MessageOption option; sptr service(new Service(SERVICE_ID)); - uint32_t code = static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_INCREMENTAL_BACKUP_SESSION); + uint32_t code = static_cast(IServiceIpcCode::COMMAND_INIT_INCREMENTAL_BACKUP_SESSION); service->OnRemoteRequest(code, datas, reply, option); service = nullptr; return true; @@ -189,7 +189,7 @@ bool CmdAppendBundlesIncrementalBackupSessionFuzzTest(const uint8_t *data, size_ sptr service(new Service(SERVICE_ID)); uint32_t code = static_cast( - IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_INCREMENTAL_BACKUP_SESSION); + IServiceIpcCode::COMMAND_APPEND_BUNDLES_INCREMENTAL_BACKUP_SESSION); service->OnRemoteRequest(code, datas, reply, option); service = nullptr; return true; @@ -216,7 +216,7 @@ bool CmdPublishIncrementalFileFuzzTest(const uint8_t *data, size_t size) MessageOption option; sptr service(new Service(SERVICE_ID)); - uint32_t code = static_cast(IServiceInterfaceCode::SERVICE_CMD_PUBLISH_INCREMENTAL_FILE); + uint32_t code = static_cast(IServiceIpcCode::COMMAND_PUBLISH_INCREMENTAL_FILE); service->OnRemoteRequest(code, datas, reply, option); service = nullptr; return true; @@ -242,7 +242,7 @@ bool CmdAppIncrementalFileReadyFuzzTest(const uint8_t *data, size_t size) MessageOption option; sptr service(new Service(SERVICE_ID)); - uint32_t code = static_cast(IServiceInterfaceCode::SERVICE_CMD_APP_INCREMENTAL_FILE_READY); + uint32_t code = static_cast(IServiceIpcCode::COMMAND_APP_INCREMENTAL_FILE_READY); service->OnRemoteRequest(code, datas, reply, option); service = nullptr; return true; @@ -261,7 +261,7 @@ bool CmdAppIncrementalDoneFuzzTest(const uint8_t *data, size_t size) MessageOption option; sptr service(new Service(SERVICE_ID)); - service->OnRemoteRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_APP_INCREMENTAL_DONE), + service->OnRemoteRequest(static_cast(IServiceIpcCode::COMMAND_APP_INCREMENTAL_DONE), datas, reply, option); service = nullptr; return true; @@ -287,7 +287,7 @@ bool CmdGetIncrementalFileHandleFuzzTest(const uint8_t *data, size_t size) MessageOption option; sptr service(new Service(SERVICE_ID)); - service->OnRemoteRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_INCREMENTAL_FILE_NAME), + service->OnRemoteRequest(static_cast(IServiceIpcCode::COMMAND_GET_INCREMENTAL_FILE_HANDLE), datas, reply, option); service = nullptr; return true; diff --git a/test/fuzztest/backupsaappend_fuzzer/backupsaappend_fuzzer.cpp b/test/fuzztest/backupsaappend_fuzzer/backupsaappend_fuzzer.cpp index 2c44b79435b279a343dc607e1f554b5d69669386..e86a82c99b69c14f37f8aab2b22d7104139da67e 100644 --- a/test/fuzztest/backupsaappend_fuzzer/backupsaappend_fuzzer.cpp +++ b/test/fuzztest/backupsaappend_fuzzer/backupsaappend_fuzzer.cpp @@ -45,7 +45,7 @@ bool CmdInitRestoreSessionFuzzTest(const uint8_t *data, size_t size) MessageOption option; sptr service(new Service(SERVICE_ID)); - service->OnRemoteRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_RESTORE_SESSION), + service->OnRemoteRequest(static_cast(IServiceIpcCode::COMMAND_INIT_RESTORE_SESSION), datas, reply, option); service = nullptr; return true; @@ -61,7 +61,7 @@ bool CmdInitBackupSessionFuzzTest(const uint8_t *data, size_t size) MessageOption option; sptr service(new Service(SERVICE_ID)); - service->OnRemoteRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_BACKUP_SESSION), + service->OnRemoteRequest(static_cast(IServiceIpcCode::COMMAND_INIT_BACKUP_SESSION), datas, reply, option); service = nullptr; return true; @@ -87,7 +87,7 @@ bool CmdPublishFileFuzzTest(const uint8_t *data, size_t size) MessageOption option; sptr service(new Service(SERVICE_ID)); - service->OnRemoteRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_PUBLISH_FILE), + service->OnRemoteRequest(static_cast(IServiceIpcCode::COMMAND_PUBLISH_FILE), datas, reply, option); service = nullptr; return true; @@ -103,7 +103,7 @@ bool CmdGetLocalCapabilitiesFuzzTest(const uint8_t *data, size_t size) MessageOption option; sptr service(new Service(SERVICE_ID)); - uint32_t code = static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_LOCAL_CAPABILITIES); + uint32_t code = static_cast(IServiceIpcCode::COMMAND_GET_LOCAL_CAPABILITIES_WITH_UNIQUE_FD); service->OnRemoteRequest(code, datas, reply, option); service = nullptr; return true; @@ -120,14 +120,14 @@ bool CmdAppFileReadyFuzzTest(const uint8_t *data, size_t size) if (size >= sizeof(int)) { fd = *(reinterpret_cast(data)); } - datas.WriteFileDescriptor(UniqueFd(fd)); + datas.WriteInt32(fd); datas.RewindRead(0); MessageParcel reply; MessageOption option; sptr service(new Service(SERVICE_ID)); - uint32_t code = static_cast(IServiceInterfaceCode::SERVICE_CMD_APP_FILE_READY); + uint32_t code = static_cast(IServiceIpcCode::COMMAND_APP_FILE_READY); service->OnRemoteRequest(code, datas, reply, option); service = nullptr; return true; @@ -145,7 +145,7 @@ bool CmdAppDoneFuzzTest(const uint8_t *data, size_t size) MessageOption option; sptr service(new Service(SERVICE_ID)); - service->OnRemoteRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_APP_DONE), + service->OnRemoteRequest(static_cast(IServiceIpcCode::COMMAND_APP_DONE), datas, reply, option); service = nullptr; return true; @@ -161,7 +161,7 @@ bool CmdStartFuzzTest(const uint8_t *data, size_t size) MessageOption option; sptr service(new Service(SERVICE_ID)); - service->OnRemoteRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_START), + service->OnRemoteRequest(static_cast(IServiceIpcCode::COMMAND_START), datas, reply, option); service = nullptr; return true; @@ -177,7 +177,7 @@ bool CmdFinishFuzzTest(const uint8_t *data, size_t size) MessageOption option; sptr service(new Service(SERVICE_ID)); - service->OnRemoteRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_FINISH), + service->OnRemoteRequest(static_cast(IServiceIpcCode::COMMAND_FINISH), datas, reply, option); service = nullptr; return true; @@ -191,7 +191,7 @@ bool CmdAppendBundlesRestoreSessionFuzzTest(const uint8_t *data, size_t size) size_t len = sizeof(int); if (size >= len) { int fd = *(reinterpret_cast(data)); - datas.WriteFileDescriptor(UniqueFd(fd)); + datas.WriteInt32(fd); } if (size > 0) { @@ -219,7 +219,7 @@ bool CmdAppendBundlesRestoreSessionFuzzTest(const uint8_t *data, size_t size) MessageOption option; sptr service(new Service(SERVICE_ID)); - service->OnRemoteRequest(static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_RESTORE_SESSION), + service->OnRemoteRequest(static_cast(IServiceIpcCode::COMMAND_APPEND_BUNDLES_RESTORE_SESSION_RESTORE_DATA_WAIT_SEND), datas, reply, option); service = nullptr; return true; diff --git a/test/fuzztest/backupservicestub_fuzzer/backupservicestub_fuzzer.cpp b/test/fuzztest/backupservicestub_fuzzer/backupservicestub_fuzzer.cpp index 2858c657a0a121d03f4096120dde86a1aefd2419..11fbc23ebf0d034745e43d44b3c32876fb26a465 100644 --- a/test/fuzztest/backupservicestub_fuzzer/backupservicestub_fuzzer.cpp +++ b/test/fuzztest/backupservicestub_fuzzer/backupservicestub_fuzzer.cpp @@ -17,7 +17,7 @@ #include -#include "b_incremental_data.h" +#include "backup_incremental_data.h" #include "b_session_backup.h" #include "b_session_restore.h" #include "message_parcel.h" @@ -72,547 +72,6 @@ bool OnRemoteRequestFuzzTest(sptr service, const uint8_t *data, size_t service->OnRemoteRequest(code, msg, reply, option); return true; } - -bool CmdInitRestoreSessionFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - BSessionRestore::Callbacks callbacks; - msg.WriteRemoteObject(new ServiceReverse(callbacks)); - msg.WriteBuffer(data, size); - service->CmdInitRestoreSession(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdInitBackupSessionFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - BSessionBackup::Callbacks callbacks; - msg.WriteRemoteObject(new ServiceReverse(callbacks)); - msg.WriteBuffer(data, size); - service->CmdInitBackupSession(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdStartFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - msg.WriteBuffer(data, size); - service->CmdStart(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdGetLocalCapabilitiesFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - msg.WriteBuffer(data, size); - service->CmdGetLocalCapabilities(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdPublishFileFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(TmpFileSN)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - BFileInfo info; - info.sn = TypeCast(data, &pos); - int len = (size - pos) >> 1; - info.owner = string(reinterpret_cast(data + pos), len); - info.fileName = string(reinterpret_cast(data + pos + len), len); - msg.WriteParcelable(&info); - service->CmdPublishFile(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppFileReadyFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int32_t) + sizeof(bool) + sizeof(int)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - int fd = TypeCast(data, &pos); - int32_t errCode = TypeCast(data + pos, &pos); - bool fdFlag = TypeCast(data + pos, &pos); - msg.WriteString(string(reinterpret_cast(data + pos), size - pos)); - msg.WriteBool(fdFlag); - if (fdFlag) { - msg.WriteFileDescriptor(fd); - } - msg.WriteInt32(errCode); - service->CmdAppFileReady(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppDoneFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int32_t)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int32_t errCode = TypeCast(data); - msg.WriteInt32(errCode); - service->CmdAppDone(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdResultReportFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int32_t) + sizeof(int32_t)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - int32_t scenario = TypeCast(data, &pos); - int32_t errCode = TypeCast(data + pos, &pos); - msg.WriteString(string(reinterpret_cast(data + pos), size - pos)); - msg.WriteInt32(scenario); - msg.WriteInt32(errCode); - service->CmdResultReport(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdGetFileHandleFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - int len = size >> 1; - msg.WriteString(string(reinterpret_cast(data), len)); - msg.WriteString(string(reinterpret_cast(data + len), size - len)); - service->CmdGetFileHandle(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppendBundlesRestoreSessionFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int) + sizeof(int32_t) + sizeof(int32_t)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - int fd = TypeCast(data, &pos); - int32_t type = TypeCast(data + pos, &pos); - int32_t userId = TypeCast(data + pos, &pos); - vector bundleNames; - bundleNames.emplace_back(string(reinterpret_cast(data + pos), size - pos)); - msg.WriteFileDescriptor(fd); - msg.WriteStringVector(bundleNames); - msg.WriteInt32(type); - msg.WriteInt32(userId); - service->CmdAppendBundlesRestoreSession(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppendBundlesDetailsRestoreSessionFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int) + sizeof(int32_t) + sizeof(int32_t)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - int fd = TypeCast(data, &pos); - int32_t type = TypeCast(data + pos, &pos); - int32_t userId = TypeCast(data + pos, &pos); - int len = (size - pos) >> 1; - vector bundleNames; - bundleNames.emplace_back(string(reinterpret_cast(data + pos), len)); - vector detailInfos; - detailInfos.emplace_back(string(reinterpret_cast(data + pos + len), len)); - msg.WriteFileDescriptor(fd); - msg.WriteStringVector(bundleNames); - msg.WriteStringVector(detailInfos); - msg.WriteInt32(type); - msg.WriteInt32(userId); - service->CmdAppendBundlesDetailsRestoreSession(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppendBundlesBackupSessionFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - vector bundleNames; - bundleNames.emplace_back(string(reinterpret_cast(data), size)); - msg.WriteStringVector(bundleNames); - service->CmdAppendBundlesBackupSession(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppendBundlesDetailsBackupSessionFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - int len = size >> 1; - vector bundleNames; - bundleNames.emplace_back(string(reinterpret_cast(data), len)); - vector detailInfos; - detailInfos.emplace_back(string(reinterpret_cast(data + len), len)); - msg.WriteStringVector(bundleNames); - msg.WriteStringVector(detailInfos); - service->CmdAppendBundlesDetailsBackupSession(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdFinishFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - try { - msg.WriteBuffer(data, size); - service->CmdFinish(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -[[maybe_unused]] bool CmdReleaseFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - try { - msg.WriteBuffer(data, size); - service->CmdRelease(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdGetLocalCapabilitiesIncrementalFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - vector bundleNames; - bundleNames.emplace_back(string(reinterpret_cast(data), size), 0); - WriteParcelableVector(bundleNames, msg); - service->CmdGetLocalCapabilitiesIncremental(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdGetAppLocalListAndDoIncrementalBackupFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - try { - msg.WriteBuffer(data, size); - service->CmdGetAppLocalListAndDoIncrementalBackup(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdInitIncrementalBackupSessionFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - BIncrementalBackupSession::Callbacks callbacks; - msg.WriteRemoteObject(new ServiceReverse(callbacks)); - msg.WriteBuffer(data, size); - service->CmdInitIncrementalBackupSession(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppendBundlesIncrementalBackupSessionFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - vector bundlesToBackup; - bundlesToBackup.emplace_back(string(reinterpret_cast(data), size), 0); - WriteParcelableVector(bundlesToBackup, msg); - service->CmdAppendBundlesIncrementalBackupSession(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppendBundlesDetailsIncrementalBackupSessionFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - int len = size >> 2; - vector bundlesToBackup; - bundlesToBackup.emplace_back(string(reinterpret_cast(data), len), 0); - std::vector infos; - infos.emplace_back(string(reinterpret_cast(data + len), len)); - infos.emplace_back(string(reinterpret_cast(data + len + len), len)); - WriteParcelableVector(bundlesToBackup, msg); - msg.WriteStringVector(infos); - service->CmdAppendBundlesDetailsIncrementalBackupSession(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdPublishIncrementalFileFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(TmpFileSN)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - BFileInfo info; - info.sn = TypeCast(data, &pos); - int len = (size - pos) >> 1; - info.owner = string(reinterpret_cast(data + pos), len); - info.fileName = string(reinterpret_cast(data + pos + len), len); - msg.WriteParcelable(&info); - service->CmdPublishIncrementalFile(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -[[maybe_unused]] bool CmdPublishSAIncrementalFileFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int) + sizeof(TmpFileSN)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - BFileInfo info; - int fd = TypeCast(data, &pos); - info.sn = TypeCast(data, &pos); - int len = (size - pos) >> 1; - info.owner = string(reinterpret_cast(data + pos), len); - info.fileName = string(reinterpret_cast(data + pos + len), len); - msg.WriteParcelable(&info); - msg.WriteFileDescriptor(fd); - service->CmdPublishSAIncrementalFile(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppIncrementalFileReadyFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int32_t) + sizeof(bool) + sizeof(int) + sizeof(int)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - int fd1 = TypeCast(data, &pos); - int fd2 = TypeCast(data + pos, &pos); - int32_t errCode = TypeCast(data + pos, &pos); - bool fdFlag = TypeCast(data + pos, &pos); - msg.WriteString(string(reinterpret_cast(data + pos), size - pos)); - msg.WriteBool(fdFlag); - if (fdFlag) { - msg.WriteFileDescriptor(fd1); - msg.WriteFileDescriptor(fd2); - } - msg.WriteInt32(errCode); - service->CmdAppIncrementalFileReady(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppIncrementalDoneFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int32_t)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int32_t errCode = TypeCast(data); - msg.WriteInt32(errCode); - service->CmdAppIncrementalDone(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdGetIncrementalFileHandleFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - int len = size >> 1; - msg.WriteString(string(reinterpret_cast(data), len)); - msg.WriteString(string(reinterpret_cast(data + len), size - len)); - service->CmdGetIncrementalFileHandle(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdGetBackupInfoFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - msg.WriteString(string(reinterpret_cast(data), size)); - service->CmdGetBackupInfo(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdUpdateTimerFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int32_t)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - int32_t timeout = TypeCast(data, &pos); - msg.WriteString(string(reinterpret_cast(data + pos), size - pos)); - msg.WriteInt32(timeout); - service->CmdUpdateTimer(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdUpdateSendRateFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int32_t)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - int32_t sendRate = TypeCast(data, &pos); - msg.WriteString(string(reinterpret_cast(data + pos), size - pos)); - msg.WriteInt32(sendRate); - service->CmdUpdateSendRate(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} } // namespace OHOS /* Fuzzer entry point */ @@ -625,32 +84,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) try { OHOS::OnRemoteRequestFuzzTest(service, data, size); - CmdInitRestoreSessionFuzzTest(service, data, size); - CmdInitBackupSessionFuzzTest(service, data, size); - CmdStartFuzzTest(service, data, size); - CmdGetLocalCapabilitiesFuzzTest(service, data, size); - CmdPublishFileFuzzTest(service, data, size); - CmdAppFileReadyFuzzTest(service, data, size); - CmdAppDoneFuzzTest(service, data, size); - CmdResultReportFuzzTest(service, data, size); - CmdGetFileHandleFuzzTest(service, data, size); - CmdAppendBundlesRestoreSessionFuzzTest(service, data, size); - CmdAppendBundlesDetailsRestoreSessionFuzzTest(service, data, size); - CmdAppendBundlesBackupSessionFuzzTest(service, data, size); - CmdAppendBundlesDetailsBackupSessionFuzzTest(service, data, size); - CmdFinishFuzzTest(service, data, size); - CmdGetLocalCapabilitiesIncrementalFuzzTest(service, data, size); - CmdGetAppLocalListAndDoIncrementalBackupFuzzTest(service, data, size); - CmdInitIncrementalBackupSessionFuzzTest(service, data, size); - CmdAppendBundlesIncrementalBackupSessionFuzzTest(service, data, size); - CmdAppendBundlesDetailsIncrementalBackupSessionFuzzTest(service, data, size); - CmdPublishIncrementalFileFuzzTest(service, data, size); - CmdAppIncrementalFileReadyFuzzTest(service, data, size); - CmdAppIncrementalDoneFuzzTest(service, data, size); - CmdGetIncrementalFileHandleFuzzTest(service, data, size); - CmdGetBackupInfoFuzzTest(service, data, size); - CmdUpdateTimerFuzzTest(service, data, size); - CmdUpdateSendRateFuzzTest(service, data, size); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } diff --git a/test/fuzztest/backupservicestubbranch_fuzzer/backupservicestubbranch_fuzzer.cpp b/test/fuzztest/backupservicestubbranch_fuzzer/backupservicestubbranch_fuzzer.cpp index e5558102895943f89beac1d98d437e63294ea2fc..fe319278acfbd8fa5f9c69bd5df9ccc8be87a8a3 100644 --- a/test/fuzztest/backupservicestubbranch_fuzzer/backupservicestubbranch_fuzzer.cpp +++ b/test/fuzztest/backupservicestubbranch_fuzzer/backupservicestubbranch_fuzzer.cpp @@ -18,7 +18,7 @@ #include #include -#include "b_incremental_data.h" +#include "backup_incremental_data.h" #include "b_session_backup.h" #include "b_session_restore.h" #include "message_parcel.h" @@ -220,841 +220,6 @@ bool OnRemoteRequestFuzzTest(sptr service, const uint8_t *data, size_t service->OnRemoteRequest(code, msg, reply, option); return true; } - -bool CmdInitRestoreSessionFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - msg.WriteBuffer(data, size); - service->CmdInitRestoreSession(msg, reply); - - BSessionRestore::Callbacks callbacks; - msg.WriteRemoteObject(new ServiceReverse(callbacks)); - ExpectReturn({false}); - service->CmdInitRestoreSession(msg, reply); - - msg.FlushBuffer(); - msg.WriteRemoteObject(new ServiceReverse(callbacks)); - ExpectReturn({true}); - service->CmdInitRestoreSession(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdInitBackupSessionFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - msg.WriteBuffer(data, size); - service->CmdInitBackupSession(msg, reply); - - BSessionBackup::Callbacks callbacks; - msg.WriteRemoteObject(new ServiceReverse(callbacks)); - ExpectReturn({false}); - service->CmdInitBackupSession(msg, reply); - - msg.FlushBuffer(); - msg.WriteRemoteObject(new ServiceReverse(callbacks)); - ExpectReturn({true}); - service->CmdInitBackupSession(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdStartFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - msg.WriteBuffer(data, size); - ExpectReturn({false}); - service->CmdStart(msg, reply); - - ExpectReturn({true}); - service->CmdStart(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdGetLocalCapabilitiesFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - msg.WriteBuffer(data, size); - ExpectReturn({false}); - service->CmdGetLocalCapabilities(msg, reply); - - ExpectReturn({true}); - service->CmdGetLocalCapabilities(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdPublishFileFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(TmpFileSN)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - BFileInfo info; - info.sn = TypeCast(data, &pos); - int len = (size - pos) >> 1; - info.owner = string(reinterpret_cast(data + pos), len); - info.fileName = string(reinterpret_cast(data + pos + len), len); - - msg.WriteParcelable(&info); - ExpectReturn({1, true, true, true, false}); - ExpectArgReturn({info.owner, info.fileName, info.sn}); - service->CmdPublishFile(msg, reply); - - msg.FlushBuffer(); - msg.WriteParcelable(&info); - ExpectReturn({1, true, true, true, true}); - ExpectArgReturn({info.owner, info.fileName, info.sn}); - service->CmdPublishFile(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppFileReadyFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int32_t) + sizeof(bool) + sizeof(int)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - int fd = TypeCast(data, &pos); - int32_t errCode = TypeCast(data + pos, &pos); - bool flag = TypeCast(data + pos, &pos); - string fileName(reinterpret_cast(data + pos), size - pos); - - service->CmdAppFileReady(msg, reply); - - ExpectReturn({false}); - ExpectArgReturn({fileName}); - service->CmdAppFileReady(msg, reply); - - msg.FlushBuffer(); - flag == true ? ExpectReturn({true, flag, fd, errCode, false}) : ExpectReturn({true, flag, errCode, false}); - ExpectArgReturn({fileName}); - service->CmdAppFileReady(msg, reply); - - msg.FlushBuffer(); - flag == true ? ExpectReturn({true, flag, fd, errCode, true}) : ExpectReturn({true, flag, errCode, true}); - ExpectArgReturn({fileName}); - service->CmdAppFileReady(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppDoneFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int32_t)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int32_t errCode = TypeCast(data); - - ExpectReturn({false}); - ExpectArgReturn({errCode}); - service->CmdAppDone(msg, reply); - - ExpectReturn({true, false}); - ExpectArgReturn({errCode}); - service->CmdAppDone(msg, reply); - - ExpectReturn({true, true}); - ExpectArgReturn({errCode}); - service->CmdAppDone(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdResultReportFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int32_t) + sizeof(int32_t)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - int32_t scenario = TypeCast(data, &pos); - int32_t errCode = TypeCast(data + pos, &pos); - string restoreRetInfo(reinterpret_cast(data + pos), size - pos); - - ExpectReturn({false}); - ExpectArgReturn({restoreRetInfo}); - service->CmdResultReport(msg, reply); - - ExpectReturn({true, false}); - ExpectArgReturn({restoreRetInfo, scenario}); - service->CmdResultReport(msg, reply); - - ExpectReturn({true, true, false}); - ExpectArgReturn({restoreRetInfo, scenario, errCode}); - service->CmdResultReport(msg, reply); - - ExpectReturn({true, true, true, false}); - ExpectArgReturn({restoreRetInfo, scenario, errCode}); - service->CmdResultReport(msg, reply); - - ExpectReturn({true, true, true, true}); - ExpectArgReturn({restoreRetInfo, scenario, errCode}); - service->CmdResultReport(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdGetFileHandleFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - int len = size >> 1; - string bundleName(reinterpret_cast(data), len); - string fileName(reinterpret_cast(data + len), size - len); - - ExpectReturn({false}); - ExpectArgReturn({bundleName}); - service->CmdGetFileHandle(msg, reply); - - ExpectReturn({true, false}); - ExpectArgReturn({bundleName, fileName}); - service->CmdGetFileHandle(msg, reply); - - ExpectReturn({true, true}); - ExpectArgReturn({bundleName, fileName}); - service->CmdGetFileHandle(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppendBundlesRestoreSessionFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int) + sizeof(int32_t) + sizeof(int32_t)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - int fd = TypeCast(data, &pos); - int32_t type = TypeCast(data + pos, &pos); - int32_t userId = TypeCast(data + pos, &pos); - vector bundleNames; - bundleNames.emplace_back(string(reinterpret_cast(data + pos), size - pos)); - - ExpectReturn({fd, false}); - ExpectArgReturn({bundleNames}); - service->CmdAppendBundlesRestoreSession(msg, reply); - - ExpectReturn({fd, true, false}); - ExpectArgReturn({bundleNames, type}); - service->CmdAppendBundlesRestoreSession(msg, reply); - - ExpectReturn({fd, true, true, false}); - ExpectArgReturn({bundleNames, type, userId}); - service->CmdAppendBundlesRestoreSession(msg, reply); - - ExpectReturn({fd, true, true, true, false}); - ExpectArgReturn({bundleNames, type, userId}); - service->CmdAppendBundlesRestoreSession(msg, reply); - - ExpectReturn({fd, true, true, true, true}); - ExpectArgReturn({bundleNames, type, userId}); - service->CmdAppendBundlesRestoreSession(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppendBundlesDetailsRestoreSessionFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int) + sizeof(int32_t) + sizeof(int32_t)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - int fd = TypeCast(data, &pos); - int32_t type = TypeCast(data + pos, &pos); - int32_t userId = TypeCast(data + pos, &pos); - int len = (size - pos) >> 1; - vector bundleNames; - bundleNames.emplace_back(string(reinterpret_cast(data + pos), len)); - vector detailInfos; - detailInfos.emplace_back(string(reinterpret_cast(data + pos + len), len)); - - ExpectReturn({fd, false}); - ExpectArgReturn({bundleNames}); - service->CmdAppendBundlesDetailsRestoreSession(msg, reply); - - ExpectReturn({fd, true, false}); - ExpectArgReturn({bundleNames, detailInfos}); - service->CmdAppendBundlesDetailsRestoreSession(msg, reply); - - ExpectReturn({fd, true, true, false}); - ExpectArgReturn({bundleNames, detailInfos, type}); - service->CmdAppendBundlesDetailsRestoreSession(msg, reply); - - ExpectReturn({fd, true, true, true, false}); - ExpectArgReturn({bundleNames, detailInfos, type, userId}); - service->CmdAppendBundlesDetailsRestoreSession(msg, reply); - - ExpectReturn({fd, true, true, true, true, false}); - ExpectArgReturn({bundleNames, detailInfos, type, userId}); - service->CmdAppendBundlesDetailsRestoreSession(msg, reply); - - ExpectReturn({fd, true, true, true, true, true}); - ExpectArgReturn({bundleNames, detailInfos, type, userId}); - service->CmdAppendBundlesDetailsRestoreSession(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppendBundlesBackupSessionFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - vector bundleNames; - bundleNames.emplace_back(string(reinterpret_cast(data), size)); - - ExpectReturn({false}); - ExpectArgReturn({bundleNames}); - service->CmdAppendBundlesBackupSession(msg, reply); - - ExpectReturn({true, false}); - ExpectArgReturn({bundleNames}); - service->CmdAppendBundlesBackupSession(msg, reply); - - ExpectReturn({true, true}); - ExpectArgReturn({bundleNames}); - service->CmdAppendBundlesBackupSession(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppendBundlesDetailsBackupSessionFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - int len = size >> 1; - vector bundleNames; - bundleNames.emplace_back(string(reinterpret_cast(data), len)); - vector detailInfos; - detailInfos.emplace_back(string(reinterpret_cast(data + len), len)); - - ExpectReturn({false}); - ExpectArgReturn({bundleNames}); - service->CmdAppendBundlesDetailsBackupSession(msg, reply); - - ExpectReturn({true, false}); - ExpectArgReturn({bundleNames, detailInfos}); - service->CmdAppendBundlesDetailsBackupSession(msg, reply); - - ExpectReturn({true, true, false}); - ExpectArgReturn({bundleNames, detailInfos}); - service->CmdAppendBundlesDetailsBackupSession(msg, reply); - - ExpectReturn({true, true, true}); - ExpectArgReturn({bundleNames, detailInfos}); - service->CmdAppendBundlesDetailsBackupSession(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdFinishFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - try { - msg.WriteBuffer(data, size); - ExpectReturn({false}); - service->CmdFinish(msg, reply); - - ExpectReturn({true}); - service->CmdFinish(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -[[maybe_unused]] bool CmdReleaseFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - try { - msg.WriteBuffer(data, size); - service->CmdRelease(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdGetLocalCapabilitiesIncrementalFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - BIncrementalData bundleNames(string(reinterpret_cast(data), size), 0); - - int32_t infoSize = 1; - ExpectReturn({false}); - ExpectArgReturn({infoSize}); - service->CmdGetLocalCapabilitiesIncremental(msg, reply); - - ExpectReturn({true, true, true, true, true, true, 1, true, true, true, 0, true, false}); - ExpectArgReturn({infoSize, "", "", 1}); - msg.FlushBuffer(); - msg.WriteParcelable(&bundleNames); - service->CmdGetLocalCapabilitiesIncremental(msg, reply); - - ExpectReturn({true, true, true, true, true, true, 1, true, true, true, 0, true, true}); - ExpectArgReturn({infoSize, "", "", 1}); - msg.FlushBuffer(); - msg.WriteParcelable(&bundleNames); - service->CmdGetLocalCapabilitiesIncremental(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdGetAppLocalListAndDoIncrementalBackupFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - try { - msg.WriteBuffer(data, size); - ExpectReturn({false}); - service->CmdGetAppLocalListAndDoIncrementalBackup(msg, reply); - - ExpectReturn({true}); - service->CmdGetAppLocalListAndDoIncrementalBackup(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdInitIncrementalBackupSessionFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - msg.WriteBuffer(data, size); - service->CmdInitIncrementalBackupSession(msg, reply); - - BIncrementalBackupSession::Callbacks callbacks; - msg.WriteRemoteObject(new ServiceReverse(callbacks)); - ExpectReturn({false}); - service->CmdInitIncrementalBackupSession(msg, reply); - - msg.FlushBuffer(); - msg.WriteRemoteObject(new ServiceReverse(callbacks)); - ExpectReturn({true}); - service->CmdInitIncrementalBackupSession(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppendBundlesIncrementalBackupSessionFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - BIncrementalData bundlesToBackup(string(reinterpret_cast(data), size), 0); - - ExpectReturn({false}); - service->CmdAppendBundlesIncrementalBackupSession(msg, reply); - - int32_t infoSize = 1; - ExpectReturn({true, true, true, true, true, true, 1, true, true, true, 0, false}); - ExpectArgReturn({infoSize, "", "", 1}); - msg.FlushBuffer(); - msg.WriteParcelable(&bundlesToBackup); - service->CmdAppendBundlesIncrementalBackupSession(msg, reply); - - ExpectReturn({true, true, true, true, true, true, 1, true, true, true, 0, true}); - ExpectArgReturn({infoSize, "", "", 1}); - msg.FlushBuffer(); - msg.WriteParcelable(&bundlesToBackup); - service->CmdAppendBundlesIncrementalBackupSession(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppendBundlesDetailsIncrementalBackupSessionFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - int32_t infoSize = 1; - int len = size >> 1; - BIncrementalData bundlesToBackup(string(reinterpret_cast(data), len), 0); - std::vector infos; - infos.emplace_back(string(reinterpret_cast(data + len), len)); - - ExpectReturn({false}); - ExpectArgReturn({infoSize}); - service->CmdAppendBundlesDetailsIncrementalBackupSession(msg, reply); - - ExpectReturn({true, true, true, true, true, true, 1, true, true, true, 0, false}); - ExpectArgReturn({infoSize, "", "", 1, infos}); - msg.FlushBuffer(); - msg.WriteParcelable(&bundlesToBackup); - service->CmdAppendBundlesDetailsIncrementalBackupSession(msg, reply); - - ExpectReturn({true, true, true, true, true, true, 1, true, true, true, 0, true, false}); - ExpectArgReturn({infoSize, "", "", 1, infos}); - msg.FlushBuffer(); - msg.WriteParcelable(&bundlesToBackup); - service->CmdAppendBundlesDetailsIncrementalBackupSession(msg, reply); - - ExpectReturn({true, true, true, true, true, true, 1, true, true, true, 0, true, true}); - ExpectArgReturn({infoSize, "", "", 1, infos}); - msg.FlushBuffer(); - msg.WriteParcelable(&bundlesToBackup); - service->CmdAppendBundlesDetailsIncrementalBackupSession(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdPublishIncrementalFileFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(TmpFileSN)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - BFileInfo info; - info.sn = TypeCast(data, &pos); - int len = (size - pos) >> 1; - info.owner = string(reinterpret_cast(data + pos), len); - info.fileName = string(reinterpret_cast(data + pos + len), len); - - msg.WriteParcelable(&info); - ExpectReturn({1, true, true, true, false}); - ExpectArgReturn({info.owner, info.fileName, info.sn}); - service->CmdPublishIncrementalFile(msg, reply); - - msg.FlushBuffer(); - msg.WriteParcelable(&info); - ExpectReturn({1, true, true, true, true}); - ExpectArgReturn({info.owner, info.fileName, info.sn}); - service->CmdPublishIncrementalFile(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -[[maybe_unused]] bool CmdPublishSAIncrementalFileFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int) + sizeof(TmpFileSN)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - BFileInfo info; - int fd = TypeCast(data, &pos); - info.sn = TypeCast(data, &pos); - int len = (size - pos) >> 1; - info.owner = string(reinterpret_cast(data + pos), len); - info.fileName = string(reinterpret_cast(data + pos + len), len); - - msg.WriteParcelable(&info); - ExpectReturn({fd, false}); - service->CmdPublishSAIncrementalFile(msg, reply); - - msg.FlushBuffer(); - msg.WriteParcelable(&info); - ExpectReturn({fd, true}); - service->CmdPublishSAIncrementalFile(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppIncrementalFileReadyFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int32_t) + sizeof(bool) + sizeof(int) + sizeof(int)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - int fd1 = TypeCast(data, &pos); - int fd2 = TypeCast(data + pos, &pos); - int32_t errCode = TypeCast(data + pos, &pos); - bool flag = TypeCast(data + pos, &pos); - string fileName(reinterpret_cast(data + pos), size - pos); - - ExpectReturn({false}); - ExpectArgReturn({fileName}); - service->CmdAppIncrementalFileReady(msg, reply); - - if (flag) { - fd1 < 0 ? ExpectReturn({true, flag, fd1, errCode, false}) : - ExpectReturn({true, flag, fd1, fd2, errCode, false}); - } else { - ExpectReturn({true, flag, errCode, false}); - } - ExpectArgReturn({fileName}); - service->CmdAppIncrementalFileReady(msg, reply); - - if (flag) { - fd1 < 0 ? ExpectReturn({true, flag, fd1, errCode, true}) : - ExpectReturn({true, flag, fd1, fd2, errCode, true}); - } else { - ExpectReturn({true, flag, errCode, true}); - } - ExpectArgReturn({fileName}); - service->CmdAppIncrementalFileReady(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdAppIncrementalDoneFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int32_t)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int32_t errCode = TypeCast(data); - - ExpectReturn({false}); - ExpectArgReturn({errCode}); - service->CmdAppIncrementalDone(msg, reply); - - ExpectReturn({true, false}); - ExpectArgReturn({errCode}); - service->CmdAppIncrementalDone(msg, reply); - - ExpectReturn({true, true}); - ExpectArgReturn({errCode}); - service->CmdAppIncrementalDone(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdGetIncrementalFileHandleFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - try { - int len = size >> 1; - string bundleName(reinterpret_cast(data), len); - string fileName(reinterpret_cast(data + len), size - len); - - ExpectReturn({false}); - ExpectArgReturn({bundleName}); - service->CmdGetIncrementalFileHandle(msg, reply); - - ExpectReturn({true, false}); - ExpectArgReturn({bundleName, fileName}); - service->CmdGetIncrementalFileHandle(msg, reply); - - ExpectReturn({true, true}); - ExpectArgReturn({bundleName, fileName}); - service->CmdGetIncrementalFileHandle(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdGetBackupInfoFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int32_t)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - int32_t scenario = TypeCast(data, &pos); - string processInfo(reinterpret_cast(data + pos), size - pos); - - ExpectReturn({false}); - ExpectArgReturn({processInfo}); - service->CmdGetBackupInfo(msg, reply); - - ExpectReturn({true, false}); - ExpectArgReturn({processInfo, scenario}); - service->CmdGetBackupInfo(msg, reply); - - ExpectReturn({true, true}); - ExpectArgReturn({processInfo, scenario}); - service->CmdGetBackupInfo(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdUpdateTimerFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int32_t)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - uint32_t timeout = TypeCast(data, &pos); - string bundleName(reinterpret_cast(data + pos), size - pos); - - ExpectReturn({false}); - ExpectArgReturn({bundleName}); - service->CmdUpdateTimer(msg, reply); - - ExpectReturn({true, false}); - ExpectArgReturn({bundleName, timeout}); - service->CmdUpdateTimer(msg, reply); - - ExpectReturn({true, true, false}); - ExpectArgReturn({bundleName, timeout}); - service->CmdUpdateTimer(msg, reply); - - ExpectReturn({true, true, true}); - ExpectArgReturn({bundleName, timeout}); - service->CmdUpdateTimer(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} - -bool CmdUpdateSendRateFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(int32_t)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - - try { - int pos = 0; - int32_t sendRate = TypeCast(data, &pos); - string bundleName(reinterpret_cast(data + pos), size - pos); - - ExpectReturn({false}); - ExpectArgReturn({bundleName}); - service->CmdUpdateSendRate(msg, reply); - - ExpectReturn({true, false}); - ExpectArgReturn({bundleName, sendRate}); - service->CmdUpdateSendRate(msg, reply); - - ExpectReturn({true, true, false}); - ExpectArgReturn({bundleName, sendRate}); - service->CmdUpdateSendRate(msg, reply); - - ExpectReturn({true, true, true}); - ExpectArgReturn({bundleName, sendRate}); - service->CmdUpdateSendRate(msg, reply); - } catch (OHOS::FileManagement::Backup::BError &err) { - // Only filter BError errors, Other results are not expected. - } - return true; -} } // namespace OHOS /* Fuzzer entry point */ @@ -1067,32 +232,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) try { OHOS::OnRemoteRequestFuzzTest(service, data, size); - CmdInitRestoreSessionFuzzTest(service, data, size); - CmdInitBackupSessionFuzzTest(service, data, size); - CmdStartFuzzTest(service, data, size); - CmdGetLocalCapabilitiesFuzzTest(service, data, size); - CmdPublishFileFuzzTest(service, data, size); - CmdAppFileReadyFuzzTest(service, data, size); - CmdAppDoneFuzzTest(service, data, size); - CmdResultReportFuzzTest(service, data, size); - CmdGetFileHandleFuzzTest(service, data, size); - CmdAppendBundlesRestoreSessionFuzzTest(service, data, size); - CmdAppendBundlesDetailsRestoreSessionFuzzTest(service, data, size); - CmdAppendBundlesBackupSessionFuzzTest(service, data, size); - CmdAppendBundlesDetailsBackupSessionFuzzTest(service, data, size); - CmdFinishFuzzTest(service, data, size); - CmdGetLocalCapabilitiesIncrementalFuzzTest(service, data, size); - CmdGetAppLocalListAndDoIncrementalBackupFuzzTest(service, data, size); - CmdInitIncrementalBackupSessionFuzzTest(service, data, size); - CmdAppendBundlesIncrementalBackupSessionFuzzTest(service, data, size); - CmdAppendBundlesDetailsIncrementalBackupSessionFuzzTest(service, data, size); - CmdPublishIncrementalFileFuzzTest(service, data, size); - CmdAppIncrementalFileReadyFuzzTest(service, data, size); - CmdAppIncrementalDoneFuzzTest(service, data, size); - CmdGetIncrementalFileHandleFuzzTest(service, data, size); - CmdGetBackupInfoFuzzTest(service, data, size); - CmdUpdateTimerFuzzTest(service, data, size); - CmdUpdateSendRateFuzzTest(service, data, size); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } diff --git a/test/fuzztest/servicereverse_fuzzer/BUILD.gn b/test/fuzztest/servicereverse_fuzzer/BUILD.gn index 83e4237e08ef29371eef2c193be5ba7bff19c498..eda6549bdbcfe411be9652561e29682d7c868210 100644 --- a/test/fuzztest/servicereverse_fuzzer/BUILD.gn +++ b/test/fuzztest/servicereverse_fuzzer/BUILD.gn @@ -43,6 +43,8 @@ ohos_fuzztest("ServiceReverseFuzzTest") { external_deps = [ "c_utils:utils", "ipc:ipc_core", + "hilog:libhilog", + "hitrace:hitrace_meter", ] defines = [ diff --git a/tests/mock/backup_ext/include/ext_extension_mock.h b/tests/mock/backup_ext/include/ext_extension_mock.h index 65733f7ad2cf5122c7f49db72f9f7b05ed4b4086..8e02c0fcc5f7c801e1cbf556a4b0c226233015fd 100644 --- a/tests/mock/backup_ext/include/ext_extension_mock.h +++ b/tests/mock/backup_ext/include/ext_extension_mock.h @@ -23,6 +23,10 @@ namespace OHOS::FileManagement::Backup { class BExtExtension { public: + virtual ErrCode GetFileHandleWithUniqueFd( + const std::string& fileName, + int32_t& getFileHandleErrCode, + int32_t& fd) = 0; virtual ErrCode GetIncrementalFileHandle(const string &) = 0; virtual UniqueFd GetFileHandle(const string &, int32_t &) = 0; virtual ErrCode HandleClear() = 0; @@ -45,8 +49,16 @@ public: virtual void AppResultReport(const std::string, BackupRestoreScenario, ErrCode) = 0; virtual void AsyncTaskOnBackup() = 0; virtual ErrCode HandleRestore() = 0; + virtual ErrCode GetIncrementalFileHandleWithUniqueFdGroup( + const std::string& fileName, + UniqueFdGroup& fdGroup) = 0; + virtual ErrCode GetIncrementalBackupFileHandleWithUniqueFdGroup( + UniqueFdGroup& fdGroup) = 0; virtual void PreparaBackupFiles(UniqueFd, UniqueFd, std::vector&, std::vector&, std::vector&) = 0; + virtual ErrCode HandleIncrementalBackup( + int32_t incrementalFd, + int32_t manifestFd) = 0; virtual ErrCode HandleIncrementalBackup(UniqueFd, UniqueFd) = 0; virtual ErrCode IncrementalOnBackup() = 0; virtual tuple GetIncrementalBackupFileHandle() = 0; @@ -76,8 +88,8 @@ public: class ExtExtensionMock : public BExtExtension { public: - MOCK_METHOD(UniqueFd, GetFileHandle, (const string &, int32_t &)); - MOCK_METHOD(std::tuple, GetIncrementalFileHandle, (const string &)); + MOCK_METHOD(ErrCode, GetFileHandleWithUniqueFd, (const string &, int32_t &,int32_t &)); + MOCK_METHOD(ErrCode, GetIncrementalFileHandleWithUniqueFdGroup, (const string &, UniqueFdGroup& fdGroup)); MOCK_METHOD(ErrCode, HandleClear, ()); MOCK_METHOD(ErrCode, BigFileReady, (sptr)); MOCK_METHOD(ErrCode, PublishFile, (const std::string &)); @@ -100,9 +112,9 @@ public: MOCK_METHOD(ErrCode, HandleRestore, ()); MOCK_METHOD(void, FillFileInfos, (UniqueFd, UniqueFd, (std::vector&), (std::vector&), (std::vector&))); - MOCK_METHOD(ErrCode, HandleIncrementalBackup, (UniqueFd, UniqueFd)); + MOCK_METHOD(ErrCode, HandleIncrementalBackup, (int32_t, int32_t)); MOCK_METHOD(ErrCode, IncrementalOnBackup, ()); - MOCK_METHOD((std::tuple), GetIncrementalBackupFileHandle, ()); + MOCK_METHOD(ErrCode, GetIncrementalBackupFileHandleWithUniqueFdGroup, (UniqueFdGroup& fdGroup)); MOCK_METHOD(ErrCode, IncrementalBigFileReady, (const TarMap&, (const std::vector&), sptr)); MOCK_METHOD(void, AsyncTaskDoIncrementalBackup, (UniqueFd, UniqueFd)); diff --git a/tests/mock/backup_ext/include/ext_extension_stub_mock.h b/tests/mock/backup_ext/include/ext_extension_stub_mock.h index 6cc34071e33779c3add99786ca7a6e7a592ac6da..089b1cc806b57a231a47779ecd695e27036da34d 100644 --- a/tests/mock/backup_ext/include/ext_extension_stub_mock.h +++ b/tests/mock/backup_ext/include/ext_extension_stub_mock.h @@ -21,7 +21,7 @@ #include "ext_extension_stub.h" namespace OHOS::FileManagement::Backup { -class ExtExtensionStubMock : public ExtExtensionStub { +class ExtExtensionStubMock : public ExtensionStub { public: MOCK_METHOD(int, OnRemoteRequest, (uint32_t, MessageParcel &, MessageParcel &, MessageOption &)); MOCK_METHOD(ErrCode, CmdGetFileHandle, (MessageParcel &, MessageParcel &)); diff --git a/tests/mock/backup_ext/src/ext_extension_mock.cpp b/tests/mock/backup_ext/src/ext_extension_mock.cpp index 4c54b88bfaf2a4414a1edb2d5da816a73aa8c335..c6cde695f2519d2eacc367753f10d64a2926cb1f 100644 --- a/tests/mock/backup_ext/src/ext_extension_mock.cpp +++ b/tests/mock/backup_ext/src/ext_extension_mock.cpp @@ -21,7 +21,24 @@ using namespace std; void BackupExtExtension::VerifyCaller() { } +ErrCode BackupExtExtension::GetIncrementalBackupFileHandleWithUniqueFdGroup(UniqueFdGroup& fdGroup) +{ + return BExtExtension::extExtension->GetIncrementalBackupFileHandleWithUniqueFdGroup(fdGroup); +} +ErrCode BackupExtExtension:: HandleIncrementalBackup(int32_t incrementalFd, int32_t manifestFd) +{ +return BExtExtension::extExtension->HandleIncrementalBackup(incrementalFd,manifestFd); +} +ErrCode BackupExtExtension::GetIncrementalFileHandleWithUniqueFdGroup( const std::string& fileName, UniqueFdGroup& fdGroup) +{ + return BExtExtension::extExtension->GetIncrementalFileHandleWithUniqueFdGroup(fileName, fdGroup); +} +ErrCode BackupExtExtension::GetFileHandleWithUniqueFd(const std::string& fileName, int32_t& getFileHandleErrCode, int32_t& fd) +{ + return BExtExtension::extExtension->GetFileHandleWithUniqueFd(fileName,getFileHandleErrCode,fd); +} +} UniqueFd BackupExtExtension::GetFileHandle(const string &fileName, int32_t &errCode) { return BExtExtension::extExtension->GetFileHandle(fileName, errCode); diff --git a/tests/mock/backup_ext/src/ext_extension_stub_mock.cpp b/tests/mock/backup_ext/src/ext_extension_stub_mock.cpp index 6f9309402ea997eda574b45647462aa8f4c79bcd..4ab92951c3d23a936ef8976d286f1c18e55327b8 100644 --- a/tests/mock/backup_ext/src/ext_extension_stub_mock.cpp +++ b/tests/mock/backup_ext/src/ext_extension_stub_mock.cpp @@ -16,11 +16,11 @@ #include "ext_extension_stub_mock.h" namespace OHOS::FileManagement::Backup { -ExtExtensionStub::ExtExtensionStub() +ExtensionStub::ExtensionStub() { } -int32_t ExtExtensionStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, +int32_t ExtensionStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { return static_cast(this)->OnRemoteRequest(code, data, reply, option); diff --git a/tests/mock/backup_kit_inner/service_client_mock.cpp b/tests/mock/backup_kit_inner/service_client_mock.cpp new file mode 100644 index 0000000000000000000000000000000000000000..ce53ce83f6c1fa72d418a888faa1cac65839381e --- /dev/null +++ b/tests/mock/backup_kit_inner/service_client_mock.cpp @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include "iremote_object.h" +#include "b_error/b_error.h" +#include "b_error/b_excep_utils.h" +#include "b_radar/b_radar.h" +#include "b_resources/b_constants.h" +#include "filemgmt_libhilog.h" +#include "iservice_registry.h" +#include "service_client.h" +#include "system_ability_definition.h" +#include "svc_death_recipient.h" +#include "hitrace_meter.h" +#include "iservice.h" +#include +#include "backup_file_info.h" +#include "backup_incremental_data.h" +#include "iservice.h" +#include "iremote_object_mock.h" +#include "utils_mock_global_variable.h" +#include "service_proxy.h" +namespace OHOS::FileManagement::Backup { +using namespace std; + +bool ServiceClient::CheckServiceProxy() +{ + serviceProxy_= ServiceClient::GetInstance(); + bool isNull=false; + if (serviceProxy_!=nullptr){ + isNull=true; + } + return isNull; +} + + +sptr ServiceClient::GetServiceProxyPointer() +{ + return serviceProxy_; +} + +sptr ServiceClient::GetInstance() +{ + + if (!GetMockGetInstance()) { + return nullptr; + } + + if (!GetMockLoadSystemAbility()) { + serviceProxy_ = sptr(new ServiceProxy(nullptr)); + } else { + sptr object = new MockIRemoteObject(); + serviceProxy_ = sptr(new ServiceProxy(object)); + } + return serviceProxy_; +} + +void ServiceClient::InvaildInstance() +{ + serviceProxy_ = nullptr; +} + +void ServiceClient::ServiceProxyLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbilityId, + const OHOS::sptr &remoteObject) +{ + +} + +void ServiceClient::ServiceProxyLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) +{ + +} +} \ No newline at end of file diff --git a/tests/mock/backup_kit_inner/service_proxy_mock.cpp b/tests/mock/backup_kit_inner/service_proxy_mock.cpp index d7ce74b5c4169dc138674b1f4572b02206f6ab6e..1e0a00d2d4d5261e64f5607e630cdbda66cabdd4 100644 --- a/tests/mock/backup_kit_inner/service_proxy_mock.cpp +++ b/tests/mock/backup_kit_inner/service_proxy_mock.cpp @@ -31,7 +31,7 @@ namespace OHOS::FileManagement::Backup { using namespace std; -int32_t ServiceProxy::InitRestoreSession(sptr remote) +int32_t ServiceProxy::InitRestoreSession(sptr& remote) { if (!GetMockInitBackupOrRestoreSession()) { return 1; @@ -39,7 +39,7 @@ int32_t ServiceProxy::InitRestoreSession(sptr remote) return 0; } -int32_t ServiceProxy::InitRestoreSession(sptr remote, std::string &errMsg) +int32_t ServiceProxy::InitRestoreSessionWithErrMsg(sptr& remote, std::string &errMsg) { if (!GetMockInitBackupOrRestoreSession()) { return 1; @@ -47,7 +47,7 @@ int32_t ServiceProxy::InitRestoreSession(sptr remote, std::stri return 0; } -int32_t ServiceProxy::InitBackupSession(sptr remote) +int32_t ServiceProxy::InitBackupSession(sptr& remote) { if (!GetMockInitBackupOrRestoreSession()) { return 1; @@ -55,7 +55,7 @@ int32_t ServiceProxy::InitBackupSession(sptr remote) return 0; } -int32_t ServiceProxy::InitBackupSession(sptr remote, std::string &errMsg) +int32_t ServiceProxy::InitBackupSessionWithErrMsg(sptr& remote, std::string &errMsg) { if (!GetMockInitBackupOrRestoreSession()) { return 1; @@ -67,13 +67,14 @@ ErrCode ServiceProxy::Start() { return BError(BError::Codes::OK); } - -UniqueFd ServiceProxy::GetLocalCapabilities() + ErrCode ServiceProxy:: GetLocalCapabilitiesWithUniqueFd( + int32_t& fd) { TestManager tm("ServiceProxyMock_GetFd_0100"); string filePath = tm.GetRootDirCurTest().append("tmp"); - UniqueFd fd(open(filePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - return fd; + UniqueFd fd_OpenData(open(filePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); + fd=fd_OpenData.Get(); + return BError(BError::Codes::OK); } ErrCode ServiceProxy::PublishFile(const BFileInfo &fileInfo) @@ -81,7 +82,7 @@ ErrCode ServiceProxy::PublishFile(const BFileInfo &fileInfo) return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppFileReady(const string &fileName, UniqueFd fd, int32_t errCode) +ErrCode ServiceProxy::AppFileReady(const string &fileName, int32_t fd, int32_t errCode) { return BError(BError::Codes::OK); } @@ -91,7 +92,7 @@ ErrCode ServiceProxy::AppDone(ErrCode errCode) return BError(BError::Codes::OK); } -ErrCode ServiceProxy::ServiceResultReport(const std::string restoreRetInfo, +ErrCode ServiceProxy::ServiceResultReport(const std::string& restoreRetInfo, BackupRestoreScenario scenario, ErrCode errCode) { return BError(BError::Codes::OK); @@ -102,19 +103,19 @@ ErrCode ServiceProxy::GetFileHandle(const string &bundleName, const string &file return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppendBundlesRestoreSession(UniqueFd fd, - const vector &bundleNames, - RestoreTypeEnum restoreType, - int32_t userId) +ErrCode ServiceProxy::AppendBundlesRestoreSessionRestoreDataWaitSend(int32_t fd, + const std::vector& bundleNames, + const std::vector& detailInfos, + int32_t restoreType, + int32_t userId) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppendBundlesRestoreSession(UniqueFd fd, - const vector &bundleNames, - const vector &detailInfos, - RestoreTypeEnum restoreType, - int32_t userId) +ErrCode ServiceProxy::AppendBundlesRestoreSessionRestoreDataWaitReady( int32_t fd, + const std::vector& bundleNames, + int32_t restoreType, + int32_t userId) { return BError(BError::Codes::OK); } @@ -140,15 +141,17 @@ ErrCode ServiceProxy::Release() return BError(BError::Codes::OK); } -ErrCode ServiceProxy::Cancel(std::string bundleName, int32_t &result) +ErrCode ServiceProxy::Cancel(const std::string& bundleName, int32_t &result) { result = BError(BError::Codes::OK); return BError(BError::Codes::OK); } -UniqueFd ServiceProxy::GetLocalCapabilitiesIncremental(const vector &bundleNames) +ErrCode ServiceProxy::GetLocalCapabilitiesIncremental( const std::vector& bundleNames, + int32_t& fd) { - return UniqueFd(-1); + fd= UniqueFd(-1).Get(); + return BError(BError::Codes::OK); } ErrCode ServiceProxy::GetAppLocalListAndDoIncrementalBackup() @@ -156,23 +159,24 @@ ErrCode ServiceProxy::GetAppLocalListAndDoIncrementalBackup() return BError(BError::Codes::OK); } -ErrCode ServiceProxy::InitIncrementalBackupSession(sptr remote) +ErrCode ServiceProxy::InitIncrementalBackupSession(sptr& remote) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::InitIncrementalBackupSession(sptr remote, std::string &errMsg) +ErrCode ServiceProxy::InitIncrementalBackupSessionWithErrMsg(sptr& remote, std::string &errMsg) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppendBundlesIncrementalBackupSession(const vector &bundlesToBackup) +ErrCode ServiceProxy::AppendBundlesIncrementalBackupSession(const std::vector& bundlesToBackup) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppendBundlesIncrementalBackupSession(const vector &bundlesToBackup, - const vector &infos) + ErrCode ServiceProxy::AppendBundlesIncrementalBackupSessionWithBundleInfos( + const std::vector& bundlesToBackup, + const std::vector& bundleInfos) { return BError(BError::Codes::OK); } @@ -182,12 +186,12 @@ ErrCode ServiceProxy::PublishIncrementalFile(const BFileInfo &fileInfo) return BError(BError::Codes::OK); } -ErrCode ServiceProxy::PublishSAIncrementalFile(const BFileInfo &fileInfo, UniqueFd fd) +ErrCode ServiceProxy::PublishSAIncrementalFile(const BFileInfo &fileInfo, int32_t fd) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppIncrementalFileReady(const string &fileName, UniqueFd fd, UniqueFd manifestFd, int32_t errCode) +ErrCode ServiceProxy::AppIncrementalFileReady(const string &fileName, int32_t fd, int32_t manifestFd, int32_t errCode) { return BError(BError::Codes::OK); } @@ -237,53 +241,19 @@ ErrCode ServiceProxy::UpdateSendRate(std::string &bundleName, int32_t sendRate, return BError(BError::Codes::OK); } -ErrCode ServiceProxy::ReportAppProcessInfo(const std::string processInfo, const BackupRestoreScenario sennario) +ErrCode ServiceProxy::ReportAppProcessInfo( const std::string& processInfo, + BackupRestoreScenario scenario) { return BError(BError::Codes::OK); } -sptr ServiceProxy::GetServiceProxyPointer() -{ - return serviceProxy_; -} - -sptr ServiceProxy::GetInstance() +ErrCode ServiceProxy::GetLocalCapabilitiesForBundleInfos(int32_t& fd) { - if (!GetMockGetInstance()) { - return nullptr; - } - - if (!GetMockLoadSystemAbility()) { - serviceProxy_ = sptr(new ServiceProxy(nullptr)); - } else { - sptr object = new MockIRemoteObject(); - serviceProxy_ = sptr(new ServiceProxy(object)); - } - return serviceProxy_; -} - -void ServiceProxy::InvaildInstance() -{ - serviceProxy_ = nullptr; -} - -void ServiceProxy::ServiceProxyLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbilityId, - const OHOS::sptr &remoteObject) -{ - return; -} - -void ServiceProxy::ServiceProxyLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) -{ - return; -} - -UniqueFd ServiceProxy::GetLocalCapabilitiesForBundleInfos() -{ - return UniqueFd(-1); + fd=-1; + return fd; } -ErrCode ServiceProxy::GetBackupDataSize(bool isPreciseScan, vector bundleNameList) +ErrCode ServiceProxy::GetBackupDataSize(bool isPreciseScan, const vector& bundleNameList) { return BError(BError::Codes::OK); } diff --git a/tests/mock/module_ipc/extension_proxy_mock.cpp b/tests/mock/module_ipc/extension_proxy_mock.cpp new file mode 100644 index 0000000000000000000000000000000000000000..e123625474e65d6312d51d1d2361078821355e70 --- /dev/null +++ b/tests/mock/module_ipc/extension_proxy_mock.cpp @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "extension_proxy.h" + +namespace OHOS::FileManagement::Backup { +using namespace std; + +ErrCode ExtensionProxy::GetFileHandleWithUniqueFd(const string &fileName, int32_t &errCode, int32_t & fd) +{ + return 0; +} + +ErrCode ExtensionProxy::HandleClear() +{ + return 0; +} + +ErrCode ExtensionProxy::HandleBackup(bool isClearData) +{ + return 0; +} + +ErrCode ExtensionProxy::PublishFile(const string &fileName) +{ + return 0; +} + +ErrCode ExtensionProxy::HandleRestore(bool isClearData) +{ + return 0; +} + +ErrCode ExtensionProxy::GetBackupInfo(std::string &result) +{ + return 0; +} + +ErrCode ExtensionProxy::GetIncrementalFileHandleWithUniqueFdGroup(const string &fileName,UniqueFdGroup& fdGroup) +{ + return 0; +} + +ErrCode ExtensionProxy::PublishIncrementalFile(const string &fileName) +{ + return 0; +} + +ErrCode ExtensionProxy::HandleIncrementalBackup(int32_t incrementalFd, int32_t manifestFd) +{ + return 0; +} + +ErrCode ExtensionProxy::IncrementalOnBackup(bool isClearData) +{ + return 0; +} + +ErrCode ExtensionProxy::UpdateFdSendRate(const std::string &bundleName, int32_t sendRate) +{ + return 0; +} + +ErrCode ExtensionProxy::User0OnBackup() +{ + return 0; +} + +ErrCode ExtensionProxy::GetIncrementalBackupFileHandleWithUniqueFdGroup( UniqueFdGroup& fdGroup) +{ + return 0; +} +} // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/tests/mock/module_ipc/extension_type_mock.cpp b/tests/mock/module_ipc/extension_type_mock.cpp new file mode 100644 index 0000000000000000000000000000000000000000..536590933126d2cd84fd9a7c99996f16a1fcc5d2 --- /dev/null +++ b/tests/mock/module_ipc/extension_type_mock.cpp @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "extension_type.h" + +namespace OHOS { +namespace FileManagement { +namespace Backup { +namespace ExtensionType { + +ErrCode UniqueFdGroupBlockMarshalling(OHOS::MessageParcel& data, const UniqueFdGroup& dataBlock) +{ + if (!data.WriteUnpadBuffer(&dataBlock, sizeof(UniqueFdGroup))) { + return ERR_INVALID_DATA; + } + return ERR_NONE; +} + +ErrCode UniqueFdGroupBlockUnmarshalling(OHOS::MessageParcel& data, UniqueFdGroup& dataBlock) +{ + const UniqueFdGroup *dataBlockPtr = reinterpret_cast(data.ReadUnpadBuffer(sizeof(UniqueFdGroup))); + if (dataBlockPtr == nullptr) { + return ERR_INVALID_DATA; + } + + if (memcpy_s(&dataBlock, sizeof(UniqueFdGroup), dataBlockPtr, sizeof(UniqueFdGroup)) != EOK) { + return ERR_INVALID_DATA; + } + return ERR_NONE; +} +} // namespace ExtensionType +} // namespace Backup +} // namespace FileManagement +} // namespace OHOS diff --git a/tests/mock/module_ipc/include/extension_proxy_mock.h b/tests/mock/module_ipc/include/extension_proxy_mock.h new file mode 100644 index 0000000000000000000000000000000000000000..cfb69b191fa9e7784bcdac35b23f7b8fbde52563 --- /dev/null +++ b/tests/mock/module_ipc/include/extension_proxy_mock.h @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License") = 0; + * 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 OHOS_FILEMGMT_BACKUP_EXTENSION_PROXY_MOCK_H +#define OHOS_FILEMGMT_BACKUP_EXTENSION_PROXY_MOCK_H + +#include + +#include "extension_proxy.h" + +namespace OHOS::FileManagement::Backup { +class ExtensionProxyMock : public ExtensionProxy { +public: + ExtensionProxyMock() : ExtensionProxy(nullptr) {}; +public: + MOCK_METHOD(ErrCode, GetFileHandleWithUniqueFd, (const std::string&, int32_t&, int32_t& )); + MOCK_METHOD(ErrCode, HandleClear, ()); + MOCK_METHOD(ErrCode, HandleBackup, (bool)); + MOCK_METHOD(ErrCode, PublishFile, (const std::string&)); + MOCK_METHOD(ErrCode, HandleRestore, (bool)); + MOCK_METHOD(ErrCode, GetIncrementalFileHandleWithUniqueFdGroup, (const std::string&, UniqueFdGroup&)); + MOCK_METHOD(ErrCode, PublishIncrementalFile, (const std::string&)); + MOCK_METHOD(ErrCode, HandleIncrementalBackup, (int32_t, int32_t)); + MOCK_METHOD(ErrCode, IncrementalOnBackup, (bool)); + MOCK_METHOD(ErrCode, GetIncrementalBackupFileHandleWithUniqueFdGroup, (UniqueFdGroup&)); + MOCK_METHOD(ErrCode, GetBackupInfo, (std::string&)); + MOCK_METHOD(ErrCode, UpdateFdSendRate, (const std::string&, int32_t)); + MOCK_METHOD(ErrCode, User0OnBackup, ()); +}; +} // namespace OHOS::FileManagement::Backup +#endif // OHOS_FILEMGMT_BACKUP_SVC_BACKUP_CONNECTION_MOCK_H \ No newline at end of file diff --git a/tests/mock/module_ipc/include/oldservice_stub_mock.h b/tests/mock/module_ipc/include/oldservice_stub_mock.h new file mode 100644 index 0000000000000000000000000000000000000000..cd32d9e662c23b7546c10b9e633e9d4c30108b13 --- /dev/null +++ b/tests/mock/module_ipc/include/oldservice_stub_mock.h @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef OHOS_FILEMGMT_BACKUP_SERVICE_STUB_MOCK_H +#define OHOS_FILEMGMT_BACKUP_SERVICE_STUB_MOCK_H + +#include + +namespace OHOS::FileManagement::Backup { +class BServiceStub { +public: + virtual int32_t OnRemoteRequest(uint32_t, MessageParcel&, MessageParcel&, MessageOption&) = 0; + virtual int32_t CmdInitRestoreSession(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdInitBackupSession(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdStart(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdGetLocalCapabilities(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdPublishFile(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdAppFileReady(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdAppDone(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdResultReport(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdGetFileHandle(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdAppendBundlesRestoreSession(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdAppendBundlesDetailsRestoreSession(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdAppendBundlesBackupSession(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdAppendBundlesDetailsBackupSession(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdFinish(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdRelease(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdCancel(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdGetLocalCapabilitiesIncremental(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdGetAppLocalListAndDoIncrementalBackup(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdInitIncrementalBackupSession(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdAppendBundlesIncrementalBackupSession(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdAppendBundlesDetailsIncrementalBackupSession(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdPublishIncrementalFile(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdPublishSAIncrementalFile(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdAppIncrementalFileReady(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdAppIncrementalDone(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdGetIncrementalFileHandle(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdGetBackupInfo(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdUpdateTimer(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdUpdateSendRate(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdStopExtTimer(MessageParcel&, MessageParcel&) = 0; + virtual int32_t CmdRefreshDataSize(MessageParcel&, MessageParcel&) = 0; + virtual void ServiceStubSupplement() = 0; + virtual void ServiceStubSuppAppendBundles() = 0; + +public: + BServiceStub() = default; + virtual ~BServiceStub() = default; +public: + static inline std::shared_ptr stub = nullptr; +}; + +class ServiceStubMock : public BServiceStub { +public: + MOCK_METHOD(int32_t, OnRemoteRequest, (uint32_t, MessageParcel&, MessageParcel&, MessageOption&)); + MOCK_METHOD(int32_t, CmdInitRestoreSession, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdInitBackupSession, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdStart, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdGetLocalCapabilities, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdPublishFile, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdAppFileReady, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdAppDone, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdResultReport, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdGetFileHandle, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdAppendBundlesRestoreSession, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdAppendBundlesDetailsRestoreSession, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdAppendBundlesBackupSession, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdAppendBundlesDetailsBackupSession, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdFinish, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdRelease, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdGetLocalCapabilitiesIncremental, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdGetAppLocalListAndDoIncrementalBackup, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdInitIncrementalBackupSession, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdAppendBundlesIncrementalBackupSession, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdAppendBundlesDetailsIncrementalBackupSession, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdPublishIncrementalFile, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdPublishSAIncrementalFile, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdAppIncrementalFileReady, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdAppIncrementalDone, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdGetIncrementalFileHandle, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdGetBackupInfo, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdUpdateTimer, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdUpdateSendRate, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdStopExtTimer, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(int32_t, CmdRefreshDataSize, (MessageParcel&, MessageParcel&)); + MOCK_METHOD(void, ServiceStubSupplement, ()); + MOCK_METHOD(void, ServiceStubSuppAppendBundles, ()); +}; +} // namespace OHOS::FileManagement::Backup +#endif // OHOS_FILEMGMT_BACKUP_SERVICE_STUB_MOCK_H diff --git a/tests/mock/module_ipc/include/service_reverse_proxy_mock.h b/tests/mock/module_ipc/include/service_reverse_proxy_mock.h index fc5c50fe80f927ef63a20e7837c4422cbcf6a078..25b7b340715679c20ea236ef6b18aeebaea97264 100644 --- a/tests/mock/module_ipc/include/service_reverse_proxy_mock.h +++ b/tests/mock/module_ipc/include/service_reverse_proxy_mock.h @@ -18,42 +18,42 @@ #include -#include "i_service_reverse.h" +#include "iservice_reverse.h" #include "iremote_proxy.h" namespace OHOS::FileManagement::Backup { class ServiceReverseProxyMock : public IRemoteProxy { public: MOCK_METHOD(int, SendRequest, (uint32_t, MessageParcel&, MessageParcel&, MessageOption&)); - MOCK_METHOD(void, BackupOnFileReady, (std::string, std::string, int, int32_t)); - MOCK_METHOD(void, BackupOnBundleStarted, (int32_t, std::string)); - MOCK_METHOD(void, BackupOnResultReport, (std::string, std::string));; - MOCK_METHOD(void, BackupOnBundleFinished, (int32_t, std::string)); - MOCK_METHOD(void, BackupOnAllBundlesFinished, (int32_t)); - MOCK_METHOD(void, BackupOnProcessInfo, (std::string, std::string)); - MOCK_METHOD(void, BackupOnScanningInfo, (std::string)); - - MOCK_METHOD(void, RestoreOnBundleStarted, (int32_t, std::string)); - MOCK_METHOD(void, RestoreOnBundleFinished, (int32_t, std::string)); - MOCK_METHOD(void, RestoreOnAllBundlesFinished, (int32_t)); - MOCK_METHOD(void, RestoreOnFileReady, (std::string, std::string, int, int32_t)); - MOCK_METHOD(void, RestoreOnResultReport, (std::string, std::string, ErrCode)); - MOCK_METHOD(void, RestoreOnProcessInfo, (std::string, std::string)); - - MOCK_METHOD(void, IncrementalBackupOnFileReady, (std::string, std::string, int, int, int32_t)); - MOCK_METHOD(void, IncrementalBackupOnBundleStarted, (int32_t, std::string)); - MOCK_METHOD(void, IncrementalBackupOnResultReport, (std::string, std::string)); - MOCK_METHOD(void, IncrementalBackupOnBundleFinished, (int32_t, std::string)); - MOCK_METHOD(void, IncrementalBackupOnAllBundlesFinished, (int32_t)); - MOCK_METHOD(void, IncrementalBackupOnProcessInfo, (std::string, std::string)); - MOCK_METHOD(void, IncrementalBackupOnScanningInfo, (std::string)); - - MOCK_METHOD(void, IncrementalRestoreOnBundleStarted, (int32_t, std::string)); - MOCK_METHOD(void, IncrementalRestoreOnBundleFinished, (int32_t, std::string)); - MOCK_METHOD(void, IncrementalRestoreOnAllBundlesFinished, (int32_t)); - MOCK_METHOD(void, IncrementalRestoreOnFileReady, (std::string, std::string, int, int, int32_t)); - MOCK_METHOD(void, IncrementalRestoreOnResultReport, (std::string, std::string, ErrCode));; - MOCK_METHOD(void, IncrementalRestoreOnProcessInfo, (std::string, std::string)); + MOCK_METHOD(ErrCode, BackupOnFileReady, (const std::string&,const std::string&, int, int32_t)); + MOCK_METHOD(ErrCode, BackupOnBundleStarted, (int32_t, const std::string&)); + MOCK_METHOD(ErrCode, BackupOnResultReport, (const std::string&, const std::string&));; + MOCK_METHOD(ErrCode, BackupOnBundleFinished, (int32_t,const std::string&)); + MOCK_METHOD(ErrCode, BackupOnAllBundlesFinished, (int32_t)); + MOCK_METHOD(ErrCode, BackupOnProcessInfo, (const std::string&, const std::string&)); + MOCK_METHOD(ErrCode, BackupOnScanningInfo, (const std::string&)); + + MOCK_METHOD(ErrCode, RestoreOnBundleStarted, (int32_t, const std::string&)); + MOCK_METHOD(ErrCode, RestoreOnBundleFinished, (int32_t, const std::string&)); + MOCK_METHOD(ErrCode, RestoreOnAllBundlesFinished, (int32_t)); + MOCK_METHOD(ErrCode, RestoreOnFileReady, (const std::string&, const std::string&, int32_t, int32_t)); + MOCK_METHOD(ErrCode, RestoreOnResultReport, (const std::string&, const std::string&, ErrCode)); + MOCK_METHOD(ErrCode, RestoreOnProcessInfo, (const std::string&, const std::string&)); + + MOCK_METHOD(ErrCode, IncrementalBackupOnFileReady, (const std::string&, const std::string&, int, int, int32_t)); + MOCK_METHOD(ErrCode, IncrementalBackupOnBundleStarted, (int32_t, const std::string&)); + MOCK_METHOD(ErrCode, IncrementalBackupOnResultReport, (const std::string&, const std::string&)); + MOCK_METHOD(ErrCode, IncrementalBackupOnBundleFinished, (int32_t, const std::string&)); + MOCK_METHOD(ErrCode, IncrementalBackupOnAllBundlesFinished, (int32_t)); + MOCK_METHOD(ErrCode, IncrementalBackupOnProcessInfo, (const std::string&, const std::string&)); + MOCK_METHOD(ErrCode, IncrementalBackupOnScanningInfo, (const std::string&)); + + MOCK_METHOD(ErrCode, IncrementalRestoreOnBundleStarted, (int32_t, const std::string&)); + MOCK_METHOD(ErrCode, IncrementalRestoreOnBundleFinished, (int32_t, const std::string&)); + MOCK_METHOD(ErrCode, IncrementalRestoreOnAllBundlesFinished, (int32_t)); + MOCK_METHOD(ErrCode, IncrementalRestoreOnFileReady, (const std::string&, const std::string&, int, int, int32_t)); + MOCK_METHOD(ErrCode, IncrementalRestoreOnResultReport, (const std::string&, const std::string&, ErrCode));; + MOCK_METHOD(ErrCode, IncrementalRestoreOnProcessInfo, (const std::string&, const std::string&)); public: ServiceReverseProxyMock() : IRemoteProxy(nullptr) {} diff --git a/tests/mock/module_ipc/include/service_stub_mock.h b/tests/mock/module_ipc/include/service_stub_mock.h index 27d151755e1798302e921b7bf8460c8bd7bf493c..3689fe0f049c171adf9d8a78da8135407fb0d5df 100644 --- a/tests/mock/module_ipc/include/service_stub_mock.h +++ b/tests/mock/module_ipc/include/service_stub_mock.h @@ -17,91 +17,15 @@ #define OHOS_FILEMGMT_BACKUP_SERVICE_STUB_MOCK_H #include - +#include "module_ipc/service_stub.h" namespace OHOS::FileManagement::Backup { -class BServiceStub { -public: - virtual int32_t OnRemoteRequest(uint32_t, MessageParcel&, MessageParcel&, MessageOption&) = 0; - virtual int32_t CmdInitRestoreSession(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdInitBackupSession(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdStart(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdGetLocalCapabilities(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdGetLocalCapabilitiesForBdInfos(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdPublishFile(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdAppFileReady(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdAppDone(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdResultReport(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdGetFileHandle(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdAppendBundlesRestoreSession(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdAppendBundlesDetailsRestoreSession(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdAppendBundlesBackupSession(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdAppendBundlesDetailsBackupSession(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdFinish(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdRelease(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdCancel(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdGetLocalCapabilitiesIncremental(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdGetAppLocalListAndDoIncrementalBackup(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdInitIncrementalBackupSession(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdAppendBundlesIncrementalBackupSession(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdAppendBundlesDetailsIncrementalBackupSession(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdPublishIncrementalFile(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdPublishSAIncrementalFile(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdAppIncrementalFileReady(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdAppIncrementalDone(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdGetIncrementalFileHandle(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdGetBackupInfo(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdUpdateTimer(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdUpdateSendRate(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdStopExtTimer(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdRefreshDataSize(MessageParcel&, MessageParcel&) = 0; - virtual int32_t CmdGetBackupDataSize(MessageParcel&, MessageParcel&) = 0; - virtual void ServiceStubSupplement() = 0; - virtual void ServiceStubSuppAppendBundles() = 0; - -public: - BServiceStub() = default; - virtual ~BServiceStub() = default; -public: - static inline std::shared_ptr stub = nullptr; -}; - -class ServiceStubMock : public BServiceStub { +class ServiceStub : public IRemoteStub { public: - MOCK_METHOD(int32_t, OnRemoteRequest, (uint32_t, MessageParcel&, MessageParcel&, MessageOption&)); - MOCK_METHOD(int32_t, CmdInitRestoreSession, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdInitBackupSession, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdStart, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdGetLocalCapabilities, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdGetLocalCapabilitiesForBdInfos, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdPublishFile, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdAppFileReady, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdAppDone, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdResultReport, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdGetFileHandle, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdAppendBundlesRestoreSession, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdAppendBundlesDetailsRestoreSession, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdAppendBundlesBackupSession, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdAppendBundlesDetailsBackupSession, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdFinish, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdRelease, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdGetLocalCapabilitiesIncremental, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdGetAppLocalListAndDoIncrementalBackup, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdInitIncrementalBackupSession, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdAppendBundlesIncrementalBackupSession, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdAppendBundlesDetailsIncrementalBackupSession, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdPublishIncrementalFile, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdPublishSAIncrementalFile, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdAppIncrementalFileReady, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdAppIncrementalDone, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdGetIncrementalFileHandle, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdGetBackupInfo, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdUpdateTimer, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdUpdateSendRate, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdStopExtTimer, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdRefreshDataSize, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(int32_t, CmdGetBackupDataSize, (MessageParcel&, MessageParcel&)); - MOCK_METHOD(void, ServiceStubSupplement, ()); - MOCK_METHOD(void, ServiceStubSuppAppendBundles, ()); + int32_t OnRemoteRequest( + uint32_t code, + MessageParcel& data, + MessageParcel& reply, + MessageOption& option) override; }; -} // namespace OHOS::FileManagement::Backup -#endif // OHOS_FILEMGMT_BACKUP_SERVICE_STUB_MOCK_H +} +#endif \ No newline at end of file diff --git a/tests/mock/module_ipc/include/svc_extension_proxy_mock.h b/tests/mock/module_ipc/include/svc_extension_proxy_mock.h index a042be3abb0f31dccf745a9fa158b9bb2b45e7b8..78b39a4fe1271687448fbb28b23414d97fb0eb04 100644 --- a/tests/mock/module_ipc/include/svc_extension_proxy_mock.h +++ b/tests/mock/module_ipc/include/svc_extension_proxy_mock.h @@ -25,16 +25,16 @@ class SvcExtensionProxyMock : public SvcExtensionProxy { public: SvcExtensionProxyMock() : SvcExtensionProxy(nullptr) {}; public: - MOCK_METHOD(UniqueFd, GetFileHandle, (const std::string&, int32_t&)); + MOCK_METHOD(ErrCode, GetFileHandleWithUniqueFd, (const std::string&, int32_t&, int32_t& )); MOCK_METHOD(ErrCode, HandleClear, ()); MOCK_METHOD(ErrCode, HandleBackup, (bool)); MOCK_METHOD(ErrCode, PublishFile, (const std::string&)); MOCK_METHOD(ErrCode, HandleRestore, (bool)); - MOCK_METHOD((std::tuple), GetIncrementalFileHandle, (const std::string&)); + MOCK_METHOD(ErrCode, GetIncrementalFileHandleWithUniqueFdGroup, (const std::string&, UniqueFdGroup&)); MOCK_METHOD(ErrCode, PublishIncrementalFile, (const std::string&)); - MOCK_METHOD(ErrCode, HandleIncrementalBackup, (UniqueFd, UniqueFd)); + MOCK_METHOD(ErrCode, HandleIncrementalBackup, (int32_t, int32_t)); MOCK_METHOD(ErrCode, IncrementalOnBackup, (bool)); - MOCK_METHOD((std::tuple), GetIncrementalBackupFileHandle, ()); + MOCK_METHOD(ErrCode, GetIncrementalBackupFileHandleWithUniqueFdGroup, (UniqueFdGroup&)); MOCK_METHOD(ErrCode, GetBackupInfo, (std::string&)); MOCK_METHOD(ErrCode, UpdateFdSendRate, (std::string&, int32_t)); MOCK_METHOD(ErrCode, User0OnBackup, ()); diff --git a/tests/mock/module_ipc/include/svc_session_manager_mock.h b/tests/mock/module_ipc/include/svc_session_manager_mock.h index 17634813c31aabd8804a23981c56e9a4cbccbbdd..f883b5f927de26c259f2619558ce3c88eac45b81 100644 --- a/tests/mock/module_ipc/include/svc_session_manager_mock.h +++ b/tests/mock/module_ipc/include/svc_session_manager_mock.h @@ -25,7 +25,7 @@ class BSvcSessionManager { public: virtual ErrCode Active(struct SvcSessionManager::Impl, bool) = 0; virtual sptr GetServiceReverseProxy() = 0; - virtual IServiceReverse::Scenario GetScenario() = 0; + virtual IServiceReverseType::Scenario GetScenario() = 0; virtual int32_t GetSessionUserId() = 0; virtual std::string GetSessionCallerName() = 0; virtual std::string GetSessionActiveTime() = 0; @@ -73,7 +73,7 @@ class SvcSessionManagerMock : public BSvcSessionManager { public: MOCK_METHOD(ErrCode, Active, (struct SvcSessionManager::Impl, bool)); MOCK_METHOD((sptr), GetServiceReverseProxy, ()); - MOCK_METHOD(IServiceReverse::Scenario, GetScenario, ()); + MOCK_METHOD(IServiceReverseType::Scenario, GetScenario, ()); MOCK_METHOD(int32_t, GetSessionUserId, ()); MOCK_METHOD(std::string, GetSessionCallerName, ()); MOCK_METHOD(std::string, GetSessionActiveTime, ()); diff --git a/tests/mock/module_ipc/message_parcel_mock.h b/tests/mock/module_ipc/message_parcel_mock.h index 97984c2312d15f00a71640761d9439b61effd259..d8b473a860bc54d7e41af3cdbd101f1ed568c839 100644 --- a/tests/mock/module_ipc/message_parcel_mock.h +++ b/tests/mock/module_ipc/message_parcel_mock.h @@ -21,8 +21,8 @@ #include "message_parcel.h" #include "iremote_broker.h" -#include "b_file_info.h" -#include "b_incremental_data.h" +#include "backup_file_info.h" +#include "backup_incremental_data.h" namespace OHOS::FileManagement::Backup { class BackupIfaceCast { diff --git a/services/backup_sa/src/module_ipc/service_stub.cpp b/tests/mock/module_ipc/odlservice_stub_mock.cpp similarity index 34% rename from services/backup_sa/src/module_ipc/service_stub.cpp rename to tests/mock/module_ipc/odlservice_stub_mock.cpp index ae94248e9f0bbc49318d2c507580f0ea5e9d22a9..97452a3ebb3fea07c203afafc04f213fee20cfa8 100644 --- a/services/backup_sa/src/module_ipc/service_stub.cpp +++ b/tests/mock/module_ipc/odlservice_stub_mock.cpp @@ -13,85 +13,33 @@ * limitations under the License. */ -/* - * 注意： - * - 注意点1：本文件原则上只处理与IPC模块的IO，具体业务逻辑实现在service.cpp中 - * - 注意点2：所有调用开头处打印 Begin 字样，通过BError返回正常结果/错误码，这是出于防抵赖的目的 - */ - #include "module_ipc/service_stub.h" #include #include "b_error/b_error.h" -#include "b_error/b_excep_utils.h" #include "b_resources/b_constants.h" -#include "filemgmt_libhilog.h" #include "module_ipc/service_reverse_proxy.h" namespace OHOS::FileManagement::Backup { using namespace std; -const int INVALID_FD = -1; - - -void ServiceStub::ServiceStubSupplement() -{ - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_BACKUP_DATA_SIZE)] = - &ServiceStub::CmdGetBackupDataSize; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_UPDATE_TIMER)] = - &ServiceStub::CmdUpdateTimer; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_UPDATE_SENDRATE)] = - &ServiceStub::CmdUpdateSendRate; - opToInterfaceMap_[static_cast( - IServiceInterfaceCode::SERVICE_CMD_GET_APP_LOCAL_LIST_AND_DO_INCREMENTAL_BACKUP)] = - &ServiceStub::CmdGetAppLocalListAndDoIncrementalBackup; - opToInterfaceMap_[static_cast( - IServiceInterfaceCode::SERVICE_CMD_REPORT_APP_PROCESS_INFO)] = - &ServiceStub::CmdReportAppProcessInfo; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_START_EXT_TIMER)] = - &ServiceStub::CmdStartExtTimer; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_START_FWK_TIMER)] = - &ServiceStub::CmdStartFwkTimer; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_CANCEL_BUNDLE)] = - &ServiceStub::CmdCancel; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_BACKUP_SESSION_MSG)] = - &ServiceStub::CmdInitBackupSessionMsg; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_INCREMENTAL_BACKUP_SESSION_MSG)] = - &ServiceStub::CmdInitIncrementalBackupSessionMsg; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_RESTORE_SESSION_MSG)] = - &ServiceStub::CmdInitRestoreSessionMsg; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_STOP_EXT_TIMER)] = - &ServiceStub::CmdStopExtTimer; - opToInterfaceMap_[static_cast( - IServiceInterfaceCode::SERVICE_CMD_GET_LOCAL_CAPABILITIES_FOR_BUNDLE_INFOS)] = - &ServiceStub::CmdGetLocalCapabilitiesForBdInfos; -} - -void ServiceStub::ServiceStubSuppAppendBundles() -{ - opToInterfaceMap_[static_cast( - IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_INCREMENTAL_BACKUP_SESSION)] = - &ServiceStub::CmdAppendBundlesIncrementalBackupSession; - opToInterfaceMap_[static_cast( - IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_INCREMENTAL_BACKUP_SESSION_DETAILS)] = - &ServiceStub::CmdAppendBundlesDetailsIncrementalBackupSession; -} ServiceStub::ServiceStub() { + opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_FINISH)] = &ServiceStub::CmdFinish; + opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_RELSEASE_SESSION)] = + &ServiceStub::CmdRelease; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_RESTORE_SESSION)] = &ServiceStub::CmdInitRestoreSession; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_BACKUP_SESSION)] = &ServiceStub::CmdInitBackupSession; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_LOCAL_CAPABILITIES)] = &ServiceStub::CmdGetLocalCapabilities; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_PUBLISH_FILE)] = - &ServiceStub::CmdPublishFile; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APP_FILE_READY)] = &ServiceStub::CmdAppFileReady; + opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_PUBLISH_FILE)] = + &ServiceStub::CmdPublishFile; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APP_DONE)] = &ServiceStub::CmdAppDone; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_RESULT_REPORT)] = - &ServiceStub::CmdResultReport; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_START)] = &ServiceStub::CmdStart; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_FILE_NAME)] = &ServiceStub::CmdGetFileHandle; @@ -101,247 +49,142 @@ ServiceStub::ServiceStub() &ServiceStub::CmdAppendBundlesDetailsRestoreSession; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_BACKUP_SESSION)] = &ServiceStub::CmdAppendBundlesBackupSession; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_BACKUP_SESSION_DETAILS)] = - &ServiceStub::CmdAppendBundlesDetailsBackupSession; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_FINISH)] = &ServiceStub::CmdFinish; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_RELSEASE_SESSION)] = - &ServiceStub::CmdRelease; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_LOCAL_CAPABILITIES_INCREMENTAL)] = &ServiceStub::CmdGetLocalCapabilitiesIncremental; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_INCREMENTAL_BACKUP_SESSION)] = &ServiceStub::CmdInitIncrementalBackupSession; - ServiceStubSuppAppendBundles(); + opToInterfaceMap_[static_cast( + IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_INCREMENTAL_BACKUP_SESSION_DETAILS)] = + &ServiceStub::CmdAppendBundlesDetailsIncrementalBackupSession; + opToInterfaceMap_[static_cast( + IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_INCREMENTAL_BACKUP_SESSION)] = + &ServiceStub::CmdAppendBundlesIncrementalBackupSession; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_PUBLISH_INCREMENTAL_FILE)] = &ServiceStub::CmdPublishIncrementalFile; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_PUBLISH_SA_INCREMENTAL_FILE)] = - &ServiceStub::CmdPublishSAIncrementalFile; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APP_INCREMENTAL_FILE_READY)] = &ServiceStub::CmdAppIncrementalFileReady; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APP_INCREMENTAL_DONE)] = - &ServiceStub::CmdAppIncrementalDone; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_INCREMENTAL_FILE_NAME)] = &ServiceStub::CmdGetIncrementalFileHandle; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_BACKUP_INFO)] = - &ServiceStub::CmdGetBackupInfo; + ServiceStubSupplement(); + opToInterfaceMap_[static_cast( + IServiceInterfaceCode::SERVICE_CMD_GET_APP_LOCAL_LIST_AND_DO_INCREMENTAL_BACKUP)] = + &ServiceStub::CmdGetAppLocalListAndDoIncrementalBackup; + opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_STOP_EXT_TIMER)] = + &ServiceStub::CmdStopExtTimer; opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_REFRESH_DATA_SIZE)] = &ServiceStub::CmdRefreshDataSize; - ServiceStubSupplement(); } -int32_t ServiceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) +void ServiceStub::ServiceStubSupplement() { - const std::u16string descriptor = ServiceStub::GetDescriptor(); - const std::u16string remoteDescriptor = data.ReadInterfaceToken(); - if (descriptor != remoteDescriptor) { - return BError(BError::Codes::SA_INVAL_ARG, "Invalid remote descriptor"); - } + opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_BACKUP_INFO)] = + &ServiceStub::CmdGetBackupInfo; + opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_UPDATE_TIMER)] = + &ServiceStub::CmdUpdateTimer; + opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_UPDATE_SENDRATE)] = + &ServiceStub::CmdUpdateSendRate; + opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_REPORT_APP_PROCESS_INFO)] = + &ServiceStub::CmdReportAppProcessInfo; + opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_CANCEL_BUNDLE)] = + &ServiceStub::CmdCancel; +} - HILOGD("Begin to call procedure indexed %{public}u", code); +int32_t ServiceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) +{ auto interfaceIndex = opToInterfaceMap_.find(code); if (interfaceIndex == opToInterfaceMap_.end() || !interfaceIndex->second) { - HILOGE("Cannot response request %{public}d : unknown procedure", code); - return IPCObjectStub::OnRemoteRequest(code, data, reply, option); + return BError(BError::Codes::OK); } - return BExcepUltils::ExceptionCatcherLocked( - [&]() { return ErrCode((this->*(interfaceIndex->second))(data, reply)); }); + const std::u16string descriptor = ServiceStub::GetDescriptor(); + const std::u16string remoteDescriptor = data.ReadInterfaceToken(); + if (descriptor != remoteDescriptor) { + return BError(BError::Codes::OK); + } + return (this->*(interfaceIndex->second))(data, reply); } int32_t ServiceStub::CmdInitRestoreSession(MessageParcel &data, MessageParcel &reply) { auto remote = data.ReadRemoteObject(); - if (!remote) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive the reverse stub"); - } auto iremote = iface_cast(remote); - if (!iremote) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive the reverse stub"); - } int32_t res = InitRestoreSession(iremote); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::SA_BROKEN_IPC, ss.str()); - } - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdInitRestoreSessionMsg(MessageParcel &data, MessageParcel &reply) -{ - auto remote = data.ReadRemoteObject(); - std::string errMsg; - if (!remote) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive the stub"); - } - auto iremote = iface_cast(remote); - if (!iremote) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive the reverse stub"); - } - int32_t res = InitRestoreSession(iremote, errMsg); - if (!reply.WriteString(errMsg)) { - return BError(BError::Codes::SA_BROKEN_IPC, "Failed to send the errMsg"); - } - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::SA_BROKEN_IPC, ss.str()); - } + reply.WriteInt32(res); return BError(BError::Codes::OK); } int32_t ServiceStub::CmdInitBackupSession(MessageParcel &data, MessageParcel &reply) { auto remote = data.ReadRemoteObject(); - if (!remote) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive the reverse stub"); - } auto iremote = iface_cast(remote); - if (!iremote) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive the reverse stub"); - } int res = InitBackupSession(iremote); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::SA_BROKEN_IPC, ss.str()); - } - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdInitBackupSessionMsg(MessageParcel &data, MessageParcel &reply) -{ - auto remote = data.ReadRemoteObject(); - std::string errMsg; - if (!remote) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive the reverse stub"); - } - auto iRemote = iface_cast(remote); - if (!iRemote) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive the reverse stub"); - } - int res = InitBackupSession(iRemote, errMsg); - if (!reply.WriteString(errMsg)) { - return BError(BError::Codes::SA_BROKEN_IPC, "Failed to send the errMsg"); - } - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::SA_BROKEN_IPC, ss.str()); - } + reply.WriteInt32(res); return BError(BError::Codes::OK); } int32_t ServiceStub::CmdStart(MessageParcel &data, MessageParcel &reply) { int res = Start(); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::SA_BROKEN_IPC, ss.str()); - } + reply.WriteInt32(res); return BError(BError::Codes::OK); } int32_t ServiceStub::CmdGetLocalCapabilities(MessageParcel &data, MessageParcel &reply) { UniqueFd fd(GetLocalCapabilities()); - if (!reply.WriteFileDescriptor(fd)) { - return BError(BError::Codes::SA_BROKEN_IPC, "Failed to send out the file"); - } + reply.WriteFileDescriptor(fd); return BError(BError::Codes::OK); } int32_t ServiceStub::CmdPublishFile(MessageParcel &data, MessageParcel &reply) { unique_ptr fileInfo(data.ReadParcelable()); - if (!fileInfo) { - return BError(BError::Codes::SA_BROKEN_IPC, "Failed to receive fileInfo"); - } int res = PublishFile(*fileInfo); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::SA_BROKEN_IPC, ss.str()); - } + reply.WriteInt32(res); return BError(BError::Codes::OK); } int32_t ServiceStub::CmdAppFileReady(MessageParcel &data, MessageParcel &reply) { string fileName; - if (!data.ReadString(fileName)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive fileName"); - } - bool fdFlag = data.ReadBool(); - UniqueFd fd = UniqueFd(INVALID_FD); - if (fdFlag == true) { - fd = UniqueFd(data.ReadFileDescriptor()); - if (fd < 0) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive fd"); - } - } - int32_t errCode = data.ReadInt32(); - - int res = AppFileReady(fileName, move(fd), errCode); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::SA_BROKEN_IPC, ss.str()); - } + data.ReadString(fileName); + UniqueFd fd(data.ReadFileDescriptor()); + int res = AppFileReady(fileName, move(fd), 0); + reply.WriteInt32(res); return BError(BError::Codes::OK); } int32_t ServiceStub::CmdAppDone(MessageParcel &data, MessageParcel &reply) { ErrCode errCode; - if (!data.ReadInt32(errCode)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive errCode"); - } + data.ReadInt32(errCode); int res = AppDone(errCode); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::SA_BROKEN_IPC, ss.str()); - } + reply.WriteInt32(res); return BError(BError::Codes::OK); } int32_t ServiceStub::CmdResultReport(MessageParcel &data, MessageParcel &reply) { std::string restoreRetInfo; + data.ReadString(restoreRetInfo); int32_t scenario; + data.ReadInt32(scenario); ErrCode errCode; - if (!data.ReadString(restoreRetInfo)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive restoreRetInfo"); - } - if (!data.ReadInt32(scenario)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive scenario"); - } - BackupRestoreScenario secenrioInfo = static_cast(scenario); - if (!data.ReadInt32(errCode)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive errCode"); - } - int res = ServiceResultReport(restoreRetInfo, secenrioInfo, errCode); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::SA_BROKEN_IPC, ss.str()); - } + data.ReadInt32(errCode); + BackupRestoreScenario type = static_cast(scenario); + int res = ServiceResultReport(restoreRetInfo, type, errCode); + reply.WriteInt32(res); return BError(BError::Codes::OK); } int32_t ServiceStub::CmdGetFileHandle(MessageParcel &data, MessageParcel &reply) { string bundleName; - if (!data.ReadString(bundleName)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive bundleName").GetCode(); - } + data.ReadString(bundleName); string fileName; - if (!data.ReadString(fileName)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive fileName").GetCode(); - } + data.ReadString(fileName); return GetFileHandle(bundleName, fileName); } @@ -349,129 +192,55 @@ int32_t ServiceStub::CmdGetFileHandle(MessageParcel &data, MessageParcel &reply) int32_t ServiceStub::CmdAppendBundlesRestoreSession(MessageParcel &data, MessageParcel &reply) { UniqueFd fd(data.ReadFileDescriptor()); - if (fd < 0) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive fd"); - } - - vector bundleNames; - if (!data.ReadStringVector(&bundleNames)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive bundleNames"); - } - int32_t type; - if (!data.ReadInt32(type)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive restoreType"); - } - RestoreTypeEnum restoreType = static_cast(type); - int32_t userId; - if (!data.ReadInt32(userId)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive userId"); - } - - int res = AppendBundlesRestoreSession(move(fd), bundleNames, restoreType, userId); - if (!reply.WriteInt32(res)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to send the result ") + to_string(res)); - } + std::vector bundleNames; + data.ReadStringVector(&bundleNames); + int res = AppendBundlesRestoreSession(move(fd), bundleNames); + reply.WriteInt32(res); return BError(BError::Codes::OK); } int32_t ServiceStub::CmdAppendBundlesDetailsRestoreSession(MessageParcel &data, MessageParcel &reply) { UniqueFd fd(data.ReadFileDescriptor()); - if (fd < 0) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive fd"); - } - - vector bundleNames; - if (!data.ReadStringVector(&bundleNames)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive bundleNames"); - } - vector detailInfos; - if (!data.ReadStringVector(&detailInfos)) { - HILOGE("Failed to receive bundle detailInfos"); - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive detailInfos"); - } - int32_t type; - if (!data.ReadInt32(type)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive restoreType"); - } - RestoreTypeEnum restoreType = static_cast(type); - int32_t userId; - if (!data.ReadInt32(userId)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive userId"); - } - - int res = AppendBundlesRestoreSession(move(fd), bundleNames, detailInfos, restoreType, userId); - if (!reply.WriteInt32(res)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to send the result ") + to_string(res)); - } + std::vector bundleNames; + data.ReadStringVector(&bundleNames); + std::vector detailInfos; + data.ReadStringVector(&detailInfos); + int res = AppendBundlesRestoreSession(move(fd), bundleNames, detailInfos); + reply.WriteInt32(res); return BError(BError::Codes::OK); } int32_t ServiceStub::CmdAppendBundlesBackupSession(MessageParcel &data, MessageParcel &reply) { - vector bundleNames; - if (!data.ReadStringVector(&bundleNames)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive bundleNames"); - } - - int32_t res = AppendBundlesBackupSession(bundleNames); - if (!reply.WriteInt32(res)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to send the result ") + to_string(res)); - } - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdAppendBundlesDetailsBackupSession(MessageParcel &data, MessageParcel &reply) -{ - vector bundleNames; - if (!data.ReadStringVector(&bundleNames)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive bundleNames"); - } - - vector detailInfos; - if (!data.ReadStringVector(&detailInfos)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive detailInfos"); - } - - int32_t res = AppendBundlesDetailsBackupSession(bundleNames, detailInfos); - if (!reply.WriteInt32(res)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to send the result ") + to_string(res)); - } + std::vector bundleNames; + data.ReadStringVector(&bundleNames); + int res = AppendBundlesBackupSession(bundleNames); + reply.WriteInt32(res); return BError(BError::Codes::OK); } int32_t ServiceStub::CmdFinish(MessageParcel &data, MessageParcel &reply) { int res = Finish(); - if (!reply.WriteInt32(res)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to send the result ") + to_string(res)); - } + reply.WriteInt32(res); return BError(BError::Codes::OK); } int32_t ServiceStub::CmdGetBackupInfo(MessageParcel &data, MessageParcel &reply) { - HILOGI("ServiceStub::CmdGetBackupInfo Begin."); int ret = ERR_OK; string bundleName; if (!data.ReadString(bundleName)) { return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to recive bundleName")); } - string result; + std::string result; ret = GetBackupInfo(bundleName, result); - if (ret != ERR_OK) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to call GetBackupInfo")); - } - if (!reply.WriteString(result)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to write result")); - } - HILOGI("ServiceStub::CmdGetBackupInfo end."); - return BError(BError::Codes::OK); + return ret; } int32_t ServiceStub::CmdUpdateTimer(MessageParcel &data, MessageParcel &reply) { - HILOGI("ServiceStub::CmdUpdateTimer Begin."); int ret = ERR_OK; string bundleName; if (!data.ReadString(bundleName)) { @@ -483,19 +252,11 @@ int32_t ServiceStub::CmdUpdateTimer(MessageParcel &data, MessageParcel &reply) } bool result; ret = UpdateTimer(bundleName, timeout, result); - if (ret != ERR_OK) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to call UpdateTimer")); - } - if (!reply.WriteBool(result)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to write result")); - } - HILOGI("ServiceStub::CmdUpdateTimer end."); return BError(BError::Codes::OK); } int32_t ServiceStub::CmdUpdateSendRate(MessageParcel &data, MessageParcel &reply) { - HILOGI("ServiceStub::CmdUpdateSendRate Begin."); int ret = ERR_OK; string bundleName; if (!data.ReadString(bundleName)) { @@ -507,352 +268,81 @@ int32_t ServiceStub::CmdUpdateSendRate(MessageParcel &data, MessageParcel &reply } bool result; ret = UpdateSendRate(bundleName, sendRate, result); - if (ret != ERR_OK) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to call UpdateSendRate")); - } - if (!reply.WriteBool(result)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to write result")); - } - HILOGI("ServiceStub::CmdUpdateSendRate end."); return BError(BError::Codes::OK); } -int32_t ServiceStub::CmdStartExtTimer(MessageParcel &data, MessageParcel &reply) +int32_t ServiceStub::CmdRelease(MessageParcel &data, MessageParcel &reply) { - HILOGI("ServiceStub::CmdStartExtTimer Begin."); - int ret = ERR_OK; - bool isExtStart; - ret = StartExtTimer(isExtStart); - if (ret != ERR_OK) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to call UpdateTimer")); - } - if (!reply.WriteBool(isExtStart)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to write result")); - } - HILOGI("ServiceStub::CmdStartExtTimer end."); + int res = Release(); + reply.WriteInt32(res); return BError(BError::Codes::OK); } -int32_t ServiceStub::CmdStartFwkTimer(MessageParcel &data, MessageParcel &reply) +int32_t ServiceStub::CmdCancel(MessageParcel &data, MessageParcel &reply) { - HILOGI("ServiceStub::CmdStartFwkTimer Begin."); int ret = ERR_OK; - bool isFwkStart; - ret = StartFwkTimer(isFwkStart); - if (ret != ERR_OK) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to call UpdateTimer")); - } - if (!reply.WriteBool(isFwkStart)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to write result")); - } - HILOGI("ServiceStub::CmdStartFwkTimer end."); - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdRelease(MessageParcel &data, MessageParcel &reply) -{ - int res = Release(); - if (!reply.WriteInt32(res)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to send the result ") + to_string(res)); + string bundleName; + if (!data.ReadString(bundleName)) { + return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive bundleName"); } - return BError(BError::Codes::OK); + int result = BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK; + ret = Cancel(bundleName, result); + reply.WriteInt32(result); + return ret; } int32_t ServiceStub::CmdGetLocalCapabilitiesIncremental(MessageParcel &data, MessageParcel &reply) { - vector bundleNames; - if (!ReadParcelableVector(bundleNames, data)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive bundleNames"); - } - - UniqueFd fd(GetLocalCapabilitiesIncremental(bundleNames)); - if (!reply.WriteFileDescriptor(fd)) { - return BError(BError::Codes::SA_BROKEN_IPC, "Failed to send out the file"); - } return BError(BError::Codes::OK); } int32_t ServiceStub::CmdGetAppLocalListAndDoIncrementalBackup(MessageParcel &data, MessageParcel &reply) { - int32_t res = GetAppLocalListAndDoIncrementalBackup(); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::SA_BROKEN_IPC, ss.str()); - } return BError(BError::Codes::OK); } int32_t ServiceStub::CmdInitIncrementalBackupSession(MessageParcel &data, MessageParcel &reply) { - auto remote = data.ReadRemoteObject(); - if (!remote) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive the reverse stub"); - } - auto iremote = iface_cast(remote); - if (!iremote) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive the reverse stub"); - } - - int32_t res = InitIncrementalBackupSession(iremote); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::SA_BROKEN_IPC, ss.str()); - } - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdInitIncrementalBackupSessionMsg(MessageParcel &data, MessageParcel &reply) -{ - auto remote = data.ReadRemoteObject(); - std::string errMsg; - if (!remote) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive the reverse stub"); - } - auto iRemote = iface_cast(remote); - if (!iRemote) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive the reverse stub"); - } - int32_t res = InitIncrementalBackupSession(iRemote, errMsg); - if (!reply.WriteString(errMsg)) { - return BError(BError::Codes::SA_BROKEN_IPC, "Failed to send the errMsg"); - } - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::SA_BROKEN_IPC, ss.str()); - } return BError(BError::Codes::OK); } int32_t ServiceStub::CmdAppendBundlesIncrementalBackupSession(MessageParcel &data, MessageParcel &reply) { - vector bundlesToBackup; - if (!ReadParcelableVector(bundlesToBackup, data)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive bundleNames"); - } - - int32_t res = AppendBundlesIncrementalBackupSession(bundlesToBackup); - if (!reply.WriteInt32(res)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to send the result ") + to_string(res)); - } return BError(BError::Codes::OK); } int32_t ServiceStub::CmdAppendBundlesDetailsIncrementalBackupSession(MessageParcel &data, MessageParcel &reply) { - vector bundlesToBackup; - if (!ReadParcelableVector(bundlesToBackup, data)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive bundleNames"); - } - std::vector infos; - if (!data.ReadStringVector(&infos)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive infos"); - } - int32_t res = AppendBundlesIncrementalBackupSession(bundlesToBackup, infos); - if (!reply.WriteInt32(res)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to send the result ") + to_string(res)); - } return BError(BError::Codes::OK); } int32_t ServiceStub::CmdPublishIncrementalFile(MessageParcel &data, MessageParcel &reply) { - unique_ptr fileInfo(data.ReadParcelable()); - if (!fileInfo) { - return BError(BError::Codes::SA_BROKEN_IPC, "Failed to receive fileInfo"); - } - int res = PublishIncrementalFile(*fileInfo); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::SA_BROKEN_IPC, ss.str()); - } - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdPublishSAIncrementalFile(MessageParcel &data, MessageParcel &reply) -{ - unique_ptr fileInfo(data.ReadParcelable()); - if (!fileInfo) { - return BError(BError::Codes::SA_BROKEN_IPC, "Failed to receive fileInfo"); - } - UniqueFd fd(data.ReadFileDescriptor()); - int res = PublishSAIncrementalFile(*fileInfo, move(fd)); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::SA_BROKEN_IPC, ss.str()); - } return BError(BError::Codes::OK); } int32_t ServiceStub::CmdAppIncrementalFileReady(MessageParcel &data, MessageParcel &reply) { - string fileName; - if (!data.ReadString(fileName)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive fileName"); - } - bool fdFlag = data.ReadBool(); - UniqueFd fd = UniqueFd(INVALID_FD); - UniqueFd manifestFd = UniqueFd(INVALID_FD); - if (fdFlag == true) { - fd = UniqueFd(data.ReadFileDescriptor()); - if (fd < 0) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive fd"); - } - - manifestFd = UniqueFd(data.ReadFileDescriptor()); - if (manifestFd < 0) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive manifestFd"); - } - } - int32_t errCode = data.ReadInt32(); - - int res = AppIncrementalFileReady(fileName, move(fd), move(manifestFd), errCode); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::SA_BROKEN_IPC, ss.str()); - } - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdAppIncrementalDone(MessageParcel &data, MessageParcel &reply) -{ - int32_t ret; - if (!data.ReadInt32(ret)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive bool flag"); - } - int res = AppIncrementalDone(ret); - if (!reply.WriteInt32(res)) { - stringstream ss; - ss << "Failed to send the result " << res; - return BError(BError::Codes::SA_BROKEN_IPC, ss.str()); - } return BError(BError::Codes::OK); } int32_t ServiceStub::CmdGetIncrementalFileHandle(MessageParcel &data, MessageParcel &reply) { - string bundleName; - if (!data.ReadString(bundleName)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive bundleName").GetCode(); - } - string fileName; - if (!data.ReadString(fileName)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive fileName").GetCode(); - } - return GetIncrementalFileHandle(bundleName, fileName); + return BError(BError::Codes::OK); } int32_t ServiceStub::CmdReportAppProcessInfo(MessageParcel &data, MessageParcel &reply) { - string processInfo; - if (!data.ReadString(processInfo)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive bundleName").GetCode(); - } - int32_t scenario; - if (!data.ReadInt32(scenario)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive errCode"); - } - BackupRestoreScenario secenrioInfo = static_cast(scenario); - return ReportAppProcessInfo(processInfo, secenrioInfo); + return BError(BError::Codes::OK); } int32_t ServiceStub::CmdStopExtTimer(MessageParcel &data, MessageParcel &reply) { - HILOGI("ServiceStub::CmdStopExtTimer Begin."); - bool isExtStop; - auto ret = StopExtTimer(isExtStop); - if (ret != ERR_OK) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to call StopExtTimer")); - } - if (!reply.WriteBool(isExtStop)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to write result")); - } - HILOGI("ServiceStub::CmdStopExtTimer end."); return BError(BError::Codes::OK); } int32_t ServiceStub::CmdRefreshDataSize(MessageParcel &data, MessageParcel &reply) { - HILOGI("ServiceStub::CmdRefreshDataSize Begin."); - int64_t totalDatasize = 0; - if (!data.ReadInt64(totalDatasize)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive totalDatasize").GetCode(); - } - auto ret = RefreshDataSize(totalDatasize); - if (ret != ERR_OK) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to receive totalDatasize")); - } - bool ifRefreshSuccess = true; - if (!reply.WriteBool(ifRefreshSuccess)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to write result")); - } - HILOGI("ServiceStub::CmdRefreshDataSize end."); return BError(BError::Codes::OK); } - -template -bool ServiceStub::ReadParcelableVector(std::vector &parcelableInfos, MessageParcel &data) -{ - int32_t infoSize = 0; - if (!data.ReadInt32(infoSize)) { - HILOGE("Failed to read Parcelable size."); - return false; - } - - parcelableInfos.clear(); - infoSize = (infoSize < BConstants::MAX_PARCELABLE_VECTOR_NUM) ? infoSize : BConstants::MAX_PARCELABLE_VECTOR_NUM; - for (int32_t index = 0; index < infoSize; index++) { - sptr info = data.ReadParcelable(); - if (info == nullptr) { - HILOGE("Failed to read Parcelable infos."); - return false; - } - parcelableInfos.emplace_back(move(*info)); - } - - return true; -} - -int32_t ServiceStub::CmdCancel(MessageParcel &data, MessageParcel &reply) -{ - HILOGI("ServiceStub::CmdCancel Begin."); - string bundleName; - if (!data.ReadString(bundleName)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive bundleName").GetCode(); - } - int result = BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK; - ErrCode res = Cancel(bundleName, result); - if (!reply.WriteInt32(result)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to send the result ") + to_string(res)); - } - return res; -} - -int32_t ServiceStub::CmdGetLocalCapabilitiesForBdInfos(MessageParcel &data, MessageParcel &reply) -{ - UniqueFd fd(GetLocalCapabilitiesForBundleInfos()); - if (!reply.WriteFileDescriptor(fd)) { - return BError(BError::Codes::SA_BROKEN_IPC, "Failed to send out the file"); - } - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdGetBackupDataSize(MessageParcel &data, MessageParcel &reply) -{ - HILOGI("ServiceStub CmdGetBackupDataSize Begin."); - bool isPreciseScan = true; - isPreciseScan = data.ReadBool(); - vector bundleNameList; - if (!ReadParcelableVector(bundleNameList, data)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive bundleNames"); - } - auto ret = GetBackupDataSize(isPreciseScan, bundleNameList); - HILOGI("ServiceStub GetBackupDataSize End ret = %{public}d", ret); - return ret; -} } // namespace OHOS::FileManagement::Backup diff --git a/tests/mock/module_ipc/service_mock.cpp b/tests/mock/module_ipc/service_mock.cpp index 547ce256218178fcce43f40f0b7fdfdee8e71f48..3d56ba0ebea255932d7f2e5ccb0caf038de88103 100644 --- a/tests/mock/module_ipc/service_mock.cpp +++ b/tests/mock/module_ipc/service_mock.cpp @@ -35,39 +35,70 @@ void Service::OnStart() {} void Service::OnStop() {} -UniqueFd Service::GetLocalCapabilities() +ErrCode Service::GetLocalCapabilitiesForBundleInfos(int32_t& fd) { - return UniqueFd(-1); + return BError(BError::Codes::OK); } - -UniqueFd Service::GetLocalCapabilitiesForBundleInfos() +ErrCode Service::InitBackupSessionWithErrMsg(sptr& remote, std::string &errMsg) { - return UniqueFd(-1); + return BError(BError::Codes::OK); } -void Service::StopAll(const wptr &obj, bool force) {} +ErrCode Service::InitRestoreSessionWithErrMsg(sptr& reverseIpcRemoteObject,std::string& errMsg) +{ + return BError(BError::Codes::OK); +} -ErrCode Service::VerifyCallerAndGetCallerName(std::string &bundleName) +ErrCode Service:: AppendBundlesRestoreSessionRestoreDataWaitSend(int32_t fd,const std::vector& bundleNames, + const std::vector& detailInfos, + int32_t restoreType, + int32_t userId) { return BError(BError::Codes::OK); } -ErrCode Service::InitRestoreSession(sptr remote) +ErrCode Service::AppendBundlesRestoreSessionRestoreDataWaitReady(int32_t fd,const std::vector& bundleNames, + int32_t restoreType, + int32_t userId) +{ + return BError(BError::Codes::OK); +} +ErrCode Service:: AppendBundlesIncrementalBackupSessionWithBundleInfos(const std::vector& bundlesToBackup, + const std::vector& bundleInfos) +{ +return BError(BError::Codes::OK); +} + +ErrCode Service::GetLocalCapabilitiesWithUniqueFd(int32_t& fd) { + fd=-1; return BError(BError::Codes::OK); } -ErrCode Service::InitRestoreSession(sptr remote, std::string &errMsg) + +UniqueFd Service::GetLocalCapabilities() +{ + return UniqueFd(-1); +} + +UniqueFd Service::GetLocalCapabilitiesForBundleInfos() +{ + return UniqueFd(-1); +} + +void Service::StopAll(const wptr &obj, bool force) {} + +ErrCode Service::VerifyCallerAndGetCallerName(std::string &bundleName) { return BError(BError::Codes::OK); } -ErrCode Service::InitBackupSession(sptr remote) +ErrCode Service::InitRestoreSession(sptr& remote) { return BError(BError::Codes::OK); } -ErrCode Service::InitBackupSession(sptr remote, std::string &errMsg) +ErrCode Service::InitBackupSession(sptr& remote) { return BError(BError::Codes::OK); } @@ -82,7 +113,7 @@ ErrCode Service::PublishFile(const BFileInfo &fileInfo) return BError(BError::Codes::OK); } -ErrCode Service::AppFileReady(const string &fileName, UniqueFd fd, int32_t errCode) +ErrCode Service::AppFileReady(const string &fileName, int32_t fd, int32_t errCode) { return BError(BError::Codes::OK); } @@ -92,7 +123,7 @@ ErrCode Service::AppDone(ErrCode errCode) return BError(BError::Codes::OK); } -ErrCode Service::ServiceResultReport(const std::string restoreRetInfo, +ErrCode Service::ServiceResultReport(const std::string& restoreRetInfo, BackupRestoreScenario sennario, ErrCode errCode) { return BError(BError::Codes::OK); @@ -168,7 +199,7 @@ ErrCode Service::VerifyCaller() return BError(BError::Codes::OK); } -ErrCode Service::VerifyCaller(IServiceReverse::Scenario scenario) +ErrCode Service::VerifyCaller(IServiceReverseType::Scenario scenario) { return BError(BError::Codes::OK); } @@ -186,28 +217,29 @@ ErrCode Service::Release() return BError(BError::Codes::OK); } -ErrCode Service::Cancel(std::string bundleName, int32_t &result) +ErrCode Service::Cancel(const std::string& bundleName, int32_t &result) { result = BError(BError::Codes::OK); return BError(BError::Codes::OK); } -UniqueFd Service::GetLocalCapabilitiesIncremental(const std::vector &bundleNames) +ErrCode Service::GetLocalCapabilitiesIncremental(const std::vector &bundleNames,int32_t& fd) { - return UniqueFd(-1); + return BError(BError::Codes::OK); } + ErrCode Service::GetAppLocalListAndDoIncrementalBackup() { return BError(BError::Codes::OK); } -ErrCode Service::InitIncrementalBackupSession(sptr remote) +ErrCode Service::InitIncrementalBackupSession(sptr& remote) { return BError(BError::Codes::OK); } -ErrCode Service::InitIncrementalBackupSession(sptr remote, std::string &errMsg) +ErrCode Service::InitIncrementalBackupSessionWithErrMsg(sptr& remote, std::string &errMsg) { return BError(BError::Codes::OK); } @@ -228,12 +260,15 @@ ErrCode Service::PublishIncrementalFile(const BFileInfo &fileInfo) return BError(BError::Codes::OK); } -ErrCode Service::PublishSAIncrementalFile(const BFileInfo &fileInfo, UniqueFd fd) +ErrCode Service::PublishSAIncrementalFile(const BFileInfo &fileInfo, int32_t fd) { return BError(BError::Codes::OK); } -ErrCode Service::AppIncrementalFileReady(const string &fileName, UniqueFd fd, UniqueFd manifestFd, int32_t errCode) +ErrCode Service::AppIncrementalFileReady( const std::string& fileName, + int32_t fd, + int32_t manifestFd, + int32_t appIncrementalFileReadyErrCode) { return BError(BError::Codes::OK); } @@ -248,7 +283,7 @@ ErrCode Service::GetIncrementalFileHandle(const string &bundleName, const string return BError(BError::Codes::OK); } -ErrCode Service::GetBackupInfo(BundleName &bundleName, std::string &result) +ErrCode Service::GetBackupInfo(BundleName &bundleName, std::string &result) { return BError(BError::Codes::OK); } @@ -283,7 +318,7 @@ ErrCode Service::UpdateSendRate(std::string &bundleName, int32_t sendRate, bool return BError(BError::Codes::OK); } -ErrCode Service::ReportAppProcessInfo(const std::string processInfo, const BackupRestoreScenario sennario) +ErrCode Service::ReportAppProcessInfo(const std::string & processInfo, const BackupRestoreScenario sennario) { return BError(BError::Codes::OK); } @@ -317,16 +352,16 @@ void Service::HandleExceptionOnAppendBundles(sptr session, const vector &appendBundleNames, const vector &restoreBundleNames) {} void Service::BundleBeginRadarReport(const std::string &bundleName, const ErrCode errCode, - const IServiceReverse::Scenario scenario) {} + const IServiceReverseType::Scenario scenario) {} void Service::BundleEndRadarReport(const std::string &bundleName, ErrCode errCode, - const IServiceReverse::Scenario scenario) {} + const IServiceReverseType::Scenario scenario) {} void Service::FileReadyRadarReport(const std::string &bundleName, const std::string &fileName, const ErrCode errCode, - const IServiceReverse::Scenario scenario) {} + const IServiceReverseType::Scenario scenario) {} void Service::ExtensionConnectFailRadarReport(const std::string &bundleName, const ErrCode errCode, - const IServiceReverse::Scenario scenario) {} + const IServiceReverseType::Scenario scenario) {} void Service::PermissionCheckFailRadar(const std::string &info, const std::string &func) {} @@ -384,7 +419,7 @@ void Service::CallOnBundleEndByScenario(const std::string &bundleName, BackupRes void Service::SetUserIdAndRestoreType(RestoreTypeEnum restoreType, int32_t userId) {} -ErrCode Service::GetBackupDataSize(bool isPreciseScan, vector bundleNameList) +ErrCode Service::GetBackupDataSize(bool isPreciseScan, const std::vector & bundleNameList) { return BError(BError::Codes::OK); } diff --git a/tests/mock/module_ipc/service_reverse_proxy_mock.cpp b/tests/mock/module_ipc/service_reverse_proxy_mock.cpp index ee7e924e040e6393b37e09aa80f5535726eec329..26198b03cabadb0996680241dc53db6a1e9cffbe 100644 --- a/tests/mock/module_ipc/service_reverse_proxy_mock.cpp +++ b/tests/mock/module_ipc/service_reverse_proxy_mock.cpp @@ -13,64 +13,142 @@ * limitations under the License. */ -#include "module_ipc/service_reverse_proxy.h" +#include "service_reverse_proxy.h" #include "b_error/b_error.h" namespace OHOS::FileManagement::Backup { using namespace std; -void ServiceReverseProxy::BackupOnFileReady(string bundleName, string fileName, int fd, int32_t errCode) {} - -void ServiceReverseProxy::BackupOnBundleStarted(int32_t errCode, string bundleName) {} - -void ServiceReverseProxy::BackupOnResultReport(string result, std::string bundleName) {} - -void ServiceReverseProxy::BackupOnBundleFinished(int32_t errCode, string bundleName) {} - -void ServiceReverseProxy::BackupOnAllBundlesFinished(int32_t errCode) {} - -void ServiceReverseProxy::BackupOnProcessInfo(std::string bundleName, std::string processInfo) {} - -void ServiceReverseProxy::BackupOnScanningInfo(std::string scannedInfo) {} - -void ServiceReverseProxy::RestoreOnBundleStarted(int32_t errCode, string bundleName) {} - -void ServiceReverseProxy::RestoreOnBundleFinished(int32_t errCode, string bundleName) {} - -void ServiceReverseProxy::RestoreOnAllBundlesFinished(int32_t errCode) {} - -void ServiceReverseProxy::RestoreOnFileReady(string bundleName, string fileName, int fd, int32_t errCode) {} - -void ServiceReverseProxy::RestoreOnResultReport(string result, string bundleName, ErrCode errCode) {} - -void ServiceReverseProxy::RestoreOnProcessInfo(std::string bundleName, std::string processInfo) {} - -void ServiceReverseProxy::IncrementalBackupOnFileReady(string bundleName, string fileName, int fd, int manifestFd, - int32_t errCode) {} - -void ServiceReverseProxy::IncrementalBackupOnBundleStarted(int32_t errCode, string bundleName) {} - -void ServiceReverseProxy::IncrementalBackupOnResultReport(string result, std::string bundleName) {} - -void ServiceReverseProxy::IncrementalBackupOnBundleFinished(int32_t errCode, string bundleName) {} - -void ServiceReverseProxy::IncrementalBackupOnAllBundlesFinished(int32_t errCode) {} - -void ServiceReverseProxy::IncrementalBackupOnProcessInfo(std::string bundleName, std::string processInfo) {} - -void ServiceReverseProxy::IncrementalBackupOnScanningInfo(std::string scannedInfo) {} - -void ServiceReverseProxy::IncrementalRestoreOnBundleStarted(int32_t errCode, string bundleName) {} - -void ServiceReverseProxy::IncrementalRestoreOnBundleFinished(int32_t errCode, string bundleName) {} - -void ServiceReverseProxy::IncrementalRestoreOnAllBundlesFinished(int32_t errCode) {} - -void ServiceReverseProxy::IncrementalRestoreOnFileReady(string bundleName, string fileName, int fd, int manifestFd, - int32_t errCode) {} - -void ServiceReverseProxy::IncrementalRestoreOnResultReport(string result, string bundleName, ErrCode errCode) {} - -void ServiceReverseProxy::IncrementalRestoreOnProcessInfo(std::string bundleName, std::string processInfo) {} +ErrCode ServiceReverseProxy::BackupOnFileReady(const std::string& bundleName, const std::string& fileName, int fd, int32_t errCode) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::BackupOnBundleStarted(int32_t errCode, const std::string& bundleName) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::BackupOnResultReport(const std::string& result, const std::string& bundleName) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::BackupOnBundleFinished(int32_t errCode, const std::string& bundleName) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::BackupOnAllBundlesFinished(int32_t errCode) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::BackupOnProcessInfo(const std::string& bundleName, const std::string& processInfo) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::BackupOnScanningInfo(const std::string& scannedInfo) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::RestoreOnBundleStarted(int32_t errCode, const std::string& bundleName) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::RestoreOnBundleFinished(int32_t errCode, const std::string& bundleName) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::RestoreOnAllBundlesFinished(int32_t errCode) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::RestoreOnFileReady(const std::string& bundleName, const std::string& fileName, int32_t fd, int32_t errCode) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::RestoreOnResultReport(const std::string& result, const std::string& bundleName, int32_t errCode) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::RestoreOnProcessInfo(const std::string& bundleName, const std::string& processInfo) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::IncrementalBackupOnFileReady(const std::string& bundleName, const std::string& fileName, int fd, int manifestFd, + int32_t errCode) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::IncrementalBackupOnBundleStarted(int32_t errCode, const std::string& bundleName) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::IncrementalBackupOnResultReport(const std::string& result, const std::string& bundleName) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::IncrementalBackupOnBundleFinished(int32_t errCode, const std::string& bundleName) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::IncrementalBackupOnAllBundlesFinished(int32_t errCode) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::IncrementalBackupOnProcessInfo(const std::string& bundleName, const std::string& processInfo) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::IncrementalBackupOnScanningInfo(const std::string& scannedInfo) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::IncrementalRestoreOnBundleStarted(int32_t errCode, const std::string& bundleName) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::IncrementalRestoreOnBundleFinished(int32_t errCode, const std::string& bundleName) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::IncrementalRestoreOnAllBundlesFinished(int32_t errCode) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::IncrementalRestoreOnFileReady(const std::string& bundleName, const std::string& fileName, int32_t fd, int32_t manifestFd, + int32_t errCode) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::IncrementalRestoreOnResultReport(const std::string& result, const std::string& bundleName, int32_t errCode) +{ + return BError(BError::Codes::OK); +} + +ErrCode ServiceReverseProxy::IncrementalRestoreOnProcessInfo(const std::string& bundleName,const std::string& processInfo) +{ + return BError(BError::Codes::OK); +} } // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/tests/mock/module_ipc/service_stub_mock.cpp b/tests/mock/module_ipc/service_stub_mock.cpp index 8a3c066a8b4c34d66e4f038642daf42a78cb8653..99db9e636854c427cfacc9087bea6c0b78439148 100644 --- a/tests/mock/module_ipc/service_stub_mock.cpp +++ b/tests/mock/module_ipc/service_stub_mock.cpp @@ -13,384 +13,522 @@ * limitations under the License. */ -#include "module_ipc/service_stub.h" - -#include - -#include "b_error/b_error.h" -#include "b_resources/b_constants.h" -#include "module_ipc/service_reverse_proxy.h" - +#include "service_stub.h" namespace OHOS::FileManagement::Backup { using namespace std; -ServiceStub::ServiceStub() -{ - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_FINISH)] = &ServiceStub::CmdFinish; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_RELSEASE_SESSION)] = - &ServiceStub::CmdRelease; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_RESTORE_SESSION)] = - &ServiceStub::CmdInitRestoreSession; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_BACKUP_SESSION)] = - &ServiceStub::CmdInitBackupSession; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_LOCAL_CAPABILITIES)] = - &ServiceStub::CmdGetLocalCapabilities; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APP_FILE_READY)] = - &ServiceStub::CmdAppFileReady; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_PUBLISH_FILE)] = - &ServiceStub::CmdPublishFile; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APP_DONE)] = &ServiceStub::CmdAppDone; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_START)] = &ServiceStub::CmdStart; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_FILE_NAME)] = - &ServiceStub::CmdGetFileHandle; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_RESTORE_SESSION)] = - &ServiceStub::CmdAppendBundlesRestoreSession; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_RESTORE_SESSION_DETAIL)] = - &ServiceStub::CmdAppendBundlesDetailsRestoreSession; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_BACKUP_SESSION)] = - &ServiceStub::CmdAppendBundlesBackupSession; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_LOCAL_CAPABILITIES_INCREMENTAL)] = - &ServiceStub::CmdGetLocalCapabilitiesIncremental; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_INCREMENTAL_BACKUP_SESSION)] = - &ServiceStub::CmdInitIncrementalBackupSession; - opToInterfaceMap_[static_cast( - IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_INCREMENTAL_BACKUP_SESSION_DETAILS)] = - &ServiceStub::CmdAppendBundlesDetailsIncrementalBackupSession; - opToInterfaceMap_[static_cast( - IServiceInterfaceCode::SERVICE_CMD_APPEND_BUNDLES_INCREMENTAL_BACKUP_SESSION)] = - &ServiceStub::CmdAppendBundlesIncrementalBackupSession; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_PUBLISH_INCREMENTAL_FILE)] = - &ServiceStub::CmdPublishIncrementalFile; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_APP_INCREMENTAL_FILE_READY)] = - &ServiceStub::CmdAppIncrementalFileReady; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_INCREMENTAL_FILE_NAME)] = - &ServiceStub::CmdGetIncrementalFileHandle; - ServiceStubSupplement(); - opToInterfaceMap_[static_cast( - IServiceInterfaceCode::SERVICE_CMD_GET_APP_LOCAL_LIST_AND_DO_INCREMENTAL_BACKUP)] = - &ServiceStub::CmdGetAppLocalListAndDoIncrementalBackup; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_STOP_EXT_TIMER)] = - &ServiceStub::CmdStopExtTimer; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_REFRESH_DATA_SIZE)] = - &ServiceStub::CmdRefreshDataSize; -} - -void ServiceStub::ServiceStubSupplement() -{ - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_BACKUP_INFO)] = - &ServiceStub::CmdGetBackupInfo; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_UPDATE_TIMER)] = - &ServiceStub::CmdUpdateTimer; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_UPDATE_SENDRATE)] = - &ServiceStub::CmdUpdateSendRate; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_REPORT_APP_PROCESS_INFO)] = - &ServiceStub::CmdReportAppProcessInfo; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_RESTORE_SESSION_MSG)] = - &ServiceStub::CmdInitRestoreSessionMsg; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_BACKUP_SESSION_MSG)] = - &ServiceStub::CmdInitBackupSessionMsg; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_INIT_INCREMENTAL_BACKUP_SESSION_MSG)] = - &ServiceStub::CmdInitIncrementalBackupSessionMsg; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_CANCEL_BUNDLE)] = - &ServiceStub::CmdCancel; - opToInterfaceMap_[static_cast( - IServiceInterfaceCode::SERVICE_CMD_GET_LOCAL_CAPABILITIES_FOR_BUNDLE_INFOS)] = - &ServiceStub::CmdGetLocalCapabilitiesForBdInfos; - opToInterfaceMap_[static_cast(IServiceInterfaceCode::SERVICE_CMD_GET_BACKUP_DATA_SIZE)] = - &ServiceStub::CmdGetBackupDataSize; -} - -int32_t ServiceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) -{ - auto interfaceIndex = opToInterfaceMap_.find(code); - if (interfaceIndex == opToInterfaceMap_.end() || !interfaceIndex->second) { - return BError(BError::Codes::OK); - } - - const std::u16string descriptor = ServiceStub::GetDescriptor(); - const std::u16string remoteDescriptor = data.ReadInterfaceToken(); - if (descriptor != remoteDescriptor) { - return BError(BError::Codes::OK); - } - return (this->*(interfaceIndex->second))(data, reply); -} - -int32_t ServiceStub::CmdInitRestoreSession(MessageParcel &data, MessageParcel &reply) -{ - auto remote = data.ReadRemoteObject(); - auto iremote = iface_cast(remote); - - int32_t res = InitRestoreSession(iremote); - reply.WriteInt32(res); - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdInitRestoreSessionMsg(MessageParcel &data, MessageParcel &reply) -{ - auto remote = data.ReadRemoteObject(); - auto iremote = iface_cast(remote); - std::string errMsg; - int32_t res = InitRestoreSession(iremote, errMsg); - reply.WriteString(errMsg); - reply.WriteInt32(res); - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdInitBackupSession(MessageParcel &data, MessageParcel &reply) -{ - auto remote = data.ReadRemoteObject(); - auto iremote = iface_cast(remote); - - int res = InitBackupSession(iremote); - reply.WriteInt32(res); - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdInitBackupSessionMsg(MessageParcel &data, MessageParcel &reply) -{ - auto remote = data.ReadRemoteObject(); - auto iremote = iface_cast(remote); - std::string errMsg; - int res = InitBackupSession(iremote, errMsg); - reply.WriteString(errMsg); - reply.WriteInt32(res); - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdStart(MessageParcel &data, MessageParcel &reply) -{ - int res = Start(); - reply.WriteInt32(res); - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdGetLocalCapabilities(MessageParcel &data, MessageParcel &reply) -{ - UniqueFd fd(GetLocalCapabilities()); - reply.WriteFileDescriptor(fd); - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdPublishFile(MessageParcel &data, MessageParcel &reply) -{ - unique_ptr fileInfo(data.ReadParcelable()); - int res = PublishFile(*fileInfo); - reply.WriteInt32(res); - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdAppFileReady(MessageParcel &data, MessageParcel &reply) -{ - string fileName; - data.ReadString(fileName); - UniqueFd fd(data.ReadFileDescriptor()); - int res = AppFileReady(fileName, move(fd), 0); - reply.WriteInt32(res); - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdAppDone(MessageParcel &data, MessageParcel &reply) -{ - ErrCode errCode; - data.ReadInt32(errCode); - int res = AppDone(errCode); - reply.WriteInt32(res); - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdResultReport(MessageParcel &data, MessageParcel &reply) -{ - std::string restoreRetInfo; - data.ReadString(restoreRetInfo); - int32_t scenario; - data.ReadInt32(scenario); - ErrCode errCode; - data.ReadInt32(errCode); - BackupRestoreScenario type = static_cast(scenario); - int res = ServiceResultReport(restoreRetInfo, type, errCode); - reply.WriteInt32(res); - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdGetFileHandle(MessageParcel &data, MessageParcel &reply) -{ - string bundleName; - data.ReadString(bundleName); - string fileName; - data.ReadString(fileName); - - return GetFileHandle(bundleName, fileName); -} - -int32_t ServiceStub::CmdAppendBundlesRestoreSession(MessageParcel &data, MessageParcel &reply) -{ - UniqueFd fd(data.ReadFileDescriptor()); - std::vector bundleNames; - data.ReadStringVector(&bundleNames); - int res = AppendBundlesRestoreSession(move(fd), bundleNames); - reply.WriteInt32(res); - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdAppendBundlesDetailsRestoreSession(MessageParcel &data, MessageParcel &reply) -{ - UniqueFd fd(data.ReadFileDescriptor()); - std::vector bundleNames; - data.ReadStringVector(&bundleNames); - std::vector detailInfos; - data.ReadStringVector(&detailInfos); - int res = AppendBundlesRestoreSession(move(fd), bundleNames, detailInfos); - reply.WriteInt32(res); - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdAppendBundlesBackupSession(MessageParcel &data, MessageParcel &reply) -{ - std::vector bundleNames; - data.ReadStringVector(&bundleNames); - int res = AppendBundlesBackupSession(bundleNames); - reply.WriteInt32(res); - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdFinish(MessageParcel &data, MessageParcel &reply) +int32_t ServiceStub::OnRemoteRequest( + uint32_t code, + MessageParcel& data, + MessageParcel& reply, + MessageOption& option) { - int res = Finish(); - reply.WriteInt32(res); - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdGetBackupInfo(MessageParcel &data, MessageParcel &reply) -{ - int ret = ERR_OK; - string bundleName; - if (!data.ReadString(bundleName)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to recive bundleName")); - } - std::string result; - ret = GetBackupInfo(bundleName, result); - return ret; -} - -int32_t ServiceStub::CmdUpdateTimer(MessageParcel &data, MessageParcel &reply) -{ - int ret = ERR_OK; - string bundleName; - if (!data.ReadString(bundleName)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to recive bundleName")); - } - uint32_t timeout; - if (!data.ReadUint32(timeout)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to recive timeout")); + std::u16string localDescriptor = GetDescriptor(); + std::u16string remoteDescriptor = data.ReadInterfaceToken(); + if (localDescriptor != remoteDescriptor) { + return ERR_TRANSACTION_FAILED; } - bool result; - ret = UpdateTimer(bundleName, timeout, result); - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdUpdateSendRate(MessageParcel &data, MessageParcel &reply) -{ - int ret = ERR_OK; - string bundleName; - if (!data.ReadString(bundleName)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to recive bundleName")); - } - int32_t sendRate; - if (!data.ReadInt32(sendRate)) { - return BError(BError::Codes::SA_BROKEN_IPC, string("Failed to recive sendRate")); - } - bool result; - ret = UpdateSendRate(bundleName, sendRate, result); - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdRelease(MessageParcel &data, MessageParcel &reply) -{ - int res = Release(); - reply.WriteInt32(res); - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdCancel(MessageParcel &data, MessageParcel &reply) -{ - int ret = ERR_OK; - string bundleName; - if (!data.ReadString(bundleName)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive bundleName"); + switch (static_cast(code)) { + case IServiceIpcCode::COMMAND_INIT_RESTORE_SESSION: { + sptr reverseIpcRemoteObject; + ErrCode errCode = InitRestoreSession(reverseIpcRemoteObject); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + if (SUCCEEDED(errCode)) { + if (reverseIpcRemoteObject == nullptr) { + return ERR_INVALID_DATA; + } + if (!reply.WriteRemoteObject(reverseIpcRemoteObject->AsObject())) { + return ERR_INVALID_DATA; + } + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_INIT_BACKUP_SESSION: { + sptr reverseIpcRemoteObject; + ErrCode errCode = InitBackupSession(reverseIpcRemoteObject); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + if (SUCCEEDED(errCode)) { + if (reverseIpcRemoteObject == nullptr) { + return ERR_INVALID_DATA; + } + if (!reply.WriteRemoteObject(reverseIpcRemoteObject->AsObject())) { + return ERR_INVALID_DATA; + } + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_START: { + ErrCode errCode = Start(); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_GET_LOCAL_CAPABILITIES_WITH_UNIQUE_FD: { + int32_t fd; + ErrCode errCode = GetLocalCapabilitiesWithUniqueFd(fd); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + if (SUCCEEDED(errCode)) { + if (!reply.WriteInt32(fd)) { + return ERR_INVALID_DATA; + } + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_PUBLISH_FILE: { + std::unique_ptr fileInfo(data.ReadParcelable()); + if (!fileInfo) { + return ERR_INVALID_DATA; + } + + ErrCode errCode = PublishFile(*fileInfo); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_GET_FILE_HANDLE: { + std::string bundleName = Str16ToStr8(data.ReadString16()); + std::string fileName = Str16ToStr8(data.ReadString16()); + ErrCode errCode = GetFileHandle(bundleName, fileName); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_APPEND_BUNDLES_RESTORE_SESSION_RESTORE_DATA_WAIT_SEND: { + int32_t fd = data.ReadInt32(); + std::vector bundleNames; + int32_t bundleNamesSize = data.ReadInt32(); + if (bundleNamesSize > static_cast(VECTOR_MAX_SIZE)) { + return ERR_INVALID_DATA; + } + for (int32_t i1 = 0; i1 < bundleNamesSize; ++i1) { + std::string value1 = Str16ToStr8(data.ReadString16()); + bundleNames.push_back(value1); + } + std::vector detailInfos; + int32_t detailInfosSize = data.ReadInt32(); + if (detailInfosSize > static_cast(VECTOR_MAX_SIZE)) { + return ERR_INVALID_DATA; + } + for (int32_t i2 = 0; i2 < detailInfosSize; ++i2) { + std::string value2 = Str16ToStr8(data.ReadString16()); + detailInfos.push_back(value2); + } + int32_t restoreType = data.ReadInt32(); + int32_t userId = data.ReadInt32(); + ErrCode errCode = AppendBundlesRestoreSessionRestoreDataWaitSend(fd, bundleNames, detailInfos, restoreType, userId); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_APPEND_BUNDLES_RESTORE_SESSION_RESTORE_DATA_WAIT_READY: { + int32_t fd = data.ReadInt32(); + std::vector bundleNames; + int32_t bundleNamesSize = data.ReadInt32(); + if (bundleNamesSize > static_cast(VECTOR_MAX_SIZE)) { + return ERR_INVALID_DATA; + } + for (int32_t i3 = 0; i3 < bundleNamesSize; ++i3) { + std::string value3 = Str16ToStr8(data.ReadString16()); + bundleNames.push_back(value3); + } + int32_t restoreType = data.ReadInt32(); + int32_t userId = data.ReadInt32(); + ErrCode errCode = AppendBundlesRestoreSessionRestoreDataWaitReady(fd, bundleNames, restoreType, userId); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_APPEND_BUNDLES_BACKUP_SESSION: { + std::vector bundleNames; + int32_t bundleNamesSize = data.ReadInt32(); + if (bundleNamesSize > static_cast(VECTOR_MAX_SIZE)) { + return ERR_INVALID_DATA; + } + for (int32_t i4 = 0; i4 < bundleNamesSize; ++i4) { + std::string value4 = Str16ToStr8(data.ReadString16()); + bundleNames.push_back(value4); + } + ErrCode errCode = AppendBundlesBackupSession(bundleNames); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_APPEND_BUNDLES_DETAILS_BACKUP_SESSION: { + std::vector bundleNames; + int32_t bundleNamesSize = data.ReadInt32(); + if (bundleNamesSize > static_cast(VECTOR_MAX_SIZE)) { + return ERR_INVALID_DATA; + } + for (int32_t i5 = 0; i5 < bundleNamesSize; ++i5) { + std::string value5 = Str16ToStr8(data.ReadString16()); + bundleNames.push_back(value5); + } + std::vector bundleInfos; + int32_t bundleInfosSize = data.ReadInt32(); + if (bundleInfosSize > static_cast(VECTOR_MAX_SIZE)) { + return ERR_INVALID_DATA; + } + for (int32_t i6 = 0; i6 < bundleInfosSize; ++i6) { + std::string value6 = Str16ToStr8(data.ReadString16()); + bundleInfos.push_back(value6); + } + ErrCode errCode = AppendBundlesDetailsBackupSession(bundleNames, bundleInfos); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_FINISH: { + ErrCode errCode = Finish(); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_RELEASE: { + ErrCode errCode = Release(); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_CANCEL: { + std::string bundleName = Str16ToStr8(data.ReadString16()); + int32_t cancelResult; + ErrCode errCode = Cancel(bundleName, cancelResult); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + if (SUCCEEDED(errCode)) { + if (!reply.WriteInt32(cancelResult)) { + return ERR_INVALID_DATA; + } + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_GET_APP_LOCAL_LIST_AND_DO_INCREMENTAL_BACKUP: { + ErrCode errCode = GetAppLocalListAndDoIncrementalBackup(); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_GET_INCREMENTAL_FILE_HANDLE: { + std::string bundleName = Str16ToStr8(data.ReadString16()); + std::string fileName = Str16ToStr8(data.ReadString16()); + ErrCode errCode = GetIncrementalFileHandle(bundleName, fileName); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_GET_BACKUP_INFO: { + std::string bundleName; + std::string getBackupInfoResult; + ErrCode errCode = GetBackupInfo(bundleName, getBackupInfoResult); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + if (SUCCEEDED(errCode)) { + if (!reply.WriteString16(Str8ToStr16(bundleName))) { + return ERR_INVALID_DATA; + } + if (!reply.WriteString16(Str8ToStr16(getBackupInfoResult))) { + return ERR_INVALID_DATA; + } + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_UPDATE_TIMER: { + std::string bundleName; + uint32_t timeout = data.ReadUint32(); + bool updateTimerResult; + ErrCode errCode = UpdateTimer(bundleName, timeout, updateTimerResult); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + if (SUCCEEDED(errCode)) { + if (!reply.WriteString16(Str8ToStr16(bundleName))) { + return ERR_INVALID_DATA; + } + if (!reply.WriteInt32(updateTimerResult ? 1 : 0)) { + return ERR_INVALID_DATA; + } + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_UPDATE_SEND_RATE: { + std::string bundleName; + int32_t sendRate = data.ReadInt32(); + bool updateSendRateResult; + ErrCode errCode = UpdateSendRate(bundleName, sendRate, updateSendRateResult); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + if (SUCCEEDED(errCode)) { + if (!reply.WriteString16(Str8ToStr16(bundleName))) { + return ERR_INVALID_DATA; + } + if (!reply.WriteInt32(updateSendRateResult ? 1 : 0)) { + return ERR_INVALID_DATA; + } + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_START_EXT_TIMER: { + bool isExtStart; + ErrCode errCode = StartExtTimer(isExtStart); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + if (SUCCEEDED(errCode)) { + if (!reply.WriteInt32(isExtStart ? 1 : 0)) { + return ERR_INVALID_DATA; + } + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_START_FWK_TIMER: { + bool isFwkStart; + ErrCode errCode = StartFwkTimer(isFwkStart); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + if (SUCCEEDED(errCode)) { + if (!reply.WriteInt32(isFwkStart ? 1 : 0)) { + return ERR_INVALID_DATA; + } + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_STOP_EXT_TIMER: { + bool isExtStop; + ErrCode errCode = StopExtTimer(isExtStop); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + if (SUCCEEDED(errCode)) { + if (!reply.WriteInt32(isExtStop ? 1 : 0)) { + return ERR_INVALID_DATA; + } + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_GET_LOCAL_CAPABILITIES_INCREMENTAL: { + std::vector bundleNames; + int32_t bundleNamesSize = data.ReadInt32(); + if (bundleNamesSize > static_cast(VECTOR_MAX_SIZE)) { + return ERR_INVALID_DATA; + } + for (int32_t i7 = 0; i7 < bundleNamesSize; ++i7) { + std::unique_ptr value7(data.ReadParcelable()); + if (!value7) { + return ERR_INVALID_DATA; + } + + bundleNames.push_back(*value7); + } + int32_t fd; + ErrCode errCode = GetLocalCapabilitiesIncremental(bundleNames, fd); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + if (SUCCEEDED(errCode)) { + if (!reply.WriteInt32(fd)) { + return ERR_INVALID_DATA; + } + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_INIT_INCREMENTAL_BACKUP_SESSION: { + sptr reverseIpcRemoteObject; + ErrCode errCode = InitIncrementalBackupSession(reverseIpcRemoteObject); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + if (SUCCEEDED(errCode)) { + if (reverseIpcRemoteObject == nullptr) { + return ERR_INVALID_DATA; + } + if (!reply.WriteRemoteObject(reverseIpcRemoteObject->AsObject())) { + return ERR_INVALID_DATA; + } + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_APPEND_BUNDLES_INCREMENTAL_BACKUP_SESSION: { + std::vector bundlesToBackup; + int32_t bundlesToBackupSize = data.ReadInt32(); + if (bundlesToBackupSize > static_cast(VECTOR_MAX_SIZE)) { + return ERR_INVALID_DATA; + } + for (int32_t i8 = 0; i8 < bundlesToBackupSize; ++i8) { + std::unique_ptr value8(data.ReadParcelable()); + if (!value8) { + return ERR_INVALID_DATA; + } + + bundlesToBackup.push_back(*value8); + } + ErrCode errCode = AppendBundlesIncrementalBackupSession(bundlesToBackup); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_APPEND_BUNDLES_INCREMENTAL_BACKUP_SESSION_WITH_BUNDLE_INFOS: { + std::vector bundlesToBackup; + int32_t bundlesToBackupSize = data.ReadInt32(); + if (bundlesToBackupSize > static_cast(VECTOR_MAX_SIZE)) { + return ERR_INVALID_DATA; + } + for (int32_t i9 = 0; i9 < bundlesToBackupSize; ++i9) { + std::unique_ptr value9(data.ReadParcelable()); + if (!value9) { + return ERR_INVALID_DATA; + } + + bundlesToBackup.push_back(*value9); + } + std::vector bundleInfos; + int32_t bundleInfosSize = data.ReadInt32(); + if (bundleInfosSize > static_cast(VECTOR_MAX_SIZE)) { + return ERR_INVALID_DATA; + } + for (int32_t i10 = 0; i10 < bundleInfosSize; ++i10) { + std::string value10 = Str16ToStr8(data.ReadString16()); + bundleInfos.push_back(value10); + } + ErrCode errCode = AppendBundlesIncrementalBackupSessionWithBundleInfos(bundlesToBackup, bundleInfos); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_PUBLISH_INCREMENTAL_FILE: { + std::unique_ptr fileInfo(data.ReadParcelable()); + if (!fileInfo) { + return ERR_INVALID_DATA; + } + + ErrCode errCode = PublishIncrementalFile(*fileInfo); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_PUBLISH_S_A_INCREMENTAL_FILE: { + std::unique_ptr fileInfo(data.ReadParcelable()); + if (!fileInfo) { + return ERR_INVALID_DATA; + } + + int32_t fd = data.ReadInt32(); + ErrCode errCode = PublishSAIncrementalFile(*fileInfo, fd); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_APP_INCREMENTAL_FILE_READY: { + std::string fileName = Str16ToStr8(data.ReadString16()); + int32_t fd = data.ReadInt32(); + int32_t manifestFd = data.ReadInt32(); + int32_t appIncrementalFileReadyErrCode = data.ReadInt32(); + ErrCode errCode = AppIncrementalFileReady(fileName, fd, manifestFd, appIncrementalFileReadyErrCode); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_APP_INCREMENTAL_DONE: { + int32_t appIncrementalDoneErrCode = data.ReadInt32(); + ErrCode errCode = AppIncrementalDone(appIncrementalDoneErrCode); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_REPORT_APP_PROCESS_INFO: { + std::string processInfo = Str16ToStr8(data.ReadString16()); + BackupRestoreScenario scenario; + { + uint64_t enumTmp = 0; + if (!data.ReadUint64(enumTmp)) { + return ERR_INVALID_DATA; + } + scenario = static_cast(enumTmp); + } + ErrCode errCode = ReportAppProcessInfo(processInfo, scenario); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_REFRESH_DATA_SIZE: { + int64_t totalDataSize = data.ReadInt64(); + ErrCode errCode = RefreshDataSize(totalDataSize); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_APP_DONE: { + int32_t appDoneErrCode = data.ReadInt32(); + ErrCode errCode = AppDone(appDoneErrCode); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_SERVICE_RESULT_REPORT: { + std::string restoreRetInfo; + BackupRestoreScenario scenario; + { + uint64_t enumTmp = 0; + if (!data.ReadUint64(enumTmp)) { + return ERR_INVALID_DATA; + } + scenario = static_cast(enumTmp); + } + int32_t serviceResultReportErrCode = data.ReadInt32(); + ErrCode errCode = ServiceResultReport(restoreRetInfo, scenario, serviceResultReportErrCode); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + if (SUCCEEDED(errCode)) { + if (!reply.WriteString16(Str8ToStr16(restoreRetInfo))) { + return ERR_INVALID_DATA; + } + } + return ERR_NONE; + } + case IServiceIpcCode::COMMAND_APP_FILE_READY: { + std::string fileName = Str16ToStr8(data.ReadString16()); + int32_t fd = data.ReadInt32(); + int32_t appFileReadyErrCode = data.ReadInt32(); + ErrCode errCode = AppFileReady(fileName, fd, appFileReadyErrCode); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + default: + return IPCObjectStub::OnRemoteRequest(code, data, reply, option); } - int result = BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK; - ret = Cancel(bundleName, result); - reply.WriteInt32(result); - return ret; -} - -int32_t ServiceStub::CmdGetLocalCapabilitiesIncremental(MessageParcel &data, MessageParcel &reply) -{ - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdGetAppLocalListAndDoIncrementalBackup(MessageParcel &data, MessageParcel &reply) -{ - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdInitIncrementalBackupSession(MessageParcel &data, MessageParcel &reply) -{ - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdInitIncrementalBackupSessionMsg(MessageParcel &data, MessageParcel &reply) -{ - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdAppendBundlesIncrementalBackupSession(MessageParcel &data, MessageParcel &reply) -{ - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdAppendBundlesDetailsIncrementalBackupSession(MessageParcel &data, MessageParcel &reply) -{ - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdPublishIncrementalFile(MessageParcel &data, MessageParcel &reply) -{ - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdAppIncrementalFileReady(MessageParcel &data, MessageParcel &reply) -{ - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdGetIncrementalFileHandle(MessageParcel &data, MessageParcel &reply) -{ - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdReportAppProcessInfo(MessageParcel &data, MessageParcel &reply) -{ - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdStopExtTimer(MessageParcel &data, MessageParcel &reply) -{ - return BError(BError::Codes::OK); -} -int32_t ServiceStub::CmdRefreshDataSize(MessageParcel &data, MessageParcel &reply) -{ - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdGetLocalCapabilitiesForBdInfos(MessageParcel &data, MessageParcel &reply) -{ - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdGetBackupDataSize(MessageParcel &data, MessageParcel &reply) -{ - return BError(BError::Codes::OK); + return ERR_TRANSACTION_FAILED; } } // namespace OHOS::FileManagement::Backup diff --git a/tests/mock/module_ipc/src/service_stub_mock.cpp b/tests/mock/module_ipc/src/service_stub_mock.cpp index 2d46ff3eab471707a310fd48531297b39c91d5c5..83216c869625dc24b04060b580e70aed17027fb3 100644 --- a/tests/mock/module_ipc/src/service_stub_mock.cpp +++ b/tests/mock/module_ipc/src/service_stub_mock.cpp @@ -23,162 +23,248 @@ ServiceStub::ServiceStub() { } -void ServiceStub::ServiceStubSupplement() -{ -} - -int32_t ServiceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) -{ - return BServiceStub::stub->OnRemoteRequest(code, data, reply, option); -} - -int32_t ServiceStub::CmdInitRestoreSession(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdInitRestoreSession(data, reply); -} - -int32_t ServiceStub::CmdInitBackupSession(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdInitBackupSession(data, reply); -} - -int32_t ServiceStub::CmdStart(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdStart(data, reply); -} - -int32_t ServiceStub::CmdGetLocalCapabilities(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdGetLocalCapabilities(data, reply); -} - -int32_t ServiceStub::CmdPublishFile(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdPublishFile(data, reply); -} - -int32_t ServiceStub::CmdAppFileReady(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdAppFileReady(data, reply); -} - -int32_t ServiceStub::CmdAppDone(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdAppDone(data, reply); -} - -int32_t ServiceStub::CmdResultReport(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdResultReport(data, reply); -} - -int32_t ServiceStub::CmdGetFileHandle(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdGetFileHandle(data, reply); -} - -int32_t ServiceStub::CmdAppendBundlesRestoreSession(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdAppendBundlesRestoreSession(data, reply); -} - -int32_t ServiceStub::CmdAppendBundlesDetailsRestoreSession(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdAppendBundlesDetailsRestoreSession(data, reply); -} - -int32_t ServiceStub::CmdAppendBundlesBackupSession(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdAppendBundlesBackupSession(data, reply); -} - -int32_t ServiceStub::CmdFinish(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdFinish(data, reply); -} - -int32_t ServiceStub::CmdGetBackupInfo(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdGetBackupInfo(data, reply); -} - -int32_t ServiceStub::CmdUpdateTimer(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdUpdateTimer(data, reply); -} - -int32_t ServiceStub::CmdUpdateSendRate(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdUpdateSendRate(data, reply); -} - -int32_t ServiceStub::CmdRelease(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdRelease(data, reply); -} - -int32_t ServiceStub::CmdCancel(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdCancel(data, reply); -} - -int32_t ServiceStub::CmdGetLocalCapabilitiesIncremental(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdGetLocalCapabilitiesIncremental(data, reply); -} - -int32_t ServiceStub::CmdGetAppLocalListAndDoIncrementalBackup(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdGetAppLocalListAndDoIncrementalBackup(data, reply); -} - -int32_t ServiceStub::CmdInitIncrementalBackupSession(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdInitIncrementalBackupSession(data, reply); -} - -int32_t ServiceStub::CmdAppendBundlesIncrementalBackupSession(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdAppendBundlesIncrementalBackupSession(data, reply); -} - -int32_t ServiceStub::CmdAppendBundlesDetailsIncrementalBackupSession(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdAppendBundlesDetailsIncrementalBackupSession(data, reply); -} - -int32_t ServiceStub::CmdPublishIncrementalFile(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdPublishIncrementalFile(data, reply); -} - -int32_t ServiceStub::CmdAppIncrementalFileReady(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdAppIncrementalFileReady(data, reply); -} -int32_t ServiceStub::CmdGetIncrementalFileHandle(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdGetIncrementalFileHandle(data, reply); +int32_t ServiceStub::OnRemoteRequest( + uint32_t code, + MessageParcel& data, + MessageParcel& reply, + MessageOption& option) +{ + std::u16string localDescriptor = GetDescriptor(); + std::u16string remoteDescriptor = data.ReadInterfaceToken(); + if (localDescriptor != remoteDescriptor) { + return ERR_TRANSACTION_FAILED; + } + switch (static_cast(code)) { + case IServiceReverseIpcCode::COMMAND_BACKUP_ON_BUNDLE_STARTED: { + int32_t backupOnBundleStartedErrCode = data.ReadInt32(); + std::string bundleName = Str16ToStr8(data.ReadString16()); + ErrCode errCode = BackupOnBundleStarted(backupOnBundleStartedErrCode, bundleName); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_BACKUP_ON_FILE_READY: { + std::string bundleName = Str16ToStr8(data.ReadString16()); + std::string fileName = Str16ToStr8(data.ReadString16()); + int32_t fd = data.ReadInt32(); + int32_t backupOnFileReadyErrCode = data.ReadInt32(); + ErrCode errCode = BackupOnFileReady(bundleName, fileName, fd, backupOnFileReadyErrCode); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_BACKUP_ON_RESULT_REPORT: { + std::string myResult = Str16ToStr8(data.ReadString16()); + std::string bundleName = Str16ToStr8(data.ReadString16()); + ErrCode errCode = BackupOnResultReport(myResult, bundleName); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_BACKUP_ON_BUNDLE_FINISHED: { + int32_t backupOnBundleFinishedErrCode = data.ReadInt32(); + std::string bundleName = Str16ToStr8(data.ReadString16()); + ErrCode errCode = BackupOnBundleFinished(backupOnBundleFinishedErrCode, bundleName); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_BACKUP_ON_ALL_BUNDLES_FINISHED: { + int32_t backupOnAllBundlesFinishedErrCode = data.ReadInt32(); + ErrCode errCode = BackupOnAllBundlesFinished(backupOnAllBundlesFinishedErrCode); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_BACKUP_ON_PROCESS_INFO: { + std::string bundleName = Str16ToStr8(data.ReadString16()); + std::string processInfo = Str16ToStr8(data.ReadString16()); + ErrCode errCode = BackupOnProcessInfo(bundleName, processInfo); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_RESTORE_ON_BUNDLE_STARTED: { + int32_t restoreOnBundleStartedErrCode = data.ReadInt32(); + std::string bundleName = Str16ToStr8(data.ReadString16()); + ErrCode errCode = RestoreOnBundleStarted(restoreOnBundleStartedErrCode, bundleName); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_RESTORE_ON_FILE_READY: { + std::string bundleName = Str16ToStr8(data.ReadString16()); + std::string fileName = Str16ToStr8(data.ReadString16()); + int32_t fd = data.ReadInt32(); + int32_t restoreOnFileReadyErrCode = data.ReadInt32(); + ErrCode errCode = RestoreOnFileReady(bundleName, fileName, fd, restoreOnFileReadyErrCode); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_RESTORE_ON_RESULT_REPORT: { + std::string myResult = Str16ToStr8(data.ReadString16()); + std::string bundleName = Str16ToStr8(data.ReadString16()); + int32_t restoreOnResultReportErrCode = data.ReadInt32(); + ErrCode errCode = RestoreOnResultReport(myResult, bundleName, restoreOnResultReportErrCode); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_RESTORE_ON_BUNDLE_FINISHED: { + int32_t restoreOnBundleFinishedErrCode = data.ReadInt32(); + std::string bundleName = Str16ToStr8(data.ReadString16()); + ErrCode errCode = RestoreOnBundleFinished(restoreOnBundleFinishedErrCode, bundleName); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_RESTORE_ON_ALL_BUNDLES_FINISHED: { + int32_t restoreOnAllBundlesFinishedErrCode = data.ReadInt32(); + ErrCode errCode = RestoreOnAllBundlesFinished(restoreOnAllBundlesFinishedErrCode); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_RESTORE_ON_PROCESS_INFO: { + std::string bundleName = Str16ToStr8(data.ReadString16()); + std::string processInfo = Str16ToStr8(data.ReadString16()); + ErrCode errCode = RestoreOnProcessInfo(bundleName, processInfo); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_INCREMENTAL_BACKUP_ON_BUNDLE_STARTED: { + int32_t incrementalBackupOnBundleStartedErrCode = data.ReadInt32(); + std::string bundleName = Str16ToStr8(data.ReadString16()); + ErrCode errCode = IncrementalBackupOnBundleStarted(incrementalBackupOnBundleStartedErrCode, bundleName); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_INCREMENTAL_BACKUP_ON_FILE_READY: { + std::string bundleName = Str16ToStr8(data.ReadString16()); + std::string fileName = Str16ToStr8(data.ReadString16()); + int32_t fd = data.ReadInt32(); + int32_t manifestFd = data.ReadInt32(); + int32_t incrementalBackupOnFileReadyErrCode = data.ReadInt32(); + ErrCode errCode = IncrementalBackupOnFileReady(bundleName, fileName, fd, manifestFd, incrementalBackupOnFileReadyErrCode); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_INCREMENTAL_BACKUP_ON_RESULT_REPORT: { + std::string myResult = Str16ToStr8(data.ReadString16()); + std::string bundleName = Str16ToStr8(data.ReadString16()); + ErrCode errCode = IncrementalBackupOnResultReport(myResult, bundleName); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_INCREMENTAL_BACKUP_ON_BUNDLE_FINISHED: { + int32_t incrementalBackupOnBundleFinishedErrCode = data.ReadInt32(); + std::string bundleName = Str16ToStr8(data.ReadString16()); + ErrCode errCode = IncrementalBackupOnBundleFinished(incrementalBackupOnBundleFinishedErrCode, bundleName); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_INCREMENTAL_BACKUP_ON_ALL_BUNDLES_FINISHED: { + int32_t incrementalBackupOnAllBundlesFinishedErrCode = data.ReadInt32(); + ErrCode errCode = IncrementalBackupOnAllBundlesFinished(incrementalBackupOnAllBundlesFinishedErrCode); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_INCREMENTAL_BACKUP_ON_PROCESS_INFO: { + std::string bundleName = Str16ToStr8(data.ReadString16()); + std::string processInfo = Str16ToStr8(data.ReadString16()); + ErrCode errCode = IncrementalBackupOnProcessInfo(bundleName, processInfo); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_INCREMENTAL_RESTORE_ON_BUNDLE_STARTED: { + int32_t incrementalRestoreOnBundleStartedErrCode = data.ReadInt32(); + std::string bundleName = Str16ToStr8(data.ReadString16()); + ErrCode errCode = IncrementalRestoreOnBundleStarted(incrementalRestoreOnBundleStartedErrCode, bundleName); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_INCREMENTAL_RESTORE_ON_FILE_READY: { + std::string bundleName = Str16ToStr8(data.ReadString16()); + std::string fileName = Str16ToStr8(data.ReadString16()); + int32_t fd = data.ReadInt32(); + int32_t manifestFd = data.ReadInt32(); + int32_t incrementalRestoreOnFileReadyErrCode = data.ReadInt32(); + ErrCode errCode = IncrementalRestoreOnFileReady(bundleName, fileName, fd, manifestFd, incrementalRestoreOnFileReadyErrCode); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_INCREMENTAL_RESTORE_ON_RESULT_REPORT: { + std::string myResult = Str16ToStr8(data.ReadString16()); + std::string bundleName = Str16ToStr8(data.ReadString16()); + int32_t incrementalRestoreOnResultReportErrCode = data.ReadInt32(); + ErrCode errCode = IncrementalRestoreOnResultReport(myResult, bundleName, incrementalRestoreOnResultReportErrCode); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_INCREMENTAL_RESTORE_ON_BUNDLE_FINISHED: { + int32_t incrementalRestoreOnBundleFinishedErrCode = data.ReadInt32(); + std::string bundleName = Str16ToStr8(data.ReadString16()); + ErrCode errCode = IncrementalRestoreOnBundleFinished(incrementalRestoreOnBundleFinishedErrCode, bundleName); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_INCREMENTAL_RESTORE_ON_ALL_BUNDLES_FINISHED: { + int32_t incrementalRestoreOnAllBundlesFinishedErrCode = data.ReadInt32(); + ErrCode errCode = IncrementalRestoreOnAllBundlesFinished(incrementalRestoreOnAllBundlesFinishedErrCode); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + case IServiceReverseIpcCode::COMMAND_INCREMENTAL_RESTORE_ON_PROCESS_INFO: { + std::string bundleName = Str16ToStr8(data.ReadString16()); + std::string processInfo = Str16ToStr8(data.ReadString16()); + ErrCode errCode = IncrementalRestoreOnProcessInfo(bundleName, processInfo); + if (!reply.WriteInt32(errCode)) { + return ERR_INVALID_VALUE; + } + return ERR_NONE; + } + default: + return IPCObjectStub::OnRemoteRequest(code, data, reply, option); + } + + return ERR_TRANSACTION_FAILED; } -int32_t ServiceStub::CmdStopExtTimer(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdStopExtTimer(data, reply); -} - -int32_t ServiceStub::CmdRefreshDataSize(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdRefreshDataSize(data, reply); -} - -int32_t ServiceStub::CmdGetLocalCapabilitiesForBdInfos(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdGetLocalCapabilitiesForBdInfos(data, reply); -} - -int32_t ServiceStub::CmdGetBackupDataSize(MessageParcel &data, MessageParcel &reply) -{ - return BServiceStub::stub->CmdGetBackupDataSize(data, reply); -} } // namespace OHOS::FileManagement::Backup diff --git a/tests/mock/module_ipc/src/svc_session_manager_mock.cpp b/tests/mock/module_ipc/src/svc_session_manager_mock.cpp index 6c8b88f42e8b815c11e69dcf2cb320ecda151aa2..6339aed08048b53e325a1ef9e9de452282171cac 100644 --- a/tests/mock/module_ipc/src/svc_session_manager_mock.cpp +++ b/tests/mock/module_ipc/src/svc_session_manager_mock.cpp @@ -21,7 +21,7 @@ namespace OHOS::FileManagement::Backup { using namespace std; -ErrCode SvcSessionManager::VerifyCallerAndScenario(uint32_t, IServiceReverse::Scenario) const +ErrCode SvcSessionManager::VerifyCallerAndScenario(uint32_t, IServiceReverseType::Scenario) const { return BError(BError::Codes::OK); } @@ -46,7 +46,7 @@ sptr SvcSessionManager::GetServiceReverseProxy() return BSvcSessionManager::sessionManager->GetServiceReverseProxy(); } -IServiceReverse::Scenario SvcSessionManager::GetScenario() +IServiceReverseType::Scenario SvcSessionManager::GetScenario() { return BSvcSessionManager::sessionManager->GetScenario(); } diff --git a/tests/mock/module_ipc/svc_backup_connection_mock.cpp b/tests/mock/module_ipc/svc_backup_connection_mock.cpp index 001f3dee2bc2017512ae9c6a415310bfbdbe57b4..061ded0a612e5fc779b5395359cd4fbfb3f54165 100644 --- a/tests/mock/module_ipc/svc_backup_connection_mock.cpp +++ b/tests/mock/module_ipc/svc_backup_connection_mock.cpp @@ -17,7 +17,7 @@ #include -#include "module_ipc/svc_extension_proxy.h" +#include "extension_proxy.h" #include "module_ipc/svc_session_manager.h" namespace OHOS::FileManagement::Backup { diff --git a/tests/mock/module_ipc/svc_extension_proxy_mock.cpp b/tests/mock/module_ipc/svc_extension_proxy_mock.cpp index a2534d899d00a0718fcd3e3007a7a963d6a26b2e..7687b6fb25921c7b639fecb0f792f95c84739fd5 100644 --- a/tests/mock/module_ipc/svc_extension_proxy_mock.cpp +++ b/tests/mock/module_ipc/svc_extension_proxy_mock.cpp @@ -18,9 +18,9 @@ namespace OHOS::FileManagement::Backup { using namespace std; -UniqueFd SvcExtensionProxy::GetFileHandle(const string &fileName, int32_t &errCode) +ErrCode SvcExtensionProxy::GetFileHandleWithUniqueFd(const string &fileName, int32_t &errCode, int32_t & fd) { - return UniqueFd(-1); + return 0; } ErrCode SvcExtensionProxy::HandleClear() @@ -48,9 +48,9 @@ ErrCode SvcExtensionProxy::GetBackupInfo(std::string &result) return 0; } -std::tuple SvcExtensionProxy::GetIncrementalFileHandle(const string &fileName) +ErrCode SvcExtensionProxy::GetIncrementalFileHandleWithUniqueFdGroup(const string &fileName,UniqueFdGroup& fdGroup) { - return {0, UniqueFd(-1), UniqueFd(-1)}; + return 0; } ErrCode SvcExtensionProxy::PublishIncrementalFile(const string &fileName) @@ -58,7 +58,7 @@ ErrCode SvcExtensionProxy::PublishIncrementalFile(const string &fileName) return 0; } -ErrCode SvcExtensionProxy::HandleIncrementalBackup(UniqueFd incrementalFd, UniqueFd manifestFd) +ErrCode SvcExtensionProxy::HandleIncrementalBackup(int32_t incrementalFd, int32_t manifestFd) { return 0; } @@ -78,8 +78,8 @@ ErrCode SvcExtensionProxy::User0OnBackup() return 0; } -tuple SvcExtensionProxy::GetIncrementalBackupFileHandle() +ErrCode SvcExtensionProxy::GetIncrementalBackupFileHandleWithUniqueFdGroup( UniqueFdGroup& fdGroup) { - return {UniqueFd(-1), UniqueFd(-1)}; + return 0; } } // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/tests/mock/module_ipc/svc_session_manager_mock.cpp b/tests/mock/module_ipc/svc_session_manager_mock.cpp index 749be058ad312f68f694b3d4af2c1eec5d6fefc9..fc29b081a8dd9f6ca84b5e56b0e782deb6dc3057 100644 --- a/tests/mock/module_ipc/svc_session_manager_mock.cpp +++ b/tests/mock/module_ipc/svc_session_manager_mock.cpp @@ -36,7 +36,7 @@ static int32_t g_nFileReadyNum = 0; static int32_t g_nAllBundlesFinished = 0; } // namespace -ErrCode SvcSessionManager::VerifyCallerAndScenario(uint32_t clientToken, IServiceReverse::Scenario scenario) const +ErrCode SvcSessionManager::VerifyCallerAndScenario(uint32_t clientToken, IServiceReverseType::Scenario scenario) const { GTEST_LOG_(INFO) << "VerifyCallerAndScenario"; return BError(BError::Codes::OK); @@ -68,7 +68,7 @@ sptr SvcSessionManager::GetServiceReverseProxy() return impl_.clientProxy; } -IServiceReverse::Scenario SvcSessionManager::GetScenario() +IServiceReverseType::Scenario SvcSessionManager::GetScenario() { GTEST_LOG_(INFO) << "GetScenario"; return impl_.scenario; diff --git a/tests/mock/module_ipc/svc_session_manager_throw_mock.cpp b/tests/mock/module_ipc/svc_session_manager_throw_mock.cpp index b7ac3a85e3c86bb2e066787e96e8800efe853be3..f4e0acd0384c9896c02a3a9db8003d930b7951d5 100644 --- a/tests/mock/module_ipc/svc_session_manager_throw_mock.cpp +++ b/tests/mock/module_ipc/svc_session_manager_throw_mock.cpp @@ -19,7 +19,7 @@ namespace OHOS::FileManagement::Backup { using namespace std; -ErrCode SvcSessionManager::VerifyCallerAndScenario(uint32_t clientToken, IServiceReverse::Scenario scenario) const +ErrCode SvcSessionManager::VerifyCallerAndScenario(uint32_t clientToken, IServiceReverseType::Scenario scenario) const { return BackupSvcSessionManager::session->VerifyCallerAndScenario(clientToken, scenario); } @@ -44,7 +44,7 @@ sptr SvcSessionManager::GetServiceReverseProxy() return BackupSvcSessionManager::session->GetServiceReverseProxy(); } -IServiceReverse::Scenario SvcSessionManager::GetScenario() +IServiceReverseType::Scenario SvcSessionManager::GetScenario() { return BackupSvcSessionManager::session->GetScenario(); } diff --git a/tests/mock/module_ipc/svc_session_manager_throw_mock.h b/tests/mock/module_ipc/svc_session_manager_throw_mock.h index 455274faaed6331b0d3831d77b1867d4c7aedff3..dc96aa6e64dca790a92bc0847512146b66623be9 100644 --- a/tests/mock/module_ipc/svc_session_manager_throw_mock.h +++ b/tests/mock/module_ipc/svc_session_manager_throw_mock.h @@ -27,12 +27,12 @@ class BackupSvcSessionManager { public: virtual ~BackupSvcSessionManager() = default; public: - virtual ErrCode VerifyCallerAndScenario(uint32_t, IServiceReverse::Scenario) = 0; + virtual ErrCode VerifyCallerAndScenario(uint32_t, IServiceReverseType::Scenario) = 0; virtual ErrCode Active(SvcSessionManager::Impl) = 0; virtual ErrCode Deactive(const wptr &, bool) = 0; virtual ErrCode VerifyBundleName(std::string &) = 0; virtual sptr GetServiceReverseProxy() = 0; - virtual IServiceReverse::Scenario GetScenario() = 0; + virtual IServiceReverseType::Scenario GetScenario() = 0; virtual bool OnBundleFileReady(const std::string &, const std::string &) = 0; virtual UniqueFd OnBundleExtManageInfo(const std::string &, UniqueFd) = 0; virtual void RemoveExtInfo(const std::string &) = 0; @@ -104,12 +104,12 @@ public: class SvcSessionManagerMock : public BackupSvcSessionManager { public: - MOCK_METHOD(ErrCode, VerifyCallerAndScenario, (uint32_t, IServiceReverse::Scenario)); + MOCK_METHOD(ErrCode, VerifyCallerAndScenario, (uint32_t, IServiceReverseType::Scenario)); MOCK_METHOD(ErrCode, Active, (SvcSessionManager::Impl)); MOCK_METHOD(ErrCode, Deactive, (const wptr &, bool)); MOCK_METHOD(ErrCode, VerifyBundleName, (std::string &)); MOCK_METHOD(sptr, GetServiceReverseProxy, ()); - MOCK_METHOD(IServiceReverse::Scenario, GetScenario, ()); + MOCK_METHOD(IServiceReverseType::Scenario, GetScenario, ()); MOCK_METHOD(bool, OnBundleFileReady, (const std::string &, const std::string &)); MOCK_METHOD(UniqueFd, OnBundleExtManageInfo, (const std::string &, UniqueFd)); MOCK_METHOD(void, RemoveExtInfo, (const std::string &)); diff --git a/tests/moduletests/backup_kit_inner/BUILD.gn b/tests/moduletests/backup_kit_inner/BUILD.gn index c3fc260eee40865512d9d714ed0bf6303853f5fd..f5c1489c460de35ac1c296b6fd1e987adc0913b0 100644 --- a/tests/moduletests/backup_kit_inner/BUILD.gn +++ b/tests/moduletests/backup_kit_inner/BUILD.gn @@ -25,21 +25,22 @@ ohos_unittest("b_session_test") { "${path_backup}/frameworks/native/backup_kit_inner/src/b_session_restore_async.cpp", "${path_backup}/frameworks/native/backup_kit_inner/src/service_incremental_reverse.cpp", "${path_backup}/frameworks/native/backup_kit_inner/src/service_reverse.cpp", - "${path_backup}/frameworks/native/backup_kit_inner/src/service_reverse_stub.cpp", "b_session_backup_test.cpp", "b_session_restore_async_test.cpp", "b_session_restore_test.cpp", + "${path_backup}/tests/mock/backup_kit_inner/service_client_mock.cpp", ] sources += backup_mock_proxy_src - include_dirs = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner/", "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", "${path_backup}/frameworks/native/backup_kit_inner/include", ] + include_dirs += backup_mock_utils_include deps = [ + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner_ipc_stub", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", ] diff --git a/tests/moduletests/backup_kit_inner/b_session_backup_test.cpp b/tests/moduletests/backup_kit_inner/b_session_backup_test.cpp index a4a5583f2bb17510bb8674db9bd4d711ece68967..0afa8e568b4ea3f2e9c9c379cfc4aec18e0f3255 100644 --- a/tests/moduletests/backup_kit_inner/b_session_backup_test.cpp +++ b/tests/moduletests/backup_kit_inner/b_session_backup_test.cpp @@ -16,7 +16,7 @@ #include #include "b_error/b_error.h" -#include "b_file_info.h" +#include "backup_file_info.h" #include "backup_kit_inner.h" #include "unique_fd.h" #include "utils_mock_global_variable.h" diff --git a/tests/moduletests/backup_kit_inner/b_session_restore_async_test.cpp b/tests/moduletests/backup_kit_inner/b_session_restore_async_test.cpp index aa3f5a3ed5885f0adfaebdfc49737bcf053a8172..66539a9ea9edc5f0c812639a73adc75d82926871 100644 --- a/tests/moduletests/backup_kit_inner/b_session_restore_async_test.cpp +++ b/tests/moduletests/backup_kit_inner/b_session_restore_async_test.cpp @@ -20,7 +20,7 @@ #include #include "b_error/b_error.h" -#include "b_file_info.h" +#include "backup_file_info.h" #include "b_session_restore_async.h" #include "backup_kit_inner.h" #include "unique_fd.h" diff --git a/tests/moduletests/backup_kit_inner/b_session_restore_test.cpp b/tests/moduletests/backup_kit_inner/b_session_restore_test.cpp index 0c2b9b32c5e31a6e80f5d88ad39fb9ce5dd7f35a..6c5ff1b3c3fd05fd07134ffd3de8d94c6f6a4b0f 100644 --- a/tests/moduletests/backup_kit_inner/b_session_restore_test.cpp +++ b/tests/moduletests/backup_kit_inner/b_session_restore_test.cpp @@ -17,7 +17,7 @@ #include #include "b_error/b_error.h" -#include "b_file_info.h" +#include "backup_file_info.h" #include "backup_kit_inner.h" #include "test_manager.h" #include "unique_fd.h" diff --git a/tests/unittests/backup_api/backup_impl/BUILD.gn b/tests/unittests/backup_api/backup_impl/BUILD.gn index 1ef532c623d247312c575220fc87451f58f32d0e..08046348f992bb513c5e78dd3f9f3af7c2197ab3 100644 --- a/tests/unittests/backup_api/backup_impl/BUILD.gn +++ b/tests/unittests/backup_api/backup_impl/BUILD.gn @@ -53,8 +53,6 @@ ohos_unittest("backup_sa_impl_test") { sources = [ "${path_backup_mock}/system_ability_manager/service_registry_mock.cpp", "${path_backup_mock}/utils_mock/src/utils_mock_global_variable.cpp", - "service_proxy_test.cpp", - "service_reverse_stub_test.cpp", "service_reverse_test.cpp", "svc_death_recipient_test.cpp", ] diff --git a/tests/unittests/backup_api/backup_impl/b_file_info_test.cpp b/tests/unittests/backup_api/backup_impl/b_file_info_test.cpp index 283508801cb2da05e4c63c69a0e21c5a79b6078b..c8ab0443de079e0cae1a5fde515e17bfdb7f03ee 100644 --- a/tests/unittests/backup_api/backup_impl/b_file_info_test.cpp +++ b/tests/unittests/backup_api/backup_impl/b_file_info_test.cpp @@ -15,7 +15,7 @@ #include -#include "b_file_info.h" +#include "backup_file_info.h" #include "parcel.h" namespace OHOS::FileManagement::Backup { diff --git a/tests/unittests/backup_api/backup_impl/include/ext_extension_mock.h b/tests/unittests/backup_api/backup_impl/include/ext_extension_mock.h index 3399bc312d7e0747aa06365fc881ab46e5f40ff8..991ce7d354aa9f3aa0a6918694b35ec74b95fb07 100644 --- a/tests/unittests/backup_api/backup_impl/include/ext_extension_mock.h +++ b/tests/unittests/backup_api/backup_impl/include/ext_extension_mock.h @@ -20,9 +20,9 @@ #include #include #include - +#include "unique_fd.h" #include "b_error/b_error.h" -#include "i_extension.h" +#include "iextension.h" #include "iremote_stub.h" #include "test_manager.h" @@ -51,9 +51,14 @@ public: reply.WriteInt32(0); reply.WriteFileDescriptor(fd); return BError(BError::Codes::OK); - } - - UniqueFd GetFileHandle(const std::string &fileName, int32_t &errCode) override + }; + ErrCode GetFileHandleWithUniqueFd(const std::string& fileName,int32_t& getFileHandleErrCode,int32_t& fd) override + { + UniqueFd f= GetFileHandle(fileName,getFileHandleErrCode); + fd=f.Get(); + return getFileHandleErrCode; + }; + UniqueFd GetFileHandle(const std::string &fileName, int32_t &errCode) { GTEST_LOG_(INFO) << "GetFileHandle" << fileName; if (fileName == "testName") { @@ -103,8 +108,11 @@ public: { return BError(BError::Codes::OK); }; - - std::tuple GetIncrementalFileHandle(const std::string &fileName) override + ErrCode GetIncrementalFileHandleWithUniqueFdGroup(const std::string& fileName, UniqueFdGroup& fdGroup) override + { + return BError(BError::Codes::OK); + } + std::tuple GetIncrementalFileHandle(const std::string &fileName) { return {BError(BError::Codes::OK), UniqueFd(-1), UniqueFd(-1)}; }; @@ -113,8 +121,11 @@ public: { return BError(BError::Codes::OK); }; - - ErrCode HandleIncrementalBackup(UniqueFd incrementalFd, UniqueFd manifestFd) override + ErrCode HandleIncrementalBackup (int32_t incrementalFd, int32_t manifestFd) override + { + return BError(BError::Codes::OK); + }; + ErrCode HandleIncrementalBackup(UniqueFd incrementalFd, UniqueFd manifestFd) { return BError(BError::Codes::OK); }; @@ -123,8 +134,11 @@ public: { return BError(BError::Codes::OK); }; - - std::tuple GetIncrementalBackupFileHandle() override + ErrCode GetIncrementalBackupFileHandleWithUniqueFdGroup(UniqueFdGroup& fdGroup) override + { + return BError(BError::Codes::OK); + }; + std::tuple GetIncrementalBackupFileHandle() { return {UniqueFd(-1), UniqueFd(-1)}; }; @@ -134,7 +148,7 @@ public: return BError(BError::Codes::OK); }; - ErrCode UpdateFdSendRate(std::string &bundleName, int32_t sendRate) override + ErrCode UpdateFdSendRate(const std::string &bundleName, int32_t sendRate) override { return BError(BError::Codes::OK); }; diff --git a/tests/unittests/backup_api/backup_impl/include/i_service_mock.h b/tests/unittests/backup_api/backup_impl/include/i_service_mock.h index d5371dae2b9a0f8821eb41dd5674d82052639d4f..9811f70e32553a487801758b6854929f9bf9d549 100644 --- a/tests/unittests/backup_api/backup_impl/include/i_service_mock.h +++ b/tests/unittests/backup_api/backup_impl/include/i_service_mock.h @@ -20,13 +20,13 @@ #include #include #include - +#include "unique_fd.h" #include "b_error/b_error.h" -#include "i_service.h" +#include "service_common.h" #include "b_resources/b_constants.h" #include "iremote_stub.h" #include "test_manager.h" - +#include "service_client.h" namespace OHOS::FileManagement::Backup { class IServiceMock : public IRemoteStub { public: @@ -62,22 +62,22 @@ public: return BError(BError::Codes::OK); } - ErrCode InitRestoreSession(sptr remote) override + ErrCode InitRestoreSession(sptr& remote) { return BError(BError::Codes::OK); } - ErrCode InitRestoreSession(sptr remote, std::string &errMsg) override + ErrCode InitRestoreSessionWithErrMsg(sptr& remote, std::string &errMsg) override { return BError(BError::Codes::OK); } - ErrCode InitBackupSession(sptr remote) override + ErrCode InitBackupSession(sptr& remote) { return BError(BError::Codes::OK); } - ErrCode InitBackupSession(sptr remote, std::string &errMsg) override + ErrCode InitBackupSessionWithErrMsg(sptr& remote, std::string &errMsg) override { return BError(BError::Codes::OK); } @@ -87,33 +87,37 @@ public: return BError(BError::Codes::OK); } - UniqueFd GetLocalCapabilities() override + ErrCode GetLocalCapabilities(int32_t& fd) { - return UniqueFd(-1); + return -1; } - UniqueFd GetLocalCapabilitiesForBundleInfos() override + ErrCode GetLocalCapabilitiesForBundleInfos(int32_t& fd) override { - return UniqueFd(-1); + return -1; } - ErrCode PublishFile(const BFileInfo &fileInfo) override + ErrCode PublishFile(const BFileInfo &fileInfo) { return BError(BError::Codes::OK); } - - ErrCode AppFileReady(const std::string &fileName, UniqueFd fd, int32_t errCode) override + ErrCode GetLocalCapabilitiesWithUniqueFd(int32_t& fd) + { + return BError(BError::Codes::OK); + } + + ErrCode AppFileReady(const std::string &fileName, int32_t fd, int32_t errCode) { return BError(BError::Codes::OK); } - ErrCode AppDone(ErrCode errCode) override + ErrCode AppDone(ErrCode errCode) { return BError(BError::Codes::OK); } - ErrCode ServiceResultReport(const std::string restoreRetInfo, - BackupRestoreScenario scenario, ErrCode errCode) override + ErrCode ServiceResultReport(const std::string& restoreRetInfo, + BackupRestoreScenario scenario, ErrCode errCode) { return BError(BError::Codes::OK); } @@ -127,7 +131,7 @@ public: const std::vector &bundleNames, const std::vector &detailInfos, RestoreTypeEnum restoreType, - int32_t userId) override + int32_t userId) { return BError(BError::Codes::OK); } @@ -135,18 +139,18 @@ public: ErrCode AppendBundlesRestoreSession(UniqueFd fd, const std::vector &bundleNames, RestoreTypeEnum restoreType, - int32_t userId) override + int32_t userId) { return BError(BError::Codes::OK); } - ErrCode AppendBundlesBackupSession(const std::vector &bundleNames) override + ErrCode AppendBundlesBackupSession(const std::vector &bundleNames) { return BError(BError::Codes::OK); } ErrCode AppendBundlesDetailsBackupSession(const std::vector &bundleNames, - const std::vector &bundleInfos) override + const std::vector &bundleInfos) { return BError(BError::Codes::OK); } @@ -181,7 +185,7 @@ public: return BError(BError::Codes::OK); } - ErrCode RefreshDataSize(int64_t totalsize) override + ErrCode RefreshDataSize(int64_t totalsize) { return BError(BError::Codes::OK); } @@ -196,15 +200,15 @@ public: return BError(BError::Codes::OK); } - ErrCode Cancel(std::string bundleName, int32_t &result) override + ErrCode Cancel( const std::string&, int32_t &result) { result = BError(BError::Codes::OK); return BError(BError::Codes::OK); } - UniqueFd GetLocalCapabilitiesIncremental(const std::vector &bundleNames) override + ErrCode GetLocalCapabilitiesIncremental(const std::vector &bundleNames,int32_t& fd) { - return UniqueFd(-1); + return BError(BError::Codes::OK); } ErrCode GetAppLocalListAndDoIncrementalBackup() override @@ -212,38 +216,38 @@ public: return BError(BError::Codes::OK); } - ErrCode InitIncrementalBackupSession(sptr remote) override + ErrCode InitIncrementalBackupSession(sptr& remote) { return BError(BError::Codes::OK); } - ErrCode InitIncrementalBackupSession(sptr remote, std::string &errMsg) override + ErrCode InitIncrementalBackupSessionWithErrMsg(sptr& remote, std::string &errMsg) override { return BError(BError::Codes::OK); } - ErrCode AppendBundlesIncrementalBackupSession(const std::vector &bundlesToBackup) override + ErrCode AppendBundlesIncrementalBackupSession(const std::vector &bundlesToBackup) { return BError(BError::Codes::OK); } ErrCode AppendBundlesIncrementalBackupSession(const std::vector &bundlesToBackup, - const std::vector &infos) override + const std::vector &infos) { return BError(BError::Codes::OK); } - ErrCode PublishIncrementalFile(const BFileInfo &fileInfo) override + ErrCode PublishIncrementalFile(const BFileInfo &fileInfo) { return BError(BError::Codes::OK); } - ErrCode PublishSAIncrementalFile(const BFileInfo &fileInfo, UniqueFd fd) override + ErrCode PublishSAIncrementalFile(const BFileInfo &fileInfo, int32_t fd) { return BError(BError::Codes::OK); } - ErrCode AppIncrementalFileReady(const std::string &fileName, UniqueFd fd, UniqueFd manifestFd, int32_t errCode) + ErrCode AppIncrementalFileReady(const std::string &fileName, int32_t fd, int32_t manifestFd, int32_t errCode) { return BError(BError::Codes::OK); } @@ -258,12 +262,37 @@ public: return BError(BError::Codes::OK); } - ErrCode ReportAppProcessInfo(const std::string processInfo, const BackupRestoreScenario sennario) + ErrCode ReportAppProcessInfo( const std::string& processInfo, const BackupRestoreScenario sennario) { return BError(BError::Codes::OK); } + ErrCode AppendBundlesRestoreSessionRestoreDataWaitSend( + int32_t fd, + const std::vector& bundleNames, + const std::vector& detailInfos, + int32_t restoreType, + int32_t userId) + { + return BError(BError::Codes::OK); + } + + ErrCode AppendBundlesRestoreSessionRestoreDataWaitReady( + int32_t fd, + const std::vector& bundleNames, + int32_t restoreType, + int32_t userId) + { + + return BError(BError::Codes::OK); + } + ErrCode AppendBundlesIncrementalBackupSessionWithBundleInfos( + const std::vector& bundlesToBackup, + const std::vector& bundleInfos){ + return BError(BError::Codes::OK); + } + - ErrCode GetBackupDataSize(bool isPreciseScan, std::vector bundleNameList) + ErrCode GetBackupDataSize(bool isPreciseScan,const std::vector& bundleNameList) { return BError(BError::Codes::OK); } diff --git a/tests/unittests/backup_api/backup_impl/include/service_reverse_mock.h b/tests/unittests/backup_api/backup_impl/include/service_reverse_mock.h index cd066641e8f0115a4f5af966287ad109cc3ef157..ad595ad016080d5371dce1c6f171bedacdce60d3 100644 --- a/tests/unittests/backup_api/backup_impl/include/service_reverse_mock.h +++ b/tests/unittests/backup_api/backup_impl/include/service_reverse_mock.h @@ -19,7 +19,7 @@ #include #include "b_error/b_error.h" -#include "i_service_reverse.h" +#include "iservice_reverse.h" #include "iremote_stub.h" namespace OHOS::FileManagement::Backup { @@ -36,37 +36,115 @@ public: code_ = code; return BError(BError::Codes::OK); } - void BackupOnFileReady(std::string bundleName, std::string fileName, int fd, int32_t errCode) override {} - void BackupOnBundleStarted(int32_t errCode, std::string bundleName) override {} - void BackupOnResultReport(std::string result, std::string bundleName) override {}; - void BackupOnBundleFinished(int32_t errCode, std::string bundleName) override {} - void BackupOnAllBundlesFinished(int32_t errCode) override {} - void BackupOnProcessInfo(std::string bundleName, std::string processInfo) override {} - void BackupOnScanningInfo(std::string scannedInfo) override {} + ErrCode BackupOnFileReady(const std::string& bundleName, const std::string& fileName, int fd, int32_t errCode) override + { + return BError(BError::Codes::OK); + } + ErrCode BackupOnBundleStarted(int32_t errCode, const std::string& bundleName) override + { + return BError(BError::Codes::OK); + } + ErrCode BackupOnResultReport(const std::string& result, const std::string& bundleName) override + { + return BError(BError::Codes::OK); + }; + ErrCode BackupOnBundleFinished(int32_t errCode, const std::string& bundleName) override + { + return BError(BError::Codes::OK); + } + ErrCode BackupOnAllBundlesFinished(int32_t errCode) override + { + return BError(BError::Codes::OK); + } + ErrCode BackupOnProcessInfo(const std::string& bundleName, const std::string& processInfo) override + { + return BError(BError::Codes::OK); + } + ErrCode BackupOnScanningInfo(const std::string& scannedInfo) override + { + return BError(BError::Codes::OK); + } - void RestoreOnBundleStarted(int32_t errCode, std::string bundleName) override {} - void RestoreOnBundleFinished(int32_t errCode, std::string bundleName) override {} - void RestoreOnAllBundlesFinished(int32_t errCode) override {} - void RestoreOnFileReady(std::string bundleName, std::string fileName, int fd, int32_t errCode) override {} - void RestoreOnResultReport(std::string result, std::string bundleName, ErrCode errCode) override {} - void RestoreOnProcessInfo(std::string bundleName, std::string processInfo) override {} + ErrCode RestoreOnBundleStarted(int32_t errCode, const std::string& bundleName) override + { + return BError(BError::Codes::OK); + } + ErrCode RestoreOnBundleFinished(int32_t errCode, const std::string& bundleName) override + { + return BError(BError::Codes::OK); + } + ErrCode RestoreOnAllBundlesFinished(int32_t errCode) override + { + return BError(BError::Codes::OK); + } + ErrCode RestoreOnFileReady(const std::string& bundleName, const std::string& fileName, int fd, int32_t errCode) override + { + return BError(BError::Codes::OK); + } + ErrCode RestoreOnResultReport(const std::string& result, const std::string& bundleName, ErrCode errCode) override + { + return BError(BError::Codes::OK); + } + ErrCode RestoreOnProcessInfo(const std::string& bundleName, const std::string& processInfo) override + { + return BError(BError::Codes::OK); + } - void IncrementalBackupOnFileReady(std::string bundleName, std::string fileName, int fd, int manifestFd, - int32_t errCode) override {} - void IncrementalBackupOnBundleStarted(int32_t errCode, std::string bundleName) override {} - void IncrementalBackupOnResultReport(std::string result, std::string bundleName) override {} - void IncrementalBackupOnBundleFinished(int32_t errCode, std::string bundleName) override {} - void IncrementalBackupOnAllBundlesFinished(int32_t errCode) override {} - void IncrementalBackupOnProcessInfo(std::string bundleName, std::string processInfo) override {} - void IncrementalBackupOnScanningInfo(std::string scannedInfo) override {} + ErrCode IncrementalBackupOnFileReady(const std::string& bundleName, const std::string& fileName, int fd, int manifestFd, + int32_t errCode) override + { + return BError(BError::Codes::OK); + } + ErrCode IncrementalBackupOnBundleStarted(int32_t errCode, const std::string& bundleName) override + { + return BError(BError::Codes::OK); + } + ErrCode IncrementalBackupOnResultReport(const std::string& result, const std::string& bundleName) override + { + return BError(BError::Codes::OK); + } + ErrCode IncrementalBackupOnBundleFinished(int32_t errCode, const std::string& bundleName) override + { + return BError(BError::Codes::OK); + } + ErrCode IncrementalBackupOnAllBundlesFinished(int32_t errCode) override + { + return BError(BError::Codes::OK); + } + ErrCode IncrementalBackupOnProcessInfo(const std::string& bundleName, const std::string& processInfo) override + { + return BError(BError::Codes::OK); + } + ErrCode IncrementalBackupOnScanningInfo(const std::string& scannedInfo) override + { + return BError(BError::Codes::OK); + } - void IncrementalRestoreOnBundleStarted(int32_t errCode, std::string bundleName) override {} - void IncrementalRestoreOnBundleFinished(int32_t errCode, std::string bundleName) override {} - void IncrementalRestoreOnAllBundlesFinished(int32_t errCode) override {} - void IncrementalRestoreOnFileReady(std::string bundleName, std::string fileName, int fd, int manifestFd, - int32_t errCode) override {} - void IncrementalRestoreOnResultReport(std::string result, std::string bundleName, ErrCode errCode) override {}; - void IncrementalRestoreOnProcessInfo(std::string bundleName, std::string processInfo) override {} + ErrCode IncrementalRestoreOnBundleStarted(int32_t errCode, const std::string& bundleName) override + { + return BError(BError::Codes::OK); + } + ErrCode IncrementalRestoreOnBundleFinished(int32_t errCode, const std::string& bundleName) override + { + return BError(BError::Codes::OK); + } + ErrCode IncrementalRestoreOnAllBundlesFinished(int32_t errCode) override + { + return BError(BError::Codes::OK); + } + ErrCode IncrementalRestoreOnFileReady(const std::string& bundleName, const std::string& fileName, int fd, int manifestFd, + int32_t errCode) override + { + return BError(BError::Codes::OK); + } + ErrCode IncrementalRestoreOnResultReport(const std::string& result, const std::string& bundleName, int32_t errCode) override + { + return BError(BError::Codes::OK); + }; + ErrCode IncrementalRestoreOnProcessInfo(const std::string& bundleName, const std::string& processInfo) override + { + return BError(BError::Codes::OK); + } }; } // namespace OHOS::FileManagement::Backup #endif // MOCK_SERVICE_REVERSE_MOCK_H \ No newline at end of file diff --git a/tests/unittests/backup_api/backup_impl/service_proxy_test.cpp b/tests/unittests/backup_api/backup_impl/service_proxy_test.cpp deleted file mode 100644 index ee2de7234d61ddaaa74f63a773928a3410c877a0..0000000000000000000000000000000000000000 --- a/tests/unittests/backup_api/backup_impl/service_proxy_test.cpp +++ /dev/null @@ -1,1444 +0,0 @@ -/* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include - -#include "b_file_info.h" -#include "i_service_mock.h" -#include "iremote_object_mock.h" -#include "iservice_registry.h" -#include "service_proxy.h" -#include "service_reverse_mock.h" -#include "unique_fd.h" -#include "utils_mock_global_variable.h" - -namespace OHOS::FileManagement::Backup { -using namespace std; -using namespace testing; - -namespace { -const string BUNDLE_NAME = "com.example.app2backup"; -const string FILE_NAME = "1.tar"; -constexpr int32_t SERVICE_ID = 5203; -} // namespace - -class ServiceProxyTest : public testing::Test { -public: - static void SetUpTestCase(void) {}; - static void TearDownTestCase() {}; - void SetUp() override; - void TearDown() override; - - shared_ptr proxy_ = nullptr; - sptr mock_ = nullptr; - sptr remote_ = nullptr; -}; - -void ServiceProxyTest::SetUp() -{ - mock_ = sptr(new IServiceMock()); - proxy_ = make_shared(mock_); - remote_ = sptr(new ServiceReverseMock()); -} - -void ServiceProxyTest::TearDown() -{ - proxy_ = nullptr; - mock_ = nullptr; - remote_ = nullptr; -} - -/** - * @tc.number: SUB_Service_proxy_InitRestoreSession_0100 - * @tc.name: SUB_Service_proxy_InitRestoreSession_0100 - * @tc.desc: 测试 InitRestoreSession 注册restore Session接口调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_InitRestoreSession_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_InitRestoreSession_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_InitRestoreSession_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)); - int32_t result = proxy_->InitRestoreSession(remote_); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->InitRestoreSession(nullptr); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_InitRestoreSession_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_InitRestoreSession_0200 - * @tc.name: SUB_Service_proxy_InitRestoreSession_0200 - * @tc.desc: 测试 InitRestoreSession 注册restore Session with errMsg接口调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_InitRestoreSession_0200, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_InitRestoreSession_0200"; - std::string errMsg; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_InitRestoreSession_0200 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeMsgSendRequest)); - int32_t result = proxy_->InitRestoreSession(remote_, errMsg); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->InitRestoreSession(nullptr, errMsg); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_InitRestoreSession_0200"; -} - -/** - * @tc.number: SUB_Service_proxy_InitBackupSession_0100 - * @tc.name: SUB_Service_proxy_InitBackupSession_0100 - * @tc.desc: 测试 InitBackupSession 注册backup Session接口调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_InitBackupSession_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_InitBackupSession_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_InitBackupSession_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)); - - int32_t result = proxy_->InitBackupSession(remote_); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->InitBackupSession(nullptr); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_InitBackupSession_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_InitBackupSession_0200 - * @tc.name: SUB_Service_proxy_InitBackupSession_0200 - * @tc.desc: 测试 InitBackupSession 注册backup Session with errMsg接口调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_InitBackupSession_0200, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_InitBackupSession_0200"; - std::string errMsg; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_InitBackupSession_0200 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeMsgSendRequest)); - - int32_t result = proxy_->InitBackupSession(remote_, errMsg); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->InitBackupSession(nullptr, errMsg); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_InitBackupSession_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_Start_0100 - * @tc.name: SUB_Service_proxy_Start_0100 - * @tc.desc: 测试 Start 启动备份恢复流程接口调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_Start_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_Start_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_Start_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - int32_t result = proxy_->Start(); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->Start(); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_Start_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_GetLocalCapabilities_0100 - * @tc.name: SUB_Service_proxy_GetLocalCapabilities_0100 - * @tc.desc: 测试 GetLocalCapabilities 获取能力文件接口调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_GetLocalCapabilities_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_GetLocalCapabilities_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_GetLocalCapabilities_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeGetLocalSendRequest)) - .WillOnce(Return(EPERM)); - UniqueFd fd = proxy_->GetLocalCapabilities(); - EXPECT_GT(fd, BError(BError::Codes::OK)); - UniqueFd fdErr = proxy_->GetLocalCapabilities(); - EXPECT_LT(fdErr, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_GetLocalCapabilities_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_PublishFile_0100 - * @tc.name: SUB_Service_proxy_PublishFile_0100 - * @tc.desc: 测试 PublishFile 推送接口调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_PublishFile_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_PublishFile_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_GetLocalCapabilities_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - string bundleName = "com.example.app2backup"; - string fileName = "1.tar"; - BFileInfo fileInfo(bundleName, fileName, -1); - int32_t result = proxy_->PublishFile(fileInfo); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->PublishFile(fileInfo); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_PublishFile_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_AppFileReady_0100 - * @tc.name: SUB_Service_proxy_AppFileReady_0100 - * @tc.desc: 测试 AppFileReady 文件就绪调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_AppFileReady_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_AppFileReady_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_AppFileReady_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(3) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)) - .WillOnce(Return(EPERM)); - - string bundleName = "com.example.app2backup"; - TestManager tm("AppFileReady_GetFd_0100"); - std::string filePath = tm.GetRootDirCurTest().append(FILE_NAME); - UniqueFd fd(open(filePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - - int32_t result = proxy_->AppFileReady(bundleName, move(fd), 0); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - TestManager tmErr("AppFileReady_GetFd_0200"); - UniqueFd fdErr(open(tmErr.GetRootDirCurTest().append(FILE_NAME).data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - result = proxy_->AppFileReady(bundleName, move(fdErr), 0); - EXPECT_NE(result, BError(BError::Codes::OK)); - result = proxy_->AppFileReady(bundleName, UniqueFd(-1), 0); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_AppFileReady_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_AppDone_0100 - * @tc.name: SUB_Service_proxy_AppDone_0100 - * @tc.desc: 测试 AppDone ext备份恢复流程结束调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_AppDone_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_AppDone_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_AppDone_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - int32_t result = proxy_->AppDone(BError(BError::Codes::OK)); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->AppDone(BError(BError::Codes::OK)); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_AppDone_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_ServiceResultReport_0100 - * @tc.name: SUB_Service_proxy_ServiceResultReport_0100 - * @tc.desc: 测试 ServiceResultReport - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_ServiceResultReport_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_ServiceResultReport_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_ServiceResultReport_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - std::string restoreRetInfo = "test_restoreRetInfo"; - BackupRestoreScenario scenario = FULL_BACKUP; - int32_t result = proxy_->ServiceResultReport(restoreRetInfo, scenario, BError(BError::Codes::OK)); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->ServiceResultReport(restoreRetInfo, scenario, BError(BError::Codes::OK)); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_ServiceResultReport_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_GetFileHandle_0100 - * @tc.name: SUB_Service_proxy_GetFileHandle_0100 - * @tc.desc: 测试 GetFileHandle 获取真实文件调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_GetFileHandle_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_GetFileHandle_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_GetFileHandle_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - string bundleName = "com.example.app2backup"; - string fileName = "1.tar"; - int32_t result = proxy_->GetFileHandle(bundleName, fileName); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->GetFileHandle(bundleName, fileName); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_GetFileHandle_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_AppendBundlesRestoreSession_0100 - * @tc.name: SUB_Service_proxy_AppendBundlesRestoreSession_0100 - * @tc.desc: 测试 AppendBundlesRestoreSession 获取真实文件调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6URNZ - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_AppendBundlesRestoreSession_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_AppendBundlesRestoreSession_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_AppendBundlesRestoreSession_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)); - - std::vector bundleNames; - TestManager tm("BackupSession_GetFd_0100"); - std::string filePath = tm.GetRootDirCurTest().append(FILE_NAME); - UniqueFd fd(open(filePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - int32_t result = proxy_->AppendBundlesRestoreSession(move(fd), bundleNames); - EXPECT_EQ(result, BError(BError::Codes::OK)); - result = proxy_->AppendBundlesRestoreSession(UniqueFd(-1), bundleNames); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_AppendBundlesRestoreSession_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_AppendBundlesRestoreSession_0101 - * @tc.name: SUB_Service_proxy_AppendBundlesRestoreSession_0101 - * @tc.desc: 测试 AppendBundlesRestoreSession 获取真实文件调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6URNZ - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_AppendBundlesRestoreSession_0101, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_AppendBundlesRestoreSession_0101"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_AppendBundlesRestoreSession_0101 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)); - - std::vector bundleNames; - TestManager tm("BackupSession_GetFd_0100"); - std::string filePath = tm.GetRootDirCurTest().append(FILE_NAME); - UniqueFd fd(open(filePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - std::vector detailInfos; - int32_t result = proxy_->AppendBundlesRestoreSession(move(fd), bundleNames, detailInfos); - EXPECT_EQ(result, BError(BError::Codes::OK)); - result = proxy_->AppendBundlesRestoreSession(UniqueFd(-1), bundleNames, detailInfos); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_AppendBundlesRestoreSession_0101"; -} - -/** - * @tc.number: SUB_Service_proxy_AppendBundlesRestoreSession_0200 - * @tc.name: SUB_Service_proxy_AppendBundlesRestoreSession_0200 - * @tc.desc: 测试 AppendBundlesRestoreSession 获取真实文件调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6URNZ - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_AppendBundlesRestoreSession_0200, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_AppendBundlesRestoreSession_0200"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_AppendBundlesRestoreSession_0200 proxy_ == nullptr"; - return; - } - - std::vector bundleNames; - int32_t result = proxy_->AppendBundlesRestoreSession(UniqueFd(-1), bundleNames); - EXPECT_NE(result, BError(BError::Codes::OK)); - result = proxy_->AppendBundlesRestoreSession(UniqueFd(-1), bundleNames); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_AppendBundlesRestoreSession_0200"; -} - -/** - * @tc.number: SUB_Service_proxy_AppendBundlesBackupSession_0100 - * @tc.name: SUB_Service_proxy_AppendBundlesBackupSession_0100 - * @tc.desc: 测试 AppendBundlesBackupSession 获取真实文件调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6URNZ - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_AppendBundlesBackupSession_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_AppendBundlesBackupSession_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_AppendBundlesBackupSession_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - - std::vector bundleNames; - - int32_t result = proxy_->AppendBundlesBackupSession(bundleNames); - EXPECT_EQ(result, BError(BError::Codes::OK)); - result = proxy_->AppendBundlesBackupSession(bundleNames); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_AppendBundlesBackupSession_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_AppendBundlesDetailsBackupSession_0100 - * @tc.name: SUB_Service_proxy_AppendBundlesDetailsBackupSession_0100 - * @tc.desc: 测试 AppendBundlesDetailsBackupSession - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6URNZ - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_AppendBundlesDetailsBackupSession_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_AppendBundlesDetailsBackupSession_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_AppendBundlesDetailsBackupSession_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - - std::vector bundleNames; - std::vector detailInfos; - - int32_t result = proxy_->AppendBundlesDetailsBackupSession(bundleNames, detailInfos); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->AppendBundlesDetailsBackupSession(bundleNames, detailInfos); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_AppendBundlesDetailsBackupSession_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_Finish_0100 - * @tc.name: SUB_Service_proxy_Finish_0100 - * @tc.desc: 测试 Finish 获取真实文件调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6URNZ - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_Finish_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_Finish_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_Finish_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - - int32_t result = proxy_->Finish(); - EXPECT_EQ(result, BError(BError::Codes::OK)); - result = proxy_->Finish(); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_Finish_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_Release_0100 - * @tc.name: SUB_Service_proxy_Release_0100 - * @tc.desc: 测试 Release 调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_Release_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_Release_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_Release_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - - int32_t result = proxy_->Release(); - EXPECT_EQ(result, BError(BError::Codes::OK)); - result = proxy_->Release(); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_Release_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_GetLocalCapabilitiesIncremental_0100 - * @tc.name: SUB_Service_proxy_GetLocalCapabilitiesIncremental_0100 - * @tc.desc: 测试 GetLocalCapabilitiesIncremental 接口调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_GetLocalCapabilitiesIncremental_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_GetLocalCapabilitiesIncremental_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_GetLocalCapabilitiesIncremental_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeGetLocalSendRequest)) - .WillOnce(Return(EPERM)); - - std::vector bundleNames; - BIncrementalData data("com.example.app2backup", 0); - bundleNames.push_back(data); - UniqueFd fd = proxy_->GetLocalCapabilitiesIncremental(bundleNames); - EXPECT_GT(fd, BError(BError::Codes::OK)); - - UniqueFd fdErr = proxy_->GetLocalCapabilitiesIncremental(bundleNames); - EXPECT_LT(fdErr, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_GetLocalCapabilitiesIncremental_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_InitIncrementalBackupSession_0100 - * @tc.name: SUB_Service_proxy_InitIncrementalBackupSession_0100 - * @tc.desc: 测试 InitIncrementalBackupSession 接口调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_InitIncrementalBackupSession_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_InitIncrementalBackupSession_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_InitIncrementalBackupSession_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)); - - int32_t result = proxy_->InitIncrementalBackupSession(remote_); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->InitIncrementalBackupSession(nullptr); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_InitIncrementalBackupSession_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_InitIncrementalBackupSession_0200 - * @tc.name: SUB_Service_proxy_InitIncrementalBackupSession_0200 - * @tc.desc: 测试 InitIncrementalBackupSession with errMsg接口调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_InitIncrementalBackupSession_0200, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_InitIncrementalBackupSession_0200"; - std::string errMsg; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_InitIncrementalBackupSession_0200 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeMsgSendRequest)); - - int32_t result = proxy_->InitIncrementalBackupSession(remote_, errMsg); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->InitIncrementalBackupSession(nullptr, errMsg); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_InitIncrementalBackupSession_0200"; -} - -/** - * @tc.number: SUB_Service_proxy_AppendBundlesIncrementalBackupSession_0100 - * @tc.name: SUB_Service_proxy_AppendBundlesIncrementalBackupSession_0100 - * @tc.desc: 测试 AppendBundlesIncrementalBackupSession 接口调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_AppendBundlesIncrementalBackupSession_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_AppendBundlesIncrementalBackupSession_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_AppendBundlesIncrementalBackupSession_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - - std::vector bundleNames; - int32_t result = proxy_->AppendBundlesIncrementalBackupSession(bundleNames); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->AppendBundlesIncrementalBackupSession(bundleNames); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_AppendBundlesIncrementalBackupSession_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_AppendBundlesIncrementalBackupSession_0101 - * @tc.name: SUB_Service_proxy_AppendBundlesIncrementalBackupSession_0101 - * @tc.desc: 测试 AppendBundlesIncrementalBackupSession 接口调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_AppendBundlesIncrementalBackupSession_0101, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_AppendBundlesDetailsIncrementalBackupSession_0101"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_AppendBundlesDetailsIncrementalBackupSession_0101 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - - std::vector bundleNames; - std::vector infos; - int32_t result = proxy_->AppendBundlesIncrementalBackupSession(bundleNames, infos); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->AppendBundlesIncrementalBackupSession(bundleNames, infos); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_AppendBundlesDetailsIncrementalBackupSession_0101"; -} - -/** - * @tc.number: SUB_Service_proxy_PublishIncrementalFile_0100 - * @tc.name: SUB_Service_proxy_PublishIncrementalFile_0100 - * @tc.desc: 测试 PublishIncrementalFile 接口调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_PublishIncrementalFile_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_PublishIncrementalFile_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_PublishIncrementalFile_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - - string bundleName = "com.example.app2backup"; - string fileName = ""; - BFileInfo fileInfo(bundleName, fileName, -1); - int32_t result = proxy_->PublishIncrementalFile(fileInfo); - EXPECT_EQ(result, BError(BError::Codes::OK)); - fileName = "test"; - result = proxy_->PublishIncrementalFile(fileInfo); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_PublishIncrementalFile_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_PublishSAIncrementalFile_0100 - * @tc.name: SUB_Service_proxy_PublishSAIncrementalFile_0100 - * @tc.desc: 测试 PublishSAIncrementalFile 接口调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_PublishSAIncrementalFile_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_PublishSAIncrementalFile_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_PublishSAIncrementalFile_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - - string bundleName = "com.example.app2backup"; - string fileName = ""; - BFileInfo fileInfo(bundleName, fileName, -1); - TestManager tm("AppIncrementalFileReady_GetFd_0100"); - std::string filePath = tm.GetRootDirCurTest().append(FILE_NAME); - UniqueFd fd(open(filePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - ErrCode ret = proxy_->PublishSAIncrementalFile(fileInfo, move(fd)); - EXPECT_EQ(ret, BError(BError::Codes::OK)); - - TestManager tmErr("AppIncrementalFileReady_GetFd_0200"); - UniqueFd fdErr(open(tmErr.GetRootDirCurTest().append(FILE_NAME).data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - ret = proxy_->PublishSAIncrementalFile(fileInfo, move(fdErr)); - EXPECT_NE(ret, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_PublishSAIncrementalFile_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_PublishSAIncrementalFile_0200 - * @tc.name: SUB_Service_proxy_PublishSAIncrementalFile_0200 - * @tc.desc: 测试 PublishSAIncrementalFile 接口调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_PublishSAIncrementalFile_0200, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_PublishSAIncrementalFile_0200"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_PublishSAIncrementalFile_0200 proxy_ == nullptr"; - return; - } - - string bundleName = "com.example.app2backup"; - string fileName = ""; - BFileInfo fileInfo(bundleName, fileName, -1); - ErrCode ret = proxy_->PublishSAIncrementalFile(fileInfo, UniqueFd(-1)); - EXPECT_NE(ret, BError(BError::Codes::OK)); - - ret = proxy_->PublishSAIncrementalFile(fileInfo, UniqueFd(-1)); - EXPECT_NE(ret, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_PublishSAIncrementalFile_0200"; -} - -/** - * @tc.number: SUB_Service_proxy_AppIncrementalFileReady_0100 - * @tc.name: SUB_Service_proxy_AppIncrementalFileReady_0100 - * @tc.desc: 测试 AppIncrementalFileReady 接口成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_AppIncrementalFileReady_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_AppIncrementalFileReady_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_AppIncrementalFileReady_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - - string bundleName = "com.example.app2backup"; - TestManager tm("AppIncrementalFileReady_GetFd_0100"); - std::string filePath = tm.GetRootDirCurTest().append(FILE_NAME); - UniqueFd fd(open(filePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - UniqueFd manifestFd(open(filePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - - int32_t result = proxy_->AppIncrementalFileReady(bundleName, move(fd), move(manifestFd), 0); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - TestManager tmErr("AppIncrementalFileReady_GetFd_0200"); - UniqueFd fdErr(open(tmErr.GetRootDirCurTest().append(FILE_NAME).data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - UniqueFd manifestFdErr( - open(tmErr.GetRootDirCurTest().append(FILE_NAME).data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - result = proxy_->AppIncrementalFileReady(bundleName, move(fdErr), move(manifestFdErr), 0); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_AppIncrementalFileReady_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_AppIncrementalFileReady_0200 - * @tc.name: SUB_Service_proxy_AppIncrementalFileReady_0200 - * @tc.desc: 测试 AppIncrementalFileReady 接口成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_AppIncrementalFileReady_0200, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_AppIncrementalFileReady_0200"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_AppIncrementalFileReady_0200 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Return(0)) - .WillOnce(Return(0)); - - string bundleName = "com.example.app2backup"; - TestManager tm("AppIncrementalFileReady_0200"); - std::string filePath = tm.GetRootDirCurTest().append(FILE_NAME); - UniqueFd fd(open(filePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - UniqueFd manifestFd(open(filePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - - int32_t result = proxy_->AppIncrementalFileReady(bundleName, UniqueFd(-1), move(manifestFd), 0); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->AppIncrementalFileReady(bundleName, move(fd), UniqueFd(-1), 0); - EXPECT_EQ(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_AppIncrementalFileReady_0200"; -} - -/** - * @tc.number: SUB_Service_proxy_AppIncrementalFileReady_0300 - * @tc.name: SUB_Service_proxy_AppIncrementalFileReady_0300 - * @tc.desc: 测试 AppIncrementalFileReady 接口成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_AppIncrementalFileReady_0300, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_AppIncrementalFileReady_0300"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_AppIncrementalFileReady_0300 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - - string bundleName = "com.example.app2backup"; - int32_t result = proxy_->AppIncrementalFileReady(bundleName, UniqueFd(-1), UniqueFd(-1), 0); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->AppIncrementalFileReady(bundleName, UniqueFd(-1), UniqueFd(-1), 0); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_AppIncrementalFileReady_0300"; -} - -/** - * @tc.number: SUB_Service_proxy_AppIncrementalDone_0100 - * @tc.name: SUB_Service_proxy_AppIncrementalDone_0100 - * @tc.desc: 测试 AppIncrementalDone 接口成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_AppIncrementalDone_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_AppIncrementalDone_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_AppIncrementalDone_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - int32_t result = proxy_->AppIncrementalDone(BError(BError::Codes::OK)); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->AppIncrementalDone(BError(BError::Codes::OK)); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_AppIncrementalDone_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_GetIncrementalFileHandle_0100 - * @tc.name: SUB_Service_proxy_GetIncrementalFileHandle_0100 - * @tc.desc: 测试 GetIncrementalFileHandle 接口成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_GetIncrementalFileHandle_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_GetIncrementalFileHandle_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_GetIncrementalFileHandle_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - string bundleName = "com.example.app2backup"; - string fileName = "1.tar"; - int32_t result = proxy_->GetIncrementalFileHandle(bundleName, fileName); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->GetIncrementalFileHandle(bundleName, fileName); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_GetIncrementalFileHandle_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_OnLoadSystemAbilitySuccess_0100 - * @tc.name: SUB_Service_proxy_OnLoadSystemAbilitySuccess_0100 - * @tc.desc: 测试 OnLoadSystemAbilitySuccess 接口 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_OnLoadSystemAbilitySuccess_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_OnLoadSystemAbilitySuccess_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_OnLoadSystemAbilitySuccess_0100 proxy_ == nullptr"; - return; - } - sptr loadCallback = new ServiceProxy::ServiceProxyLoadCallback(); - EXPECT_NE(loadCallback, nullptr); - loadCallback->OnLoadSystemAbilitySuccess(SERVICE_ID, nullptr); - loadCallback = nullptr; - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_OnLoadSystemAbilitySuccess_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_OnLoadSystemAbilitySuccess_0101 - * @tc.name: SUB_Service_proxy_OnLoadSystemAbilitySuccess_0101 - * @tc.desc: 测试 OnLoadSystemAbilitySuccess 接口 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_OnLoadSystemAbilitySuccess_0101, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_OnLoadSystemAbilitySuccess_0101"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_OnLoadSystemAbilitySuccess_0101 proxy_ == nullptr"; - return; - } - sptr loadCallback = new ServiceProxy::ServiceProxyLoadCallback(); - EXPECT_NE(loadCallback, nullptr); - int32_t systemAbilityId = 0; - sptr remoteObject = new MockIRemoteObject(); - loadCallback->OnLoadSystemAbilitySuccess(systemAbilityId, remoteObject); - loadCallback = nullptr; - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_OnLoadSystemAbilitySuccess_0101"; -} - -/** - * @tc.number: SUB_Service_proxy_OnLoadSystemAbilitySuccess_0102 - * @tc.name: SUB_Service_proxy_OnLoadSystemAbilitySuccess_0102 - * @tc.desc: 测试 OnLoadSystemAbilitySuccess 接口 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_OnLoadSystemAbilitySuccess_0102, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_OnLoadSystemAbilitySuccess_0102"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_OnLoadSystemAbilitySuccess_0102 proxy_ == nullptr"; - return; - } - sptr loadCallback = new ServiceProxy::ServiceProxyLoadCallback(); - EXPECT_NE(loadCallback, nullptr); - int32_t systemAbilityId = 0; - loadCallback->OnLoadSystemAbilitySuccess(systemAbilityId, nullptr); - loadCallback = nullptr; - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_OnLoadSystemAbilitySuccess_0102"; -} - -/** - * @tc.number: SUB_Service_proxy_OnLoadSystemAbilitySuccess_0103 - * @tc.name: SUB_Service_proxy_OnLoadSystemAbilitySuccess_0103 - * @tc.desc: 测试 OnLoadSystemAbilitySuccess 接口 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_OnLoadSystemAbilitySuccess_0103, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_OnLoadSystemAbilitySuccess_0103"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_OnLoadSystemAbilitySuccess_0103 proxy_ == nullptr"; - return; - } - sptr loadCallback = new ServiceProxy::ServiceProxyLoadCallback(); - EXPECT_NE(loadCallback, nullptr); - sptr remoteObject = new MockIRemoteObject(); - loadCallback->OnLoadSystemAbilitySuccess(SERVICE_ID, remoteObject); - loadCallback = nullptr; - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_OnLoadSystemAbilitySuccess_0103"; -} - -/** - * @tc.number: SUB_Service_proxy_OnLoadSystemAbilityFail_0100 - * @tc.name: SUB_Service_proxy_OnLoadSystemAbilityFail_0100 - * @tc.desc: 测试 OnLoadSystemAbilityFail 接口 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_OnLoadSystemAbilityFail_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_OnLoadSystemAbilityFail_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_OnLoadSystemAbilityFail_0100 proxy_ == nullptr"; - return; - } - sptr loadCallback = new ServiceProxy::ServiceProxyLoadCallback(); - EXPECT_NE(loadCallback, nullptr); - loadCallback->OnLoadSystemAbilityFail(SERVICE_ID); - loadCallback = nullptr; - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_OnLoadSystemAbilityFail_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_GetInstance_0100 - * @tc.name: SUB_Service_proxy_GetInstance_0100 - * @tc.desc: 测试 GetInstance 接口 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_GetInstance_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_GetInstance_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_GetInstance_0100 proxy_ == nullptr"; - return; - } - GTEST_LOG_(INFO) << "MockLoadSystemAbility is false"; - SetMockLoadSystemAbility(false); - auto proxy = ServiceProxy::GetInstance(); - EXPECT_EQ(proxy, nullptr); - GTEST_LOG_(INFO) << "MockLoadSystemAbility is true"; - SetMockLoadSystemAbility(true); - proxy = ServiceProxy::GetInstance(); - EXPECT_EQ(proxy, nullptr); - sptr loadCallback = new ServiceProxy::ServiceProxyLoadCallback(); - sptr object = new MockIRemoteObject(); - loadCallback->OnLoadSystemAbilitySuccess(SERVICE_ID, object); - GTEST_LOG_(INFO) << "GetInstance is ok"; - proxy = ServiceProxy::GetInstance(); - EXPECT_NE(proxy, nullptr); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_GetInstance_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_InvaildInstance_0100 - * @tc.name: SUB_Service_proxy_InvaildInstance_0100 - * @tc.desc: 测试 InvaildInstance 接口 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_InvaildInstance_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_InvaildInstance_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_InvaildInstance_0100 proxy_ == nullptr"; - return; - } - ServiceProxy::InvaildInstance(); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_InvaildInstance_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_GetBackupInfo_0100 - * @tc.name: SUB_Service_proxy_GetBackupInfo_0100 - * @tc.desc: 测试 GetBackupInfo 获取应用信息接口调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_GetBackupInfo_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_GetBackupInfo_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_GetBackupInfo_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)); - std::string result; - std::string bundleName = "com.example.app2backup"; - int32_t ret = proxy_->GetBackupInfo(bundleName, result); - EXPECT_EQ(ret, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_GetBackupInfo_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_UpdateTimer_0100 - * @tc.name: SUB_Service_proxy_UpdateTimer_0100 - * @tc.desc: 测试 UpdateTimer 获取应用信息接口调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_UpdateTimer_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_UpdateTimer_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_UpdateTimer_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)); - bool result; - std::string bundleName = "com.example.app2backup"; - uint32_t timeout = 30000; - int32_t ret = proxy_->UpdateTimer(bundleName, timeout, result); - EXPECT_EQ(ret, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_UpdateTimer_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_UpdateSendRate_0100 - * @tc.name: SUB_Service_proxy_UpdateSendRate_0100 - * @tc.desc: 测试 UpdateSendRate 获取应用信息接口调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_UpdateSendRate_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_UpdateSendRate_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_UpdateSendRate_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)); - bool result; - std::string bundleName = "com.example.app2backup"; - int32_t sendRate = 300; - int32_t ret = proxy_->UpdateSendRate(bundleName, sendRate, result); - EXPECT_EQ(ret, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_UpdateSendRate_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_GetAppLocalListAndDoIncrementalBackup_0100 - * @tc.name: SUB_Service_proxy_GetAppLocalListAndDoIncrementalBackup_0100 - * @tc.desc: 测试 GetAppLocalListAndDoIncrementalBackup 执行DoBackup的接口成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_GetAppLocalListAndDoIncrementalBackup_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_GetAppLocalListAndDoIncrementalBackup_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_GetAppLocalListAndDoIncrementalBackup_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - int32_t ret = proxy_->GetAppLocalListAndDoIncrementalBackup(); - EXPECT_EQ(ret, BError(BError::Codes::OK)); - ret = proxy_->GetAppLocalListAndDoIncrementalBackup(); - EXPECT_NE(ret, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_GetAppLocalListAndDoIncrementalBackup_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_ReportAppProcessInfo_0100 - * @tc.name: SUB_Service_proxy_ReportAppProcessInfo_0100 - * @tc.desc: 测试 ReportAppProcessInfo 接口成功 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_ReportAppProcessInfo_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_ReportAppProcessInfo_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_ReportAppProcessInfo_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(4) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)); - std::string processInfo = "{\"timeInfo\": \"\", \"resultInfo\": \"\"}"; - int32_t result = proxy_->ReportAppProcessInfo(processInfo, BackupRestoreScenario::FULL_RESTORE); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->ReportAppProcessInfo(processInfo, BackupRestoreScenario::INCREMENTAL_RESTORE); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->ReportAppProcessInfo(processInfo, BackupRestoreScenario::FULL_BACKUP); - EXPECT_EQ(result, BError(BError::Codes::OK)); - - result = proxy_->ReportAppProcessInfo(processInfo, BackupRestoreScenario::INCREMENTAL_BACKUP); - EXPECT_EQ(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_ReportAppProcessInfo_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_ReportAppProcessInfo_0101 - * @tc.name: SUB_Service_proxy_ReportAppProcessInfo_0101 - * @tc.desc: 测试 ReportAppProcessInfo 接口失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_ReportAppProcessInfo_0101, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_ReportAppProcessInfo_0101"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_ReportAppProcessInfo_0101 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(4) - .WillOnce(Return(EPERM)) - .WillOnce(Return(EPERM)) - .WillOnce(Return(EPERM)) - .WillOnce(Return(EPERM)); - std::string processInfo = "{\"timeInfo\": \"\", \"resultInfo\": \"\"}"; - int32_t result = proxy_->ReportAppProcessInfo(processInfo, BackupRestoreScenario::FULL_RESTORE); - EXPECT_NE(result, BError(BError::Codes::OK)); - - result = proxy_->ReportAppProcessInfo(processInfo, BackupRestoreScenario::INCREMENTAL_RESTORE); - EXPECT_NE(result, BError(BError::Codes::OK)); - - result = proxy_->ReportAppProcessInfo(processInfo, BackupRestoreScenario::FULL_BACKUP); - EXPECT_NE(result, BError(BError::Codes::OK)); - - result = proxy_->ReportAppProcessInfo(processInfo, BackupRestoreScenario::INCREMENTAL_BACKUP); - EXPECT_NE(result, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_ReportAppProcessInfo_0101"; -} - -/** - * @tc.number: SUB_Service_proxy_StartExtTimer_0100 - * @tc.name: SUB_Service_proxy_StartExtTimer_0100 - * @tc.desc: 测试 StartExtTimer 执行DoBackup的接口成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_StartExtTimer_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_StartExtTimer_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_StartExtTimer_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - bool isExtStart; - int32_t ret = proxy_->StartExtTimer(isExtStart); - EXPECT_EQ(ret, BError(BError::Codes::OK)); - ret = proxy_->StartExtTimer(isExtStart); - EXPECT_NE(ret, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_StartExtTimer_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_StartFwkTimer_0100 - * @tc.name: SUB_Service_proxy_StartFwkTimer_0100 - * @tc.desc: 测试 StartFwkTimer 执行DoBackup的接口成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_StartFwkTimer_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_StartFwkTimer_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_StartFwkTimer_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - bool isFwkStart; - int32_t ret = proxy_->StartFwkTimer(isFwkStart); - EXPECT_EQ(ret, BError(BError::Codes::OK)); - ret = proxy_->StartFwkTimer(isFwkStart); - EXPECT_NE(ret, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_StartFwkTimer_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_Cancel_0100 - * @tc.name: SUB_Service_proxy_Cancel_0100 - * @tc.desc: 测试 Cancel 调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_Cancel_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_Cancel_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_Cancel_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - std::string bundleName; - int result; - ErrCode ret = proxy_->Cancel(bundleName, result); - EXPECT_EQ(ret, BError(BError::Codes::OK)); - ret = proxy_->Cancel(bundleName, result); - EXPECT_NE(ret, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_Cancel_0100"; -} -} // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/tests/unittests/backup_api/backup_impl/service_reverse_stub_test.cpp b/tests/unittests/backup_api/backup_impl/service_reverse_stub_test.cpp deleted file mode 100644 index 7c2284f6bf33b9c9b602d1cda4e592fc641fb8a1..0000000000000000000000000000000000000000 --- a/tests/unittests/backup_api/backup_impl/service_reverse_stub_test.cpp +++ /dev/null @@ -1,889 +0,0 @@ -/* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "b_error/b_error.h" -#include "i_service_reverse.h" -#include "service_reverse_stub.h" -#include "test_manager.h" -#include "unique_fd.h" - -namespace OHOS::FileManagement::Backup { -using namespace std; -using namespace testing; - -namespace { -const string BUNDLE_NAME = "com.example.app2backup"; -const string FILE_NAME = "1.tar"; -const string FILE_NAME_MANIFEST = "1.fr"; -} // namespace - -class MockServiceReverse final : public ServiceReverseStub { -public: - MOCK_METHOD4(BackupOnFileReady, void(string bundleName, string fileName, int fd, int32_t errCode)); - MOCK_METHOD2(BackupOnBundleStarted, void(int32_t errCode, string bundleName)); - MOCK_METHOD2(BackupOnResultReport, void(string result, std::string bundleName)); - MOCK_METHOD2(BackupOnBundleFinished, void(int32_t errCode, string bundleName)); - MOCK_METHOD1(BackupOnAllBundlesFinished, void(int32_t errCode)); - MOCK_METHOD2(BackupOnProcessInfo, void(std::string bundleName, std::string processInfo)); - MOCK_METHOD1(BackupOnScanningInfo, void(std::string scannedInfo)); - - MOCK_METHOD2(RestoreOnBundleStarted, void(int32_t errCode, std::string bundleName)); - MOCK_METHOD2(RestoreOnBundleFinished, void(int32_t errCode, string bundleName)); - MOCK_METHOD1(RestoreOnAllBundlesFinished, void(int32_t errCode)); - MOCK_METHOD4(RestoreOnFileReady, void(string bundleName, string fileName, int fd, int32_t errCode)); - MOCK_METHOD3(RestoreOnResultReport, void(string result, string bundleName, ErrCode errCode)); - MOCK_METHOD2(RestoreOnProcessInfo, void(std::string bundleName, std::string processInfo)); - - MOCK_METHOD5(IncrementalBackupOnFileReady, - void(string bundleName, string fileName, int fd, int manifestFd, int32_t errCode)); - MOCK_METHOD2(IncrementalBackupOnBundleStarted, void(int32_t errCode, string bundleName)); - MOCK_METHOD2(IncrementalBackupOnResultReport, void(string result, std::string bundleName)); - MOCK_METHOD2(IncrementalBackupOnBundleFinished, void(int32_t errCode, string bundleName)); - MOCK_METHOD1(IncrementalBackupOnAllBundlesFinished, void(int32_t errCode)); - MOCK_METHOD2(IncrementalBackupOnProcessInfo, void(std::string bundleName, std::string processInfo)); - MOCK_METHOD1(IncrementalBackupOnScanningInfo, void(std::string scannedInfo)); - - MOCK_METHOD2(IncrementalRestoreOnBundleStarted, void(int32_t errCode, std::string bundleName)); - MOCK_METHOD2(IncrementalRestoreOnBundleFinished, void(int32_t errCode, string bundleName)); - MOCK_METHOD1(IncrementalRestoreOnAllBundlesFinished, void(int32_t errCode)); - MOCK_METHOD5(IncrementalRestoreOnFileReady, - void(string bundleName, string fileName, int fd, int manifestFd, int32_t errCode)); - MOCK_METHOD3(IncrementalRestoreOnResultReport, void(string result, string bundleName, ErrCode errCode)); - MOCK_METHOD2(IncrementalRestoreOnProcessInfo, void(std::string bundleName, std::string processInfo)); -}; - -class ServiceReverseStubTest : public testing::Test { -public: - static void SetUpTestCase(void) {}; - static void TearDownTestCase() {}; - void SetUp() override {}; - void TearDown() override {}; -}; - -/** - * @tc.number: SUB_backup_ServiceReverseStub_BackupOnFileReady_0100 - * @tc.name: SUB_backup_ServiceReverseStub_BackupOnFileReady_0100 - * @tc.desc: Test function of BackupOnFileReady interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseStubTest, SUB_backup_ServiceReverseStub_BackupOnFileReady_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_BackupOnFileReady_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, BackupOnFileReady(_, _, _, _)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteString(BUNDLE_NAME)); - EXPECT_TRUE(data.WriteString(FILE_NAME)); - TestManager tm("ServiceReverseStub_0100"); - string filePath = tm.GetRootDirCurTest().append(FILE_NAME); - UniqueFd fd(open(filePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - data.WriteFileDescriptor(fd); - data.WriteInt32(0); - - EXPECT_EQ( - BError(BError::Codes::OK), - service.OnRemoteRequest(static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_FILE_READY), - data, reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by BackupOnFileReady."; - } - GTEST_LOG_(INFO) << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_BackupOnFileReady_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_BackupOnBundleStarted_0100 - * @tc.name: SUB_backup_ServiceReverseStub_BackupOnBundleStarted_0100 - * @tc.desc: Test function of BackupOnBundleStarted interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_BackupOnBundleStarted_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_BackupOnBundleStarted_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, BackupOnBundleStarted(_, _)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteInt32(BError(BError::Codes::OK))); - EXPECT_TRUE(data.WriteString(BUNDLE_NAME)); - - EXPECT_EQ(BError(BError::Codes::OK), - service.OnRemoteRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_SUB_TASK_STARTED), data, - reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by BackupOnBundleStarted."; - } - GTEST_LOG_(INFO) << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_BackupOnBundleStarted_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_BackupOnResultReport_0100 - * @tc.name: SUB_backup_ServiceReverseStub_BackupOnResultReport_0100 - * @tc.desc: Test function of BackupOnResultReport interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_BackupOnResultReport_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_BackupOnResultReport_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, BackupOnResultReport(_, _)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteString(BUNDLE_NAME)); - - EXPECT_EQ(BError(BError::Codes::OK), - service.OnRemoteRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_RESULT_REPORT), data, - reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by BackupOnResultReport."; - } - GTEST_LOG_(INFO) << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_BackupOnResultReport_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_BackupOnBundleFinished_0100 - * @tc.name: SUB_backup_ServiceReverseStub_BackupOnBundleFinished_0100 - * @tc.desc: Test function of BackupOnBundleFinished interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_BackupOnBundleFinished_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_BackupOnBundleFinished_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, BackupOnBundleFinished(_, _)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteInt32(BError(BError::Codes::OK))); - EXPECT_TRUE(data.WriteString(BUNDLE_NAME)); - - EXPECT_EQ(BError(BError::Codes::OK), - service.OnRemoteRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_SUB_TASK_FINISHED), data, - reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by BackupOnBundleFinished."; - } - GTEST_LOG_(INFO) << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_BackupOnBundleFinished_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_BackupOnAllBundlesFinished_0100 - * @tc.name: SUB_backup_ServiceReverseStub_BackupOnAllBundlesFinished_0100 - * @tc.desc: Test function of BackupOnAllBundlesFinished interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_BackupOnAllBundlesFinished_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_BackupOnAllBundlesFinished_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, BackupOnAllBundlesFinished(_)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteInt32(BError(BError::Codes::OK))); - - EXPECT_EQ(BError(BError::Codes::OK), - service.OnRemoteRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_TASK_FINISHED), data, - reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by BackupOnAllBundlesFinished."; - } - GTEST_LOG_(INFO) << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_BackupOnAllBundlesFinished_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_RestoreOnBundleStarted_0100 - * @tc.name: SUB_backup_ServiceReverseStub_RestoreOnBundleStarted_0100 - * @tc.desc: Test function of RestoreOnBundleStarted interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_RestoreOnBundleStarted_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_RestoreOnBundleStarted_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, RestoreOnBundleStarted(_, _)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteInt32(BError(BError::Codes::OK))); - EXPECT_TRUE(data.WriteString(BUNDLE_NAME)); - - EXPECT_EQ(BError(BError::Codes::OK), - service.OnRemoteRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_SUB_TASK_STARTED), data, - reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by RestoreOnBundleStarted."; - } - GTEST_LOG_(INFO) << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_RestoreOnBundleStarted_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_RestoreOnBundleFinished_0100 - * @tc.name: SUB_backup_ServiceReverseStub_RestoreOnBundleFinished_0100 - * @tc.desc: Test function of RestoreOnBundleFinished interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_RestoreOnBundleFinished_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_RestoreOnBundleFinished_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, RestoreOnBundleFinished(_, _)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteInt32(BError(BError::Codes::OK))); - EXPECT_TRUE(data.WriteString(BUNDLE_NAME)); - - EXPECT_EQ(BError(BError::Codes::OK), - service.OnRemoteRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_SUB_TASK_FINISHED), data, - reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by RestoreOnBundleFinished."; - } - GTEST_LOG_(INFO) << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_RestoreOnBundleFinished_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_RestoreOnAllBundlesFinished_0100 - * @tc.name: SUB_backup_ServiceReverseStub_RestoreOnAllBundlesFinished_0100 - * @tc.desc: Test function of RestoreOnBundleStarted interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_RestoreOnAllBundlesFinished_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_RestoreOnAllBundlesFinished_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, RestoreOnAllBundlesFinished(_)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteInt32(BError(BError::Codes::OK))); - - EXPECT_EQ(BError(BError::Codes::OK), - service.OnRemoteRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_TASK_FINISHED), data, - reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by RestoreOnAllBundlesFinished."; - } - GTEST_LOG_(INFO) << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_RestoreOnAllBundlesFinished_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_RestoreOnFileReady_0100 - * @tc.name: SUB_backup_ServiceReverseStub_RestoreOnFileReady_0100 - * @tc.desc: Test function of RestoreOnFileReady interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseStubTest, SUB_backup_ServiceReverseStub_RestoreOnFileReady_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_RestoreOnFileReady_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, RestoreOnFileReady(_, _, _, _)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - int32_t errCode = 0; - bool fdFlag = true; - - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteString(BUNDLE_NAME)); - EXPECT_TRUE(data.WriteString(FILE_NAME)); - - TestManager tm("ServiceReverseStub_0200"); - string filePath = tm.GetRootDirCurTest().append(FILE_NAME); - UniqueFd fd(open(filePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - if (fd < 0) { - errCode = BError::GetCodeByErrno(errno); - fdFlag = false; - } - data.WriteBool(fdFlag); - if (fdFlag == true) { - data.WriteFileDescriptor(fd); - } - data.WriteInt32(errCode); - - EXPECT_EQ( - BError(BError::Codes::OK), - service.OnRemoteRequest(static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_FILE_READY), - data, reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by RestoreOnFileReady."; - } - GTEST_LOG_(INFO) << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_RestoreOnFileReady_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_error_0100 - * @tc.name: SUB_backup_ServiceReverseStub_error_0100 - * @tc.desc: Test function of RestoreOnFileReady interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseStubTest, SUB_backup_ServiceReverseStub_error_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_error_0100"; - try { - MockServiceReverse service; - MessageParcel data; - MessageParcel reply; - MessageOption option; - EXPECT_TRUE(data.WriteInterfaceToken(Str8ToStr16("test"))); - - EXPECT_NE(BError(BError::Codes::OK), service.OnRemoteRequest(3333, data, reply, option)); - EXPECT_NE( - BError(BError::Codes::OK), - service.OnRemoteRequest(static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_FILE_READY), - data, reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred."; - } - GTEST_LOG_(INFO) << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_error_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_IncrementalBackupOnFileReady_0100 - * @tc.name: SUB_backup_ServiceReverseStub_IncrementalBackupOnFileReady_0100 - * @tc.desc: Test function of IncrementalBackupOnFileReady interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZZX - */ -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_IncrementalBackupOnFileReady_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_IncrementalBackupOnFileReady_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, IncrementalBackupOnFileReady(_, _, _, _, _)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteString(BUNDLE_NAME)); - EXPECT_TRUE(data.WriteString(FILE_NAME)); - TestManager tm("ServiceReverseStub_0300"); - string filePath = tm.GetRootDirCurTest().append(FILE_NAME); - UniqueFd fd(open(filePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - data.WriteFileDescriptor(fd); - TestManager tm2("ServiceReverseStub_0301"); - string filePathManifest = tm2.GetRootDirCurTest().append(FILE_NAME_MANIFEST); - UniqueFd fdManifest(open(filePathManifest.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - data.WriteFileDescriptor(fdManifest); - data.WriteInt32(0); - - EXPECT_EQ(BError(BError::Codes::OK), - service.OnRemoteRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_FILE_READY), - data, reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by IncrementalBackupOnFileReady."; - } - GTEST_LOG_(INFO) << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_IncrementalBackupOnFileReady_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_IncrementalBackupOnBundleStarted_0100 - * @tc.name: SUB_backup_ServiceReverseStub_IncrementalBackupOnBundleStarted_0100 - * @tc.desc: Test function of IncrementalBackupOnBundleStarted interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZZX - */ -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_IncrementalBackupOnBundleStarted_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) - << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_IncrementalBackupOnBundleStarted_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, IncrementalBackupOnBundleStarted(_, _)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteInt32(BError(BError::Codes::OK))); - EXPECT_TRUE(data.WriteString(BUNDLE_NAME)); - - EXPECT_EQ( - BError(BError::Codes::OK), - service.OnRemoteRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_SUB_TASK_STARTED), - data, reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by IncrementalBackupOnBundleStarted."; - } - GTEST_LOG_(INFO) - << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_IncrementalBackupOnBundleStarted_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_IncrementalBackupOnResultReport_0100 - * @tc.name: SUB_backup_ServiceReverseStub_IncrementalBackupOnResultReport_0100 - * @tc.desc: Test function of IncrementalBackupOnResultReport interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZZX - */ -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_IncrementalBackupOnResultReport_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) - << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_IncrementalBackupOnResultReport_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, IncrementalBackupOnResultReport(_, _)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteString(BUNDLE_NAME)); - - EXPECT_EQ( - BError(BError::Codes::OK), - service.OnRemoteRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_RESULT_REPORT), - data, reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by IncrementalBackupOnResultReport."; - } - GTEST_LOG_(INFO) - << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_IncrementalBackupOnResultReport_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_IncrementalBackupOnBundleFinished_0100 - * @tc.name: SUB_backup_ServiceReverseStub_IncrementalBackupOnBundleFinished_0100 - * @tc.desc: Test function of IncrementalBackupOnBundleFinished interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZZX - */ -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_IncrementalBackupOnBundleFinished_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) - << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_IncrementalBackupOnBundleFinished_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, IncrementalBackupOnBundleFinished(_, _)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteInt32(BError(BError::Codes::OK))); - EXPECT_TRUE(data.WriteString(BUNDLE_NAME)); - - EXPECT_EQ( - BError(BError::Codes::OK), - service.OnRemoteRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_SUB_TASK_FINISHED), - data, reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by IncrementalBackupOnBundleFinished."; - } - GTEST_LOG_(INFO) - << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_IncrementalBackupOnBundleFinished_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_IncrementalBackupOnAllBundlesFinished_0100 - * @tc.name: SUB_backup_ServiceReverseStub_IncrementalBackupOnAllBundlesFinished_0100 - * @tc.desc: Test function of IncrementalBackupOnAllBundlesFinished interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZZX - */ - -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_IncrementalBackupOnAllBundlesFinished_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) - << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_IncrementalBackupOnAllBundlesFinished_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, IncrementalBackupOnAllBundlesFinished(_)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteInt32(BError(BError::Codes::OK))); - - EXPECT_EQ(BError(BError::Codes::OK), - service.OnRemoteRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_TASK_FINISHED), - data, reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by IncrementalBackupOnAllBundlesFinished."; - } - GTEST_LOG_(INFO) - << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_IncrementalBackupOnAllBundlesFinished_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_IncrementalRestoreOnBundleStarted_0100 - * @tc.name: SUB_backup_ServiceReverseStub_IncrementalRestoreOnBundleStarted_0100 - * @tc.desc: Test function of IncrementalRestoreOnBundleStarted interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZZX - */ -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_IncrementalRestoreOnBundleStarted_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) - << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_IncrementalRestoreOnBundleStarted_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, IncrementalRestoreOnBundleStarted(_, _)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteInt32(BError(BError::Codes::OK))); - EXPECT_TRUE(data.WriteString(BUNDLE_NAME)); - - EXPECT_EQ( - BError(BError::Codes::OK), - service.OnRemoteRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_RESTORE_ON_SUB_TASK_STARTED), - data, reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by IncrementalRestoreOnBundleStarted."; - } - GTEST_LOG_(INFO) - << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_IncrementalRestoreOnBundleStarted_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_IncrementalRestoreOnBundleFinished_0100 - * @tc.name: SUB_backup_ServiceReverseStub_IncrementalRestoreOnBundleFinished_0100 - * @tc.desc: Test function of IncrementalRestoreOnBundleFinished interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZZX - */ -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_IncrementalRestoreOnBundleFinished_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) - << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_IncrementalRestoreOnBundleFinished_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, IncrementalRestoreOnBundleFinished(_, _)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteInt32(BError(BError::Codes::OK))); - EXPECT_TRUE(data.WriteString(BUNDLE_NAME)); - - EXPECT_EQ( - BError(BError::Codes::OK), - service.OnRemoteRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_RESTORE_ON_SUB_TASK_FINISHED), - data, reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by IncrementalRestoreOnBundleFinished."; - } - GTEST_LOG_(INFO) - << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_IncrementalRestoreOnBundleFinished_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_IncrementalRestoreOnAllBundlesFinished_0100 - * @tc.name: SUB_backup_ServiceReverseStub_IncrementalRestoreOnAllBundlesFinished_0100 - * @tc.desc: Test function of IncrementalRestoreOnAllBundlesFinished interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZZX - */ -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_IncrementalRestoreOnAllBundlesFinished_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) - << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_IncrementalRestoreOnAllBundlesFinished_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, IncrementalRestoreOnAllBundlesFinished(_)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteInt32(BError(BError::Codes::OK))); - - EXPECT_EQ( - BError(BError::Codes::OK), - service.OnRemoteRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_RESTORE_ON_TASK_FINISHED), - data, reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by IncrementalRestoreOnAllBundlesFinished."; - } - GTEST_LOG_(INFO) - << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_IncrementalRestoreOnAllBundlesFinished_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_IncrementalRestoreOnFileReady_0100 - * @tc.name: SUB_backup_ServiceReverseStub_IncrementalRestoreOnFileReady_0100 - * @tc.desc: Test function of IncrementalRestoreOnFileReady interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZZX - */ -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_IncrementalRestoreOnFileReady_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_IncrementalRestoreOnFileReady_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, IncrementalRestoreOnFileReady(_, _, _, _, _)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteString(BUNDLE_NAME)); - EXPECT_TRUE(data.WriteString(FILE_NAME)); - TestManager tm("ServiceReverseStub_0400"); - string filePath = tm.GetRootDirCurTest().append(FILE_NAME); - UniqueFd fd(open(filePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - data.WriteFileDescriptor(fd); - TestManager tm2("ServiceReverseStub_0401"); - string filePathManifest = tm2.GetRootDirCurTest().append(FILE_NAME_MANIFEST); - UniqueFd fdManifest(open(filePathManifest.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - data.WriteFileDescriptor(fdManifest); - - EXPECT_EQ(BError(BError::Codes::OK), - service.OnRemoteRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_RESTORE_ON_FILE_READY), - data, reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by IncrementalRestoreOnFileReady."; - } - GTEST_LOG_(INFO) << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_IncrementalRestoreOnFileReady_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_RestoreOnResultReport_0100 - * @tc.name: SUB_backup_ServiceReverseStub_RestoreOnResultReport_0100 - * @tc.desc: Test function of RestoreOnResultReport interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZZX - */ -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_RestoreOnResultReport_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) - << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_RestoreOnResultReport_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, RestoreOnResultReport(_, _, _)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - std::string resultReport = "result_report"; - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteString(resultReport)); - EXPECT_TRUE(data.WriteString(BUNDLE_NAME)); - EXPECT_TRUE(data.WriteInt32(0)); - - EXPECT_EQ( - BError(BError::Codes::OK), - service.OnRemoteRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_RESULT_REPORT), - data, reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by RestoreOnResultReport."; - } - GTEST_LOG_(INFO) - << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_RestoreOnResultReport_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_IncrementalRestoreOnResultReport_0100 - * @tc.name: SUB_backup_ServiceReverseStub_IncrementalRestoreOnResultReport_0100 - * @tc.desc: Test function of IncrementalRestoreOnResultReport interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZZX - */ -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_IncrementalRestoreOnResultReport_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) - << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_RestoreOnResultReport_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, IncrementalRestoreOnResultReport(_, _, _)).WillOnce(Return()); - MessageParcel data; - MessageParcel reply; - MessageOption option; - std::string resultReport = "result_report"; - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteString(resultReport)); - EXPECT_TRUE(data.WriteInt32(0)); - - EXPECT_EQ( - BError(BError::Codes::OK), - service.OnRemoteRequest( - static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_RESTORE_ON_RESULT_REPORT), - data, reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by RestoreOnResultReport."; - } - GTEST_LOG_(INFO) - << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_IncrementalRestoreOnResultReport_0100"; -} -} // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/tests/unittests/backup_api/backup_impl/service_reverse_test.cpp b/tests/unittests/backup_api/backup_impl/service_reverse_test.cpp index 98bccfac2d5691c8908071cec4c743556ec0cf1a..05e4d6c77f26d9e8da4351ec7c9f2041b299369e 100644 --- a/tests/unittests/backup_api/backup_impl/service_reverse_test.cpp +++ b/tests/unittests/backup_api/backup_impl/service_reverse_test.cpp @@ -45,8 +45,8 @@ public: void SetUp() override {}; void TearDown() override; - void Init(IServiceReverse::Scenario scenario, int nType = 0); - void IncrementalInit(IServiceReverse::Scenario scenario, int nType = 0); + void Init(IServiceReverseType::Scenario scenario, int nType = 0); + void IncrementalInit(IServiceReverseType::Scenario scenario, int nType = 0); sptr service_ = nullptr; }; @@ -89,9 +89,9 @@ void ServiceReverseTest::TearDown() service_ = nullptr; } -void ServiceReverseTest::Init(IServiceReverse::Scenario scenario, int nType) +void ServiceReverseTest::Init(IServiceReverseType::Scenario scenario, int nType) { - if (scenario == IServiceReverse::Scenario::BACKUP) { + if (scenario == IServiceReverseType::Scenario::BACKUP) { if (nType) { service_ = new ServiceReverse(BSessionBackup::Callbacks {.onFileReady = nullptr, .onBundleStarted = nullptr, @@ -128,9 +128,9 @@ void ServiceReverseTest::Init(IServiceReverse::Scenario scenario, int nType) } } -void ServiceReverseTest::IncrementalInit(IServiceReverse::Scenario scenario, int nType) +void ServiceReverseTest::IncrementalInit(IServiceReverseType::Scenario scenario, int nType) { - if (scenario == IServiceReverse::Scenario::BACKUP) { + if (scenario == IServiceReverseType::Scenario::BACKUP) { if (nType) { service_ = new ServiceReverse(BIncrementalBackupSession::Callbacks {.onFileReady = nullptr, .onBundleStarted = nullptr, @@ -179,7 +179,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_BackupOnFileReady_0100, t { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_BackupOnFileReady_0100"; try { - Init(IServiceReverse::Scenario::BACKUP); + Init(IServiceReverseType::Scenario::BACKUP); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_BackupOnFileReady_0100 service_ == nullptr"; @@ -207,7 +207,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_BackupOnFileReady_0101, t { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_BackupOnFileReady_0101"; try { - Init(IServiceReverse::Scenario::RESTORE); + Init(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_BackupOnFileReady_0101 service_ == nullptr"; @@ -234,7 +234,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_BackupOnFileReady_0102, t { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_BackupOnFileReady_0102"; try { - Init(IServiceReverse::Scenario::BACKUP, 1); + Init(IServiceReverseType::Scenario::BACKUP, 1); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_BackupOnFileReady_0102 service_ == nullptr"; @@ -261,7 +261,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_BackupOnBundleStarted_010 { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_BackupOnBundleStarted_0100"; try { - Init(IServiceReverse::Scenario::BACKUP); + Init(IServiceReverseType::Scenario::BACKUP); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_BackupOnBundleStarted_0100 service_ == nullptr"; @@ -289,7 +289,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_BackupOnBundleStarted_010 { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_BackupOnBundleStarted_0101"; try { - Init(IServiceReverse::Scenario::RESTORE); + Init(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_BackupOnBundleStarted_0101 service_ == nullptr"; @@ -316,7 +316,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_BackupOnBundleStarted_010 { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_BackupOnBundleStarted_0102"; try { - Init(IServiceReverse::Scenario::BACKUP, 1); + Init(IServiceReverseType::Scenario::BACKUP, 1); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_BackupOnBundleStarted_0102 service_ == nullptr"; @@ -343,7 +343,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_BackupOnBundleFinished_01 { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_BackupOnBundleFinished_0100"; try { - Init(IServiceReverse::Scenario::BACKUP); + Init(IServiceReverseType::Scenario::BACKUP); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_BackupOnBundleFinished_0100 service_ == nullptr"; @@ -371,7 +371,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_BackupOnBundleFinished_01 { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_BackupOnBundleFinished_0101"; try { - Init(IServiceReverse::Scenario::RESTORE); + Init(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_BackupOnBundleFinished_0101 service_ == nullptr"; @@ -398,7 +398,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_BackupOnBundleFinished_01 { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_BackupOnBundleFinished_0102"; try { - Init(IServiceReverse::Scenario::BACKUP, 1); + Init(IServiceReverseType::Scenario::BACKUP, 1); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_BackupOnBundleFinished_0102 service_ == nullptr"; @@ -425,7 +425,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_BackupOnAllBundlesFinishe { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_BackupOnAllBundlesFinished_0100"; try { - Init(IServiceReverse::Scenario::BACKUP); + Init(IServiceReverseType::Scenario::BACKUP); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_BackupOnAllBundlesFinished_0100 service_ == nullptr"; @@ -453,7 +453,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_BackupOnAllBundlesFinishe { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_BackupOnAllBundlesFinished_0101"; try { - Init(IServiceReverse::Scenario::RESTORE); + Init(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_BackupOnAllBundlesFinished_0101 service_ == nullptr"; @@ -480,7 +480,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_BackupOnAllBundlesFinishe { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_BackupOnAllBundlesFinished_0102"; try { - Init(IServiceReverse::Scenario::BACKUP, 1); + Init(IServiceReverseType::Scenario::BACKUP, 1); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_BackupOnAllBundlesFinished_0102 service_ == nullptr"; @@ -507,7 +507,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_RestoreOnFileReady_0100, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_RestoreOnFileReady_0100"; try { - Init(IServiceReverse::Scenario::RESTORE); + Init(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_RestoreOnFileReady_0100 service_ == nullptr"; @@ -535,7 +535,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_RestoreOnFileReady_0101, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_RestoreOnFileReady_0101"; try { - Init(IServiceReverse::Scenario::BACKUP); + Init(IServiceReverseType::Scenario::BACKUP); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_RestoreOnFileReady_0101 service_ == nullptr"; @@ -562,7 +562,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_RestoreOnFileReady_0102, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_RestoreOnFileReady_0102"; try { - Init(IServiceReverse::Scenario::RESTORE, 1); + Init(IServiceReverseType::Scenario::RESTORE, 1); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_RestoreOnFileReady_0102 service_ == nullptr"; @@ -589,7 +589,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_RestoreOnBundleStarted_01 { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_RestoreOnBundleStarted_0100"; try { - Init(IServiceReverse::Scenario::RESTORE); + Init(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_RestoreOnBundleStarted_0100 service_ == nullptr"; @@ -617,7 +617,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_RestoreOnBundleStarted_01 { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_RestoreOnBundleStarted_0101"; try { - Init(IServiceReverse::Scenario::BACKUP); + Init(IServiceReverseType::Scenario::BACKUP); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_RestoreOnBundleStarted_0101 service_ == nullptr"; @@ -644,7 +644,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_RestoreOnBundleStarted_01 { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_RestoreOnBundleStarted_0102"; try { - Init(IServiceReverse::Scenario::RESTORE, 1); + Init(IServiceReverseType::Scenario::RESTORE, 1); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_RestoreOnBundleStarted_0102 service_ == nullptr"; @@ -671,7 +671,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_RestoreOnBundleFinished_0 { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_RestoreOnBundleFinished_0100"; try { - Init(IServiceReverse::Scenario::RESTORE); + Init(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_RestoreOnBundleFinished_0100 service_ == nullptr"; @@ -699,7 +699,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_RestoreOnBundleFinished_0 { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_RestoreOnBundleFinished_0101"; try { - Init(IServiceReverse::Scenario::BACKUP); + Init(IServiceReverseType::Scenario::BACKUP); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_RestoreOnBundleFinished_0101 service_ == nullptr"; @@ -726,7 +726,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_RestoreOnBundleFinished_0 { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_RestoreOnBundleFinished_0102"; try { - Init(IServiceReverse::Scenario::RESTORE, 1); + Init(IServiceReverseType::Scenario::RESTORE, 1); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_RestoreOnBundleFinished_0102 service_ == nullptr"; @@ -753,7 +753,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_RestoreOnAllBundlesFinish { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_RestoreOnAllBundlesFinished_0100"; try { - Init(IServiceReverse::Scenario::RESTORE); + Init(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_RestoreOnAllBundlesFinished_0100 service_ == nullptr"; @@ -781,7 +781,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_RestoreOnAllBundlesFinish { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_RestoreOnAllBundlesFinished_0101"; try { - Init(IServiceReverse::Scenario::BACKUP); + Init(IServiceReverseType::Scenario::BACKUP); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_RestoreOnAllBundlesFinished_0101 service_ == nullptr"; @@ -808,7 +808,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_RestoreOnAllBundlesFinish { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_RestoreOnAllBundlesFinished_0102"; try { - Init(IServiceReverse::Scenario::RESTORE, 1); + Init(IServiceReverseType::Scenario::RESTORE, 1); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_RestoreOnAllBundlesFinished_0102 service_ == nullptr"; @@ -835,7 +835,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_BackupOnProcessInfo_0100, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_BackupOnProcessInfo_0100"; try { - Init(IServiceReverse::Scenario::BACKUP); + Init(IServiceReverseType::Scenario::BACKUP); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_BackupOnProcessInfo_0100 service_ == nullptr"; @@ -865,7 +865,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_BackupOnProcessInfo_0101, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_BackupOnProcessInfo_0101"; try { - Init(IServiceReverse::Scenario::RESTORE); + Init(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_BackupOnProcessInfo_0101 service_ == nullptr"; @@ -894,7 +894,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_BackupOnProcessInfo_0102, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_BackupOnProcessInfo_0102"; try { - Init(IServiceReverse::Scenario::BACKUP, 1); + Init(IServiceReverseType::Scenario::BACKUP, 1); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_BackupOnProcessInfo_0102 service_ == nullptr"; @@ -923,7 +923,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_0200, testing::ext::TestS { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_0200"; try { - Init(IServiceReverse::Scenario::RESTORE, 1); + Init(IServiceReverseType::Scenario::RESTORE, 1); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_0200 service_ == nullptr"; @@ -953,7 +953,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_0201, testing::ext::TestS { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_0201"; try { - Init(IServiceReverse::Scenario::RESTORE, 0); + Init(IServiceReverseType::Scenario::RESTORE, 0); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_0201 service_ == nullptr"; @@ -983,7 +983,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_0300, testing::ext::TestS { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_0300"; try { - Init(IServiceReverse::Scenario::BACKUP, 1); + Init(IServiceReverseType::Scenario::BACKUP, 1); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_0300 service_ == nullptr"; @@ -1013,7 +1013,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_0301, testing::ext::TestS { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_0301"; try { - Init(IServiceReverse::Scenario::BACKUP, 0); + Init(IServiceReverseType::Scenario::BACKUP, 0); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_0301 service_ == nullptr"; @@ -1043,7 +1043,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_IncrementalBackupOnFileRe { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalBackupOnFileReady_0100"; try { - IncrementalInit(IServiceReverse::Scenario::BACKUP); + IncrementalInit(IServiceReverseType::Scenario::BACKUP); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalBackupOnFileReady_0100 service_ == nullptr"; @@ -1071,7 +1071,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_IncrementalBackupOnFileRe { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalBackupOnFileReady_0101"; try { - IncrementalInit(IServiceReverse::Scenario::RESTORE); + IncrementalInit(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalBackupOnFileReady_0101 service_ == nullptr"; @@ -1079,7 +1079,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_IncrementalBackupOnFileRe } service_->IncrementalBackupOnFileReady(BUNDLE_NAME, FILE_NAME, -1, -1, 0); - IncrementalInit(IServiceReverse::Scenario::BACKUP, 1); + IncrementalInit(IServiceReverseType::Scenario::BACKUP, 1); service_->IncrementalBackupOnFileReady(BUNDLE_NAME, FILE_NAME, -1, -1, 0); } catch (...) { EXPECT_TRUE(false); @@ -1103,7 +1103,7 @@ HWTEST_F(ServiceReverseTest, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalBackupOnBundleStarted_0100"; try { - IncrementalInit(IServiceReverse::Scenario::BACKUP); + IncrementalInit(IServiceReverseType::Scenario::BACKUP); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalBackupOnBundleStarted_0100 service_ == nullptr"; @@ -1133,7 +1133,7 @@ HWTEST_F(ServiceReverseTest, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalBackupOnBundleStarted_0101"; try { - IncrementalInit(IServiceReverse::Scenario::RESTORE); + IncrementalInit(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalBackupOnBundleStarted_0101 service_ == nullptr"; @@ -1141,7 +1141,7 @@ HWTEST_F(ServiceReverseTest, } service_->IncrementalBackupOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - IncrementalInit(IServiceReverse::Scenario::BACKUP, 1); + IncrementalInit(IServiceReverseType::Scenario::BACKUP, 1); service_->IncrementalBackupOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); } catch (...) { EXPECT_TRUE(false); @@ -1165,7 +1165,7 @@ HWTEST_F(ServiceReverseTest, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalBackupOnBundleFinished_0100"; try { - IncrementalInit(IServiceReverse::Scenario::BACKUP); + IncrementalInit(IServiceReverseType::Scenario::BACKUP); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalBackupOnBundleFinished_0100 service_ == nullptr"; @@ -1195,7 +1195,7 @@ HWTEST_F(ServiceReverseTest, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalBackupOnBundleFinished_0101"; try { - IncrementalInit(IServiceReverse::Scenario::RESTORE); + IncrementalInit(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalBackupOnBundleFinished_0101 service_ == nullptr"; @@ -1203,7 +1203,7 @@ HWTEST_F(ServiceReverseTest, } service_->IncrementalBackupOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - IncrementalInit(IServiceReverse::Scenario::BACKUP, 1); + IncrementalInit(IServiceReverseType::Scenario::BACKUP, 1); service_->IncrementalBackupOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); } catch (...) { EXPECT_TRUE(false); @@ -1227,7 +1227,7 @@ HWTEST_F(ServiceReverseTest, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalBackupOnAllBundlesFinished_0100"; try { - IncrementalInit(IServiceReverse::Scenario::BACKUP); + IncrementalInit(IServiceReverseType::Scenario::BACKUP); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalBackupOnAllBundlesFinished_0100 service_ == nullptr"; @@ -1257,7 +1257,7 @@ HWTEST_F(ServiceReverseTest, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalBackupOnAllBundlesFinished_0101"; try { - IncrementalInit(IServiceReverse::Scenario::RESTORE); + IncrementalInit(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalBackupOnAllBundlesFinished_0101 service_ == nullptr"; @@ -1265,7 +1265,7 @@ HWTEST_F(ServiceReverseTest, } service_->IncrementalBackupOnAllBundlesFinished(BError(BError::Codes::OK)); - IncrementalInit(IServiceReverse::Scenario::BACKUP, 1); + IncrementalInit(IServiceReverseType::Scenario::BACKUP, 1); service_->IncrementalBackupOnAllBundlesFinished(BError(BError::Codes::OK)); } catch (...) { EXPECT_TRUE(false); @@ -1289,7 +1289,7 @@ HWTEST_F(ServiceReverseTest, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalRestoreOnFileReady_0100"; try { - IncrementalInit(IServiceReverse::Scenario::RESTORE); + IncrementalInit(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalRestoreOnFileReady_0100 service_ == nullptr"; @@ -1319,7 +1319,7 @@ HWTEST_F(ServiceReverseTest, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalRestoreOnFileReady_0101"; try { - IncrementalInit(IServiceReverse::Scenario::BACKUP); + IncrementalInit(IServiceReverseType::Scenario::BACKUP); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalRestoreOnFileReady_0101 service_ == nullptr"; @@ -1327,7 +1327,7 @@ HWTEST_F(ServiceReverseTest, } service_->IncrementalRestoreOnFileReady(BUNDLE_NAME, FILE_NAME, -1, -1, 0); - IncrementalInit(IServiceReverse::Scenario::RESTORE, 1); + IncrementalInit(IServiceReverseType::Scenario::RESTORE, 1); service_->IncrementalRestoreOnFileReady(BUNDLE_NAME, FILE_NAME, -1, -1, 0); } catch (...) { EXPECT_TRUE(false); @@ -1351,7 +1351,7 @@ HWTEST_F(ServiceReverseTest, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalRestoreOnBundleStarted_0100"; try { - IncrementalInit(IServiceReverse::Scenario::RESTORE); + IncrementalInit(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalRestoreOnBundleStarted_0100 service_ == nullptr"; @@ -1381,7 +1381,7 @@ HWTEST_F(ServiceReverseTest, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalRestoreOnBundleStarted_0101"; try { - IncrementalInit(IServiceReverse::Scenario::BACKUP); + IncrementalInit(IServiceReverseType::Scenario::BACKUP); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalRestoreOnBundleStarted_0101 service_ == nullptr"; @@ -1389,7 +1389,7 @@ HWTEST_F(ServiceReverseTest, } service_->IncrementalRestoreOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - IncrementalInit(IServiceReverse::Scenario::RESTORE, 1); + IncrementalInit(IServiceReverseType::Scenario::RESTORE, 1); service_->IncrementalRestoreOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); } catch (...) { EXPECT_TRUE(false); @@ -1413,7 +1413,7 @@ HWTEST_F(ServiceReverseTest, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalRestoreOnBundleFinished_0100"; try { - IncrementalInit(IServiceReverse::Scenario::RESTORE); + IncrementalInit(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalRestoreOnBundleFinished_0100 service_ == nullptr"; @@ -1443,7 +1443,7 @@ HWTEST_F(ServiceReverseTest, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalRestoreOnBundleFinished_0101"; try { - IncrementalInit(IServiceReverse::Scenario::BACKUP); + IncrementalInit(IServiceReverseType::Scenario::BACKUP); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalRestoreOnBundleFinished_0101 service_ == nullptr"; @@ -1451,7 +1451,7 @@ HWTEST_F(ServiceReverseTest, } service_->IncrementalRestoreOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - IncrementalInit(IServiceReverse::Scenario::RESTORE, 1); + IncrementalInit(IServiceReverseType::Scenario::RESTORE, 1); service_->IncrementalRestoreOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); } catch (...) { EXPECT_TRUE(false); @@ -1476,7 +1476,7 @@ HWTEST_F(ServiceReverseTest, GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalRestoreOnAllBundlesFinished_0100"; try { - IncrementalInit(IServiceReverse::Scenario::RESTORE); + IncrementalInit(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalRestoreOnAllBundlesFinished_0100 service_ == nullptr"; @@ -1507,7 +1507,7 @@ HWTEST_F(ServiceReverseTest, GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalRestoreOnAllBundlesFinished_0101"; try { - IncrementalInit(IServiceReverse::Scenario::BACKUP); + IncrementalInit(IServiceReverseType::Scenario::BACKUP); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalRestoreOnAllBundlesFinished_0101 service_ == nullptr"; @@ -1515,7 +1515,7 @@ HWTEST_F(ServiceReverseTest, } service_->IncrementalRestoreOnAllBundlesFinished(BError(BError::Codes::OK)); - IncrementalInit(IServiceReverse::Scenario::RESTORE, 1); + IncrementalInit(IServiceReverseType::Scenario::RESTORE, 1); service_->IncrementalRestoreOnAllBundlesFinished(BError(BError::Codes::OK)); } catch (...) { EXPECT_TRUE(false); @@ -1537,7 +1537,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_RestoreOnResultReport_010 { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_RestoreOnResultReport_0100"; try { - Init(IServiceReverse::Scenario::RESTORE); + Init(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_RestoreOnResultReport_0100 service_ == nullptr"; return; @@ -1565,7 +1565,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_RestoreOnResultReport_010 { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_RestoreOnResultReport_0101"; try { - Init(IServiceReverse::Scenario::RESTORE, 1); + Init(IServiceReverseType::Scenario::RESTORE, 1); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_RestoreOnResultReport_0101 service_ == nullptr"; return; @@ -1594,14 +1594,14 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_IncrementalRestoreOnResul { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalRestoreOnResultReport_0100"; try { - IncrementalInit(IServiceReverse::Scenario::RESTORE); + IncrementalInit(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalRestoreOnResultReport_0100 service_ == nullptr"; return; } std::string resultReport = "result_report"; std::string bundleName = BUNDLE_NAME; - service_->IncrementalRestoreOnResultReport(resultReport, bundleName); + service_->IncrementalRestoreOnResultReport(resultReport, bundleName, 0); } catch (...) { EXPECT_TRUE(false); GTEST_LOG_(INFO) << "ServiceReverseTest-an exception occurred by IncrementalRestoreOnResultReport."; @@ -1623,14 +1623,14 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_IncrementalRestoreOnResul { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalRestoreOnResultReport_0101"; try { - IncrementalInit(IServiceReverse::Scenario::RESTORE, 1); + IncrementalInit(IServiceReverseType::Scenario::RESTORE, 1); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalRestoreOnResultReport_0101 service_ == nullptr"; return; } std::string resultReport = "result_report"; std::string bundleName = BUNDLE_NAME; - service_->IncrementalRestoreOnResultReport(resultReport, bundleName); + service_->IncrementalRestoreOnResultReport(resultReport, bundleName, 0); } catch (...) { EXPECT_TRUE(false); GTEST_LOG_(INFO) << "ServiceReverseTest-an exception occurred by IncrementalRestoreOnResultReport."; @@ -1651,7 +1651,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_BackupOnResultReport_0100 { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_BackupOnResultReport_0100"; try { - Init(IServiceReverse::Scenario::BACKUP); + Init(IServiceReverseType::Scenario::BACKUP); std::string resultReport = "result_report"; std::string bundleName = BUNDLE_NAME; if (service_ == nullptr) { @@ -1679,7 +1679,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_BackupOnResultReport_0101 { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_BackupOnResultReport_0101"; try { - Init(IServiceReverse::Scenario::BACKUP, 1); + Init(IServiceReverseType::Scenario::BACKUP, 1); std::string resultReport = "result_report"; std::string bundleName = BUNDLE_NAME; if (service_ == nullptr) { @@ -1708,7 +1708,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_IncrementalBackupOnResult { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalBackupOnResultReport_0100"; try { - IncrementalInit(IServiceReverse::Scenario::BACKUP); + IncrementalInit(IServiceReverseType::Scenario::BACKUP); std::string resultReport = "result_report"; std::string bundleName = BUNDLE_NAME; if (service_ == nullptr) { @@ -1737,7 +1737,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_IncrementalBackupOnResult { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalBackupOnResultReport_0101"; try { - IncrementalInit(IServiceReverse::Scenario::BACKUP, 1); + IncrementalInit(IServiceReverseType::Scenario::BACKUP, 1); std::string resultReport = "result_report"; std::string bundleName = BUNDLE_NAME; if (service_ == nullptr) { diff --git a/tests/unittests/backup_ext/BUILD.gn b/tests/unittests/backup_ext/BUILD.gn index aa8aa131721fa88c64b501c21696ca0fa93d05a2..64c6c92351a19aa0744dd5b19a8cddbbceed4894 100644 --- a/tests/unittests/backup_ext/BUILD.gn +++ b/tests/unittests/backup_ext/BUILD.gn @@ -26,8 +26,6 @@ ohos_unittest("ext_extension_test") { module_out_path = path_module_out_tests sources = [ - "${path_backup}/frameworks/native/backup_kit_inner/src/service_incremental_proxy.cpp", - "${path_backup}/frameworks/native/backup_kit_inner/src/service_proxy.cpp", "ext_extension_test.cpp", ] @@ -41,6 +39,7 @@ ohos_unittest("ext_extension_test") { ] deps = [ + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner_ipc_stub", "${path_backup}/utils:backup_utils", "${path_jsoncpp}:jsoncpp", "//third_party/googletest:gtest_main", @@ -78,49 +77,6 @@ ohos_unittest("ext_extension_test") { use_exceptions = true } -ohos_unittest("ext_extension_stub_test") { - module_out_path = path_module_out_tests - - sources = [ - "${path_backup_mock}/module_ipc/message_parcel_mock.cpp", - "${path_backup}/frameworks/native/backup_ext/src/ext_extension_stub.cpp", - "ext_extension_stub_test.cpp", - ] - - include_dirs = [ - "${path_backup_mock}/module_ipc", - "${path_backup}/frameworks/native/backup_ext/include", - "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", - "${path_backup}/interfaces/common/include", - "${path_backup}/utils/include", - ] - - deps = [ - "${path_backup}/utils:backup_utils", - "//third_party/googletest:gmock_main", - "//third_party/googletest:gtest_main", - ] - - external_deps = [ - "c_utils:utils", - "hilog:libhilog", - "ipc:ipc_core", - "safwk:system_ability_fwk", - ] - - cflags = [ "--coverage" ] - ldflags = [ "--coverage" ] - cflags_cc = [ "--coverage" ] - - defines = [ - "LOG_TAG=\"app_file_service\"", - "LOG_DOMAIN=0xD004303", - "private=public", - ] - - use_exceptions = true -} - ohos_unittest("tar_file_test") { branch_protector_ret = "pac_ret" sanitize = { @@ -139,7 +95,6 @@ ohos_unittest("tar_file_test") { "${path_backup}/frameworks/native/backup_ext/src/ext_backup_js.cpp", "${path_backup}/frameworks/native/backup_ext/src/ext_backup_loader.cpp", "${path_backup}/frameworks/native/backup_ext/src/ext_extension.cpp", - "${path_backup}/frameworks/native/backup_ext/src/ext_extension_stub.cpp", "${path_backup}/frameworks/native/backup_ext/src/sub_ext_extension.cpp", "${path_backup}/frameworks/native/backup_ext/src/tar_file.cpp", "${path_backup}/frameworks/native/backup_ext/src/untar_file.cpp", @@ -214,7 +169,6 @@ ohos_unittest("untar_file_sup_test") { "${path_backup}/frameworks/native/backup_ext/src/ext_backup_js.cpp", "${path_backup}/frameworks/native/backup_ext/src/ext_backup_loader.cpp", "${path_backup}/frameworks/native/backup_ext/src/ext_extension.cpp", - "${path_backup}/frameworks/native/backup_ext/src/ext_extension_stub.cpp", "${path_backup}/frameworks/native/backup_ext/src/sub_ext_extension.cpp", "${path_backup}/frameworks/native/backup_ext/src/tar_file.cpp", "${path_backup}/tests/mock/library_func_mock/library_func_mock.cpp", @@ -290,7 +244,6 @@ ohos_unittest("untar_file_test") { "${path_backup}/frameworks/native/backup_ext/src/ext_backup_js.cpp", "${path_backup}/frameworks/native/backup_ext/src/ext_backup_loader.cpp", "${path_backup}/frameworks/native/backup_ext/src/ext_extension.cpp", - "${path_backup}/frameworks/native/backup_ext/src/ext_extension_stub.cpp", "${path_backup}/frameworks/native/backup_ext/src/sub_ext_extension.cpp", "${path_backup}/frameworks/native/backup_ext/src/tar_file.cpp", "${path_backup}/frameworks/native/backup_ext/src/untar_file.cpp", @@ -368,6 +321,7 @@ ohos_unittest("ext_backup_js_test") { deps = [ "${path_backup}/utils:backup_utils", + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner_ipc_stub", "${path_googletest}:gmock_main", "${path_googletest}:gtest_main", "${path_jsoncpp}:jsoncpp", @@ -403,6 +357,13 @@ ohos_unittest("ext_backup_js_test") { "private=public", ] + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + blocklist = "${path_backup}/cfi_blocklist.txt" + } + use_exceptions = true } @@ -445,7 +406,6 @@ group("backup_ext_test") { if (!use_libfuzzer) { deps = [ ":ext_backup_js_test", - ":ext_extension_stub_test", ":ext_extension_test", ":tar_file_sub_test", ":tar_file_test", diff --git a/tests/unittests/backup_ext/ext_extension_stub_test.cpp b/tests/unittests/backup_ext/ext_extension_stub_test.cpp deleted file mode 100644 index 6e07ddd4d1ccb59e9d565c239926e9b31462c8c6..0000000000000000000000000000000000000000 --- a/tests/unittests/backup_ext/ext_extension_stub_test.cpp +++ /dev/null @@ -1,606 +0,0 @@ -/* - * Copyright (c) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include - -#include "b_error/b_error.h" -#include "ext_extension_stub.h" -#include "message_parcel_mock.h" - -namespace OHOS::FileManagement::Backup { -using namespace std; -using namespace testing; - -class ExtExtensionStubMock : public ExtExtensionStub { -public: - MOCK_METHOD(UniqueFd, GetFileHandle, (const std::string &fileName, int32_t &errCode)); - MOCK_METHOD(ErrCode, HandleClear, ()); - MOCK_METHOD(ErrCode, HandleBackup, (bool isClearData)); - MOCK_METHOD(ErrCode, PublishFile, (const std::string &fileName)); - MOCK_METHOD(ErrCode, HandleRestore, (bool isClearData)); - MOCK_METHOD((std::tuple), GetIncrementalFileHandle, (const std::string &fileName)); - MOCK_METHOD(ErrCode, PublishIncrementalFile, (const std::string &fileName)); - MOCK_METHOD(ErrCode, HandleIncrementalBackup, (UniqueFd incrementalFd, UniqueFd manifestFd)); - MOCK_METHOD(ErrCode, IncrementalOnBackup, (bool isClearData)); - MOCK_METHOD((std::tuple), GetIncrementalBackupFileHandle, ()); - MOCK_METHOD(ErrCode, GetBackupInfo, (std::string &result)); - MOCK_METHOD(ErrCode, UpdateFdSendRate, (std::string &bundleName, int32_t sendRate)); - MOCK_METHOD(ErrCode, User0OnBackup, ()); -}; - -class ExtExtensionStubTest : public testing::Test { -public: - //所有测试用例执行之前执行 - static void SetUpTestCase(void); - //所有测试用例执行之后执行 - static void TearDownTestCase(void); - //每次测试用例执行之前执行 - void SetUp() {}; - //每次测试用例执行之后执行 - void TearDown() {}; -public: - static inline shared_ptr stub = nullptr; - static inline shared_ptr messageParcelMock = nullptr; -}; - -void ExtExtensionStubTest::SetUpTestCase() -{ - stub = make_shared(); - messageParcelMock = make_shared(); - MessageParcelMock::messageParcel = messageParcelMock; -} - -void ExtExtensionStubTest::TearDownTestCase() -{ - stub = nullptr; - MessageParcelMock::messageParcel = nullptr; - messageParcelMock = nullptr; -} - -/** - * @tc.number: SUB_backup_ext_ExtExtensionStub_OnRemoteRequest_0100 - * @tc.name: SUB_backup_ext_ExtExtensionStub_OnRemoteRequest_0100 - * @tc.desc: 测试 OnRemoteRequest 各个分支成功与失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: issuesI9QWK5 - */ -HWTEST_F(ExtExtensionStubTest, SUB_backup_ext_ExtExtensionStub_OnRemoteRequest_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ExtExtensionStubTest-begin SUB_backup_ext_ExtExtensionStub_OnRemoteRequest_0100"; - try { - ASSERT_TRUE(stub != nullptr); - uint32_t code = 0; - MessageParcel data; - MessageParcel reply; - MessageOption option; - EXPECT_CALL(*messageParcelMock, ReadInterfaceToken()).WillOnce(Return(u16string())); - auto err = stub->OnRemoteRequest(code, data, reply, option); - EXPECT_EQ(err, BError(BError::Codes::EXT_INVAL_ARG)); - - const std::u16string descriptor = ExtExtensionStub::GetDescriptor(); - EXPECT_CALL(*messageParcelMock, ReadInterfaceToken()).WillOnce(Return(descriptor)); - EXPECT_CALL(*messageParcelMock, ReadString(_)).WillOnce(Return(false)); - err = stub->OnRemoteRequest(static_cast(IExtensionInterfaceCode::CMD_GET_FILE_HANDLE), - data, reply, option); - EXPECT_EQ(err, BError(BError::Codes::EXT_INVAL_ARG)); - - EXPECT_CALL(*messageParcelMock, ReadInterfaceToken()).WillOnce(Return(descriptor)); - auto ret = stub->OnRemoteRequest(-1, data, reply, option); - EXPECT_EQ(ret, IPC_STUB_UNKNOW_TRANS_ERR); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ExtExtensionStubTest-an exception occurred by OnRemoteRequest."; - } - GTEST_LOG_(INFO) << "ExtExtensionStubTest-end SUB_backup_ext_ExtExtensionStub_OnRemoteRequest_0100"; -} - -/** - * @tc.number: SUB_backup_ext_ExtExtensionStub_CmdGetFileHandle_0100 - * @tc.name: SUB_backup_ext_ExtExtensionStub_CmdGetFileHandle_0100 - * @tc.desc: 测试 CmdGetFileHandle 各个分支成功与失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: issuesI9QWK5 - */ -HWTEST_F(ExtExtensionStubTest, SUB_backup_ext_ExtExtensionStub_CmdGetFileHandle_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ExtExtensionStubTest-begin SUB_backup_ext_ExtExtensionStub_CmdGetFileHandle_0100"; - try { - ASSERT_TRUE(stub != nullptr); - MessageParcel data; - MessageParcel reply; - EXPECT_CALL(*messageParcelMock, ReadString(_)).WillOnce(Return(false)); - auto err = stub->CmdGetFileHandle(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_INVAL_ARG)); - - EXPECT_CALL(*messageParcelMock, ReadString(_)).WillOnce(Return(true)); - EXPECT_CALL(*stub, GetFileHandle(_, _)).WillOnce(Return(UniqueFd(-1))); - EXPECT_CALL(*messageParcelMock, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(true)); - err = stub->CmdGetFileHandle(data, reply); - EXPECT_EQ(err, BError(BError::Codes::OK)); - - EXPECT_CALL(*messageParcelMock, ReadString(_)).WillOnce(Return(true)); - EXPECT_CALL(*stub, GetFileHandle(_, _)).WillOnce(Return(UniqueFd(0))); - EXPECT_CALL(*messageParcelMock, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock, WriteFileDescriptor(_)).WillOnce(Return(false)); - err = stub->CmdGetFileHandle(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_BROKEN_IPC)); - - EXPECT_CALL(*messageParcelMock, ReadString(_)).WillOnce(Return(true)); - EXPECT_CALL(*stub, GetFileHandle(_, _)).WillOnce(Return(UniqueFd(0))); - EXPECT_CALL(*messageParcelMock, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock, WriteFileDescriptor(_)).WillOnce(Return(true)); - err = stub->CmdGetFileHandle(data, reply); - EXPECT_EQ(err, BError(BError::Codes::OK)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ExtExtensionStubTest-an exception occurred by CmdGetFileHandle."; - } - GTEST_LOG_(INFO) << "ExtExtensionStubTest-end SUB_backup_ext_ExtExtensionStub_CmdGetFileHandle_0100"; -} - -/** - * @tc.number: SUB_backup_ext_ExtExtensionStub_CmdHandleClear_0100 - * @tc.name: SUB_backup_ext_ExtExtensionStub_CmdHandleClear_0100 - * @tc.desc: 测试 CmdHandleClear 各个分支成功与失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: issuesI9QWK5 - */ -HWTEST_F(ExtExtensionStubTest, SUB_backup_ext_ExtExtensionStub_CmdHandleClear_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ExtExtensionStubTest-begin SUB_backup_ext_ExtExtensionStub_CmdHandleClear_0100"; - try { - ASSERT_TRUE(stub != nullptr); - MessageParcel data; - MessageParcel reply; - EXPECT_CALL(*stub, HandleClear()).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(false)); - auto err = stub->CmdHandleClear(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_BROKEN_IPC)); - - EXPECT_CALL(*stub, HandleClear()).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(true)); - err = stub->CmdHandleClear(data, reply); - EXPECT_EQ(err, BError(BError::Codes::OK)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ExtExtensionStubTest-an exception occurred by CmdHandleClear."; - } - GTEST_LOG_(INFO) << "ExtExtensionStubTest-end SUB_backup_ext_ExtExtensionStub_CmdHandleClear_0100"; -} - -/** - * @tc.number: SUB_backup_ext_ExtExtensionStub_CmdHandleBackup_0100 - * @tc.name: SUB_backup_ext_ExtExtensionStub_CmdHandleBackup_0100 - * @tc.desc: 测试 CmdHandleBackup 各个分支成功与失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: issuesI9QWK5 - */ -HWTEST_F(ExtExtensionStubTest, SUB_backup_ext_ExtExtensionStub_CmdHandleBackup_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ExtExtensionStubTest-begin SUB_backup_ext_ExtExtensionStub_CmdHandleBackup_0100"; - try { - ASSERT_TRUE(stub != nullptr); - MessageParcel data; - MessageParcel reply; - EXPECT_CALL(*messageParcelMock, ReadBool()).WillOnce(Return(true)); - EXPECT_CALL(*stub, HandleBackup(_)).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(false)); - auto err = stub->CmdHandleBackup(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_BROKEN_IPC)); - - EXPECT_CALL(*messageParcelMock, ReadBool()).WillOnce(Return(true)); - EXPECT_CALL(*stub, HandleBackup(_)).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(true)); - err = stub->CmdHandleBackup(data, reply); - EXPECT_EQ(err, BError(BError::Codes::OK)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ExtExtensionStubTest-an exception occurred by CmdHandleBackup."; - } - GTEST_LOG_(INFO) << "ExtExtensionStubTest-end SUB_backup_ext_ExtExtensionStub_CmdHandleBackup_0100"; -} - -/** - * @tc.number: SUB_backup_ext_ExtExtensionStub_CmdPublishFile_0100 - * @tc.name: SUB_backup_ext_ExtExtensionStub_CmdPublishFile_0100 - * @tc.desc: 测试 CmdPublishFile 各个分支成功与失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: issuesI9QWK5 - */ -HWTEST_F(ExtExtensionStubTest, SUB_backup_ext_ExtExtensionStub_CmdPublishFile_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ExtExtensionStubTest-begin SUB_backup_ext_ExtExtensionStub_CmdPublishFile_0100"; - try { - ASSERT_TRUE(stub != nullptr); - MessageParcel data; - MessageParcel reply; - EXPECT_CALL(*messageParcelMock, ReadString(_)).WillOnce(Return(false)); - auto err = stub->CmdPublishFile(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_INVAL_ARG)); - - EXPECT_CALL(*messageParcelMock, ReadString(_)).WillOnce(Return(true)); - EXPECT_CALL(*stub, PublishFile(_)).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(false)); - err = stub->CmdPublishFile(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_BROKEN_IPC)); - - EXPECT_CALL(*messageParcelMock, ReadString(_)).WillOnce(Return(true)); - EXPECT_CALL(*stub, PublishFile(_)).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(true)); - err = stub->CmdPublishFile(data, reply); - EXPECT_EQ(err, BError(BError::Codes::OK)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ExtExtensionStubTest-an exception occurred by CmdPublishFile."; - } - GTEST_LOG_(INFO) << "ExtExtensionStubTest-end SUB_backup_ext_ExtExtensionStub_CmdPublishFile_0100"; -} - -/** - * @tc.number: SUB_backup_ext_ExtExtensionStub_CmdHandleRestore_0100 - * @tc.name: SUB_backup_ext_ExtExtensionStub_CmdHandleRestore_0100 - * @tc.desc: 测试 CmdHandleRestore 各个分支成功与失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: issuesI9QWK5 - */ -HWTEST_F(ExtExtensionStubTest, SUB_backup_ext_ExtExtensionStub_CmdHandleRestore_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ExtExtensionStubTest-begin SUB_backup_ext_ExtExtensionStub_CmdHandleRestore_0100"; - try { - ASSERT_TRUE(stub != nullptr); - MessageParcel data; - MessageParcel reply; - EXPECT_CALL(*messageParcelMock, ReadBool()).WillOnce(Return(true)); - EXPECT_CALL(*stub, HandleRestore(_)).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(false)); - auto err = stub->CmdHandleRestore(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_BROKEN_IPC)); - - EXPECT_CALL(*messageParcelMock, ReadBool()).WillOnce(Return(true)); - EXPECT_CALL(*stub, HandleRestore(_)).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(true)); - err = stub->CmdHandleRestore(data, reply); - EXPECT_EQ(err, BError(BError::Codes::OK)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ExtExtensionStubTest-an exception occurred by CmdHandleRestore."; - } - GTEST_LOG_(INFO) << "ExtExtensionStubTest-end SUB_backup_ext_ExtExtensionStub_CmdHandleRestore_0100"; -} - -/** - * @tc.number: SUB_backup_ext_ExtExtensionStub_CmdGetIncrementalFileHandle_0100 - * @tc.name: SUB_backup_ext_ExtExtensionStub_CmdGetIncrementalFileHandle_0100 - * @tc.desc: 测试 CmdGetIncrementalFileHandle 各个分支成功与失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: issuesI9QWK5 - */ -HWTEST_F(ExtExtensionStubTest, SUB_backup_ext_ExtExtensionStub_CmdGetIncrementalFileHandle_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ExtExtensionStubTest-begin SUB_backup_ext_ExtExtensionStub_CmdGetIncrementalFileHandle_0100"; - try { - ASSERT_TRUE(stub != nullptr); - MessageParcel data; - MessageParcel reply; - EXPECT_CALL(*messageParcelMock, ReadString(_)).WillOnce(Return(false)); - auto err = stub->CmdGetIncrementalFileHandle(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_INVAL_ARG)); - - EXPECT_CALL(*messageParcelMock, ReadString(_)).WillOnce(Return(true)); - EXPECT_CALL(*stub, GetIncrementalFileHandle(_)).WillOnce(Return(make_tuple(0, UniqueFd(-1), UniqueFd(-1)))); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(false)); - err = stub->CmdGetIncrementalFileHandle(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_BROKEN_IPC)); - - EXPECT_CALL(*messageParcelMock, ReadString(_)).WillOnce(Return(true)); - EXPECT_CALL(*stub, GetIncrementalFileHandle(_)).WillOnce(Return(make_tuple(0, UniqueFd(-1), UniqueFd(-1)))); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock, WriteFileDescriptor(_)).WillOnce(Return(true)).WillOnce(Return(true)); - err = stub->CmdGetIncrementalFileHandle(data, reply); - EXPECT_EQ(err, BError(BError::Codes::OK)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ExtExtensionStubTest-an exception occurred by CmdGetIncrementalFileHandle."; - } - GTEST_LOG_(INFO) << "ExtExtensionStubTest-end SUB_backup_ext_ExtExtensionStub_CmdGetIncrementalFileHandle_0100"; -} - -/** - * @tc.number: SUB_backup_ext_ExtExtensionStub_CmdPublishIncrementalFile_0100 - * @tc.name: SUB_backup_ext_ExtExtensionStub_CmdPublishIncrementalFile_0100 - * @tc.desc: 测试 CmdPublishIncrementalFile 各个分支成功与失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: issuesI9QWK5 - */ -HWTEST_F(ExtExtensionStubTest, SUB_backup_ext_ExtExtensionStub_CmdPublishIncrementalFile_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ExtExtensionStubTest-begin SUB_backup_ext_ExtExtensionStub_CmdPublishIncrementalFile_0100"; - try { - ASSERT_TRUE(stub != nullptr); - MessageParcel data; - MessageParcel reply; - EXPECT_CALL(*messageParcelMock, ReadString(_)).WillOnce(Return(false)); - auto err = stub->CmdPublishIncrementalFile(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_INVAL_ARG)); - - EXPECT_CALL(*messageParcelMock, ReadString(_)).WillOnce(Return(true)); - EXPECT_CALL(*stub, PublishIncrementalFile(_)).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(false)); - err = stub->CmdPublishIncrementalFile(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_BROKEN_IPC)); - - EXPECT_CALL(*messageParcelMock, ReadString(_)).WillOnce(Return(true)); - EXPECT_CALL(*stub, PublishIncrementalFile(_)).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(true)); - err = stub->CmdPublishIncrementalFile(data, reply); - EXPECT_EQ(err, BError(BError::Codes::OK)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ExtExtensionStubTest-an exception occurred by CmdPublishIncrementalFile."; - } - GTEST_LOG_(INFO) << "ExtExtensionStubTest-end SUB_backup_ext_ExtExtensionStub_CmdPublishIncrementalFile_0100"; -} - -/** - * @tc.number: SUB_backup_ext_ExtExtensionStub_CmdHandleIncrementalBackup_0100 - * @tc.name: SUB_backup_ext_ExtExtensionStub_CmdHandleIncrementalBackup_0100 - * @tc.desc: 测试 CmdHandleIncrementalBackup 各个分支成功与失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: issuesI9QWK5 - */ -HWTEST_F(ExtExtensionStubTest, SUB_backup_ext_ExtExtensionStub_CmdHandleIncrementalBackup_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ExtExtensionStubTest-begin SUB_backup_ext_ExtExtensionStub_CmdHandleIncrementalBackup_0100"; - try { - ASSERT_TRUE(stub != nullptr); - MessageParcel data; - MessageParcel reply; - EXPECT_CALL(*messageParcelMock, ReadFileDescriptor()).WillOnce(Return(0)).WillOnce(Return(0)); - EXPECT_CALL(*stub, HandleIncrementalBackup(_, _)).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(false)); - auto err = stub->CmdHandleIncrementalBackup(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_BROKEN_IPC)); - - EXPECT_CALL(*messageParcelMock, ReadFileDescriptor()).WillOnce(Return(0)).WillOnce(Return(0)); - EXPECT_CALL(*stub, HandleIncrementalBackup(_, _)).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(true)); - err = stub->CmdHandleIncrementalBackup(data, reply); - EXPECT_EQ(err, BError(BError::Codes::OK)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ExtExtensionStubTest-an exception occurred by CmdHandleIncrementalBackup."; - } - GTEST_LOG_(INFO) << "ExtExtensionStubTest-end SUB_backup_ext_ExtExtensionStub_CmdHandleIncrementalBackup_0100"; -} - -/** - * @tc.number: SUB_backup_ext_ExtExtensionStub_CmdIncrementalOnBackup_0100 - * @tc.name: SUB_backup_ext_ExtExtensionStub_CmdIncrementalOnBackup_0100 - * @tc.desc: 测试 CmdIncrementalOnBackup 各个分支成功与失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: issuesI9QWK5 - */ -HWTEST_F(ExtExtensionStubTest, SUB_backup_ext_ExtExtensionStub_CmdIncrementalOnBackup_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ExtExtensionStubTest-begin SUB_backup_ext_ExtExtensionStub_CmdIncrementalOnBackup_0100"; - try { - ASSERT_TRUE(stub != nullptr); - MessageParcel data; - MessageParcel reply; - EXPECT_CALL(*messageParcelMock, ReadBool()).WillOnce(Return(true)); - EXPECT_CALL(*stub, IncrementalOnBackup(_)).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(false)); - auto err = stub->CmdIncrementalOnBackup(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_BROKEN_IPC)); - - EXPECT_CALL(*messageParcelMock, ReadBool()).WillOnce(Return(true)); - EXPECT_CALL(*stub, IncrementalOnBackup(_)).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(true)); - err = stub->CmdIncrementalOnBackup(data, reply); - EXPECT_EQ(err, BError(BError::Codes::OK)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ExtExtensionStubTest-an exception occurred by CmdIncrementalOnBackup."; - } - GTEST_LOG_(INFO) << "ExtExtensionStubTest-end SUB_backup_ext_ExtExtensionStub_CmdIncrementalOnBackup_0100"; -} - -/** - * @tc.number: SUB_backup_ext_ExtExtensionStub_CmdGetIncrementalBackupFileHandle_0100 - * @tc.name: SUB_backup_ext_ExtExtensionStub_CmdGetIncrementalBackupFileHandle_0100 - * @tc.desc: 测试 CmdGetIncrementalBackupFileHandle 各个分支成功与失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: issuesI9QWK5 - */ -HWTEST_F(ExtExtensionStubTest, SUB_backup_ext_ExtExtensionStub_CmdGetIncrementalBackupFileHandle_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << - "ExtExtensionStubTest-begin SUB_backup_ext_ExtExtensionStub_CmdGetIncrementalBackupFileHandle_0100"; - try { - ASSERT_TRUE(stub != nullptr); - MessageParcel data; - MessageParcel reply; - EXPECT_CALL(*stub, GetIncrementalBackupFileHandle()) - .WillOnce(Return(std::tuple(UniqueFd(-1), UniqueFd(-1)))); - EXPECT_CALL(*messageParcelMock, WriteFileDescriptor(_)).WillOnce(Return(false)); - auto err = stub->CmdGetIncrementalBackupFileHandle(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_BROKEN_IPC)); - - EXPECT_CALL(*stub, GetIncrementalBackupFileHandle()) - .WillOnce(Return(std::tuple(UniqueFd(-1), UniqueFd(-1)))); - EXPECT_CALL(*messageParcelMock, WriteFileDescriptor(_)).WillOnce(Return(true)).WillOnce(Return(false)); - err = stub->CmdGetIncrementalBackupFileHandle(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_BROKEN_IPC)); - - EXPECT_CALL(*stub, GetIncrementalBackupFileHandle()) - .WillOnce(Return(std::tuple(UniqueFd(-1), UniqueFd(-1)))); - EXPECT_CALL(*messageParcelMock, WriteFileDescriptor(_)).WillOnce(Return(true)).WillOnce(Return(true)); - err = stub->CmdGetIncrementalBackupFileHandle(data, reply); - EXPECT_EQ(err, BError(BError::Codes::OK)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ExtExtensionStubTest-an exception occurred by CmdGetIncrementalBackupFileHandle."; - } - GTEST_LOG_(INFO) << - "ExtExtensionStubTest-end SUB_backup_ext_ExtExtensionStub_CmdGetIncrementalBackupFileHandle_0100"; -} - -/** - * @tc.number: SUB_backup_ext_ExtExtensionStub_CmdGetBackupInfo_0100 - * @tc.name: SUB_backup_ext_ExtExtensionStub_CmdGetBackupInfo_0100 - * @tc.desc: 测试 CmdGetBackupInfo 各个分支成功与失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: issuesI9QWK5 - */ -HWTEST_F(ExtExtensionStubTest, SUB_backup_ext_ExtExtensionStub_CmdGetBackupInfo_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ExtExtensionStubTest-begin SUB_backup_ext_ExtExtensionStub_CmdGetBackupInfo_0100"; - try { - ASSERT_TRUE(stub != nullptr); - MessageParcel data; - MessageParcel reply; - EXPECT_CALL(*stub, GetBackupInfo(_)).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(false)); - auto err = stub->CmdGetBackupInfo(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_BROKEN_IPC)); - - EXPECT_CALL(*stub, GetBackupInfo(_)).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock, WriteString(_)).WillOnce(Return(false)); - err = stub->CmdGetBackupInfo(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_BROKEN_IPC)); - - EXPECT_CALL(*stub, GetBackupInfo(_)).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock, WriteString(_)).WillOnce(Return(true)); - err = stub->CmdGetBackupInfo(data, reply); - EXPECT_EQ(err, BError(BError::Codes::OK)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ExtExtensionStubTest-an exception occurred by CmdGetBackupInfo."; - } - GTEST_LOG_(INFO) << "ExtExtensionStubTest-end SUB_backup_ext_ExtExtensionStub_CmdGetBackupInfo_0100"; -} - -/** - * @tc.number: SUB_backup_ext_ExtExtensionStub_CmdUpdateSendRate_0100 - * @tc.name: SUB_backup_ext_ExtExtensionStub_CmdUpdateSendRate_0100 - * @tc.desc: 测试 CmdUpdateSendRate 各个分支成功与失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: issuesI9QWK5 - */ -HWTEST_F(ExtExtensionStubTest, SUB_backup_ext_ExtExtensionStub_CmdUpdateSendRate_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ExtExtensionStubTest-begin SUB_backup_ext_ExtExtensionStub_CmdUpdateSendRate_0100"; - try { - ASSERT_TRUE(stub != nullptr); - MessageParcel data; - MessageParcel reply; - EXPECT_CALL(*messageParcelMock, ReadString(_)).WillOnce(Return(false)); - auto err = stub->CmdUpdateFdSendRate(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_INVAL_ARG)); - - EXPECT_CALL(*messageParcelMock, ReadString(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock, ReadInt32(_)).WillOnce(Return(false)); - err = stub->CmdUpdateFdSendRate(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_INVAL_ARG)); - - EXPECT_CALL(*messageParcelMock, ReadString(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock, ReadInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*stub, UpdateFdSendRate(_, _)).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(false)); - err = stub->CmdUpdateFdSendRate(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_BROKEN_IPC)); - - EXPECT_CALL(*messageParcelMock, ReadString(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock, ReadInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*stub, UpdateFdSendRate(_, _)).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(true)); - err = stub->CmdUpdateFdSendRate(data, reply); - EXPECT_EQ(err, BError(BError::Codes::OK)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ExtExtensionStubTest-an exception occurred by CmdUpdateSendRate."; - } - GTEST_LOG_(INFO) << "ExtExtensionStubTest-end SUB_backup_ext_ExtExtensionStub_CmdUpdateSendRate_0100"; -} - -/** - * @tc.number: SUB_backup_ext_ExtExtensionStub_CmdUser0_0100 - * @tc.name: SUB_backup_ext_ExtExtensionStub_CmdUser0_0100 - * @tc.desc: 测试 CmdHandleUser0Backup 各个分支成功与失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: issues - */ -HWTEST_F(ExtExtensionStubTest, SUB_backup_ext_ExtExtensionStub_CmdUser0_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ExtExtensionStubTest-begin SUB_backup_ext_ExtExtensionStub_CmdUser0_0100"; - try { - MessageParcel data; - MessageParcel reply; - EXPECT_CALL(*stub, User0OnBackup()).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(false)); - EXPECT_TRUE(stub != nullptr); - auto err = stub->CmdHandleUser0Backup(data, reply); - EXPECT_EQ(err, BError(BError::Codes::EXT_BROKEN_IPC)); - - EXPECT_CALL(*stub, User0OnBackup()).WillOnce(Return(0)); - EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(true)); - err = stub->CmdHandleUser0Backup(data, reply); - EXPECT_EQ(err, BError(BError::Codes::OK)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ExtExtensionStubTest-an exception occurred by CmdHandleClear."; - } - GTEST_LOG_(INFO) << "ExtExtensionStubTest-end SUB_backup_ext_ExtExtensionStub_CmdUser0_0100"; -} -} // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/tests/unittests/backup_sa/BUILD.gn b/tests/unittests/backup_sa/BUILD.gn index 5351c84bdbf85a42b387bef2ee72b856a1145dc2..b552944b36440350ab9912752b5be12b0964ecbd 100644 --- a/tests/unittests/backup_sa/BUILD.gn +++ b/tests/unittests/backup_sa/BUILD.gn @@ -19,6 +19,7 @@ group("backup_sa_test") { deps = [ "module_app_gallery:app_gallery_test", + "module_client:service_client_test", "module_external:adapter_test", "module_ipc:backup_sa_ipc_test", "session:session_test", diff --git a/tests/unittests/backup_sa/module_client/BUILD.gn b/tests/unittests/backup_sa/module_client/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..9ff89a21a6f5d7192487ac9d8ff25e2bc02053c7 --- /dev/null +++ b/tests/unittests/backup_sa/module_client/BUILD.gn @@ -0,0 +1,87 @@ +# Copyright (c) 2024 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//build/test.gni") +import("//foundation/filemanagement/app_file_service/app_file_service.gni") +import("//foundation/filemanagement/app_file_service/backup.gni") + +ohos_unittest("service_client_test") { + module_out_path = path_module_out_tests + + include_dirs = [ + "${path_backup}/frameworks/native/backup_kit_inner/include", + "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", + "${path_backup}/services/backup_sa/include", + "${path_backup}/services/backup_sa/include/module_notify", + "${path_backup}/utils/include", + "${path_backup}/utils/src", + "${path_backup}/tests/mock/utils_mock/include", + ".", + ] + + sources = [ + "${path_backup}/tests/mock/utils_mock/src/utils_mock_global_variable.cpp", + "service_client_test.cpp", + ] + + deps = [ + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner_ipc_stub", + "${path_backup}/utils:backup_utils", + ] + + sanitize = { + integer_overflow = true + ubsan = true + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + debug = false + } + + defines = [ + "LOG_TAG=\"app_file_service\"", + "LOG_DOMAIN=0xD200000", + "private = public", + "protected = public", + ] + + external_deps = [ + "ability_base:want", + "ability_runtime:ability_connect_callback_stub", + "ability_runtime:ability_manager", + "access_token:libaccesstoken_sdk", + "access_token:libtokenid_sdk", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", + "c_utils:utils", + "c_utils:utils", + "common_event_service:cesfwk_innerkits", + "googletest:gmock_main", + "googletest:gtest_main", + "hilog:libhilog", + "hitrace:hitrace_meter", + "ipc:ipc_core", + "jsoncpp:jsoncpp", + "safwk:system_ability_fwk", + "samgr:samgr_proxy", + "storage_service:storage_manager_sa_proxy", + ] + + use_exceptions = true +} + +group("backup_sa_service_client_test") { + testonly = true + deps = [ ":service_client_test" ] +} diff --git a/tests/unittests/backup_sa/module_client/service_client_test.cpp b/tests/unittests/backup_sa/module_client/service_client_test.cpp new file mode 100644 index 0000000000000000000000000000000000000000..685dfda42c1f082bbf2af3db732639c62872ee1a --- /dev/null +++ b/tests/unittests/backup_sa/module_client/service_client_test.cpp @@ -0,0 +1,434 @@ +/* + * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include +#include + +#include "b_error/b_error.h" +#include "service_client.h" +#include "service_reverse.h" +#include "b_session_restore.h" + +namespace OHOS::FileManagement::Backup { +using namespace std; +using namespace testing; + +class ServiceClientTest : public testing::Test { +public: + static void SetUpTestCase(void); + static void TearDownTestCase(); + void SetUp() override {}; + void TearDown() override {}; + +public: + static inline sptr proxy = nullptr; +}; + +void ServiceClientTest::SetUpTestCase() +{ + GTEST_LOG_(INFO) << "begin SetUpTestCase"; + proxy = ServiceClient::GetInstance(); + if (proxy == nullptr) { + GTEST_LOG_(INFO) << "Failed to get ServiceClient instance"; + } +} + +void ServiceClientTest::TearDownTestCase() +{ + if (proxy != nullptr) { + ServiceClient::InvaildInstance(); + proxy = nullptr; + } + ServiceClient::InvaildInstance(); +} + +/** + * @tc.number: SUB_service_client_test_0100 + * @tc.name: SUB_service_client_test_0100 + * @tc.desc: 测试 InitIncrementalBackupSession 接口 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: issuesI9KPRL + */ +HWTEST_F(ServiceClientTest, SUB_service_client_test_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ServiceClientTest-begin SUB_service_client_test_0100"; + EXPECT_NE(proxy, nullptr); + ServiceClient::InvaildInstance(); + proxy=ServiceClient::serviceProxy_; + EXPECT_EQ(proxy, nullptr); + GTEST_LOG_(INFO) << "ServiceClientTest-end SUB_service_client_test_0100"; +} + +HWTEST_F(ServiceClientTest, SUB_service_client_test_0200, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ServiceClientTest-begin SUB_service_client_test_0200"; + proxy = ServiceClient::GetInstance(); + EXPECT_NE(proxy, nullptr); + ErrCode ret = proxy->Start(); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_PERM)); + ret = proxy->Finish(); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_PERM)); + ret = proxy->Release(); + EXPECT_NE(ret, BError(BError::BackupErrorCode::E_PERM)); + ret = proxy->GetAppLocalListAndDoIncrementalBackup(); + EXPECT_NE(ret, BError(BError::Codes::OK)); + GTEST_LOG_(INFO) << "ServiceClientTest-end SUB_service_client_test_0200"; +} + +HWTEST_F(ServiceClientTest, SUB_service_client_test_0300, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ServiceClientTest-begin SUB_service_client_test_0300"; + proxy = ServiceClient::GetInstance(); + EXPECT_NE(proxy, nullptr); + std::string bundleName; + int32_t result = -1; + ErrCode ret = proxy->Cancel(bundleName, result); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK)); + bundleName = ""; + ret = proxy->Cancel(bundleName, result); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK)); + bundleName = "test"; + ret = proxy->Cancel(bundleName, result); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK)); + EXPECT_NE(result, 0); + GTEST_LOG_(INFO) << "ServiceClientTest-end SUB_service_client_test_0300"; +} + +HWTEST_F(ServiceClientTest, SUB_service_client_test_0400, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ServiceClientTest-begin SUB_service_client_test_0400"; + proxy = ServiceClient::GetInstance(); + EXPECT_NE(proxy, nullptr); + ErrCode err = -1; + ErrCode ret = proxy->AppIncrementalDone(err); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + err = 0; + ret = proxy->AppIncrementalDone(err); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + err = 1; + ret = proxy->AppIncrementalDone(err); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + GTEST_LOG_(INFO) << "ServiceClientTest-end SUB_service_client_test_0400"; +} + +HWTEST_F(ServiceClientTest, SUB_service_client_test_0500, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ServiceClientTest-begin SUB_service_client_test_0500"; + proxy = ServiceClient::GetInstance(); + EXPECT_NE(proxy, nullptr); + ErrCode err = -1; + ErrCode ret = proxy->AppDone(err); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + err = 0; + ret = proxy->AppDone(err); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + err = 1; + ret = proxy->AppDone(err); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + GTEST_LOG_(INFO) << "ServiceClientTest-end SUB_service_client_test_0500"; +} + +HWTEST_F(ServiceClientTest, SUB_service_client_test_0600, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ServiceClientTest-begin SUB_service_client_test_0600"; + proxy = ServiceClient::GetInstance(); + EXPECT_NE(proxy, nullptr); + int32_t fd = -1; + ErrCode ret = proxy->GetLocalCapabilitiesWithUniqueFd(fd); + EXPECT_NE(ret, BError(BError::Codes::OK)); + EXPECT_NE(fd, BError(BError::Codes::OK)); + fd = -2; + ret = proxy->GetLocalCapabilitiesForBundleInfos(fd); + EXPECT_NE(ret, BError(BError::Codes::OK)); + EXPECT_NE(fd, 1); + GTEST_LOG_(INFO) << "ServiceClientTest-end SUB_service_client_test_0600"; +} + +HWTEST_F(ServiceClientTest, SUB_service_client_test_0700, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ServiceClientTest-begin SUB_service_client_test_0700"; + proxy = ServiceClient::GetInstance(); + EXPECT_NE(proxy, nullptr); + std::string bundleName; + std::string fileName; + ErrCode ret = proxy->GetIncrementalFileHandle(bundleName, fileName); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + bundleName = ""; + fileName = ""; + ret = proxy->GetIncrementalFileHandle(bundleName, fileName); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + bundleName = "test"; + fileName = "test"; + ret = proxy->GetIncrementalFileHandle(bundleName, fileName); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + GTEST_LOG_(INFO) << "ServiceClientTest-end SUB_service_client_test_0700"; +} + +HWTEST_F(ServiceClientTest, SUB_service_client_test_0800, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ServiceClientTest-begin SUB_service_client_test_0800"; + proxy = ServiceClient::GetInstance(); + EXPECT_NE(proxy, nullptr); + std::string bundleName; + std::string fileName; + bool booleanValue = false; + ErrCode ret = proxy->GetBackupInfo(bundleName, fileName); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_BEF)); + EXPECT_EQ(bundleName, ""); + EXPECT_EQ(fileName, ""); + booleanValue = true; + ret = proxy->StartExtTimer(booleanValue); + EXPECT_EQ(ret,BError(BError::BackupErrorCode::E_INVAL)); + booleanValue = false; + ret = proxy->StartExtTimer(booleanValue); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + + booleanValue = true; + ret = proxy->StartFwkTimer(booleanValue); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + booleanValue = false; + ret = proxy->StartFwkTimer(booleanValue); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + + booleanValue = true; + ret = proxy->StopExtTimer(booleanValue); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + booleanValue = false; + ret = proxy->StopExtTimer(booleanValue); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + bool isExt = true; + bundleName =""; + ret = proxy->UpdateTimer(bundleName, 0, isExt); + EXPECT_NE(ret, BError(BError::BackupErrorCode::E_INVAL)); + EXPECT_EQ(isExt, false); + bundleName = ""; + ret = proxy->UpdateTimer(bundleName, 0, isExt); + EXPECT_NE(ret, BError(BError::BackupErrorCode::E_INVAL)); + EXPECT_EQ(isExt, false); + bundleName = "test"; + ret = proxy->UpdateTimer(bundleName, 10, isExt); + EXPECT_EQ(ret, BError(BError::Codes::OK)); + EXPECT_EQ(isExt, false); + + isExt = true; + bundleName = ""; + ret = proxy->UpdateSendRate(bundleName, 0, isExt); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + EXPECT_TRUE(isExt); + + isExt = true; + bundleName = ""; + ret = proxy->UpdateSendRate(bundleName, 0, isExt); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + EXPECT_TRUE(isExt); + + bundleName = "test"; + ret = proxy->UpdateSendRate(bundleName, 10, isExt); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + EXPECT_TRUE(isExt); + bundleName = ""; + ret = proxy->AppIncrementalFileReady(bundleName, 0, 0, 0); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + bundleName = ""; + ret = proxy->AppIncrementalFileReady(bundleName, 0, 0, 0); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + bundleName = "test"; + ret = proxy->AppIncrementalFileReady(bundleName, 1, 1, 0); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + fileName = ""; + ret = proxy->AppFileReady(fileName, 0, 0); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + fileName = ""; + ret = proxy->AppFileReady(fileName, 0, 0); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + fileName = "name"; + ret = proxy->AppFileReady(fileName, -1, 0); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->AppFileReady(fileName, 0, 0); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + bundleName = ""; + fileName = ""; + ret = proxy->GetFileHandle(bundleName, fileName); + EXPECT_EQ(ret, BError(BError::Codes::OK)); + EXPECT_EQ(fileName, ""); + bundleName = ""; + ret = proxy->GetFileHandle(bundleName, fileName); + EXPECT_EQ(ret, BError(BError::Codes::OK)); + EXPECT_EQ(fileName, ""); + bundleName = "test"; + ret = proxy->GetFileHandle(bundleName, fileName); + EXPECT_EQ(ret, BError(BError::Codes::OK)); + EXPECT_EQ(fileName, ""); + GTEST_LOG_(INFO) << "ServiceClientTest-end SUB_service_client_test_0800"; +} + +HWTEST_F(ServiceClientTest, SUB_service_client_test_0900, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ServiceClientTest-begin SUB_service_client_test_0900"; + proxy = ServiceClient::GetInstance(); + EXPECT_NE(proxy, nullptr); + std::string stringVal = ""; + ErrCode ret = proxy->ReportAppProcessInfo(stringVal, BackupRestoreScenario::FULL_BACKUP); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + stringVal = ""; + ret = proxy->ReportAppProcessInfo(stringVal, BackupRestoreScenario::FULL_BACKUP); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + stringVal = "test"; + ret = proxy->ReportAppProcessInfo(stringVal, BackupRestoreScenario::FULL_BACKUP); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + int64_t val = -1; + ret = proxy->RefreshDataSize(val); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + val = 1; + ret = proxy->RefreshDataSize(val); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + stringVal = ""; + ret = proxy->ServiceResultReport(stringVal, BackupRestoreScenario::FULL_BACKUP, 0); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_PERM)); + stringVal = ""; + ret = proxy->ServiceResultReport(stringVal, BackupRestoreScenario::FULL_BACKUP, 0); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_PERM)); + GTEST_LOG_(INFO) << "ServiceClientTest-end SUB_service_client_test_0900"; +} + +HWTEST_F(ServiceClientTest, SUB_service_client_test_1000, testing::ext::TestSize.Level1) +{ + std::string BUNDLE_NAME = ""; + GTEST_LOG_(INFO) << "ServiceClientTest-begin SUB_service_client_test_1000"; + proxy = ServiceClient::GetInstance(); + EXPECT_NE(proxy, nullptr); + BFileInfo *fileInfo = nullptr; + BFileInfo bf {BUNDLE_NAME, "", 0}; + ErrCode ret = proxy->PublishFile(*fileInfo); + EXPECT_NE(ret, BError(BError::Codes::OK)); + ret = proxy->PublishIncrementalFile(*fileInfo); + EXPECT_NE(ret, BError(BError::Codes::OK)); + ret = proxy->PublishSAIncrementalFile(*fileInfo, 0); + EXPECT_NE(ret, BError(BError::Codes::OK)); + fileInfo = &bf; + ret = proxy->PublishFile(*fileInfo); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->PublishIncrementalFile(*fileInfo); + EXPECT_EQ(ret,BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->PublishSAIncrementalFile(*fileInfo, 0); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + GTEST_LOG_(INFO) << "ServiceClientTest-end SUB_service_client_test_1000"; +} + +HWTEST_F(ServiceClientTest, SUB_service_client_test_1100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ServiceClientTest-begin SUB_service_client_test_1100"; + proxy = ServiceClient::GetInstance(); + EXPECT_NE(proxy, nullptr); + int32_t fd = 0; + int32_t restoreType = -1; + int32_t userid = -1; + std::vector bundleNames; + std::vector detailInfos; + std::vector bundlesToBackup; + ErrCode ret = + proxy->AppendBundlesRestoreSessionRestoreDataWaitSend(fd, bundleNames, detailInfos, restoreType, userid); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->AppendBundlesRestoreSessionRestoreDataWaitReady(fd, bundleNames, restoreType, userid); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->AppendBundlesIncrementalBackupSessionWithBundleInfos(bundlesToBackup, detailInfos); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->AppendBundlesBackupSession(bundleNames); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->AppendBundlesDetailsBackupSession(bundleNames, detailInfos); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + bundleNames.push_back("test"); + ret = proxy->AppendBundlesRestoreSessionRestoreDataWaitSend(fd, bundleNames, detailInfos, restoreType, userid); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->AppendBundlesRestoreSessionRestoreDataWaitReady(fd, bundleNames, restoreType, userid); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->AppendBundlesIncrementalBackupSessionWithBundleInfos(bundlesToBackup, detailInfos); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->AppendBundlesBackupSession(bundleNames); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->AppendBundlesDetailsBackupSession(bundleNames, detailInfos); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + detailInfos.push_back("test"); + ret = proxy->AppendBundlesRestoreSessionRestoreDataWaitSend(fd, bundleNames, detailInfos, restoreType, userid); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->AppendBundlesRestoreSessionRestoreDataWaitReady(fd, bundleNames, restoreType, userid); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->AppendBundlesIncrementalBackupSessionWithBundleInfos(bundlesToBackup, detailInfos); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->AppendBundlesDetailsBackupSession(bundleNames, detailInfos); + EXPECT_EQ(ret,BError(BError::BackupErrorCode::E_INVAL)); + restoreType = 1; + userid = 1; + ret = proxy->AppendBundlesRestoreSessionRestoreDataWaitSend(fd, bundleNames, detailInfos, restoreType, userid); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->AppendBundlesRestoreSessionRestoreDataWaitReady(fd, bundleNames, restoreType, userid); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->AppendBundlesIncrementalBackupSessionWithBundleInfos(bundlesToBackup, detailInfos); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + GTEST_LOG_(INFO) << "ServiceClientTest-end SUB_service_client_test_1100"; +} + +HWTEST_F(ServiceClientTest, SUB_service_client_test_1200, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ServiceClientTest-begin SUB_service_client_test_1200"; + proxy = ServiceClient::GetInstance(); + EXPECT_NE(proxy, nullptr); + sptr srptr = nullptr; + ErrCode ret = proxy->InitRestoreSession(srptr); + EXPECT_EQ(ret,BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->InitBackupSession(srptr); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->InitIncrementalBackupSession(srptr); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + std::string errMsg = ""; + std::string result = "err"; + ret = proxy->InitRestoreSessionWithErrMsg(srptr, errMsg); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->InitBackupSessionWithErrMsg(srptr, errMsg); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->InitIncrementalBackupSessionWithErrMsg(srptr, errMsg); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + BSessionRestore::Callbacks callback; + srptr = sptr(new ServiceReverse(callback)); + ret = proxy->InitRestoreSession(srptr); + EXPECT_EQ(ret,BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->InitBackupSession(srptr); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + ret = proxy->InitIncrementalBackupSession(srptr); + EXPECT_EQ(ret,BError(BError::BackupErrorCode::E_INVAL)); + + ret = proxy->InitRestoreSessionWithErrMsg(srptr, errMsg); + EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_INVAL)); + EXPECT_EQ(errMsg, ""); + ret = proxy->InitBackupSessionWithErrMsg(srptr, errMsg); + EXPECT_EQ(ret,BError(BError::BackupErrorCode::E_INVAL)); + EXPECT_EQ(errMsg, ""); + ret = proxy->InitIncrementalBackupSessionWithErrMsg(srptr, errMsg); + EXPECT_EQ(ret,BError(BError::BackupErrorCode::E_INVAL)); + EXPECT_EQ(errMsg, ""); + + GTEST_LOG_(INFO) << "ServiceClientTest-end SUB_service_client_test_1200"; +} + +HWTEST_F(ServiceClientTest, SUB_service_client_test_1300, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ServiceClientTest-begin SUB_service_client_test_1300"; + proxy = ServiceClient::GetInstance(); + EXPECT_NE(proxy, nullptr); + + GTEST_LOG_(INFO) << "ServiceClientTest-end SUB_service_client_test_1300"; +} +} // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/tests/unittests/backup_sa/module_client/service_mock.cpp b/tests/unittests/backup_sa/module_client/service_mock.cpp new file mode 100644 index 0000000000000000000000000000000000000000..b94536657f0bd2c4fd5ce930325ad20bd0da69d4 --- /dev/null +++ b/tests/unittests/backup_sa/module_client/service_mock.cpp @@ -0,0 +1,625 @@ +/* + * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "module_ipc/service.h" + +#include +#include +#include +#include + +#include "b_error/b_error.h" +#include "b_resources/b_constants.h" + +namespace OHOS::FileManagement::Backup { +using namespace std; + +int32_t Service::GetUserIdDefault() +{ + return 0; +} + +void Service::OnStart() {} + +void Service::OnStop() {} + +ErrCode Service::GetLocalCapabilitiesForBundleInfos(int32_t &fd) +{ + fd = 1; + return BError(BError::Codes::OK); +} +ErrCode Service::InitBackupSessionWithErrMsg(sptr &remote, std::string &errMsg) +{ + if (remote == nullptr) { + return BError(BError::Codes::SA_BROKEN_IPC); + } + errMsg = "err"; + return BError(BError::Codes::OK); +} + +ErrCode Service::InitRestoreSessionWithErrMsg(sptr &reverseIpcRemoteObject, std::string &errMsg) +{ + if (reverseIpcRemoteObject == nullptr) { + return BError(BError::Codes::SA_BROKEN_IPC); + } + errMsg = "err"; + return BError(BError::Codes::OK); +} + +ErrCode Service::AppendBundlesRestoreSessionRestoreDataWaitSend(int32_t fd, + const std::vector &bundleNames, + const std::vector &detailInfos, + int32_t restoreType, + int32_t userId) +{ + if (bundleNames.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + } + if (detailInfos.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + } + if (restoreType < 0 || userId < 0 || fd < 0) { + return BError(BError::BackupErrorCode::E_INVAL); + } + + return BError(BError::Codes::OK); +} + +ErrCode Service::AppendBundlesRestoreSessionRestoreDataWaitReady(int32_t fd, + const std::vector &bundleNames, + int32_t restoreType, + int32_t userId) +{ + if (bundleNames.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + } + if (restoreType < 0 || userId < 0 || fd < 0) { + return BError(BError::BackupErrorCode::E_INVAL); + } + + return BError(BError::Codes::OK); +} +ErrCode Service::AppendBundlesIncrementalBackupSessionWithBundleInfos( + const std::vector &bundlesToBackup, + const std::vector &bundleInfos) +{ + if (bundlesToBackup.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + } + if (bundleInfos.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + } + return BError(BError::Codes::OK); +} + +ErrCode Service::GetLocalCapabilitiesWithUniqueFd(int32_t &fd) +{ + fd = 1; + return BError(BError::Codes::OK); +} + +UniqueFd Service::GetLocalCapabilities() +{ + return UniqueFd(-1); +} + +UniqueFd Service::GetLocalCapabilitiesForBundleInfos() +{ + return UniqueFd(-1); +} + +void Service::StopAll(const wptr &obj, bool force) {} + +ErrCode Service::VerifyCallerAndGetCallerName(std::string &bundleName) +{ + return BError(BError::Codes::OK); +} + +ErrCode Service::InitRestoreSession(sptr &remote) +{ + if (remote == nullptr) { + return BError(BError::Codes::SA_BROKEN_IPC); + } + + return BError(BError::Codes::OK); +} + +ErrCode Service::InitBackupSession(sptr &remote) +{ + if (remote == nullptr) { + return BError(BError::Codes::SA_BROKEN_IPC); + } + + return BError(BError::Codes::OK); +} + +ErrCode Service::Start() +{ + GTEST_LOG_(INFO) << "Service mock start"; + return BError(BError::Codes::OK); +} + +ErrCode Service::PublishFile(const BFileInfo &fileInfo) +{ + if (fileInfo.fileName.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + } + + return BError(BError::Codes::OK); +} + +ErrCode Service::AppFileReady(const string &fileName, int32_t fd, int32_t errCode) +{ + if (fileName.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + } + if (fd < 0) { + return BError(BError::BackupErrorCode::E_INVAL); + } + + return BError(BError::Codes::OK); +} + +ErrCode Service::AppDone(ErrCode errCode) +{ + if (errCode == 0) { + return BError(BError::BackupErrorCode::E_INVAL); + } + if (errCode == -1) { + return BError(BError::BackupErrorCode::E_EMPTY); + } + if (errCode > 0) { + return BError(BError::Codes::OK); + } + return BError(BError::Codes::OK); +} + +ErrCode Service::ServiceResultReport(const std::string &restoreRetInfo, BackupRestoreScenario sennario, ErrCode errCode) +{ + if (restoreRetInfo.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + } + + return BError(BError::Codes::OK); +} + +ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, + const std::vector &bundleNames, + const std::vector &detailInfos, + RestoreTypeEnum restoreType, + int32_t userId) +{ + return BError(BError::Codes::OK); +} + +ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, + const std::vector &bundleNames, + RestoreTypeEnum restoreType, + int32_t userId) +{ + return BError(BError::Codes::OK); +} + +ErrCode Service::AppendBundlesBackupSession(const std::vector &bundleNames) +{ + if ( bundleNames.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + } + + return BError(BError::Codes::OK); +} + +ErrCode Service::AppendBundlesDetailsBackupSession(const std::vector &bundleNames, + const std::vector &bundleInfos) +{ + if ( bundleNames.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + } + if (bundleInfos.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + } + return BError(BError::Codes::OK); +} + +ErrCode Service::Finish() +{ + return BError(BError::Codes::OK); +} + +ErrCode Service::LaunchBackupExtension(const BundleName &bundleName) +{ + return BError(BError::Codes::OK); +} + +ErrCode Service::LaunchBackupSAExtension(const BundleName &bundleName) +{ + return BError(BError::Codes::OK); +} + +ErrCode Service::GetFileHandle(const string &bundleName, const string &fileName) +{ + if (bundleName.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + } + + return BError(BError::Codes::OK); +} + +void Service::OnBackupExtensionDied(const string &&bundleName, bool isCleanCalled) {} + +void Service::ExtConnectDied(const string &callName) {} + +void Service::ExtStart(const string &bundleName) {} + +int Service::Dump(int fd, const vector &args) +{ + return 0; +} + +void Service::ExtConnectFailed(const string &bundleName, ErrCode ret) +{ + GTEST_LOG_(INFO) << "ExtConnectFailed is OK"; +} + +void Service::ExtConnectDone(string bundleName) {} + +void Service::ClearSessionAndSchedInfo(const string &bundleName) {} + +ErrCode Service::VerifyCaller() +{ + return BError(BError::Codes::OK); +} + +ErrCode Service::VerifyCaller(IServiceReverseType::Scenario scenario) +{ + return BError(BError::Codes::OK); +} + +void Service::OnAllBundlesFinished(ErrCode errCode) {} + +void Service::OnStartSched() {} + +void Service::SendStartAppGalleryNotify(const BundleName &bundleName) {} + +void Service::SessionDeactive() {} + +ErrCode Service::Release() +{ + return BError(BError::Codes::OK); +} + +ErrCode Service::Cancel(const std::string &bundleName, int32_t &result) +{ + if (bundleName.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + } + if (!bundleName.empty()) { + result = 0; + return BError(BError::Codes::OK); + } + result = BError(BError::Codes::OK); + return BError(BError::Codes::OK); +} + +ErrCode Service::GetLocalCapabilitiesIncremental(const std::vector &bundleNames, int32_t &fd) +{ + return BError(BError::Codes::OK); +} + +ErrCode Service::GetAppLocalListAndDoIncrementalBackup() +{ + return BError(BError::Codes::OK); +} + +ErrCode Service::InitIncrementalBackupSession(sptr &remote) +{ + if (remote == nullptr) { + return BError(BError::Codes::SA_BROKEN_IPC); + } + return BError(BError::Codes::OK); +} + +ErrCode Service::InitIncrementalBackupSessionWithErrMsg(sptr &remote, std::string &errMsg) +{ + if (remote == nullptr) { + return BError(BError::Codes::SA_BROKEN_IPC); + } + errMsg = "err"; + return BError(BError::Codes::OK); +} + +ErrCode Service::AppendBundlesIncrementalBackupSession(const std::vector &bundlesToBackup) +{ + return BError(BError::Codes::OK); +} + +ErrCode Service::AppendBundlesIncrementalBackupSession(const std::vector &bundlesToBackup, + const std::vector &infos) +{ + return BError(BError::Codes::OK); +} + +ErrCode Service::PublishIncrementalFile(const BFileInfo &fileInfo) +{ + if (fileInfo.fileName.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + } + + return BError(BError::Codes::OK); +} + +ErrCode Service::PublishSAIncrementalFile(const BFileInfo &fileInfo, int32_t fd) +{ + if (fileInfo.fileName.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + } + return BError(BError::Codes::OK); +} + +ErrCode Service::AppIncrementalFileReady(const std::string &fileName, + int32_t fd, + int32_t manifestFd, + int32_t appIncrementalFileReadyErrCode) +{ + if (fileName.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + } + if (fd < 0 || manifestFd < 0) { + return BError(BError::BackupErrorCode::E_INVAL); + } + + return BError(BError::Codes::OK); +} + +ErrCode Service::AppIncrementalDone(ErrCode errCode) +{ + if (errCode == 0) { + return BError(BError::BackupErrorCode::E_INVAL); + } + if (errCode == -1) { + return BError(BError::BackupErrorCode::E_EMPTY); + } + if (errCode > 0) { + return BError(BError::Codes::OK); + } + return BError(BError::Codes::OK); +} + +ErrCode Service::GetIncrementalFileHandle(const string &bundleName, const string &fileName) +{ + if (bundleName.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + } + if (fileName.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + } + return BError(BError::Codes::OK); +} + +ErrCode Service::GetBackupInfo(BundleName &bundleName, std::string &result) +{ + bundleName = "name"; + result = "abc"; + return BError(BError::Codes::OK); +} + +ErrCode Service::StartExtTimer(bool &isExtStart) +{ + if (isExtStart) { + return BError(BError::Codes::OK); + } + + return BError(BError::BackupErrorCode::E_TASKFAIL); +} + +ErrCode Service::StartFwkTimer(bool &isFwkStart) +{ + if (isFwkStart) { + return BError(BError::Codes::OK); + } + + return BError(BError::BackupErrorCode::E_TASKFAIL); +} + +ErrCode Service::StopExtTimer(bool &isExtStop) +{ + if (isExtStop) { + return BError(BError::Codes::OK); + } + return BError(BError::BackupErrorCode::E_TASKFAIL); +} + +ErrCode Service::RefreshDataSize(int64_t totalDatasize) +{ + if (totalDatasize < 0) { + return BError(BError::BackupErrorCode::E_INVAL); + } + return BError(BError::Codes::OK); +} + +ErrCode Service::UpdateTimer(BundleName &bundleName, uint32_t timeout, bool &result) +{ + if ( bundleName.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + result = false; + } + if (timeout < 0) { + return BError(BError::BackupErrorCode::E_INVAL); + result = false; + } + result = true; + return BError(BError::Codes::OK); +} + +ErrCode Service::UpdateSendRate(std::string &bundleName, int32_t sendRate, bool &result) +{ + if (bundleName.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + result = false; + } + if (sendRate < 0) { + return BError(BError::BackupErrorCode::E_INVAL); + result = false; + } + result = true; + return BError(BError::Codes::OK); +} + +ErrCode Service::ReportAppProcessInfo(const std::string &processInfo, const BackupRestoreScenario sennario) +{ + if (processInfo.empty()) { + return BError(BError::BackupErrorCode::E_INVAL); + } + return BError(BError::Codes::OK); +} + +void Service::OnSABackup(const std::string &bundleName, + const int &fd, + const std::string &result, + const ErrCode &errCode) +{ +} + +void Service::OnSARestore(const std::string &bundleName, const std::string &result, const ErrCode &errCode) {} + +ErrCode Service::ClearResidualBundleData(const std::string &bundleName) +{ + return BError(BError::Codes::OK); +} + +std::shared_ptr Service::GetExtensionMutex(const BundleName &bundleName) +{ + return make_shared(bundleName); +} + +void Service::RemoveExtensionMutex(const BundleName &bundleName) {} + +void Service::OnBundleStarted(BError error, sptr session, const BundleName &bundleName) {} + +void Service::HandleExceptionOnAppendBundles(sptr session, + const vector &appendBundleNames, + const vector &restoreBundleNames) +{ +} + +void Service::BundleBeginRadarReport(const std::string &bundleName, + const ErrCode errCode, + const IServiceReverseType::Scenario scenario) +{ +} + +void Service::BundleEndRadarReport(const std::string &bundleName, + ErrCode errCode, + const IServiceReverseType::Scenario scenario) +{ +} + +void Service::FileReadyRadarReport(const std::string &bundleName, + const std::string &fileName, + const ErrCode errCode, + const IServiceReverseType::Scenario scenario) +{ +} + +void Service::ExtensionConnectFailRadarReport(const std::string &bundleName, + const ErrCode errCode, + const IServiceReverseType::Scenario scenario) +{ +} + +void Service::PermissionCheckFailRadar(const std::string &info, const std::string &func) {} + +void Service::OnStartResRadarReport(const std::vector &bundleNameList, int32_t stage) {} + +std::string Service::GetCallerName() +{ + return ""; +} + +bool Service::IsReportBundleExecFail(const std::string &bundleName) +{ + return true; +} + +void Service::ClearBundleRadarReport() {} + +void Service::UpdateBundleRadarReport(const std::string &bundleName) {} + +bool Service::IsReportFileReadyFail(const std::string &bundleName) +{ + return true; +} + +void Service::ClearFileReadyRadarReport() {} + +void Service::UpdateFailedBundles(const std::string &bundleName, BundleTaskInfo taskInfo) {} + +void Service::ClearFailedBundles() {} + +void Service::GetOldDeviceBackupVersion() {} + +void Service::CreateDirIfNotExist(const std::string &path) {} + +void Service::StartRunningTimer(const std::string &bundleName) {} + +std::vector Service::GetSupportBackupBundleNames(vector &, + bool, + const vector &) +{ + return {}; +} + +void Service::HandleNotSupportBundleNames(const vector &, vector &, bool) {} + +void Service::SetBundleIncDataInfo(const std::vector &, std::vector &) {} + +void Service::CancelTask(std::string bundleName, wptr ptr) {} + +void SetUserIdAndRestoreType(RestoreTypeEnum restoreType, int32_t userId) {} + +void Service::CallOnBundleEndByScenario(const std::string &bundleName, BackupRestoreScenario scenario, ErrCode errCode) +{ +} + +void Service::SetUserIdAndRestoreType(RestoreTypeEnum restoreType, int32_t userId) {} + +ErrCode Service::GetBackupDataSize(bool isPreciseScan, const std::vector &bundleNameList) +{ + return BError(BError::Codes::OK); +} + +void Service::GetDataSizeStepByStep(bool isPreciseScan, vector bundleNameList, string &scanning) {} + +void Service::GetPresumablySize(vector bundleNameList, string &scanning) {} + +void Service::GetPrecisesSize(vector bundleNameList, string &scanning) {} + +void Service::WriteToList(BJsonUtil::BundleDataSize bundleDataSize) {} + +void Service::DeleteFromList(size_t scannedSize) {} + +void Service::WriteScannedInfoToList(const string &bundleName, int64_t dataSize, int64_t incDataSize) {} + +void Service::SendScannedInfo(const string &scannendInfos, sptr session) {} + +void Service::CyclicSendScannedInfo(bool isPreciseScan, vector bundleNameList) {} + +bool Service::GetScanningInfo(wptr obj, size_t scannedSize, string &scanning) +{ + return true; +} + +void Service::SetScanningInfo(string &scanning, string name) {} +} // namespace OHOS::FileManagement::Backup diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn index 6685f522e0465f166c8fb7d4fd65fab27b0c714b..efc4a12d482a72aa001fb5313aa1870c75420a80 100644 --- a/tests/unittests/backup_sa/module_ipc/BUILD.gn +++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn @@ -21,20 +21,13 @@ ohos_unittest("module_ipc_test") { module_out_path = path_module_out_tests sources = [ + "${path_backup_mock}/module_ipc/extension_type_mock.cpp", "${path_backup_mock}/module_ipc/app_gallery_dispose_proxy_mock.cpp", "${path_backup_mock}/module_ipc/message_parcel_mock.cpp", "${path_backup_mock}/timer/timer_mock.cpp", "${path_backup}/frameworks/native/backup_kit_inner/src/service_incremental_reverse.cpp", - "${path_backup}/services/backup_sa/src/module_ipc/service_incremental_reverse_proxy.cpp", - "${path_backup}/services/backup_sa/src/module_ipc/service_reverse_proxy.cpp", - "${path_backup}/services/backup_sa/src/module_ipc/service_stub.cpp", "${path_backup}/services/backup_sa/src/module_ipc/svc_backup_connection.cpp", - "${path_backup}/services/backup_sa/src/module_ipc/svc_extension_incremental_proxy.cpp", - "${path_backup}/services/backup_sa/src/module_ipc/svc_extension_proxy.cpp", - "service_reverse_proxy_test.cpp", - "service_stub_test.cpp", "svc_backup_connection_test.cpp", - "svc_extension_proxy_test.cpp", ] include_dirs = [ @@ -416,15 +409,16 @@ ohos_unittest("backup_service_incremental_test") { "${path_backup_mock}/module_external/src/sms_adapter_mock.cpp", "${path_backup_mock}/module_ipc/src/ipc_skeleton_mock.cpp", "${path_backup_mock}/module_ipc/src/sa_backup_connection_mock.cpp", - "${path_backup_mock}/module_ipc/src/service_stub_mock.cpp", + "${path_backup_mock}/module_ipc/service_stub_mock.cpp", "${path_backup_mock}/module_ipc/src/svc_backup_connection_mock.cpp", "${path_backup_mock}/module_ipc/src/svc_session_manager_mock.cpp", "${path_backup_mock}/module_sched/sched_scheduler_mock.cpp", "${path_backup_mock}/utils_mock/src/b_jsonutil_mock.cpp", "${path_backup_mock}/utils_mock/src/backup_para_mock.cpp", - "${path_backup}/services/backup_sa/src/module_ipc/svc_extension_incremental_proxy.cpp", - "${path_backup}/services/backup_sa/src/module_ipc/svc_extension_proxy.cpp", + "${path_backup_mock}/module_ipc/extension_type_mock.cpp", + "${path_backup_mock}/module_ipc/extension_proxy_mock.cpp", "service_incremental_test.cpp", + "${path_backup}/frameworks/native/backup_kit_inner/src/service_client.cpp" ] include_dirs = [ @@ -479,7 +473,7 @@ ohos_unittest("backup_service_other_test") { "${path_backup_mock}/module_ipc/src/ipc_skeleton_mock.cpp", "${path_backup_mock}/module_ipc/src/notify_work_service_mock.cpp", "${path_backup_mock}/module_ipc/src/sa_backup_connection_mock.cpp", - "${path_backup_mock}/module_ipc/src/service_stub_mock.cpp", + "${path_backup_mock}/module_ipc/service_stub_mock.cpp", "${path_backup_mock}/module_ipc/src/svc_backup_connection_mock.cpp", "${path_backup_mock}/module_ipc/src/svc_restore_deps_manager_mock.cpp", "${path_backup_mock}/module_ipc/src/svc_session_manager_mock.cpp", @@ -490,8 +484,8 @@ ohos_unittest("backup_service_other_test") { "${path_backup_mock}/utils_mock/src/b_jsonutil_mock.cpp", "${path_backup_mock}/utils_mock/src/b_sa_utils_mock.cpp", "${path_backup_mock}/utils_mock/src/backup_para_mock.cpp", - "${path_backup}/services/backup_sa/src/module_ipc/svc_extension_incremental_proxy.cpp", - "${path_backup}/services/backup_sa/src/module_ipc/svc_extension_proxy.cpp", + "${path_backup_mock}/module_ipc/extension_type_mock.cpp", + "${path_backup_mock}/module_ipc/extension_proxy_mock.cpp", "service_other_test.cpp", ] diff --git a/tests/unittests/backup_sa/module_ipc/extension_proxy_test.cpp b/tests/unittests/backup_sa/module_ipc/extension_proxy_test.cpp new file mode 100644 index 0000000000000000000000000000000000000000..767c2615320deb2d5a352c9a394d871637d9018c --- /dev/null +++ b/tests/unittests/backup_sa/module_ipc/extension_proxy_test.cpp @@ -0,0 +1,544 @@ +/* + * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include +#include +#include + +#include "b_error/b_error.h" +#include "ext_extension_mock.h" +#include "message_parcel_mock.h" +#include "module_ipc/extension_proxy.h" +#include "unique_fd.h" + +namespace OHOS::FileManagement::Backup { +using namespace std; +using namespace testing; + +class SvcExtensionProxyTest : public testing::Test { +public: + static void SetUpTestCase(void); + static void TearDownTestCase(); + void SetUp() override {}; + void TearDown() override {}; +public: + static inline sptr proxy_ = nullptr; + static inline sptr mock_ = nullptr; + static inline shared_ptr messageParcelMock_ = nullptr; +}; + +void SvcExtensionProxyTest::SetUpTestCase() +{ + mock_ = sptr(new BackupExtExtensionMock()); + proxy_ = sptr(new ExtensionProxy(mock_)); + messageParcelMock_ = make_shared(); + MessageParcelMock::messageParcel = messageParcelMock_; +} +void SvcExtensionProxyTest::TearDownTestCase() +{ + mock_ = nullptr; + proxy_ = nullptr; + MessageParcelMock::messageParcel = nullptr; + messageParcelMock_ = nullptr; +} + +/** + * @tc.number: SUB_Ext_Extension_proxy_GetFileHandle_0100 + * @tc.name: SUB_Ext_Extension_proxy_GetFileHandle_0100 + * @tc.desc: 测试 GetFileHandle 获取真实文件接口调用成功和失败 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SvcExtensionProxyTest, SUB_Ext_Extension_proxy_GetFileHandle_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-begin SUB_Ext_Extension_proxy_GetFileHandle_0100"; + try { + string fileName = "1.tar"; + int32_t errCode = 0; + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); + EXPECT_TRUE(proxy_ != nullptr); + UniqueFd fd = proxy_->GetFileHandle(fileName, errCode); + EXPECT_LT(fd, BError(BError::Codes::OK)); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(EPERM)); + fd = proxy_->GetFileHandle(fileName, errCode); + EXPECT_LT(fd, BError(BError::Codes::OK)); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(NO_ERROR)); + EXPECT_CALL(*messageParcelMock_, ReadBool()).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, ReadFileDescriptor()).WillOnce(Return(-1)); + fd = proxy_->GetFileHandle(fileName, errCode); + EXPECT_LT(fd, BError(BError::Codes::OK)); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(NO_ERROR)); + EXPECT_CALL(*messageParcelMock_, ReadBool()).WillOnce(Return(false)); + fd = proxy_->GetFileHandle(fileName, errCode); + EXPECT_LT(fd, BError(BError::Codes::OK)); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-an exception occurred by GetFileHandle."; + } + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-end SUB_Ext_Extension_proxy_GetFileHandle_0100"; +} + +/** + * @tc.number: SUB_Ext_Extension_proxy_HandleClear_0100 + * @tc.name: SUB_Ext_Extension_proxy_HandleClear_0100 + * @tc.desc: 测试 HandleClear 接口调用成功和失败 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SvcExtensionProxyTest, SUB_Ext_Extension_proxy_HandleClear_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-begin SUB_Ext_Extension_proxy_HandleClear_0100"; + try { + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(EPERM)); + EXPECT_TRUE(proxy_ != nullptr); + ErrCode ret = proxy_->HandleClear(); + EXPECT_EQ(EPERM, ret); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*messageParcelMock_, ReadInt32()).WillOnce(Return(0)); + ret = proxy_->HandleClear(); + EXPECT_EQ(BError(BError::Codes::OK), ret); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-an exception occurred by HandleClear."; + } + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-end SUB_Ext_Extension_proxy_HandleClear_0100"; +} + +/** + * @tc.number: SUB_Ext_Extension_proxy_HandleBackup_0100 + * @tc.name: SUB_Ext_Extension_proxy_HandleBackup_0100 + * @tc.desc: 测试 HandleBackup 接口调用成功和失败 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SvcExtensionProxyTest, SUB_Ext_Extension_proxy_HandleBackup_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-begin SUB_Ext_Extension_proxy_HandleBackup_0100"; + try { + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(EPERM)); + EXPECT_TRUE(proxy_ != nullptr); + ErrCode ret = proxy_->HandleBackup(true); + EXPECT_EQ(EPERM, ret); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*messageParcelMock_, ReadInt32()).WillOnce(Return(0)); + ret = proxy_->HandleBackup(true); + EXPECT_EQ(BError(BError::Codes::OK), ret); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-an exception occurred by HandleBackup."; + } + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-end SUB_Ext_Extension_proxy_HandleBackup_0100"; +} + +/** + * @tc.number: SUB_Ext_Extension_proxy_PublishFile_0100 + * @tc.name: SUB_Ext_Extension_proxy_PublishFile_0100 + * @tc.desc: 测试 PublishFile 接口调用成功和失败 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SvcExtensionProxyTest, SUB_Ext_Extension_proxy_PublishFile_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-begin SUB_Ext_Extension_proxy_PublishFile_0100"; + try { + string fileName = "1.tar"; + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); + EXPECT_TRUE(proxy_ != nullptr); + ErrCode ret = proxy_->PublishFile(fileName); + EXPECT_EQ(EPERM, ret); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(EPERM)); + ret = proxy_->PublishFile(fileName); + EXPECT_EQ(EPERM, ret); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*messageParcelMock_, ReadInt32()).WillOnce(Return(0)); + ret = proxy_->PublishFile(fileName); + EXPECT_EQ(BError(BError::Codes::OK), ret); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-an exception occurred by PublishFile."; + } + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-end SUB_Ext_Extension_proxy_PublishFile_0100"; +} + +/** + * @tc.number: SUB_Ext_Extension_proxy_HandleRestore_0100 + * @tc.name: SUB_Ext_Extension_proxy_HandleRestore_0100 + * @tc.desc: 测试 HandleRestore 接口调用成功和失败 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SvcExtensionProxyTest, SUB_Ext_Extension_proxy_HandleRestore_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-begin SUB_Ext_Extension_proxy_HandleRestore_0100"; + try { + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(EPERM)); + EXPECT_TRUE(proxy_ != nullptr); + ErrCode ret = proxy_->HandleRestore(true); + EXPECT_EQ(EPERM, ret); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*messageParcelMock_, ReadInt32()).WillOnce(Return(0)); + ret = proxy_->HandleRestore(true); + EXPECT_EQ(BError(BError::Codes::OK), ret); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-an exception occurred by HandleRestore."; + } + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-end SUB_Ext_Extension_proxy_HandleRestore_0100"; +} + +/** + * @tc.number: SUB_Ext_Extension_proxy_GetBackupInfo_0100 + * @tc.name: SUB_Ext_Extension_proxy_GetBackupInfo_0100 + * @tc.desc: 测试 GetBackupInfo 接口调用成功和失败 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SvcExtensionProxyTest, SUB_Ext_Extension_proxy_GetBackupInfo_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-begin SUB_Ext_Extension_proxy_GetBackupInfo_0100"; + try { + string result = "result_report"; + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(EPERM)); + EXPECT_TRUE(proxy_ != nullptr); + ErrCode ret = proxy_->GetBackupInfo(result); + EXPECT_EQ(EPERM, ret); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(NO_ERROR)); + EXPECT_CALL(*messageParcelMock_, ReadInt32(_)).WillOnce(Return(false)); + ret = proxy_->GetBackupInfo(result); + EXPECT_EQ(BError(BError::Codes::OK), ret); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(NO_ERROR)); + EXPECT_CALL(*messageParcelMock_, ReadInt32(_)).WillOnce(DoAll(SetArgReferee<0>(EPERM), Return(true))); + ret = proxy_->GetBackupInfo(result); + EXPECT_EQ(EPERM, ret); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(NO_ERROR)); + EXPECT_CALL(*messageParcelMock_, ReadInt32(_)).WillOnce(DoAll(SetArgReferee<0>(NO_ERROR), Return(true))); + EXPECT_CALL(*messageParcelMock_, ReadString(_)).WillOnce(Return(false)); + ret = proxy_->GetBackupInfo(result); + EXPECT_EQ(BError(BError::Codes::OK), ret); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(NO_ERROR)); + EXPECT_CALL(*messageParcelMock_, ReadInt32(_)).WillOnce(DoAll(SetArgReferee<0>(NO_ERROR), Return(true))); + EXPECT_CALL(*messageParcelMock_, ReadString(_)).WillOnce(Return(true)); + ret = proxy_->GetBackupInfo(result); + EXPECT_EQ(BError(BError::Codes::OK), ret); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-an exception occurred by GetBackupInfo."; + } + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-end SUB_Ext_Extension_proxy_GetBackupInfo_0100"; +} + +/** + * @tc.number: SUB_Ext_Extension_proxy_UpdateFdSendRate_0100 + * @tc.name: SUB_Ext_Extension_proxy_UpdateFdSendRate_0100 + * @tc.desc: 测试 HandleRestore 接口调用成功和失败 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SvcExtensionProxyTest, SUB_Service_GetBackupInfoCmdHandle_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-begin SUB_Ext_Extension_proxy_UpdateFdSendRate_0100"; + try { + std::string bundleName = "bundleName"; + int32_t sendRate = 0; + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); + EXPECT_TRUE(proxy_ != nullptr); + ErrCode ret = proxy_->UpdateFdSendRate(bundleName, sendRate); + EXPECT_EQ(EPERM, ret); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(false)); + EXPECT_TRUE(proxy_ != nullptr); + ret = proxy_->UpdateFdSendRate(bundleName, sendRate); + EXPECT_EQ(EPERM, ret); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(EPERM)); + EXPECT_TRUE(proxy_ != nullptr); + ret = proxy_->UpdateFdSendRate(bundleName, sendRate); + EXPECT_EQ(EPERM, ret); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(NO_ERROR)); + EXPECT_CALL(*messageParcelMock_, ReadInt32(_)).WillOnce(Return(false)); + EXPECT_TRUE(proxy_ != nullptr); + ret = proxy_->UpdateFdSendRate(bundleName, sendRate); + EXPECT_EQ(BError(BError::Codes::OK), ret); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(NO_ERROR)); + EXPECT_CALL(*messageParcelMock_, ReadInt32(_)).WillOnce(Return(true)); + EXPECT_TRUE(proxy_ != nullptr); + ret = proxy_->UpdateFdSendRate(bundleName, sendRate); + EXPECT_EQ(BError(BError::Codes::OK), ret); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-an exception occurred by UpdateFdSendRate."; + } + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-end SUB_Ext_Extension_proxy_UpdateFdSendRate_0100"; +} + +/** + * @tc.number: SUB_Ext_Extension_proxy_GetIncrementalFileHandle_0100 + * @tc.name: SUB_Ext_Extension_proxy_GetIncrementalFileHandle_0100 + * @tc.desc: 测试 GetIncrementalFileHandle 接口调用成功和失败 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SvcExtensionProxyTest, SUB_Ext_Extension_proxy_GetIncrementalFileHandle_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-begin SUB_Ext_Extension_proxy_GetIncrementalFileHandle_0100"; + try { + string fileName = "1.tar"; + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); + EXPECT_TRUE(proxy_ != nullptr); + auto [ret, fd, reportFd] = proxy_->GetIncrementalFileHandle(fileName); + EXPECT_EQ(ret, ErrCode(EPERM)); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(EPERM)); + tie(ret, fd, reportFd) = proxy_->GetIncrementalFileHandle(fileName); + EXPECT_EQ(ret, ErrCode(EPERM)); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(NO_ERROR)); + EXPECT_CALL(*messageParcelMock_, ReadInt32()).WillOnce(Return(NO_ERROR)); + EXPECT_CALL(*messageParcelMock_, ReadFileDescriptor()).WillOnce(Return(-1)).WillOnce(Return(-1)); + tie(ret, fd, reportFd) = proxy_->GetIncrementalFileHandle(fileName); + EXPECT_EQ(ret, ErrCode(BError::Codes::OK)); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-an exception occurred by GetIncrementalFileHandle."; + } + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-end SUB_Ext_Extension_proxy_GetIncrementalFileHandle_0100"; +} + +/** + * @tc.number: SUB_Ext_Extension_proxy_PublishIncrementalFile_0100 + * @tc.name: SUB_Ext_Extension_proxy_PublishIncrementalFile_0100 + * @tc.desc: 测试 PublishIncrementalFile 接口调用成功和失败 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SvcExtensionProxyTest, SUB_Ext_Extension_proxy_PublishIncrementalFile_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-begin SUB_Ext_Extension_proxy_PublishIncrementalFile_0100"; + try { + string fileName = "1.tar"; + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); + EXPECT_TRUE(proxy_ != nullptr); + ErrCode ret = proxy_->PublishIncrementalFile(fileName); + EXPECT_EQ(ret, ErrCode(EPERM)); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(EPERM)); + ret = proxy_->PublishIncrementalFile(fileName); + EXPECT_EQ(ret, ErrCode(EPERM)); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(NO_ERROR)); + EXPECT_CALL(*messageParcelMock_, ReadInt32()).WillOnce(Return(NO_ERROR)); + ret = proxy_->PublishIncrementalFile(fileName); + EXPECT_EQ(ret, ErrCode(BError::Codes::OK)); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-an exception occurred by PublishIncrementalFile."; + } + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-end SUB_Ext_Extension_proxy_PublishIncrementalFile_0100"; +} + +/** + * @tc.number: SUB_Ext_Extension_proxy_HandleIncrementalBackup_0100 + * @tc.name: SUB_Ext_Extension_proxy_HandleIncrementalBackup_0100 + * @tc.desc: 测试 HandleIncrementalBackup 接口调用成功和失败 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SvcExtensionProxyTest, SUB_Ext_Extension_proxy_HandleIncrementalBackup_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-begin SUB_Ext_Extension_proxy_HandleIncrementalBackup_0100"; + try { + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteFileDescriptor(_)).WillOnce(Return(true)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(EPERM)); + EXPECT_TRUE(proxy_ != nullptr); + ErrCode ret = proxy_->HandleIncrementalBackup(UniqueFd(-1), UniqueFd(-1)); + EXPECT_EQ(ret, ErrCode(EPERM)); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteFileDescriptor(_)).WillOnce(Return(true)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(NO_ERROR)); + EXPECT_CALL(*messageParcelMock_, ReadInt32()).WillOnce(Return(NO_ERROR)); + ret = proxy_->HandleIncrementalBackup(UniqueFd(-1), UniqueFd(-1)); + EXPECT_EQ(ret, ErrCode(BError::Codes::OK)); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-an exception occurred by HandleIncrementalBackup."; + } + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-end SUB_Ext_Extension_proxy_HandleIncrementalBackup_0100"; +} + +/** + * @tc.number: SUB_Ext_Extension_proxy_IncrementalOnBackup_0100 + * @tc.name: SUB_Ext_Extension_proxy_IncrementalOnBackup_0100 + * @tc.desc: 测试 IncrementalOnBackup 接口调用成功和失败 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SvcExtensionProxyTest, SUB_Ext_Extension_proxy_IncrementalOnBackup_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-begin SUB_Ext_Extension_proxy_IncrementalOnBackup_0100"; + try { + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); + EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); + EXPECT_TRUE(proxy_ != nullptr); + ErrCode ret = proxy_->IncrementalOnBackup(true); + EXPECT_NE(ret, ErrCode(BError::Codes::OK)); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(false)); + EXPECT_TRUE(proxy_ != nullptr); + ret = proxy_->IncrementalOnBackup(true); + EXPECT_NE(ret, ErrCode(BError::Codes::OK)); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(EPERM)); + EXPECT_TRUE(proxy_ != nullptr); + ret = proxy_->IncrementalOnBackup(true); + EXPECT_EQ(ret, ErrCode(EPERM)); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(NO_ERROR)); + EXPECT_TRUE(proxy_ != nullptr); + ret = proxy_->IncrementalOnBackup(true); + EXPECT_EQ(ret, ErrCode(BError::Codes::OK)); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-an exception occurred by IncrementalOnBackup."; + } + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-end SUB_Ext_Extension_proxy_IncrementalOnBackup_0100"; +} + +/** + * @tc.number: SUB_Ext_Extension_proxy_GetIncrementalBackupFileHandle_0100 + * @tc.name: SUB_Ext_Extension_proxy_GetIncrementalBackupFileHandle_0100 + * @tc.desc: 测试 GetIncrementalBackupFileHandle 接口调用成功和失败 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SvcExtensionProxyTest, SUB_Ext_Extension_proxy_GetIncrementalBackupFileHandle_0100, + testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-begin SUB_Ext_Extension_proxy_GetIncrementalBackupFileHandle_0100"; + try { + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(EPERM)); + EXPECT_TRUE(proxy_ != nullptr); + auto [incrementalFd, manifestFd] = proxy_->GetIncrementalBackupFileHandle(); + EXPECT_EQ(incrementalFd, -1); + EXPECT_EQ(manifestFd, -1); + + EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(NO_ERROR)); + EXPECT_CALL(*messageParcelMock_, ReadFileDescriptor()).WillOnce(Return(-1)).WillOnce(Return(-1)); + tie(incrementalFd, manifestFd) = proxy_->GetIncrementalBackupFileHandle(); + EXPECT_EQ(incrementalFd, -1); + EXPECT_EQ(manifestFd, -1); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-an exception occurred by GetIncrementalBackupFileHandle."; + } + GTEST_LOG_(INFO) << "SvcExtensionProxyTest-end SUB_Ext_Extension_proxy_GetIncrementalBackupFileHandle_0100"; +} +} // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/tests/unittests/backup_sa/module_ipc/sched_scheduler_test.cpp b/tests/unittests/backup_sa/module_ipc/sched_scheduler_test.cpp index 505e0eb577076c7510f55349b957c7e1164d4034..788616b821116ef47a81915196441e250d9222a3 100644 --- a/tests/unittests/backup_sa/module_ipc/sched_scheduler_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/sched_scheduler_test.cpp @@ -42,7 +42,7 @@ public: static void TearDownTestCase(); void SetUp() override {}; void TearDown() override {}; - void Init(IServiceReverse::Scenario scenario); + void Init(IServiceReverseType::Scenario scenario); static inline sptr schedPtr_ = nullptr; static inline sptr sessionManagerPtr_ = nullptr; @@ -63,7 +63,7 @@ void SchedSchedulerTest::TearDownTestCase() sessionManagerPtr_ = nullptr; } -void SchedSchedulerTest::Init(IServiceReverse::Scenario scenario) +void SchedSchedulerTest::Init(IServiceReverseType::Scenario scenario) { vector bundleNames; map backupExtNameMap; @@ -99,7 +99,7 @@ HWTEST_F(SchedSchedulerTest, SUB_Service_Sched_0100, testing::ext::TestSize.Leve { GTEST_LOG_(INFO) << "SchedSchedulerTest-begin SUB_Service_Sched_0100"; try { - Init(IServiceReverse::Scenario::BACKUP); + Init(IServiceReverseType::Scenario::BACKUP); EXPECT_TRUE(schedPtr_ != nullptr); schedPtr_->Sched(); GTEST_LOG_(INFO) << "SchedSchedulerTest-Sched Branches"; diff --git a/tests/unittests/backup_sa/module_ipc/service_incremental_test.cpp b/tests/unittests/backup_sa/module_ipc/service_incremental_test.cpp index b63452aac02b5720f9925deb37d9def0db739056..be0316576517a5dab9e4b5b24ff69285609b8c00 100644 --- a/tests/unittests/backup_sa/module_ipc/service_incremental_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_incremental_test.cpp @@ -23,7 +23,7 @@ #include "sa_backup_connection_mock.h" #include "service_reverse_proxy_mock.h" #include "svc_backup_connection_mock.h" -#include "svc_extension_proxy_mock.h" +#include "extension_proxy_mock.h" #include "svc_session_manager_mock.h" #include "service_incremental.cpp" @@ -35,6 +35,15 @@ void Service::OnStart() {} void Service::OnStop() {} +ErrCode Service::GetLocalCapabilitiesForBundleInfos(int32_t& fd) +{ + return BError(BError::Codes::OK); +} +ErrCode Service::InitBackupSessionWithErrMsg(sptr& remote, std::string &errMsg) +{ + return BError(BError::Codes::OK); +} + UniqueFd Service::GetLocalCapabilities() { return UniqueFd(-1); @@ -47,22 +56,15 @@ ErrCode Service::VerifyCallerAndGetCallerName(std::string &bundleName) return BError(BError::Codes::OK); } -ErrCode Service::InitRestoreSession(sptr remote) +ErrCode Service::InitRestoreSession(sptr& remote) { return BError(BError::Codes::OK); } - -ErrCode Service::InitRestoreSession(sptr remote, std::string &errMsg) -{ - return BError(BError::Codes::OK); -} - -ErrCode Service::InitBackupSession(sptr remote) +ErrCode Service::InitRestoreSessionWithErrMsg(sptr& remote,std::string &errMsg) { return BError(BError::Codes::OK); } - -ErrCode Service::InitBackupSession(sptr remote, std::string &errMsg) +ErrCode Service::InitBackupSession(sptr& remote) { return BError(BError::Codes::OK); } @@ -77,36 +79,39 @@ ErrCode Service::PublishFile(const BFileInfo &fileInfo) return BError(BError::Codes::OK); } -ErrCode Service::AppFileReady(const string &fileName, UniqueFd fd, int32_t errCode) +ErrCode Service::AppFileReady(const std::string& fileName, + int32_t fd, + int32_t appFileReadyErrCode) { return BError(BError::Codes::OK); } -ErrCode Service::AppDone(ErrCode errCode) +ErrCode Service::AppDone( int32_t appDoneErrCode) { return BError(BError::Codes::OK); } -ErrCode Service::ServiceResultReport(const std::string restoreRetInfo, +ErrCode Service::ServiceResultReport(const std::string& restoreRetInfo, BackupRestoreScenario sennario, ErrCode errCode) { return BError(BError::Codes::OK); } -ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, const std::vector &bundleNames, - const std::vector &detailInfos, RestoreTypeEnum restoreType, int32_t userId) -{ - return BError(BError::Codes::OK); -} - -ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, - const std::vector &bundleNames, - RestoreTypeEnum restoreType, - int32_t userId) +ErrCode Service::AppendBundlesRestoreSessionRestoreDataWaitSend(int32_t fd,const std::vector& bundleNames, + const std::vector& detailInfos, + int32_t restoreType, + int32_t userId) { return BError(BError::Codes::OK); } + ErrCode Service:: AppendBundlesRestoreSessionRestoreDataWaitReady( + int32_t fd, + const std::vector& bundleNames, + int32_t restoreType, + int32_t userId) { + return BError(BError::Codes::OK); + } ErrCode Service::AppendBundlesBackupSession(const std::vector &bundleNames) { return BError(BError::Codes::OK); @@ -122,15 +127,17 @@ ErrCode Service::Finish() { return BError(BError::Codes::OK); } - +ErrCode Service::GetLocalCapabilitiesWithUniqueFd(int32_t& fd){ + return BError(BError::Codes::OK); +} ErrCode Service::LaunchBackupExtension(const BundleName &bundleName) { - return BError(BError::Codes::OK); + return BError(BError::Codes::OK); } ErrCode Service::LaunchBackupSAExtension(const BundleName &bundleName) { - return BError(BError::Codes::OK); + return BError(BError::Codes::OK); } ErrCode Service::GetFileHandle(const string &bundleName, const string &fileName) @@ -163,7 +170,7 @@ ErrCode Service::VerifyCaller() return BError(BError::Codes::OK); } -ErrCode Service::VerifyCaller(IServiceReverse::Scenario scenario) +ErrCode Service::VerifyCaller(IServiceReverseType::Scenario scenario) { return BError(BError::Codes::OK); } @@ -215,7 +222,7 @@ void Service::NoticeClientFinish(const string &bundleName, ErrCode errCode) { } -ErrCode Service::ReportAppProcessInfo(const std::string processInfo, BackupRestoreScenario sennario) +ErrCode Service::ReportAppProcessInfo( const std::string& processInfo, BackupRestoreScenario sennario) { return BError(BError::Codes::OK); } @@ -268,16 +275,16 @@ void Service::HandleExceptionOnAppendBundles(sptr session, const vector &appendBundleNames, const vector &restoreBundleNames) {} void Service::BundleBeginRadarReport(const std::string &bundleName, const ErrCode errCode, - const IServiceReverse::Scenario scenario) {} + const IServiceReverseType::Scenario scenario) {} void Service::BundleEndRadarReport(const std::string &bundleName, const ErrCode errCode, - const IServiceReverse::Scenario scenario) {} + const IServiceReverseType::Scenario scenario) {} void Service::FileReadyRadarReport(const std::string &bundleName, const std::string &fileName, const ErrCode errCode, - const IServiceReverse::Scenario scenario) {} + const IServiceReverseType::Scenario scenario) {} void Service::ExtensionConnectFailRadarReport(const std::string &bundleName, const ErrCode errCode, - const IServiceReverse::Scenario scenario) {} + const IServiceReverseType::Scenario scenario) {} void Service::PermissionCheckFailRadar(const std::string &info, const std::string &func) {} @@ -334,7 +341,7 @@ UniqueFd Service::GetLocalCapabilitiesForBundleInfos() } void Service::AppendBundles(const std::vector &bundleNames) {} -ErrCode Service::GetBackupDataSize(bool isPreciseScan, vector bundleNameList) +ErrCode Service::GetBackupDataSize(bool isPreciseScan, const std::vector& bundleNameList) { return BError(BError::Codes::OK); } @@ -359,7 +366,7 @@ public: static inline shared_ptr jsonUtil = nullptr; static inline shared_ptr session = nullptr; static inline shared_ptr bms = nullptr; - static inline sptr svcProxy = nullptr; + static inline sptr svcProxy = nullptr; static inline sptr connect = nullptr; static inline shared_ptr saConnect = nullptr; static inline shared_ptr skeleton = nullptr; @@ -376,7 +383,7 @@ void ServiceIncrementalTest::SetUpTestCase(void) BJsonUtilMock::jsonUtil = jsonUtil; session = make_shared(); SvcSessionManagerMock::sessionManager = session; - svcProxy = sptr(new SvcExtensionProxyMock()); + svcProxy = sptr(new ExtensionProxyMock()); bms = make_shared(); BundleMgrAdapterMock::bms = bms; connect = sptr(new SvcBackupConnectionMock()); @@ -386,6 +393,16 @@ void ServiceIncrementalTest::SetUpTestCase(void) skeleton = make_shared(); IPCSkeletonMock::skeleton = skeleton; srProxy = sptr(new ServiceReverseProxyMock()); + EXPECT_NE(service, nullptr); + EXPECT_NE(param, nullptr); + EXPECT_NE(jsonUtil, nullptr); + EXPECT_NE(session, nullptr); + EXPECT_NE(bms, nullptr); + EXPECT_NE(svcProxy, nullptr); + EXPECT_NE(connect, nullptr); + EXPECT_NE(saConnect, nullptr); + EXPECT_NE(skeleton, nullptr); + EXPECT_NE(srProxy, nullptr); } void ServiceIncrementalTest::TearDownTestCase() @@ -425,7 +442,8 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_GetLocalCapabilitiesIncr try { auto session_ = service->session_; service->session_ = nullptr; - auto fd = service->GetLocalCapabilitiesIncremental({}); + int fd = -1; + service->GetLocalCapabilitiesIncremental({},fd); service->session_ = session_; EXPECT_EQ(static_cast(fd), -ENOENT); } catch (...) { @@ -535,13 +553,15 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_InitIncrementalBackupSes try { auto session_ = service->session_; service->session_ = nullptr; - EXPECT_EQ(service->InitIncrementalBackupSession(nullptr), BError(BError::Codes::SA_INVAL_ARG).GetCode()); + sptr srPrt = static_cast>(srProxy); + srPrt = nullptr; + EXPECT_EQ(service->InitIncrementalBackupSession(srPrt), BError(BError::Codes::SA_INVAL_ARG).GetCode()); service->session_ = session_; EXPECT_CALL(*param, GetBackupDebugOverrideAccount()).WillOnce(Return(make_pair(false, 0))); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); EXPECT_CALL(*session, Active(_, _)).WillOnce(Return(BError(BError::Codes::OK))); - EXPECT_EQ(service->InitIncrementalBackupSession(nullptr), BError(BError::Codes::OK).GetCode()); + EXPECT_EQ(service->InitIncrementalBackupSession(srPrt), BError(BError::Codes::OK).GetCode()); } catch (...) { EXPECT_TRUE(false); GTEST_LOG_(INFO) << "ServiceIncrementalTest-an exception occurred by InitIncrementalBackupSession."; @@ -565,14 +585,15 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_InitIncrementalBackupSes std::string errMsg; auto session_ = service->session_; service->session_ = nullptr; - EXPECT_EQ(service->InitIncrementalBackupSession(nullptr, errMsg), + sptr reverseNUll = nullptr; + EXPECT_EQ(service->InitIncrementalBackupSessionWithErrMsg(reverseNUll, errMsg), BError(BError::Codes::SA_INVAL_ARG).GetCode()); service->session_ = session_; EXPECT_CALL(*param, GetBackupDebugOverrideAccount()).WillOnce(Return(make_pair(false, 0))); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); EXPECT_CALL(*session, Active(_, _)).WillOnce(Return(BError(BError::Codes::OK))); - EXPECT_EQ(service->InitIncrementalBackupSession(nullptr, errMsg), BError(BError::Codes::OK).GetCode()); + EXPECT_EQ(service->InitIncrementalBackupSessionWithErrMsg(reverseNUll, errMsg), BError(BError::Codes::OK).GetCode()); } catch (...) { EXPECT_TRUE(false); GTEST_LOG_(INFO) << "ServiceIncrementalTest-an exception occurred by InitIncrementalBackupSession."; @@ -761,26 +782,26 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalFileReady_ try { string fileName; int32_t errCode = 0; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalRestoreOnFileReady(_, _, _, _, _)).WillOnce(Return()); - auto ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode); + EXPECT_CALL(*srProxy, IncrementalRestoreOnFileReady(_, _, _, _, _)).WillOnce(Return(0)); + auto ret = service->AppIncrementalFileReady(fileName, 1, 1, errCode); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalBackupOnFileReady(_, _, _, _, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalBackupOnFileReady(_, _, _, _, _)).WillOnce(Return(0)); EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false)); - ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode); + ret = service->AppIncrementalFileReady(fileName, 1, 1, errCode); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); fileName = BConstants::EXT_BACKUP_MANAGE; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, OnBundleExtManageInfo(_, _)).WillOnce(Return(UniqueFd(-1))); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalBackupOnFileReady(_, _, _, _, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalBackupOnFileReady(_, _, _, _, _)).WillOnce(Return(0)); EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false)); - ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode); + ret = service->AppIncrementalFileReady(fileName, 1, 1, errCode); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); } catch (...) { EXPECT_TRUE(false); @@ -804,27 +825,27 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalFileReady_ try { string fileName; int32_t errCode = 0; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalBackupOnFileReady(_, _, _, _, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalBackupOnFileReady(_, _, _, _, _)).WillOnce(Return(0)); EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(true)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); - auto ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode); + auto ret = service->AppIncrementalFileReady(fileName, 1, 1, errCode); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalBackupOnFileReady(_, _, _, _, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalBackupOnFileReady(_, _, _, _, _)).WillOnce(Return(0)); EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(true)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); EXPECT_CALL(*svcProxy, HandleClear()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); EXPECT_CALL(*session, StopFwkTimer(_)).WillOnce(Return(true)); EXPECT_CALL(*session, StopExtTimer(_)).WillOnce(Return(true)); - EXPECT_CALL(*srProxy, IncrementalBackupOnBundleFinished(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalBackupOnBundleFinished(_, _)).WillOnce(Return(0)); EXPECT_CALL(*connect, DisconnectBackupExtAbility()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); - ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode); + ret = service->AppIncrementalFileReady(fileName, 1, 1, errCode); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); } catch (...) { EXPECT_TRUE(false); @@ -900,10 +921,10 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_GetIncrementalFileHandle EXPECT_CALL(*session, GetServiceSchedAction(_)).WillOnce(Return(BConstants::ServiceSchedAction::RUNNING)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*svcProxy, GetIncrementalFileHandle(_)).WillOnce(Return(make_tuple(0, UniqueFd(-1), UniqueFd(-1)))); - EXPECT_CALL(*srProxy, IncrementalBackupOnFileReady(_, _, _, _, _)).WillOnce(Return()); + EXPECT_CALL(*svcProxy, GetIncrementalFileHandleWithUniqueFdGroup(_, _)).WillOnce(Return(0)); + EXPECT_CALL(*srProxy, IncrementalBackupOnFileReady(_, _, _, _, _)).WillOnce(Return(0)); EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(true)); ret = service->GetIncrementalFileHandle(bundleName, fileName); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); @@ -932,46 +953,46 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_IncrementalBackup_0000, GTEST_LOG_(INFO) << "ServiceIncrementalTest-begin SUB_ServiceIncremental_IncrementalBackup_0000"; try { string bundleName; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(nullptr)); bool res = service->IncrementalBackup(bundleName); EXPECT_TRUE(res); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(nullptr)); res = service->IncrementalBackup(bundleName); EXPECT_TRUE(res); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); auto ret = service->IncrementalBackup(bundleName); EXPECT_FALSE(ret); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); EXPECT_CALL(*session, GetIsIncrementalBackup()).WillOnce(Return(true)); EXPECT_CALL(*session, GetClearDataFlag(_)).WillOnce(Return(false)); EXPECT_CALL(*svcProxy, IncrementalOnBackup(_)).WillOnce(Return(0)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalBackupOnBundleStarted(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalBackupOnBundleStarted(_, _)).WillOnce(Return(1)); ret = service->IncrementalBackup(bundleName); EXPECT_TRUE(ret); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); EXPECT_CALL(*session, GetIsIncrementalBackup()).WillOnce(Return(true)); EXPECT_CALL(*session, GetClearDataFlag(_)).WillOnce(Return(false)); EXPECT_CALL(*svcProxy, IncrementalOnBackup(_)).WillOnce(Return(1)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalBackupOnBundleStarted(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalBackupOnBundleStarted(_, _)).WillOnce(Return(1)); ret = service->IncrementalBackup(bundleName); EXPECT_TRUE(ret); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); EXPECT_CALL(*session, GetIsIncrementalBackup()).WillOnce(Return(false)); @@ -998,14 +1019,14 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_IncrementalBackup_0100, GTEST_LOG_(INFO) << "ServiceIncrementalTest-begin SUB_ServiceIncremental_IncrementalBackup_0100"; try { string bundleName; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(false)); auto ret = service->IncrementalBackup(bundleName); EXPECT_FALSE(ret); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(true)); @@ -1014,7 +1035,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_IncrementalBackup_0100, EXPECT_FALSE(ret); set fileNameVec { "fileName" }; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(true)); @@ -1022,14 +1043,14 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_IncrementalBackup_0100, EXPECT_CALL(*session, GetClearDataFlag(_)).WillOnce(Return(false)); EXPECT_CALL(*svcProxy, HandleRestore(_)).WillOnce(Return(BError(BError::Codes::OK).GetCode())); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleStarted(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleStarted(_, _)).WillOnce(Return(1)); EXPECT_CALL(*session, GetExtFileNameRequest(_)).WillOnce(Return(fileNameVec)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); EXPECT_CALL(*svcProxy, IncrementalOnBackup(_)).WillOnce(Return(1)); - EXPECT_CALL(*srProxy, IncrementalBackupOnBundleStarted(_, _)).WillOnce(Return()); - EXPECT_CALL(*svcProxy, GetIncrementalFileHandle(_)) - .WillOnce(Return(make_tuple(BError(BError::Codes::OK).GetCode(), UniqueFd(-1), UniqueFd(-1)))); + EXPECT_CALL(*srProxy, IncrementalBackupOnBundleStarted(_, _)).WillOnce(Return(1)); + EXPECT_CALL(*svcProxy, GetIncrementalFileHandleWithUniqueFdGroup(_,_)) + .WillOnce(Return(0)); EXPECT_CALL(*session, GetIsIncrementalBackup()).WillOnce(Return(true)); ret = service->IncrementalBackup(bundleName); EXPECT_TRUE(ret); @@ -1055,7 +1076,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_IncrementalBackup_0200, try { string bundleName; set fileNameVec { "fileName" }; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(true)); @@ -1063,14 +1084,14 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_IncrementalBackup_0200, EXPECT_CALL(*session, GetClearDataFlag(_)).WillOnce(Return(false)); EXPECT_CALL(*svcProxy, HandleRestore(_)).WillOnce(Return(BError(BError::Codes::OK).GetCode())); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleStarted(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleStarted(_, _)).WillOnce(Return(1)); EXPECT_CALL(*session, GetExtFileNameRequest(_)).WillOnce(Return(fileNameVec)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); EXPECT_CALL(*svcProxy, IncrementalOnBackup(_)).WillOnce(Return(1)); - EXPECT_CALL(*srProxy, IncrementalBackupOnBundleStarted(_, _)).WillOnce(Return()); - EXPECT_CALL(*svcProxy, GetIncrementalFileHandle(_)) - .WillOnce(Return(make_tuple(BError(BError::Codes::SA_INVAL_ARG).GetCode(), UniqueFd(-1), UniqueFd(-1)))); + EXPECT_CALL(*srProxy, IncrementalBackupOnBundleStarted(_, _)).WillOnce(Return(1)); + EXPECT_CALL(*svcProxy, GetIncrementalFileHandleWithUniqueFdGroup(_,_)) + .WillOnce(Return(0)); EXPECT_CALL(*session, GetIsIncrementalBackup()).WillOnce(Return(true)); auto ret = service->IncrementalBackup(bundleName); EXPECT_TRUE(ret); @@ -1096,19 +1117,19 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_NotifyCallerCurAppIncrem try { ErrCode errCode = 0; string callerName; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); service->NotifyCallerCurAppIncrementDone(errCode, callerName); EXPECT_TRUE(true); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalBackupOnBundleFinished(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalBackupOnBundleFinished(_, _)).WillOnce(Return(1)); service->NotifyCallerCurAppIncrementDone(errCode, callerName); EXPECT_TRUE(true); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleFinished(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleFinished(_, _)).WillOnce(Return(1)); service->NotifyCallerCurAppIncrementDone(errCode, callerName); EXPECT_TRUE(true); } catch (...) { @@ -1208,17 +1229,17 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_Release_0000, TestSize.L EXPECT_EQ(ret, BError(BError::Codes::SA_INVAL_ARG).GetCode()); service->session_ = session_; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*session, GetSessionUserId()).WillOnce(Return(0)); ret = service->Release(); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetSessionUserId()).WillOnce(Return(0)); ret = service->Release(); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); ret = service->Release(); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -1282,24 +1303,24 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_Cancel_0000, TestSize.Le impl.backupExtNameMap.insert(make_pair(bundleName, info)); int32_t result; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); service->Cancel(bundleName, result); EXPECT_EQ(result, BError(BError::BackupErrorCode::E_CANCEL_NO_TASK).GetCode()); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*session, GetImpl()).WillOnce(Return(impl)); EXPECT_CALL(*session, GetServiceSchedAction(_)).WillOnce(Return(BConstants::ServiceSchedAction::CLEAN)); service->Cancel(bundleName, result); EXPECT_EQ(result, BError(BError::BackupErrorCode::E_CANCEL_NO_TASK).GetCode()); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*session, GetImpl()).WillOnce(Return(impl)); EXPECT_CALL(*session, GetServiceSchedAction(_)).WillOnce(Return(BConstants::ServiceSchedAction::START)); service->Cancel(bundleName, result); EXPECT_EQ(result, BError(BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK).GetCode()); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)) - .WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)) + .WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*session, GetImpl()).WillOnce(Return(impl)); EXPECT_CALL(*session, GetServiceSchedAction(_)).WillOnce(Return(BConstants::ServiceSchedAction::RUNNING)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(nullptr)); diff --git a/tests/unittests/backup_sa/module_ipc/service_other_test.cpp b/tests/unittests/backup_sa/module_ipc/service_other_test.cpp index 5df07ad2bfa747b504ab5f40d957f4d15e37466a..a4ca214469b96e6718f086cfbe7fa91a1b10f9fd 100644 --- a/tests/unittests/backup_sa/module_ipc/service_other_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_other_test.cpp @@ -31,7 +31,7 @@ #include "service_reverse_proxy_mock.h" #include "sms_adapter_mock.h" #include "svc_backup_connection_mock.h" -#include "svc_extension_proxy_mock.h" +#include "extension_proxy_mock.h" #include "svc_restore_deps_manager_mock.h" #include "svc_session_manager_mock.h" #include "system_ability_mock.h" @@ -40,20 +40,41 @@ #include "sub_service.cpp" namespace OHOS::FileManagement::Backup { +ErrCode Service::AppendBundlesIncrementalBackupSessionWithBundleInfos( + const std::vector& bundlesToBackup, + const std::vector& bundleInfos) +{ + return BError(BError::Codes::OK); +} +ErrCode Service::PublishSAIncrementalFile( + const BFileInfo& fileInfo, + int32_t fd) +{ + return BError(BError::Codes::OK); +} +ErrCode Service::AppIncrementalFileReady( + const std::string& fileName, + int32_t fd, + int32_t manifestFd, + int32_t appIncrementalFileReadyErrCode) +{ + return BError(BError::Codes::OK); +} + ErrCode Service::Release() { return BError(BError::Codes::OK); } -ErrCode Service::Cancel(std::string bundleName, int32_t &result) +ErrCode Service::Cancel(const std::string& bundleName, int32_t &result) { result = BError(BError::Codes::OK); return BError(BError::Codes::OK); } -UniqueFd Service::GetLocalCapabilitiesIncremental(const std::vector&) +ErrCode Service::GetLocalCapabilitiesIncremental(const std::vector& bundleNames,int32_t& fd) { - return UniqueFd(-1); + return BError(BError::Codes::OK); } void Service::StartGetFdTask(std::string, wptr) {} @@ -63,12 +84,12 @@ ErrCode Service::GetAppLocalListAndDoIncrementalBackup() return BError(BError::Codes::OK); } -ErrCode Service::InitIncrementalBackupSession(sptr) +ErrCode Service::InitIncrementalBackupSession(sptr& ) { return BError(BError::Codes::OK); } -ErrCode Service::InitIncrementalBackupSession(sptr, std::string &) +ErrCode Service::InitIncrementalBackupSessionWithErrMsg(sptr&, std::string &) { return BError(BError::Codes::OK); } @@ -176,7 +197,7 @@ public: static inline shared_ptr jsonUtil = nullptr; static inline shared_ptr session = nullptr; static inline shared_ptr bms = nullptr; - static inline sptr svcProxy = nullptr; + static inline sptr svcProxy = nullptr; static inline sptr connect = nullptr; static inline shared_ptr saConnect = nullptr; static inline shared_ptr skeleton = nullptr; @@ -203,7 +224,7 @@ void ServiceTest::SetUpTestCase(void) BJsonUtilMock::jsonUtil = jsonUtil; session = make_shared(); SvcSessionManagerMock::sessionManager = session; - svcProxy = sptr(new SvcExtensionProxyMock()); + svcProxy = sptr(new ExtensionProxyMock()); bms = make_shared(); BundleMgrAdapterMock::bms = bms; connect = sptr(new SvcBackupConnectionMock()); @@ -693,30 +714,30 @@ HWTEST_F(ServiceTest, SUB_Service_OnBundleStarted_0100, TestSize.Level1) BError error(BError::Codes::OK); sptr session_ = service->session_; BundleName bundleName; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); service->OnBundleStarted(error, session_, bundleName); EXPECT_TRUE(true); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(false)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, RestoreOnBundleStarted(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, RestoreOnBundleStarted(_, _)).WillOnce(Return(1)); service->OnBundleStarted(error, session_, bundleName); EXPECT_TRUE(true); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(true)); EXPECT_CALL(*session, ValidRestoreDataType(_)).WillOnce(Return(false)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, RestoreOnBundleStarted(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, RestoreOnBundleStarted(_, _)).WillOnce(Return(1)); service->OnBundleStarted(error, session_, bundleName); EXPECT_TRUE(true); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(true)); EXPECT_CALL(*session, ValidRestoreDataType(_)).WillOnce(Return(true)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleStarted(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleStarted(_, _)).WillOnce(Return(1)); service->OnBundleStarted(error, session_, bundleName); EXPECT_TRUE(true); } catch (...) { @@ -767,7 +788,7 @@ HWTEST_F(ServiceTest, SUB_Service_HandleExceptionOnAppendBundles_0100, TestSize. try { vector appendBundleNames { "bundleName" }; vector restoreBundleNames; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); service->HandleExceptionOnAppendBundles(service->session_, appendBundleNames, restoreBundleNames); EXPECT_TRUE(true); @@ -915,7 +936,7 @@ HWTEST_F(ServiceTest, SUB_Service_SetCurrentSessProperties_0200, TestSize.Level1 restoreBundleNames.emplace_back("bundleName"); EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("bundleName")) .WillOnce(Return("bundleName")); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); service->SetCurrentSessProperties(restoreBundleInfos, restoreBundleNames, bundleNameDetailMap, isClearDataFlags, restoreType, backupVersion); EXPECT_TRUE(true); @@ -923,7 +944,7 @@ HWTEST_F(ServiceTest, SUB_Service_SetCurrentSessProperties_0200, TestSize.Level1 restoreBundleInfos[0].allToBackup = true; EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("bundleName")) .WillOnce(Return("bundleName")); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)); service->SetCurrentSessProperties(restoreBundleInfos, restoreBundleNames, bundleNameDetailMap, isClearDataFlags, restoreType, backupVersion); @@ -933,7 +954,7 @@ HWTEST_F(ServiceTest, SUB_Service_SetCurrentSessProperties_0200, TestSize.Level1 restoreBundleInfos[0].versionName = string(BConstants::DEFAULT_VERSION_NAME); EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("bundleName")) .WillOnce(Return("bundleName")); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)); service->SetCurrentSessProperties(restoreBundleInfos, restoreBundleNames, bundleNameDetailMap, isClearDataFlags, restoreType, backupVersion); @@ -1325,12 +1346,12 @@ HWTEST_F(ServiceTest, SUB_Service_LaunchBackupExtension_0100, TestSize.Level1) try { ASSERT_TRUE(service != nullptr); std::string bundleName = ""; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); auto ret = service->LaunchBackupExtension(bundleName); EXPECT_EQ(ret, BError(BError::Codes::SA_INVAL_ARG)); BJsonUtil::BundleDetailInfo info; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)); EXPECT_CALL(*jsonUtil, ParseBundleNameIndexStr(_)).WillOnce(Return(info)); EXPECT_CALL(*session, GetBackupExtName(_)).WillOnce(Return("")); @@ -1342,7 +1363,7 @@ HWTEST_F(ServiceTest, SUB_Service_LaunchBackupExtension_0100, TestSize.Level1) ret = service->LaunchBackupExtension(bundleName); EXPECT_EQ(ret, BError(BError::Codes::SA_INVAL_ARG)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)); EXPECT_CALL(*jsonUtil, ParseBundleNameIndexStr(_)).WillOnce(Return(info)); EXPECT_CALL(*session, GetBackupExtName(_)).WillOnce(Return("")); @@ -1378,7 +1399,7 @@ HWTEST_F(ServiceTest, SUB_Service_LaunchBackupExtension_0200, TestSize.Level1) ASSERT_TRUE(service != nullptr); string bundleName = ""; BJsonUtil::BundleDetailInfo info; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)); EXPECT_CALL(*jsonUtil, ParseBundleNameIndexStr(_)).WillOnce(Return(info)); EXPECT_CALL(*session, GetBackupExtName(_)).WillOnce(Return("")); @@ -1397,7 +1418,7 @@ HWTEST_F(ServiceTest, SUB_Service_LaunchBackupExtension_0200, TestSize.Level1) auto ret = service->LaunchBackupExtension(bundleName); EXPECT_EQ(ret, BError(BError::Codes::SA_BOOT_EXT_FAIL)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)); EXPECT_CALL(*jsonUtil, ParseBundleNameIndexStr(_)).WillOnce(Return(info)); EXPECT_CALL(*session, GetBackupExtName(_)).WillOnce(Return("")); @@ -1566,14 +1587,14 @@ HWTEST_F(ServiceTest, SUB_Service_UpdateSendRate_0000, TestSize.Level1) EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)); EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); ret = service->UpdateSendRate(bundleName, 0, result); EXPECT_EQ(ret, BError(BError::Codes::SA_INVAL_ARG).GetCode()); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)); EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(nullptr)); ret = service->UpdateSendRate(bundleName, 0, result); @@ -1604,7 +1625,7 @@ HWTEST_F(ServiceTest, SUB_Service_UpdateSendRate_0100, TestSize.Level1) EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)); EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); EXPECT_CALL(*svcProxy, UpdateFdSendRate(_, _)).WillOnce(Return(EPERM)); @@ -1614,7 +1635,7 @@ HWTEST_F(ServiceTest, SUB_Service_UpdateSendRate_0100, TestSize.Level1) EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)); EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); EXPECT_CALL(*svcProxy, UpdateFdSendRate(_, _)).WillOnce(Return(NO_ERROR)); @@ -1642,42 +1663,42 @@ HWTEST_F(ServiceTest, SUB_Service_BackupSA_0000, TestSize.Level1) try { string bundleName; shared_ptr sa = nullptr; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, GetSAExtConnection(_)).WillOnce(Return(sa)); auto ret = service->BackupSA(bundleName); EXPECT_EQ(ret, BError(BError::Codes::SA_INVAL_ARG).GetCode()); sa = make_shared(nullptr, nullptr, nullptr, nullptr); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, GetSAExtConnection(_)).WillOnce(Return(sa)); ret = service->BackupSA(bundleName); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetSAExtConnection(_)).WillOnce(Return(sa)); EXPECT_CALL(*saConnect, CallBackupSA()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, BackupOnBundleStarted(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, BackupOnBundleStarted(_, _)).WillOnce(Return(1)); ret = service->BackupSA(bundleName); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, GetSAExtConnection(_)).WillOnce(Return(sa)); EXPECT_CALL(*saConnect, CallBackupSA()).WillOnce(Return(BError(BError::Codes::SA_BOOT_EXT_FAIL).GetCode())); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, BackupOnBundleStarted(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, BackupOnBundleStarted(_, _)).WillOnce(Return(1)); EXPECT_CALL(*cdConfig, DeleteClearBundleRecord(_)).WillOnce(Return(false)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); ret = service->BackupSA(bundleName); EXPECT_EQ(ret, BError(BError::Codes::SA_BOOT_EXT_FAIL).GetCode()); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*session, GetSAExtConnection(_)).WillOnce(Return(sa)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleStarted(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleStarted(_, _)).WillOnce(Return(1)); ret = service->BackupSA(bundleName); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -1718,7 +1739,7 @@ HWTEST_F(ServiceTest, SUB_Service_SADone_0000, TestSize.Level1) EXPECT_CALL(*saConnect, DisconnectBackupSAExt()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); EXPECT_CALL(*session, StopFwkTimer(_)).WillOnce(Return(true)); EXPECT_CALL(*session, StopExtTimer(_)).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*cdConfig, DeleteClearBundleRecord(_)).WillOnce(Return(false)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); ret = service->SADone(0, ""); @@ -1743,20 +1764,20 @@ HWTEST_F(ServiceTest, SUB_Service_NotifyCallerCurAppDone_0000, TestSize.Level1) { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_NotifyCallerCurAppDone_0000"; try { - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); service->NotifyCallerCurAppDone(0, ""); EXPECT_TRUE(true); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, BackupOnBundleFinished(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, BackupOnBundleFinished(_, _)).WillOnce(Return(1)); service->NotifyCallerCurAppDone(0, ""); EXPECT_TRUE(true); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, RestoreOnBundleFinished(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, RestoreOnBundleFinished(_, _)).WillOnce(Return(1)); service->NotifyCallerCurAppDone(0, ""); EXPECT_TRUE(true); } catch (...) { @@ -1785,7 +1806,7 @@ HWTEST_F(ServiceTest, SUB_Service_ReportAppProcessInfo_0000, TestSize.Level1) EXPECT_CALL(*token, GetHapTokenInfo(_, _)).WillOnce(Return(0)); EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("")); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, RestoreOnProcessInfo(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, RestoreOnProcessInfo(_, _)).WillOnce(Return(1)); auto ret = service->ReportAppProcessInfo(processInfo, BackupRestoreScenario::FULL_RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); @@ -1794,7 +1815,7 @@ HWTEST_F(ServiceTest, SUB_Service_ReportAppProcessInfo_0000, TestSize.Level1) EXPECT_CALL(*token, GetHapTokenInfo(_, _)).WillOnce(Return(0)); EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("")); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalRestoreOnProcessInfo(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalRestoreOnProcessInfo(_, _)).WillOnce(Return(1)); ret = service->ReportAppProcessInfo(processInfo, BackupRestoreScenario::INCREMENTAL_RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); @@ -1803,7 +1824,7 @@ HWTEST_F(ServiceTest, SUB_Service_ReportAppProcessInfo_0000, TestSize.Level1) EXPECT_CALL(*token, GetHapTokenInfo(_, _)).WillOnce(Return(0)); EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("")); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, BackupOnProcessInfo(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, BackupOnProcessInfo(_, _)).WillOnce(Return(1)); ret = service->ReportAppProcessInfo(processInfo, BackupRestoreScenario::FULL_BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); @@ -1812,7 +1833,7 @@ HWTEST_F(ServiceTest, SUB_Service_ReportAppProcessInfo_0000, TestSize.Level1) EXPECT_CALL(*token, GetHapTokenInfo(_, _)).WillOnce(Return(0)); EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("")); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalBackupOnProcessInfo(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalBackupOnProcessInfo(_, _)).WillOnce(Return(1)); ret = service->ReportAppProcessInfo(processInfo, BackupRestoreScenario::INCREMENTAL_BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -1876,9 +1897,9 @@ HWTEST_F(ServiceTest, SUB_Service_DoTimeout_0000, TestSize.Level1) service->session_ = session_; EXPECT_TRUE(true); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)).WillOnce(Return(true)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, DisconnectBackupExtAbility()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); @@ -1890,7 +1911,7 @@ HWTEST_F(ServiceTest, SUB_Service_DoTimeout_0000, TestSize.Level1) EXPECT_TRUE(true); shared_ptr sa = nullptr; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); @@ -1919,7 +1940,7 @@ HWTEST_F(ServiceTest, SUB_Service_DoTimeout_0100, TestSize.Level1) try { string bundleName; shared_ptr sa = nullptr; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); @@ -1928,16 +1949,16 @@ HWTEST_F(ServiceTest, SUB_Service_DoTimeout_0100, TestSize.Level1) EXPECT_TRUE(true); sa = nullptr; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); EXPECT_CALL(*session, GetSAExtConnection(_)).WillOnce(Return(sa)); service->DoTimeout(service, bundleName); EXPECT_TRUE(true); sa = make_shared(nullptr, nullptr, nullptr, nullptr); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)).WillOnce(Return(true)); EXPECT_CALL(*session, GetSAExtConnection(_)).WillOnce(Return(sa)); EXPECT_CALL(*saConnect, DisconnectBackupSAExt()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); @@ -2028,19 +2049,19 @@ HWTEST_F(ServiceTest, SUB_Service_ReleaseOnException_0000, TestSize.Level1) EXPECT_TRUE(true); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); service->isInRelease_ = false; service->ReleaseOnException(); EXPECT_TRUE(true); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); service->isInRelease_ = true; service->ReleaseOnException(); EXPECT_TRUE(true); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); service->isInRelease_ = true; auto session_ = service->session_; service->session_ = nullptr; diff --git a/tests/unittests/backup_sa/module_ipc/service_reverse_proxy_test.cpp b/tests/unittests/backup_sa/module_ipc/service_reverse_proxy_test.cpp index 48853ff353a59615de35cf6e450c0bba9fefc0f3..1d4fa7ecd0effd67e5aec6c76f953e5b14f4bfec 100644 --- a/tests/unittests/backup_sa/module_ipc/service_reverse_proxy_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_reverse_proxy_test.cpp @@ -20,7 +20,7 @@ #include #include "b_error/b_error.h" -#include "b_file_info.h" +#include "backup_file_info.h" #include "iservice_registry.h" #include "message_parcel_mock.h" #include "module_ipc/service_reverse_proxy.h" @@ -93,7 +93,8 @@ HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_BackupOnFileReady_010 std::string filePath = tm.GetRootDirCurTest().append(FILE_NAME); UniqueFd fd(open(filePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnFileReady(BUNDLE_NAME, FILE_NAME, fd, 0); + int32_t fdValue=fd.Get(); + proxy_->BackupOnFileReady(BUNDLE_NAME, FILE_NAME, fdValue, 0); EXPECT_TRUE(true); } catch (...) { EXPECT_TRUE(false); @@ -360,7 +361,7 @@ HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_BackupOnBundleFinishe .Times(1) .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); + proxy_->BackupOnBundleFinished(BError(BError::Codes::OK).GetCode(), BUNDLE_NAME); EXPECT_TRUE(true); } catch (...) { EXPECT_TRUE(false); @@ -1924,7 +1925,8 @@ HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_RestoreOnResultReport .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); std::string bundleName = "app01"; EXPECT_TRUE(proxy_ != nullptr); - proxy_->RestoreOnResultReport(RESULT_REPORT, bundleName); + int32_t code=0; + proxy_->RestoreOnResultReport(RESULT_REPORT, bundleName,code); EXPECT_TRUE(true); } catch (...) { EXPECT_TRUE(false); @@ -1945,12 +1947,13 @@ HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_RestoreOnResultReport HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_RestoreOnResultReport_0101, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_RestoreOnResultReport_0101"; - try { + try { + int32_t code=0; std::string bundleName = "app01"; try { EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); EXPECT_TRUE(proxy_ != nullptr); - proxy_->RestoreOnResultReport(RESULT_REPORT, bundleName); + proxy_->RestoreOnResultReport(RESULT_REPORT, bundleName,code); EXPECT_TRUE(false); } catch (BError &err) { EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); @@ -1959,7 +1962,7 @@ HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_RestoreOnResultReport try { EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - proxy_->RestoreOnResultReport(RESULT_REPORT, bundleName); + proxy_->RestoreOnResultReport(RESULT_REPORT, bundleName,code); EXPECT_TRUE(false); } catch (BError &err) { EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); @@ -1968,7 +1971,7 @@ HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_RestoreOnResultReport try { EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(false)); - proxy_->RestoreOnResultReport(RESULT_REPORT, bundleName); + proxy_->RestoreOnResultReport(RESULT_REPORT, bundleName,code); EXPECT_TRUE(false); } catch (BError &err) { EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); @@ -1979,7 +1982,7 @@ HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_RestoreOnResultReport EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->RestoreOnResultReport(RESULT_REPORT, bundleName); + proxy_->RestoreOnResultReport(RESULT_REPORT, bundleName,code); EXPECT_TRUE(false); } catch (BError &err) { EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); @@ -2012,8 +2015,10 @@ HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_IncrementalRestoreOnR .Times(1) .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); std::string bundleName = "app01"; + EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalRestoreOnResultReport(RESULT_REPORT, bundleName); + int32_t code=0; + proxy_->IncrementalRestoreOnResultReport(RESULT_REPORT, bundleName,code); EXPECT_TRUE(true); } catch (...) { EXPECT_TRUE(false); @@ -2036,11 +2041,13 @@ HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_IncrementalRestoreOnR { GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalRestoreOnResultReport_0101"; try { + int32_t code = 0; std::string bundleName = "app01"; try { EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalRestoreOnResultReport(RESULT_REPORT, bundleName); + + proxy_->IncrementalRestoreOnResultReport(RESULT_REPORT, bundleName,code); EXPECT_TRUE(false); } catch (BError &err) { EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); @@ -2049,7 +2056,7 @@ HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_IncrementalRestoreOnR try { EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - proxy_->IncrementalRestoreOnResultReport(RESULT_REPORT, bundleName); + proxy_->IncrementalRestoreOnResultReport(RESULT_REPORT, bundleName,code); EXPECT_TRUE(false); } catch (BError &err) { EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); @@ -2058,7 +2065,7 @@ HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_IncrementalRestoreOnR try { EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(false)); - proxy_->IncrementalRestoreOnResultReport(RESULT_REPORT, bundleName); + proxy_->IncrementalRestoreOnResultReport(RESULT_REPORT, bundleName,code); EXPECT_TRUE(false); } catch (BError &err) { EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); @@ -2069,7 +2076,7 @@ HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_IncrementalRestoreOnR EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->IncrementalRestoreOnResultReport(RESULT_REPORT, bundleName); + proxy_->IncrementalRestoreOnResultReport(RESULT_REPORT, bundleName,code); EXPECT_TRUE(false); } catch (BError &err) { EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); diff --git a/tests/unittests/backup_sa/module_ipc/service_stub_test.cpp b/tests/unittests/backup_sa/module_ipc/service_stub_test.cpp index c63b4b11f1d46231025bed93e97c97893d6a359c..ed45e2105fb2f5f4324e5c972be17e4493991a51 100644 --- a/tests/unittests/backup_sa/module_ipc/service_stub_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_stub_test.cpp @@ -25,7 +25,7 @@ #include "b_error/b_error.h" #include "b_resources/b_constants.h" #include "ipc_types.h" -#include "i_service.h" +#include "iservice.h" #include "message_parcel_mock.h" #include "module_ipc/service_stub.h" #include "service_reverse_mock.h" @@ -43,29 +43,26 @@ const string FILE_NAME = "1.tar"; class ServiceMock final : public ServiceStub { public: - MOCK_METHOD1(InitRestoreSession, ErrCode(sptr remote)); - MOCK_METHOD2(InitRestoreSession, ErrCode(sptr remote, std::string &errMsg)); - MOCK_METHOD1(InitBackupSession, ErrCode(sptr remote)); - MOCK_METHOD2(InitBackupSession, ErrCode(sptr remote, std::string &errMsg)); + MOCK_METHOD1(InitRestoreSession, ErrCode(sptr& remote)); + MOCK_METHOD2(InitRestoreSessionWithErrMsg, ErrCode(sptr& remote, std::string &errMsg)); + MOCK_METHOD1(InitBackupSession, ErrCode(sptr& remote)); + MOCK_METHOD2(InitBackupSessionWithErrMsg, ErrCode(sptr& remote, std::string &errMsg)); MOCK_METHOD0(Start, ErrCode()); MOCK_METHOD0(GetLocalCapabilities, UniqueFd()); MOCK_METHOD0(GetLocalCapabilitiesForBundleInfos, UniqueFd()); MOCK_METHOD1(PublishFile, ErrCode(const BFileInfo &fileInfo)); MOCK_METHOD3(AppFileReady, ErrCode(const string &fileName, UniqueFd fd, int32_t errCode)); MOCK_METHOD1(AppDone, ErrCode(ErrCode errCode)); - MOCK_METHOD3(ServiceResultReport, ErrCode(const string restoreRetInfo, + MOCK_METHOD3(ServiceResultReport, ErrCode(const string& restoreRetInfo, BackupRestoreScenario scenario, ErrCode errCode)); MOCK_METHOD2(GetFileHandle, ErrCode(const string &bundleName, const string &fileName)); MOCK_METHOD5( - AppendBundlesRestoreSession, + AppendBundlesRestoreSessionRestoreDataWaitSend, ErrCode(UniqueFd fd, const std::vector &bundleNames, const std::vector &detailInfos, - RestoreTypeEnum restoreType, int32_t userId)); - MOCK_METHOD4( - AppendBundlesRestoreSession, - ErrCode(UniqueFd fd, const std::vector &bundleNames, RestoreTypeEnum restoreType, int32_t userId)); + int32_t restoreType, int32_t userId)); + MOCK_METHOD4(AppendBundlesRestoreSessionRestoreDataWaitReady,ErrCode(UniqueFd fd, const std::vector &bundleNames, int32_t restoreType, int32_t userId)); MOCK_METHOD1(AppendBundlesBackupSession, ErrCode(const std::vector &bundleNames)); - MOCK_METHOD2(AppendBundlesDetailsBackupSession, - ErrCode(const std::vector &bundleNames, const std::vector &bundleInfos)); + MOCK_METHOD2(AppendBundlesDetailsBackupSession,ErrCode(const std::vector &bundleNames, const std::vector &bundleInfos)); MOCK_METHOD0(Finish, ErrCode()); MOCK_METHOD0(Release, ErrCode()); MOCK_METHOD2(Cancel, ErrCode(std::string bundleName, int32_t &result)); @@ -74,13 +71,11 @@ public: MOCK_METHOD1(InitIncrementalBackupSession, ErrCode(sptr remote)); MOCK_METHOD2(InitIncrementalBackupSession, ErrCode(sptr remote, std::string &errMsg)); MOCK_METHOD1(AppendBundlesIncrementalBackupSession, ErrCode(const std::vector &bundlesToBackup)); - MOCK_METHOD2(AppendBundlesIncrementalBackupSession, - ErrCode(const std::vector &bundlesToBackup, const std::vector &infos)); + MOCK_METHOD2(AppendBundlesIncrementalBackupSession, ErrCode(const std::vector &bundlesToBackup, const std::vector &infos)); MOCK_METHOD1(PublishIncrementalFile, ErrCode(const BFileInfo &fileInfo)); MOCK_METHOD2(PublishSAIncrementalFile, ErrCode(const BFileInfo &fileInfo, UniqueFd fd)); - MOCK_METHOD4(AppIncrementalFileReady, ErrCode(const std::string &fileName, UniqueFd fd, UniqueFd manifestFd, - int32_t errCode)); + MOCK_METHOD4(AppIncrementalFileReady, ErrCode(const std::string &fileName, UniqueFd fd, UniqueFd manifestFd,int32_t errCode)); MOCK_METHOD1(AppIncrementalDone, ErrCode(ErrCode errCode)); MOCK_METHOD2(GetIncrementalFileHandle, ErrCode(const std::string &bundleName, const std::string &fileName)); MOCK_METHOD2(GetBackupInfo, ErrCode(string &bundleName, string &result)); @@ -1181,7 +1176,7 @@ HWTEST_F(ServiceStubTest, SUB_backup_sa_ServiceStub_InitIncrementalBackupSession EXPECT_CALL(*messageParcelMock, ReadRemoteObject()).WillOnce(Return(remote)); EXPECT_CALL(*castMock, iface_cast(_)).WillOnce(Return(remote)); - EXPECT_CALL(*service, InitIncrementalBackupSession(_, _)).WillOnce(Return(0)); + EXPECT_CALL(*service, InitIncrementalBackupSessionWithErrMsg(_, _)).WillOnce(Return(0)); EXPECT_CALL(*messageParcelMock, WriteString(_)).WillOnce(Return(true)); EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(false)); err = service->CmdInitIncrementalBackupSessionMsg(data, reply); @@ -1189,7 +1184,7 @@ HWTEST_F(ServiceStubTest, SUB_backup_sa_ServiceStub_InitIncrementalBackupSession EXPECT_CALL(*messageParcelMock, ReadRemoteObject()).WillOnce(Return(remote)); EXPECT_CALL(*castMock, iface_cast(_)).WillOnce(Return(remote)); - EXPECT_CALL(*service, InitIncrementalBackupSession(_, _)).WillOnce(Return(0)); + EXPECT_CALL(*service, InitIncrementalBackupSessionWithErrMsg(_, _)).WillOnce(Return(0)); EXPECT_CALL(*messageParcelMock, WriteString(_)).WillOnce(Return(true)); EXPECT_CALL(*messageParcelMock, WriteInt32(_)).WillOnce(Return(true)); auto ret = service->CmdInitIncrementalBackupSessionMsg(data, reply); diff --git a/tests/unittests/backup_sa/module_ipc/service_test.cpp b/tests/unittests/backup_sa/module_ipc/service_test.cpp index ba99f49ffacdfc48cd91a3c3b3dfb531aa665ac2..7aac06a1534dda8f3ef297ef535509c6c7f6da00 100644 --- a/tests/unittests/backup_sa/module_ipc/service_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_test.cpp @@ -44,7 +44,7 @@ public: void SetUp() {}; void TearDown() {}; - ErrCode Init(IServiceReverse::Scenario scenario); + ErrCode Init(IServiceReverseType::Scenario scenario); static inline sptr servicePtr_ = nullptr; static inline sptr remote_ = nullptr; @@ -64,7 +64,7 @@ void ServiceTest::TearDownTestCase() remote_ = nullptr; } -ErrCode ServiceTest::Init(IServiceReverse::Scenario scenario) +ErrCode ServiceTest::Init(IServiceReverseType::Scenario scenario) { vector bundleNames; vector detailInfos; @@ -83,23 +83,25 @@ ErrCode ServiceTest::Init(IServiceReverse::Scenario scenario) detailInfos.emplace_back(json); string errMsg; ErrCode ret = 0; - if (scenario == IServiceReverse::Scenario::RESTORE) { + if (scenario == IServiceReverseType::Scenario::RESTORE) { EXPECT_TRUE(servicePtr_ != nullptr); EXPECT_TRUE(remote_ != nullptr); UniqueFd fd = servicePtr_->GetLocalCapabilities(); EXPECT_GE(fd, BError(BError::Codes::OK)); - ret = servicePtr_->InitRestoreSession(remote_); + sptr srptr_=static_cast>(remote_); + ret = servicePtr_->InitRestoreSession(srptr_); EXPECT_EQ(ret, BError(BError::Codes::OK)); - ret = servicePtr_->InitRestoreSession(remote_, errMsg); + ret = servicePtr_->InitRestoreSessionWithErrMsg(srptr_, errMsg); EXPECT_EQ(ret, BError(BError::Codes::OK)); ret = servicePtr_->AppendBundlesRestoreSession(move(fd), bundleNames, detailInfos); EXPECT_EQ(ret, BError(BError::Codes::OK)); ret = servicePtr_->Finish(); EXPECT_EQ(ret, BError(BError::Codes::OK)); - } else if (scenario == IServiceReverse::Scenario::BACKUP) { - ret = servicePtr_->InitBackupSession(remote_); + } else if (scenario == IServiceReverseType::Scenario::BACKUP) { + sptr srptr_=static_cast>(remote_); + ret = servicePtr_->InitBackupSession(srptr_); EXPECT_EQ(ret, BError(BError::Codes::OK)); - ret = servicePtr_->InitBackupSession(remote_, errMsg); + ret = servicePtr_->InitBackupSessionWithErrMsg(srptr_, errMsg); EXPECT_EQ(ret, BError(BError::Codes::OK)); ret = servicePtr_->AppendBundlesBackupSession(bundleNames); EXPECT_EQ(ret, BError(BError::Codes::OK)); @@ -213,7 +215,7 @@ HWTEST_F(ServiceTest, SUB_Service_PublishFile_0100, testing::ext::TestSize.Level { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_PublishFile_0100"; try { - ErrCode ret = Init(IServiceReverse::Scenario::RESTORE); + ErrCode ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); BFileInfo fileInfo {BUNDLE_NAME, "", 0}; EXPECT_TRUE(servicePtr_ != nullptr); @@ -243,7 +245,7 @@ HWTEST_F(ServiceTest, SUB_Service_PublishFile_0101, testing::ext::TestSize.Level { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_PublishFile_0101"; try { - ErrCode ret = Init(IServiceReverse::Scenario::RESTORE); + ErrCode ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); BFileInfo fileInfo {BUNDLE_NAME, "", 0}; EXPECT_TRUE(servicePtr_ != nullptr); @@ -273,7 +275,7 @@ HWTEST_F(ServiceTest, SUB_Service_PublishFile_0102, testing::ext::TestSize.Level { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_PublishFile_0102"; try { - ErrCode ret = Init(IServiceReverse::Scenario::RESTORE); + ErrCode ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); BFileInfo fileInfo {BUNDLE_NAME, "", 0}; EXPECT_TRUE(servicePtr_ != nullptr); @@ -301,11 +303,11 @@ HWTEST_F(ServiceTest, SUB_Service_AppFileReady_0100, testing::ext::TestSize.Leve try { string fileName = MANAGE_JSON; EXPECT_TRUE(servicePtr_ != nullptr); - auto ret = servicePtr_->AppFileReady(fileName, UniqueFd(-1), 0); + auto ret = servicePtr_->AppFileReady(fileName, 1, 0); EXPECT_EQ(ret, BError(BError::Codes::OK)); GTEST_LOG_(INFO) << "ServiceTest-AppFileReady Branches"; fileName = "test"; - ret = servicePtr_->AppFileReady(fileName, UniqueFd(-1), 0); + ret = servicePtr_->AppFileReady(fileName, 1, 0); EXPECT_EQ(ret, BError(BError::Codes::OK)); } catch (...) { EXPECT_TRUE(false); @@ -329,7 +331,7 @@ HWTEST_F(ServiceTest, SUB_Service_AppFileReady_0101, testing::ext::TestSize.Leve try { string fileName = ""; EXPECT_TRUE(servicePtr_ != nullptr); - auto ret = servicePtr_->AppFileReady(fileName, UniqueFd(-1), 0); + auto ret = servicePtr_->AppFileReady(fileName, 1, 0); EXPECT_EQ(ret, BError(BError::Codes::OK)); } catch (...) { EXPECT_TRUE(false); @@ -353,7 +355,7 @@ HWTEST_F(ServiceTest, SUB_Service_AppFileReady_0102, testing::ext::TestSize.Leve try { string fileName = "manage.json"; EXPECT_TRUE(servicePtr_ != nullptr); - auto ret = servicePtr_->AppFileReady(fileName, UniqueFd(-1), 0); + auto ret = servicePtr_->AppFileReady(fileName, 1, 0); EXPECT_EQ(ret, BError(BError::Codes::OK)); } catch (...) { EXPECT_TRUE(false); @@ -377,16 +379,16 @@ HWTEST_F(ServiceTest, SUB_Service_AppDone_0100, testing::ext::TestSize.Level1) try { GTEST_LOG_(INFO) << "SUB_Service_AppDone Branches Start"; EXPECT_TRUE(servicePtr_ != nullptr); - auto ret = servicePtr_->AppDone(BError(BError::Codes::OK)); + auto ret = servicePtr_->AppDone(BError(BError::Codes::OK).GetCode()); EXPECT_EQ(ret, BError(BError::Codes::OK)); GTEST_LOG_(INFO) << "SUB_Service_AppDone_0100 BACKUP"; - ret = Init(IServiceReverse::Scenario::BACKUP); + ret = Init(IServiceReverseType::Scenario::BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK)); GTEST_LOG_(INFO) << "ServiceTest-AppDone Branches"; ret = servicePtr_->AppDone(1); EXPECT_EQ(ret, BError(BError::Codes::OK)); GTEST_LOG_(INFO) << "ServiceTest-AppDone Branches End"; - ret = servicePtr_->AppDone(BError(BError::Codes::OK)); + ret = servicePtr_->AppDone(BError(BError::Codes::OK).GetCode()); EXPECT_EQ(ret, BError(BError::Codes::OK)); } catch (...) { EXPECT_TRUE(false); @@ -410,12 +412,12 @@ HWTEST_F(ServiceTest, SUB_Service_AppDone_0101, testing::ext::TestSize.Level1) try { GTEST_LOG_(INFO) << "SUB_Service_AppDone Branches Start"; EXPECT_TRUE(servicePtr_ != nullptr); - auto ret = servicePtr_->AppDone(BError(BError::Codes::OK)); + auto ret = servicePtr_->AppDone(BError(BError::Codes::OK).GetCode()); EXPECT_EQ(ret, BError(BError::Codes::OK)); GTEST_LOG_(INFO) << "SUB_Service_AppDone_0101 RESTORE"; - ret = Init(IServiceReverse::Scenario::RESTORE); + ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); - ret = servicePtr_->AppDone(BError(BError::Codes::OK)); + ret = servicePtr_->AppDone(BError(BError::Codes::OK).GetCode()); EXPECT_EQ(ret, BError(BError::Codes::OK)); } catch (...) { EXPECT_TRUE(false); @@ -440,7 +442,7 @@ HWTEST_F(ServiceTest, SUB_Service_AppDone_0102, testing::ext::TestSize.Level1) GTEST_LOG_(INFO) << "SUB_Service_AppDone Branches Start"; string bundleName = ""; EXPECT_TRUE(servicePtr_ != nullptr); - auto ret = servicePtr_->AppDone(BError(BError::Codes::OK)); + auto ret = servicePtr_->AppDone(BError(BError::Codes::OK).GetCode()); EXPECT_EQ(ret, BError(BError::Codes::OK)); } catch (...) { EXPECT_TRUE(false); @@ -500,13 +502,13 @@ HWTEST_F(ServiceTest, SUB_Service_LaunchBackupExtension_0100, testing::ext::Test GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_LaunchBackupExtension_0100"; try { GTEST_LOG_(INFO) << "SUB_Service_LaunchBackupExtension_0100 RESTORE"; - ErrCode ret = Init(IServiceReverse::Scenario::RESTORE); + ErrCode ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); EXPECT_TRUE(servicePtr_ != nullptr); ret = servicePtr_->LaunchBackupExtension(BUNDLE_NAME); EXPECT_EQ(ret, BError(BError::Codes::OK)); GTEST_LOG_(INFO) << "SUB_Service_LaunchBackupExtension_0100 BACKUP"; - ret = Init(IServiceReverse::Scenario::BACKUP); + ret = Init(IServiceReverseType::Scenario::BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK)); ret = servicePtr_->LaunchBackupExtension(BUNDLE_NAME); EXPECT_EQ(ret, BError(BError::Codes::OK)); @@ -531,7 +533,7 @@ HWTEST_F(ServiceTest, SUB_Service_LaunchBackupExtension_0101, testing::ext::Test GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_LaunchBackupExtension_0101"; try { GTEST_LOG_(INFO) << "SUB_Service_LaunchBackupExtension_0100 UNDEFINED"; - ErrCode ret = Init(IServiceReverse::Scenario::UNDEFINED); + ErrCode ret = Init(IServiceReverseType::Scenario::UNDEFINED); EXPECT_EQ(ret, BError(BError::Codes::OK)); EXPECT_TRUE(servicePtr_ != nullptr); ret = servicePtr_->LaunchBackupExtension(BUNDLE_NAME); @@ -556,7 +558,7 @@ HWTEST_F(ServiceTest, SUB_Service_GetFileHandle_0100, testing::ext::TestSize.Lev { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_GetFileHandle_0100"; try { - ErrCode ret = Init(IServiceReverse::Scenario::RESTORE); + ErrCode ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); EXPECT_TRUE(servicePtr_ != nullptr); ret = servicePtr_->GetFileHandle(BUNDLE_NAME, FILE_NAME); @@ -581,7 +583,7 @@ HWTEST_F(ServiceTest, SUB_Service_GetFileHandle_0101, testing::ext::TestSize.Lev { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_GetFileHandle_0101"; try { - ErrCode ret = Init(IServiceReverse::Scenario::RESTORE); + ErrCode ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); SvcSessionManager::Impl impl_; @@ -617,13 +619,13 @@ HWTEST_F(ServiceTest, SUB_Service_OnBackupExtensionDied_0100, testing::ext::Test GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_OnBackupExtensionDied_0100"; try { GTEST_LOG_(INFO) << "SUB_Service_OnBackupExtensionDied_0100 RESTORE"; - ErrCode ret = Init(IServiceReverse::Scenario::RESTORE); + ErrCode ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); string bundleName = BUNDLE_NAME; EXPECT_TRUE(servicePtr_ != nullptr); servicePtr_->OnBackupExtensionDied(move(bundleName)); GTEST_LOG_(INFO) << "SUB_Service_OnBackupExtensionDied_0100 BACKUP"; - ret = Init(IServiceReverse::Scenario::BACKUP); + ret = Init(IServiceReverseType::Scenario::BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK)); bundleName = BUNDLE_NAME; servicePtr_->OnBackupExtensionDied(move(bundleName)); @@ -648,7 +650,7 @@ HWTEST_F(ServiceTest, SUB_Service_OnBackupExtensionDied_0101, testing::ext::Test GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_OnBackupExtensionDied_0101"; try { GTEST_LOG_(INFO) << "SUB_Service_OnBackupExtensionDied_0101 RESTORE"; - ErrCode ret = Init(IServiceReverse::Scenario::RESTORE); + ErrCode ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); string bundleName = BUNDLE_NAME; SvcSessionManager::Impl impl_; @@ -658,12 +660,12 @@ HWTEST_F(ServiceTest, SUB_Service_OnBackupExtensionDied_0101, testing::ext::Test extInfo.versionName = "0.0.0.0-0.0.0.0"; impl_.restoreDataType = RESTORE_DATA_WAIT_SEND; impl_.backupExtNameMap[BUNDLE_NAME] = extInfo; - impl_.scenario = IServiceReverse::Scenario::RESTORE; + impl_.scenario = IServiceReverseType::Scenario::RESTORE; EXPECT_TRUE(servicePtr_ != nullptr); servicePtr_->OnBackupExtensionDied(move(bundleName)); GTEST_LOG_(INFO) << "SUB_Service_OnBackupExtensionDied_0101 BACKUP"; - ret = Init(IServiceReverse::Scenario::BACKUP); + ret = Init(IServiceReverseType::Scenario::BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK)); impl_.restoreDataType = RESTORE_DATA_READDY; bundleName = "123456789"; @@ -690,14 +692,14 @@ HWTEST_F(ServiceTest, SUB_Service_ExtStart_0100, testing::ext::TestSize.Level1) GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_ExtStart_0100"; try { GTEST_LOG_(INFO) << "SUB_Service_ExtStart_0100 BACKUP"; - ErrCode ret = Init(IServiceReverse::Scenario::BACKUP); + ErrCode ret = Init(IServiceReverseType::Scenario::BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK)); EXPECT_TRUE(servicePtr_ != nullptr); servicePtr_->ExtStart(BUNDLE_NAME); GTEST_LOG_(INFO) << "ServiceTest-ExtStart BACKUP Branches"; servicePtr_->ExtStart(BUNDLE_NAME); GTEST_LOG_(INFO) << "SUB_Service_ExtStart_0100 RESTORE"; - ret = Init(IServiceReverse::Scenario::RESTORE); + ret = Init(IServiceReverseType::Scenario::RESTORE); servicePtr_->ExtStart(BUNDLE_NAME); } catch (...) { EXPECT_TRUE(false); @@ -721,7 +723,7 @@ HWTEST_F(ServiceTest, SUB_Service_ExtStart_0101, testing::ext::TestSize.Level1) try { GTEST_LOG_(INFO) << "SUB_Service_ExtStart_0101 BACKUP"; std::string bundleName = "123456"; - ErrCode ret = Init(IServiceReverse::Scenario::BACKUP); + ErrCode ret = Init(IServiceReverseType::Scenario::BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK)); EXPECT_TRUE(servicePtr_ != nullptr); servicePtr_->ExtStart(bundleName); @@ -736,16 +738,16 @@ HWTEST_F(ServiceTest, SUB_Service_ExtStart_0101, testing::ext::TestSize.Level1) extInfo.backUpConnection = sptr(new SvcBackupConnection(callDied, callConnected, bundleNameIndexInfo)); extInfo.backUpConnection->backupProxy_ = nullptr; impl_.backupExtNameMap[BUNDLE_NAME] = extInfo; - impl_.scenario = IServiceReverse::Scenario::UNDEFINED; - ret = Init(IServiceReverse::Scenario::UNDEFINED); + impl_.scenario = IServiceReverseType::Scenario::UNDEFINED; + ret = Init(IServiceReverseType::Scenario::UNDEFINED); EXPECT_EQ(ret, BError(BError::Codes::OK)); servicePtr_->ExtStart(BUNDLE_NAME); - ret = Init(IServiceReverse::Scenario::RESTORE); + ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); servicePtr_->ExtStart(BUNDLE_NAME); - ret = Init(IServiceReverse::Scenario::UNDEFINED); + ret = Init(IServiceReverseType::Scenario::UNDEFINED); EXPECT_EQ(ret, BError(BError::Codes::OK)); servicePtr_->ExtStart(BUNDLE_NAME); } catch (...) { @@ -841,19 +843,19 @@ HWTEST_F(ServiceTest, SUB_Service_ExtConnectFailed_0100, testing::ext::TestSize. GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_ExtConnectFailed_0100"; try { GTEST_LOG_(INFO) << "SUB_Service_ExtConnectFailed_0100 RESTORE"; - ErrCode ret = Init(IServiceReverse::Scenario::RESTORE); + ErrCode ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); EXPECT_TRUE(servicePtr_ != nullptr); servicePtr_->ExtConnectFailed(BUNDLE_NAME, BError(BError::Codes::OK)); GTEST_LOG_(INFO) << "SUB_Service_ExtConnectFailed_0100 BACKUP"; - ret = Init(IServiceReverse::Scenario::BACKUP); + ret = Init(IServiceReverseType::Scenario::BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK)); servicePtr_->ExtConnectFailed(BUNDLE_NAME, BError(BError::Codes::OK)); SvcSessionManager::Impl impl_; impl_.clientToken = 1; impl_.restoreDataType = RESTORE_DATA_READDY; - ret = Init(IServiceReverse::Scenario::RESTORE); + ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); servicePtr_->ExtConnectFailed(BUNDLE_NAME, BError(BError::Codes::OK)); } catch (...) { @@ -1064,7 +1066,7 @@ HWTEST_F(ServiceTest, SUB_Service_SendStartAppGalleryNotify_0101, testing::ext:: { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_SendStartAppGalleryNotify_0101"; try { - ErrCode ret = Init(IServiceReverse::Scenario::RESTORE); + ErrCode ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); EXPECT_TRUE(servicePtr_ != nullptr); servicePtr_->SendStartAppGalleryNotify(BUNDLE_NAME); @@ -1112,7 +1114,7 @@ HWTEST_F(ServiceTest, SUB_Service_GetBackupInfo_0100, testing::ext::TestSize.Lev try { std::string bundleName = "com.example.app2backup"; std::string backupInfo = "backup info"; - auto ret = Init(IServiceReverse::Scenario::BACKUP); + auto ret = Init(IServiceReverseType::Scenario::BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK)); EXPECT_TRUE(servicePtr_ != nullptr); servicePtr_->GetBackupInfo(bundleName, backupInfo); @@ -1138,7 +1140,7 @@ HWTEST_F(ServiceTest, SUB_Service_GetBackupInfo_0101, testing::ext::TestSize.Lev try { std::string bundleName = "com.example.app2backup"; std::string result = "ok"; - auto ret = Init(IServiceReverse::Scenario::BACKUP); + auto ret = Init(IServiceReverseType::Scenario::BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK)); EXPECT_TRUE(servicePtr_ != nullptr); servicePtr_->session_ = nullptr; @@ -1280,7 +1282,7 @@ HWTEST_F(ServiceTest, SUB_Service_OnBundleStarted_0100, testing::ext::TestSize.L servicePtr_->OnBundleStarted(BError(BError::Codes::SA_INVAL_ARG), session, BUNDLE_NAME); SvcSessionManager::Impl impl_; impl_.clientToken = 1; - impl_.scenario = IServiceReverse::Scenario::RESTORE; + impl_.scenario = IServiceReverseType::Scenario::RESTORE; servicePtr_->OnBundleStarted(BError(BError::Codes::SA_INVAL_ARG), session, BUNDLE_NAME); } catch (...) { EXPECT_TRUE(false); @@ -1524,7 +1526,7 @@ HWTEST_F(ServiceTest, SUB_Service_HandleCurBundleEndWork_0100, testing::ext::Tes BackupExtInfo extInfo {}; extInfo.backUpConnection = nullptr; impl_.backupExtNameMap[BUNDLE_NAME] = extInfo; - impl_.scenario = IServiceReverse::Scenario::RESTORE; + impl_.scenario = IServiceReverseType::Scenario::RESTORE; EXPECT_TRUE(servicePtr_ != nullptr); servicePtr_->HandleCurBundleEndWork(BUNDLE_NAME, BackupRestoreScenario::FULL_RESTORE); } catch (...) { @@ -1548,7 +1550,7 @@ HWTEST_F(ServiceTest, SUB_Service_LaunchBackupSAExtension_0100, testing::ext::Te GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_LaunchBackupSAExtension_0100"; try { std::string bundleName = "123456"; - ErrCode ret = Init(IServiceReverse::Scenario::RESTORE); + ErrCode ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); EXPECT_TRUE(servicePtr_ != nullptr); ret = servicePtr_->LaunchBackupSAExtension(BUNDLE_NAME); @@ -1571,7 +1573,7 @@ HWTEST_F(ServiceTest, SUB_Service_LaunchBackupSAExtension_0100, testing::ext::Te ret = servicePtr_->LaunchBackupSAExtension(bundleName); EXPECT_NE(ret, BError(BError::Codes::OK)); - ret = Init(IServiceReverse::Scenario::BACKUP); + ret = Init(IServiceReverseType::Scenario::BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK)); ret = servicePtr_->LaunchBackupSAExtension(bundleName); EXPECT_NE(ret, BError(BError::Codes::OK)); @@ -1596,7 +1598,7 @@ HWTEST_F(ServiceTest, SUB_Service_ExtConnectDied_0100, testing::ext::TestSize.Le GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_ExtConnectDied_0100"; try { std::string callName = "123456"; - ErrCode ret = Init(IServiceReverse::Scenario::RESTORE); + ErrCode ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); SvcSessionManager::Impl impl_; impl_.clientToken = 1; @@ -1606,7 +1608,7 @@ HWTEST_F(ServiceTest, SUB_Service_ExtConnectDied_0100, testing::ext::TestSize.Le string bundleNameIndexInfo = "123456789"; extInfo.backUpConnection = sptr(new SvcBackupConnection(callDied, callConnected, bundleNameIndexInfo)); impl_.backupExtNameMap[BUNDLE_NAME] = extInfo; - impl_.scenario = IServiceReverse::Scenario::RESTORE; + impl_.scenario = IServiceReverseType::Scenario::RESTORE; EXPECT_TRUE(servicePtr_ != nullptr); servicePtr_->ExtConnectDied(callName); extInfo.backUpConnection->isConnected_.store(true); @@ -1631,19 +1633,19 @@ HWTEST_F(ServiceTest, SUB_Service_NoticeClientFinish_0100, testing::ext::TestSiz { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_NoticeClientFinish_0100"; try { - ErrCode ret = Init(IServiceReverse::Scenario::RESTORE); + ErrCode ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); EXPECT_TRUE(servicePtr_ != nullptr); servicePtr_->NoticeClientFinish(BUNDLE_NAME, BError(BError::Codes::OK)); GTEST_LOG_(INFO) << "SUB_Service_NoticeClientFinish_0100 BACKUP"; - ret = Init(IServiceReverse::Scenario::BACKUP); + ret = Init(IServiceReverseType::Scenario::BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK)); servicePtr_->NoticeClientFinish(BUNDLE_NAME, BError(BError::Codes::OK)); SvcSessionManager::Impl impl_; impl_.clientToken = 1; impl_.restoreDataType = RESTORE_DATA_READDY; - ret = Init(IServiceReverse::Scenario::RESTORE); + ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); servicePtr_->NoticeClientFinish(BUNDLE_NAME, BError(BError::Codes::OK)); } catch (...) { @@ -1666,13 +1668,13 @@ HWTEST_F(ServiceTest, SUB_Service_OnAllBundlesFinished_0100, testing::ext::TestS { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_OnAllBundlesFinished_0100"; try { - ErrCode ret = Init(IServiceReverse::Scenario::BACKUP); + ErrCode ret = Init(IServiceReverseType::Scenario::BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK)); EXPECT_TRUE(servicePtr_ != nullptr); servicePtr_->session_ = sptr(new SvcSessionManager(servicePtr_)); servicePtr_->OnAllBundlesFinished(BError(BError::Codes::OK)); - ret = Init(IServiceReverse::Scenario::RESTORE); + ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); servicePtr_->OnAllBundlesFinished(BError(BError::Codes::OK)); } catch (...) { @@ -1695,12 +1697,12 @@ HWTEST_F(ServiceTest, SUB_Service_SendEndAppGalleryNotify_0100, testing::ext::Te { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_SendEndAppGalleryNotify_0100"; try { - ErrCode ret = Init(IServiceReverse::Scenario::BACKUP); + ErrCode ret = Init(IServiceReverseType::Scenario::BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK)); EXPECT_TRUE(servicePtr_ != nullptr); servicePtr_->SendEndAppGalleryNotify(BUNDLE_NAME); - ret = Init(IServiceReverse::Scenario::RESTORE); + ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); servicePtr_->SendEndAppGalleryNotify(BUNDLE_NAME); } catch (...) { @@ -1723,12 +1725,12 @@ HWTEST_F(ServiceTest, SUB_Service_SendErrAppGalleryNotify_0100, testing::ext::Te { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_SendErrAppGalleryNotify_0100"; try { - ErrCode ret = Init(IServiceReverse::Scenario::BACKUP); + ErrCode ret = Init(IServiceReverseType::Scenario::BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK)); EXPECT_TRUE(servicePtr_ != nullptr); servicePtr_->SendErrAppGalleryNotify(); - ret = Init(IServiceReverse::Scenario::RESTORE); + ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); servicePtr_->SendErrAppGalleryNotify(); } catch (...) { @@ -1751,12 +1753,12 @@ HWTEST_F(ServiceTest, SUB_Service_ClearDisposalOnSaStart_0100, testing::ext::Tes { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_ClearDisposalOnSaStart_0100"; try { - ErrCode ret = Init(IServiceReverse::Scenario::BACKUP); + ErrCode ret = Init(IServiceReverseType::Scenario::BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK)); EXPECT_TRUE(servicePtr_ != nullptr); servicePtr_->ClearDisposalOnSaStart(); - ret = Init(IServiceReverse::Scenario::RESTORE); + ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); servicePtr_->ClearDisposalOnSaStart(); } catch (...) { @@ -1779,12 +1781,12 @@ HWTEST_F(ServiceTest, SUB_Service_DeleteDisConfigFile_0100, testing::ext::TestSi { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_DeleteDisConfigFile_0100"; try { - ErrCode ret = Init(IServiceReverse::Scenario::BACKUP); + ErrCode ret = Init(IServiceReverseType::Scenario::BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK)); EXPECT_TRUE(servicePtr_ != nullptr); servicePtr_->DeleteDisConfigFile(); - ret = Init(IServiceReverse::Scenario::RESTORE); + ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); servicePtr_->DeleteDisConfigFile(); } catch (...) { diff --git a/tests/unittests/backup_sa/module_ipc/service_throw_test.cpp b/tests/unittests/backup_sa/module_ipc/service_throw_test.cpp index 05bd4ba713fd973746a164da5c08e4332ddb00bb..b1d8cdf7fe5e2db283f5ea4aeec6f31950b1a143 100644 --- a/tests/unittests/backup_sa/module_ipc/service_throw_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_throw_test.cpp @@ -136,7 +136,8 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitRestoreSession_0100, testing::e EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL)); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); - auto ret = service->InitRestoreSession(nullptr); + sptr reverse = nullptr; + auto ret = service->InitRestoreSession(reverse); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); @@ -146,8 +147,8 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitRestoreSession_0100, testing::e EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*sessionMock, Active(_)).WillOnce(Return(BError(BError::Codes::SA_REFUSED_ACT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); - ret = service->InitRestoreSession(nullptr); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); + ret = service->InitRestoreSession(reverse); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); @@ -157,7 +158,7 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitRestoreSession_0100, testing::e EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*sessionMock, Active(_)).WillOnce(Return(BError(BError::Codes::OK))); - ret = service->InitRestoreSession(nullptr); + ret = service->InitRestoreSession(reverse); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); GTEST_LOG_(INFO) << "ServiceThrowTest-end SUB_Service_throw_InitRestoreSession_0100"; } @@ -180,7 +181,8 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitRestoreSession_0200, testing::e EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL)); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); - auto ret = service->InitRestoreSession(nullptr, errMsg); + sptr reverseNUll = nullptr; + auto ret = service->InitRestoreSessionWithErrMsg(reverseNUll, errMsg); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); @@ -190,8 +192,8 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitRestoreSession_0200, testing::e EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*sessionMock, Active(_)).WillOnce(Return(BError(BError::Codes::SA_REFUSED_ACT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); - ret = service->InitRestoreSession(nullptr, errMsg); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); + ret = service->InitRestoreSessionWithErrMsg(reverseNUll, errMsg); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); @@ -201,8 +203,8 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitRestoreSession_0200, testing::e EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*sessionMock, Active(_)).WillOnce(Return(BError(BError::Codes::SA_SESSION_CONFLICT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); - ret = service->InitRestoreSession(nullptr, errMsg); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); + ret = service->InitRestoreSessionWithErrMsg(reverseNUll, errMsg); EXPECT_EQ(ret, BError(BError::Codes::SA_SESSION_CONFLICT).GetCode()); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); @@ -212,7 +214,7 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitRestoreSession_0200, testing::e EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*sessionMock, Active(_)).WillOnce(Return(BError(BError::Codes::OK))); - ret = service->InitRestoreSession(nullptr, errMsg); + ret = service->InitRestoreSessionWithErrMsg(reverseNUll, errMsg); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); GTEST_LOG_(INFO) << "ServiceThrowTest-end SUB_Service_throw_InitRestoreSession_0200"; } @@ -234,7 +236,8 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitBackupSession_0100, testing::ex EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL)); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); - auto ret = service->InitBackupSession(nullptr); + sptr reverse = nullptr; + auto ret = service->InitBackupSession(reverse); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); @@ -244,8 +247,8 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitBackupSession_0100, testing::ex EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*sessionMock, Active(_)).WillOnce(Return(BError(BError::Codes::SA_REFUSED_ACT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); - ret = service->InitBackupSession(nullptr); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); + ret = service->InitBackupSession(reverse); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); @@ -255,7 +258,7 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitBackupSession_0100, testing::ex EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*sessionMock, Active(_)).WillOnce(Return(BError(BError::Codes::OK))); - ret = service->InitBackupSession(nullptr); + ret = service->InitBackupSession(reverse); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); GTEST_LOG_(INFO) << "ServiceThrowTest-end SUB_Service_throw_InitBackupSession_0100"; } @@ -278,7 +281,8 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitBackupSession_0200, testing::ex EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL)); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); - auto ret = service->InitBackupSession(nullptr, errMsg); + sptr reverseNUll = nullptr; + auto ret = service->InitBackupSessionWithErrMsg(reverseNUll, errMsg); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); @@ -288,8 +292,8 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitBackupSession_0200, testing::ex EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*sessionMock, Active(_)).WillOnce(Return(BError(BError::Codes::SA_REFUSED_ACT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); - ret = service->InitBackupSession(nullptr, errMsg); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); + ret = service->InitBackupSessionWithErrMsg(reverseNUll, errMsg); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); @@ -299,8 +303,8 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitBackupSession_0200, testing::ex EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*sessionMock, Active(_)).WillOnce(Return(BError(BError::Codes::SA_SESSION_CONFLICT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); - ret = service->InitBackupSession(nullptr, errMsg); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); + ret = service->InitBackupSessionWithErrMsg(reverseNUll, errMsg); EXPECT_EQ(ret, BError(BError::Codes::SA_SESSION_CONFLICT).GetCode()); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); @@ -310,7 +314,7 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitBackupSession_0200, testing::ex EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*sessionMock, Active(_)).WillOnce(Return(BError(BError::Codes::OK))); - ret = service->InitBackupSession(nullptr, errMsg); + ret = service->InitBackupSessionWithErrMsg(reverseNUll, errMsg); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); GTEST_LOG_(INFO) << "ServiceThrowTest-end SUB_Service_throw_InitBackupSession_0200"; } @@ -527,7 +531,8 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_AppFileReady_0100, testing::ext::Te EXPECT_CALL(*token, GetHapTokenInfo(_, _)).WillOnce(Return(0)); EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("bundleName")); EXPECT_CALL(*sessionMock, VerifyBundleName(_)).WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG))); - auto ret = service->AppFileReady(fileName, UniqueFd(-1), 0); + int fd = 1; + auto ret = service->AppFileReady(fileName, fd, 0); EXPECT_EQ(ret, BError(BError::Codes::SA_INVAL_ARG).GetCode()); EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)).WillOnce(Return(0)).WillOnce(Return(0)); @@ -540,7 +545,7 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_AppFileReady_0100, testing::ext::Te .WillOnce(Return("bundleName")) .WillOnce(Return("bundleName")); EXPECT_CALL(*sessionMock, VerifyBundleName(_)).WillOnce(Return(BError(BError::Codes::SA_REFUSED_ACT))); - ret = service->AppFileReady(fileName, UniqueFd(-1), 0); + ret = service->AppFileReady(fileName, fd, 0); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); } catch (...) { EXPECT_TRUE(false); @@ -593,7 +598,7 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_LaunchBackupExtension_0100, testing try { EXPECT_NE(service, nullptr); BundleName bundleName; - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); auto ret = service->LaunchBackupExtension(bundleName); EXPECT_EQ(ret, BError(BError::Codes::SA_INVAL_ARG).GetCode()); } catch (...) { @@ -653,8 +658,8 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_OnBackupExtensionDied_0100, testing EXPECT_NE(service, nullptr); string bundleName; EXPECT_CALL(*sessionMock, GetScenario()) - .WillOnce(Return(IServiceReverse::Scenario::CLEAN)) - .WillOnce(Return(IServiceReverse::Scenario::CLEAN)); + .WillOnce(Return(IServiceReverseType::Scenario::CLEAN)) + .WillOnce(Return(IServiceReverseType::Scenario::CLEAN)); EXPECT_CALL(*sessionMock, VerifyBundleName(_)) .WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG))) .WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG))); @@ -692,21 +697,21 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_ExtConnectFailed_0100, testing::ext BundleName bundleName; EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Invoke([]() { throw BError(BError::Codes::EXT_THROW_EXCEPTION); - return IServiceReverse::Scenario::UNDEFINED; + return IServiceReverseType::Scenario::UNDEFINED; })); service->ExtConnectFailed(bundleName, 0); EXPECT_TRUE(true); EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Invoke([]() { throw runtime_error("运行时错误"); - return IServiceReverse::Scenario::UNDEFINED; + return IServiceReverseType::Scenario::UNDEFINED; })); service->ExtConnectFailed(bundleName, 0); EXPECT_TRUE(true); EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Invoke([]() { throw "未知错误"; - return IServiceReverse::Scenario::UNDEFINED; + return IServiceReverseType::Scenario::UNDEFINED; })); service->ExtConnectFailed(bundleName, 0); EXPECT_TRUE(true); @@ -734,8 +739,8 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_NoticeClientFinish_0100, testing::e string bundleName; ErrCode errCode = 0; EXPECT_CALL(*sessionMock, GetScenario()) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*sessionMock, IsOnAllBundlesFinished()).WillOnce(Return(false)); service->NoticeClientFinish(bundleName, errCode); EXPECT_TRUE(true); @@ -909,22 +914,23 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_GetLocalCapabilitiesIncremental_010 throw BError(BError::Codes::EXT_THROW_EXCEPTION); })); EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return()); - auto ret = service->GetLocalCapabilitiesIncremental(bundleNames); - EXPECT_EQ(-ret, BError(BError::Codes::EXT_THROW_EXCEPTION).GetCode()); + int32_t fd = -1; + ErrCode ret = service->GetLocalCapabilitiesIncremental(bundleNames, fd); + EXPECT_EQ(-fd, BError(BError::Codes::EXT_THROW_EXCEPTION).GetCode()); EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() { throw runtime_error("运行时错误"); })); EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return()); - ret = service->GetLocalCapabilitiesIncremental(bundleNames); - EXPECT_EQ(-ret, EPERM); + ret = service->GetLocalCapabilitiesIncremental(bundleNames, fd); + EXPECT_EQ(-fd, EPERM); EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() { throw "未知错误"; })); EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return()); - ret = service->GetLocalCapabilitiesIncremental(bundleNames); - EXPECT_EQ(-ret, EPERM); + ret = service->GetLocalCapabilitiesIncremental(bundleNames, fd); + EXPECT_EQ(-fd, EPERM); } catch (...) { EXPECT_TRUE(false); GTEST_LOG_(INFO) << "ServiceThrowTest-an exception occurred by GetLocalCapabilitiesIncremental."; @@ -990,7 +996,8 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitIncrementalBackupSession_0100, EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL)); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); - auto ret = service->InitIncrementalBackupSession(nullptr); + sptr reverse = nullptr; + auto ret = service->InitIncrementalBackupSession(reverse); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); @@ -1001,8 +1008,8 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitIncrementalBackupSession_0100, .WillOnce(Return(make_pair(true, DEBUG_ID + 1))) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*sessionMock, Active(_)).WillOnce(Return(BError(BError::Codes::SA_REFUSED_ACT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); - ret = service->InitIncrementalBackupSession(nullptr); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); + ret = service->InitIncrementalBackupSession(reverse); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); @@ -1014,7 +1021,7 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitIncrementalBackupSession_0100, .WillOnce(Return(make_pair(true, DEBUG_ID + 1))) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*sessionMock, Active(_)).WillOnce(Return(BError(BError::Codes::OK))); - ret = service->InitIncrementalBackupSession(nullptr); + ret = service->InitIncrementalBackupSession(reverse); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); GTEST_LOG_(INFO) << "ServiceThrowTest-end SUB_Service_throw_InitIncrementalBackupSession_0100"; } @@ -1037,7 +1044,8 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitIncrementalBackupSession_0200, EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL)); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); - auto ret = service->InitIncrementalBackupSession(nullptr, errMsg); + sptr reverseNUll = nullptr; + auto ret = service->InitIncrementalBackupSessionWithErrMsg(reverseNUll, errMsg); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); @@ -1048,8 +1056,8 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitIncrementalBackupSession_0200, .WillOnce(Return(make_pair(true, DEBUG_ID + 1))) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*sessionMock, Active(_)).WillOnce(Return(BError(BError::Codes::SA_REFUSED_ACT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); - ret = service->InitIncrementalBackupSession(nullptr, errMsg); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); + ret = service->InitIncrementalBackupSessionWithErrMsg(reverseNUll, errMsg); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); @@ -1060,8 +1068,8 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitIncrementalBackupSession_0200, .WillOnce(Return(make_pair(true, DEBUG_ID + 1))) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*sessionMock, Active(_)).WillOnce(Return(BError(BError::Codes::SA_SESSION_CONFLICT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); - ret = service->InitIncrementalBackupSession(nullptr, errMsg); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); + ret = service->InitIncrementalBackupSessionWithErrMsg(reverseNUll, errMsg); EXPECT_EQ(ret, BError(BError::Codes::SA_SESSION_CONFLICT).GetCode()); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); @@ -1073,7 +1081,7 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitIncrementalBackupSession_0200, .WillOnce(Return(make_pair(true, DEBUG_ID + 1))) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*sessionMock, Active(_)).WillOnce(Return(BError(BError::Codes::OK))); - ret = service->InitIncrementalBackupSession(nullptr, errMsg); + ret = service->InitIncrementalBackupSessionWithErrMsg(reverseNUll, errMsg); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); GTEST_LOG_(INFO) << "ServiceThrowTest-end SUB_Service_throw_InitIncrementalBackupSession_0200"; } @@ -1133,14 +1141,14 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_AppendBundlesIncrementalBackupSessi throw BError(BError::Codes::EXT_THROW_EXCEPTION); })); EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return()); - auto ret = service->AppendBundlesIncrementalBackupSession(bundlesToBackup, infos); + auto ret = service->AppendBundlesIncrementalBackupSessionWithBundleInfos(bundlesToBackup, infos); EXPECT_EQ(ret, BError(BError::Codes::EXT_THROW_EXCEPTION).GetCode()); EXPECT_CALL(*sessionMock, IncreaseSessionCnt(_)).WillOnce(Invoke([]() { throw "未知错误"; })); EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return()); - ret = service->AppendBundlesIncrementalBackupSession(bundlesToBackup, infos); + ret = service->AppendBundlesIncrementalBackupSessionWithBundleInfos(bundlesToBackup, infos); EXPECT_EQ(ret, EPERM); } catch (...) { EXPECT_TRUE(false); @@ -1202,7 +1210,8 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_AppIncrementalFileReady_0100, testi EXPECT_CALL(*token, GetHapTokenInfo(_, _)).WillOnce(Return(0)); EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("bundleName")); EXPECT_CALL(*sessionMock, VerifyBundleName(_)).WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG))); - auto ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), 0); + int fd = 1; + auto ret = service->AppIncrementalFileReady(fileName, fd, fd, 0); EXPECT_EQ(ret, BError(BError::Codes::SA_INVAL_ARG).GetCode()); EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)).WillOnce(Return(0)).WillOnce(Return(0)); @@ -1215,7 +1224,7 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_AppIncrementalFileReady_0100, testi .WillOnce(Return("bundleName")) .WillOnce(Return("bundleName")); EXPECT_CALL(*sessionMock, VerifyBundleName(_)).WillOnce(Return(BError(BError::Codes::SA_REFUSED_ACT))); - ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), 0); + ret = service->AppIncrementalFileReady(fileName, fd,fd, 0); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); } catch (...) { EXPECT_TRUE(false); diff --git a/tests/unittests/backup_sa/module_ipc/sub_service_test.cpp b/tests/unittests/backup_sa/module_ipc/sub_service_test.cpp index a982e92e2f4e05961e6401364e4dbffd6e1951af..3b1e57c5b81f841dc5124c7ce413321b47a7690c 100644 --- a/tests/unittests/backup_sa/module_ipc/sub_service_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/sub_service_test.cpp @@ -32,7 +32,7 @@ HWTEST_F(ServiceTest, SUB_Service_HandleCurGroupBackupInfos_0000, TestSize.Level map isClearDataFlags; EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("")); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, BackupOnBundleStarted(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, BackupOnBundleStarted(_, _)).WillOnce(Return(1)); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*jsonUtil, FindBundleInfoByName(_, _, _, _)).WillOnce(Return(false)); @@ -75,7 +75,7 @@ HWTEST_F(ServiceTest, SUB_Service_ServiceResultReport_0000, TestSize.Level1) EXPECT_CALL(*token, GetHapTokenInfo(_, _)).WillOnce(Return(0)); EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("")); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, RestoreOnResultReport(_, _, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, RestoreOnResultReport(_, _, _)).WillOnce(Return(1)); EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); @@ -87,7 +87,7 @@ HWTEST_F(ServiceTest, SUB_Service_ServiceResultReport_0000, TestSize.Level1) EXPECT_CALL(*token, GetHapTokenInfo(_, _)).WillOnce(Return(0)); EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("")); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalRestoreOnResultReport(_, _, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalRestoreOnResultReport(_, _, _)).WillOnce(Return(1)); EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); @@ -100,7 +100,7 @@ HWTEST_F(ServiceTest, SUB_Service_ServiceResultReport_0000, TestSize.Level1) EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("")); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, BackupOnResultReport(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, BackupOnResultReport(_, _)).WillOnce(Return(1)); ret = service->ServiceResultReport("", BackupRestoreScenario::FULL_BACKUP, 0); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); @@ -110,7 +110,7 @@ HWTEST_F(ServiceTest, SUB_Service_ServiceResultReport_0000, TestSize.Level1) EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("")); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalBackupOnResultReport(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalBackupOnResultReport(_, _)).WillOnce(Return(1)); ret = service->ServiceResultReport("", BackupRestoreScenario::INCREMENTAL_BACKUP, 0); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -134,29 +134,29 @@ HWTEST_F(ServiceTest, SUB_Service_SAResultReport_0000, TestSize.Level1) GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_SAResultReport_0000"; try { EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, RestoreOnResultReport(_, _, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, RestoreOnResultReport(_, _, _)).WillOnce(Return(1)); EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); auto ret = service->SAResultReport("", "", 0, BackupRestoreScenario::FULL_RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalRestoreOnResultReport(_, _, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalRestoreOnResultReport(_, _, _)).WillOnce(Return(1)); EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); ret = service->SAResultReport("", "", 0, BackupRestoreScenario::INCREMENTAL_RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, BackupOnResultReport(_, _)).WillOnce(Return()); - EXPECT_CALL(*srProxy, BackupOnBundleFinished(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, BackupOnResultReport(_, _)).WillOnce(Return(1)); + EXPECT_CALL(*srProxy, BackupOnBundleFinished(_, _)).WillOnce(Return(1)); EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); ret = service->SAResultReport("", "", 0, BackupRestoreScenario::FULL_BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalBackupOnResultReport(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalBackupOnResultReport(_, _)).WillOnce(Return(1)); EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); ret = service->SAResultReport("", "", 0, BackupRestoreScenario::INCREMENTAL_BACKUP); @@ -183,14 +183,14 @@ HWTEST_F(ServiceTest, SUB_Service_LaunchBackupSAExtension_0000, TestSize.Level1) try { BundleName bundleName; EXPECT_CALL(*session, GetBackupExtInfo(_)).WillOnce(Return("")); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)); auto ret = service->LaunchBackupSAExtension(bundleName); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); shared_ptr sa = nullptr; EXPECT_CALL(*session, GetBackupExtInfo(_)).WillOnce(Return("")); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); EXPECT_CALL(*session, GetSAExtConnection(_)).WillOnce(Return(sa)); ret = service->LaunchBackupSAExtension(bundleName); @@ -198,14 +198,14 @@ HWTEST_F(ServiceTest, SUB_Service_LaunchBackupSAExtension_0000, TestSize.Level1) sa = make_shared(nullptr, nullptr, nullptr, nullptr); EXPECT_CALL(*session, GetBackupExtInfo(_)).WillOnce(Return("")); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); EXPECT_CALL(*session, GetSAExtConnection(_)).WillOnce(Return(sa)); ret = service->LaunchBackupSAExtension(bundleName); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); EXPECT_CALL(*session, GetBackupExtInfo(_)).WillOnce(Return("")); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); EXPECT_CALL(*session, GetSAExtConnection(_)).WillOnce(Return(sa)); EXPECT_CALL(*saConnect, ConnectBackupSAExt(_, _, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode())); @@ -213,7 +213,7 @@ HWTEST_F(ServiceTest, SUB_Service_LaunchBackupSAExtension_0000, TestSize.Level1) EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); EXPECT_CALL(*session, GetBackupExtInfo(_)).WillOnce(Return("")); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); EXPECT_CALL(*session, GetSAExtConnection(_)).WillOnce(Return(sa)); EXPECT_CALL(*saConnect, ConnectBackupSAExt(_, _, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode())); @@ -303,9 +303,9 @@ HWTEST_F(ServiceTest, SUB_Service_GetFileHandle_0100, TestSize.Level1) EXPECT_CALL(*session, GetServiceSchedAction(_)).WillOnce(Return(BConstants::ServiceSchedAction::RUNNING)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); - EXPECT_CALL(*svcProxy, GetFileHandle(_, _)).WillOnce(Return(UniqueFd(-1))); + EXPECT_CALL(*svcProxy, GetFileHandleWithUniqueFd(_, _,_)).WillOnce(Return(0)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, RestoreOnFileReady(_, _, _, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, RestoreOnFileReady(_, _, _, _)).WillOnce(Return(1)); auto ret = service->GetFileHandle(bundleName, fileName); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); @@ -316,12 +316,12 @@ HWTEST_F(ServiceTest, SUB_Service_GetFileHandle_0100, TestSize.Level1) EXPECT_CALL(*session, GetServiceSchedAction(_)).WillOnce(Return(BConstants::ServiceSchedAction::RUNNING)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); - EXPECT_CALL(*svcProxy, GetFileHandle(_, _)).WillOnce(DoAll(SetArgReferee<1>(1), Return(UniqueFd(-1)))); + EXPECT_CALL(*svcProxy, GetFileHandleWithUniqueFd(_, _,_)).WillOnce(DoAll(SetArgReferee<1>(1), Return(0))); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, RestoreOnFileReady(_, _, _, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, RestoreOnFileReady(_, _, _, _)).WillOnce(Return(1)); ret = service->GetFileHandle(bundleName, fileName); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -345,15 +345,15 @@ HWTEST_F(ServiceTest, SUB_Service_OnBackupExtensionDied_0000, TestSize.Level1) GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_OnBackupExtensionDied_0000"; try { service->isOccupyingSession_ = false; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*cdConfig, DeleteClearBundleRecord(_)).WillOnce(Return(true)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); service->OnBackupExtensionDied("", true); EXPECT_TRUE(true); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, StopFwkTimer(_)).WillOnce(Return(true)); EXPECT_CALL(*session, StopExtTimer(_)).WillOnce(Return(true)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(nullptr)); @@ -388,9 +388,9 @@ HWTEST_F(ServiceTest, SUB_Service_ExtConnectDied_0000, TestSize.Level1) EXPECT_CALL(*session, StopExtTimer(_)).WillOnce(Return(true)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(nullptr)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*cdConfig, DeleteClearBundleRecord(_)).WillOnce(Return(true)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); service->ExtConnectDied(callName); @@ -401,9 +401,9 @@ HWTEST_F(ServiceTest, SUB_Service_ExtConnectDied_0000, TestSize.Level1) EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, IsExtAbilityConnected()).WillOnce(Return(false)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*cdConfig, DeleteClearBundleRecord(_)).WillOnce(Return(true)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); service->ExtConnectDied(callName); @@ -415,9 +415,9 @@ HWTEST_F(ServiceTest, SUB_Service_ExtConnectDied_0000, TestSize.Level1) EXPECT_CALL(*connect, IsExtAbilityConnected()).WillOnce(Return(true)); EXPECT_CALL(*connect, DisconnectBackupExtAbility()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*cdConfig, DeleteClearBundleRecord(_)).WillOnce(Return(true)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); service->ExtConnectDied(callName); @@ -445,15 +445,15 @@ HWTEST_F(ServiceTest, SUB_Service_ExtStart_0000, TestSize.Level1) string callName; shared_ptr sa = make_shared(nullptr, nullptr, nullptr, nullptr); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, GetSAExtConnection(_)).WillOnce(Return(sa)); service->ExtStart(callName); EXPECT_TRUE(true); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(nullptr)); EXPECT_CALL(*cdConfig, DeleteClearBundleRecord(_)).WillOnce(Return(true)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); @@ -461,9 +461,9 @@ HWTEST_F(ServiceTest, SUB_Service_ExtStart_0000, TestSize.Level1) EXPECT_TRUE(true); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(nullptr)); EXPECT_CALL(*cdConfig, DeleteClearBundleRecord(_)).WillOnce(Return(true)); @@ -472,9 +472,9 @@ HWTEST_F(ServiceTest, SUB_Service_ExtStart_0000, TestSize.Level1) EXPECT_TRUE(true); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); EXPECT_CALL(*cdConfig, DeleteClearBundleRecord(_)).WillOnce(Return(true)); @@ -503,26 +503,26 @@ HWTEST_F(ServiceTest, SUB_Service_ExtStart_0100, TestSize.Level1) try { string callName; EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); EXPECT_CALL(*session, GetClearDataFlag(_)).WillOnce(Return(false)); EXPECT_CALL(*svcProxy, HandleBackup(_)).WillOnce(Return(BError(BError::Codes::OK).GetCode())); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, BackupOnBundleStarted(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, BackupOnBundleStarted(_, _)).WillOnce(Return(1)); service->ExtStart(callName); EXPECT_TRUE(true); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); EXPECT_CALL(*session, GetClearDataFlag(_)).WillOnce(Return(false)); EXPECT_CALL(*svcProxy, HandleBackup(_)).WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG).GetCode())); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, BackupOnBundleStarted(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, BackupOnBundleStarted(_, _)).WillOnce(Return(1)); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*cdConfig, DeleteClearBundleRecord(_)).WillOnce(Return(true)); @@ -532,13 +532,13 @@ HWTEST_F(ServiceTest, SUB_Service_ExtStart_0100, TestSize.Level1) set fileNameVec; EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); EXPECT_CALL(*session, GetClearDataFlag(_)).WillOnce(Return(false)); EXPECT_CALL(*svcProxy, HandleRestore(_)).WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG).GetCode())); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, RestoreOnBundleStarted(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, RestoreOnBundleStarted(_, _)).WillOnce(Return(1)); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*session, GetExtFileNameRequest(_)).WillOnce(Return(fileNameVec)); @@ -593,46 +593,46 @@ HWTEST_F(ServiceTest, SUB_Service_ReportOnExtConnectFailed_0000, TestSize.Level1 string bundleName; auto session_ = service->session_; service->session_ = nullptr; - service->ReportOnExtConnectFailed(IServiceReverse::Scenario::UNDEFINED, bundleName, 0); + service->ReportOnExtConnectFailed(IServiceReverseType::Scenario::UNDEFINED, bundleName, 0); service->session_ = session_; EXPECT_TRUE(true); - service->ReportOnExtConnectFailed(IServiceReverse::Scenario::UNDEFINED, bundleName, 0); + service->ReportOnExtConnectFailed(IServiceReverseType::Scenario::UNDEFINED, bundleName, 0); EXPECT_TRUE(true); EXPECT_CALL(*session, GetIsIncrementalBackup()).WillOnce(Return(true)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalBackupOnBundleStarted(_, _)).WillOnce(Return()); - service->ReportOnExtConnectFailed(IServiceReverse::Scenario::BACKUP, bundleName, 0); + EXPECT_CALL(*srProxy, IncrementalBackupOnBundleStarted(_, _)).WillOnce(Return(1)); + service->ReportOnExtConnectFailed(IServiceReverseType::Scenario::BACKUP, bundleName, 0); EXPECT_TRUE(true); EXPECT_CALL(*session, GetIsIncrementalBackup()).WillOnce(Return(false)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, BackupOnBundleStarted(_, _)).WillOnce(Return()); - service->ReportOnExtConnectFailed(IServiceReverse::Scenario::BACKUP, bundleName, 0); + EXPECT_CALL(*srProxy, BackupOnBundleStarted(_, _)).WillOnce(Return(1)); + service->ReportOnExtConnectFailed(IServiceReverseType::Scenario::BACKUP, bundleName, 0); EXPECT_TRUE(true); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(true)); EXPECT_CALL(*session, ValidRestoreDataType(_)).WillOnce(Return(true)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleStarted(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleStarted(_, _)).WillOnce(Return(1)); EXPECT_CALL(*gallery, EndRestore(_, _)).WillOnce(Return(DisposeErr::OK)); - service->ReportOnExtConnectFailed(IServiceReverse::Scenario::RESTORE, bundleName, 0); + service->ReportOnExtConnectFailed(IServiceReverseType::Scenario::RESTORE, bundleName, 0); EXPECT_TRUE(true); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(true)); EXPECT_CALL(*session, ValidRestoreDataType(_)).WillOnce(Return(false)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, RestoreOnBundleStarted(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, RestoreOnBundleStarted(_, _)).WillOnce(Return(1)); EXPECT_CALL(*gallery, EndRestore(_, _)).WillOnce(Return(DisposeErr::OK)); - service->ReportOnExtConnectFailed(IServiceReverse::Scenario::RESTORE, bundleName, 0); + service->ReportOnExtConnectFailed(IServiceReverseType::Scenario::RESTORE, bundleName, 0); EXPECT_TRUE(true); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(false)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, RestoreOnBundleStarted(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, RestoreOnBundleStarted(_, _)).WillOnce(Return(1)); EXPECT_CALL(*gallery, EndRestore(_, _)).WillOnce(Return(DisposeErr::OK)); - service->ReportOnExtConnectFailed(IServiceReverse::Scenario::RESTORE, bundleName, 0); + service->ReportOnExtConnectFailed(IServiceReverseType::Scenario::RESTORE, bundleName, 0); EXPECT_TRUE(true); } catch (...) { EXPECT_TRUE(false); @@ -656,35 +656,35 @@ HWTEST_F(ServiceTest, SUB_Service_NoticeClientFinish_0000, TestSize.Level1) try { string bundleName; EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); service->NoticeClientFinish(bundleName, 0); EXPECT_TRUE(true); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetIsIncrementalBackup()).WillOnce(Return(true)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalBackupOnBundleFinished(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalBackupOnBundleFinished(_, _)).WillOnce(Return(1)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); service->NoticeClientFinish(bundleName, 0); EXPECT_TRUE(true); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(true)); EXPECT_CALL(*session, ValidRestoreDataType(_)).WillOnce(Return(true)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleFinished(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleFinished(_, _)).WillOnce(Return(1)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); service->NoticeClientFinish(bundleName, 0); EXPECT_TRUE(true); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetIsIncrementalBackup()).WillOnce(Return(false)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, BackupOnBundleFinished(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, BackupOnBundleFinished(_, _)).WillOnce(Return(1)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); service->NoticeClientFinish(bundleName, 0); EXPECT_TRUE(true); @@ -710,20 +710,20 @@ HWTEST_F(ServiceTest, SUB_Service_NoticeClientFinish_0100, TestSize.Level1) try { string bundleName; EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(true)); EXPECT_CALL(*session, ValidRestoreDataType(_)).WillOnce(Return(false)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, RestoreOnBundleFinished(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, RestoreOnBundleFinished(_, _)).WillOnce(Return(1)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); service->NoticeClientFinish(bundleName, 0); EXPECT_TRUE(true); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(false)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, RestoreOnBundleFinished(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, RestoreOnBundleFinished(_, _)).WillOnce(Return(1)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); service->NoticeClientFinish(bundleName, 0); EXPECT_TRUE(true); @@ -789,13 +789,13 @@ HWTEST_F(ServiceTest, SUB_Service_ClearSessionAndSchedInfo_0000, TestSize.Level1 try { string bundleName; service->isOccupyingSession_ = false; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*cdConfig, DeleteClearBundleRecord(_)).WillOnce(Return(true)); service->ClearSessionAndSchedInfo(bundleName); EXPECT_TRUE(true); service->isOccupyingSession_ = true; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*cdConfig, DeleteClearBundleRecord(_)).WillOnce(Return(true)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); service->ClearSessionAndSchedInfo(bundleName); @@ -803,7 +803,7 @@ HWTEST_F(ServiceTest, SUB_Service_ClearSessionAndSchedInfo_0000, TestSize.Level1 service->failedBundles_.clear(); service->successBundlesNum_ = 0; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*cdConfig, DeleteClearBundleRecord(_)).WillOnce(Return(true)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(true)); service->ClearSessionAndSchedInfo(bundleName); @@ -829,19 +829,19 @@ HWTEST_F(ServiceTest, SUB_Service_HandleRestoreDepsBundle_0000, TestSize.Level1) GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_HandleRestoreDepsBundle_0000"; try { string bundleName; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); service->HandleRestoreDepsBundle(bundleName); EXPECT_TRUE(true); map bundleMap; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*depManager, GetRestoreBundleMap()).WillOnce(Return(bundleMap)); service->HandleRestoreDepsBundle(bundleName); EXPECT_TRUE(true); bundleMap["bundleName"] = {.fileNames_ = {"name"}}; vector bundleInfos {{.name = "name"}}; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*depManager, GetRestoreBundleMap()).WillOnce(Return(bundleMap)); EXPECT_CALL(*depManager, GetAllBundles()).WillOnce(Return(bundleInfos)); service->HandleRestoreDepsBundle(bundleName); @@ -849,7 +849,7 @@ HWTEST_F(ServiceTest, SUB_Service_HandleRestoreDepsBundle_0000, TestSize.Level1) bundleInfos.clear(); bundleInfos = {{.name = "bundleName"}}; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*depManager, GetRestoreBundleMap()).WillOnce(Return(bundleMap)); EXPECT_CALL(*depManager, GetAllBundles()).WillOnce(Return(bundleInfos)); service->HandleRestoreDepsBundle(bundleName); @@ -881,36 +881,36 @@ HWTEST_F(ServiceTest, SUB_Service_OnAllBundlesFinished_0000, TestSize.Level1) service->isInRelease_.store(false); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*param, GetBackupOverrideBackupSARelease()).WillOnce(Return(true)); service->OnAllBundlesFinished(0); EXPECT_TRUE(true); service->isInRelease_.store(true); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*param, GetBackupOverrideBackupSARelease()).WillOnce(Return(true)); service->OnAllBundlesFinished(0); EXPECT_TRUE(true); service->isInRelease_.store(true); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)) - .WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)) + .WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*session, CleanAndCheckIfNeedWait(_, _)).WillOnce(Return(true)); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(false)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, RestoreOnAllBundlesFinished(_)).WillOnce(Return()); + EXPECT_CALL(*srProxy, RestoreOnAllBundlesFinished(_)).WillOnce(Return(1)); EXPECT_CALL(*param, GetBackupOverrideBackupSARelease()).WillOnce(Return(true)); service->OnAllBundlesFinished(0); EXPECT_TRUE(true); service->isInRelease_.store(false); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetIsIncrementalBackup()).WillOnce(Return(true)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalBackupOnAllBundlesFinished(_)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalBackupOnAllBundlesFinished(_)).WillOnce(Return(1)); EXPECT_CALL(*param, GetBackupOverrideBackupSARelease()).WillOnce(Return(true)); service->OnAllBundlesFinished(0); EXPECT_TRUE(true); @@ -936,32 +936,32 @@ HWTEST_F(ServiceTest, SUB_Service_OnAllBundlesFinished_0100, TestSize.Level1) try { service->isInRelease_.store(false); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetIsIncrementalBackup()).WillOnce(Return(false)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, BackupOnAllBundlesFinished(_)).WillOnce(Return()); + EXPECT_CALL(*srProxy, BackupOnAllBundlesFinished(_)).WillOnce(Return(1)); EXPECT_CALL(*param, GetBackupOverrideBackupSARelease()).WillOnce(Return(true)); service->OnAllBundlesFinished(0); EXPECT_TRUE(true); service->isInRelease_.store(false); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(true)); EXPECT_CALL(*session, ValidRestoreDataType(_)).WillOnce(Return(true)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalRestoreOnAllBundlesFinished(_)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalRestoreOnAllBundlesFinished(_)).WillOnce(Return(1)); EXPECT_CALL(*param, GetBackupOverrideBackupSARelease()).WillOnce(Return(true)); service->OnAllBundlesFinished(0); EXPECT_TRUE(true); service->isInRelease_.store(false); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(true)); EXPECT_CALL(*session, ValidRestoreDataType(_)).WillOnce(Return(false)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, RestoreOnAllBundlesFinished(_)).WillOnce(Return()); + EXPECT_CALL(*srProxy, RestoreOnAllBundlesFinished(_)).WillOnce(Return(1)); EXPECT_CALL(*param, GetBackupOverrideBackupSARelease()).WillOnce(Return(true)); service->OnAllBundlesFinished(0); EXPECT_TRUE(true); @@ -987,17 +987,17 @@ HWTEST_F(ServiceTest, SUB_Service_OnAllBundlesFinished_0200, TestSize.Level1) try { service->isInRelease_.store(false); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(false)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, RestoreOnAllBundlesFinished(_)).WillOnce(Return()); + EXPECT_CALL(*srProxy, RestoreOnAllBundlesFinished(_)).WillOnce(Return(1)); EXPECT_CALL(*param, GetBackupOverrideBackupSARelease()).WillOnce(Return(true)); service->OnAllBundlesFinished(0); EXPECT_TRUE(true); service->isInRelease_.store(false); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(true)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*param, GetBackupOverrideBackupSARelease()).WillOnce(Return(false)); service->OnAllBundlesFinished(0); EXPECT_TRUE(true); @@ -1054,18 +1054,18 @@ HWTEST_F(ServiceTest, SUB_Service_SendStartAppGalleryNotify_0000, TestSize.Level EXPECT_TRUE(true); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); service->SendStartAppGalleryNotify(bundleName); EXPECT_TRUE(true); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*jdConfig, IfBundleNameInDisposalConfigFile(_)).WillOnce(Return(false)); service->SendStartAppGalleryNotify(bundleName); EXPECT_TRUE(true); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*jdConfig, IfBundleNameInDisposalConfigFile(_)).WillOnce(Return(true)); EXPECT_CALL(*gallery, StartRestore(_, _)).WillOnce(Return(DisposeErr::OK)); service->SendStartAppGalleryNotify(bundleName); @@ -1096,25 +1096,25 @@ HWTEST_F(ServiceTest, SUB_Service_SendEndAppGalleryNotify_0000, TestSize.Level1) EXPECT_TRUE(true); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); service->SendEndAppGalleryNotify(bundleName); EXPECT_TRUE(true); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*gallery, EndRestore(_, _)).WillOnce(Return(DisposeErr::REQUEST_FAIL)); service->SendEndAppGalleryNotify(bundleName); EXPECT_TRUE(true); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*gallery, EndRestore(_, _)).WillOnce(Return(DisposeErr::OK)); EXPECT_CALL(*jdConfig, DeleteFromDisposalConfigFile(_)).WillOnce(Return(false)); service->SendEndAppGalleryNotify(bundleName); EXPECT_TRUE(true); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*gallery, EndRestore(_, _)).WillOnce(Return(DisposeErr::OK)); EXPECT_CALL(*jdConfig, DeleteFromDisposalConfigFile(_)).WillOnce(Return(true)); service->SendEndAppGalleryNotify(bundleName); @@ -1170,18 +1170,18 @@ HWTEST_F(ServiceTest, SUB_Service_SendErrAppGalleryNotify_0000, TestSize.Level1) { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_SendErrAppGalleryNotify_0000"; try { - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); service->SendErrAppGalleryNotify(); EXPECT_TRUE(true); vector bundleNameList; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*jdConfig, GetBundleNameFromConfigFile()).WillOnce(Return(bundleNameList)); service->SendErrAppGalleryNotify(); EXPECT_TRUE(true); bundleNameList.emplace_back("bundleName"); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*jdConfig, GetBundleNameFromConfigFile()).WillOnce(Return(bundleNameList)); EXPECT_CALL(*gallery, EndRestore(_, _)).WillOnce(Return(DisposeErr::OK)); EXPECT_CALL(*jdConfig, DeleteFromDisposalConfigFile(_)).WillOnce(Return(true)); @@ -1238,24 +1238,24 @@ HWTEST_F(ServiceTest, SUB_Service_DeleteDisConfigFile_0000, TestSize.Level1) { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_DeleteDisConfigFile_0000"; try { - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); service->DeleteDisConfigFile(); EXPECT_TRUE(true); vector bundleNameList {"bundleName"}; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*jdConfig, GetBundleNameFromConfigFile()).WillOnce(Return(bundleNameList)); service->DeleteDisConfigFile(); EXPECT_TRUE(true); bundleNameList.clear(); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*jdConfig, GetBundleNameFromConfigFile()).WillOnce(Return(bundleNameList)); EXPECT_CALL(*jdConfig, DeleteConfigFile()).WillOnce(Return(false)); service->DeleteDisConfigFile(); EXPECT_TRUE(true); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*jdConfig, GetBundleNameFromConfigFile()).WillOnce(Return(bundleNameList)); EXPECT_CALL(*jdConfig, DeleteConfigFile()).WillOnce(Return(true)); service->DeleteDisConfigFile(); @@ -1288,27 +1288,27 @@ HWTEST_F(ServiceTest, SUB_Service_SessionDeactive_0000, TestSize.Level1) auto sched = service->sched_; service->sched_ = nullptr; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); service->SessionDeactive(); EXPECT_TRUE(true); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, CleanAndCheckIfNeedWait(_, _)).WillOnce(Return(false)); service->SessionDeactive(); EXPECT_TRUE(true); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*session, CleanAndCheckIfNeedWait(_, _)) .WillOnce(DoAll(SetArgReferee<0>(BError(BError::Codes::SA_INVAL_ARG)), Return(true))); service->SessionDeactive(); EXPECT_TRUE(true); vector bundleNameList {"bundleName"}; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*session, CleanAndCheckIfNeedWait(_, _)) .WillOnce(DoAll(SetArgReferee<1>(bundleNameList), Return(true))); EXPECT_CALL(*cdConfig, DeleteClearBundleRecord(_)).WillOnce(Return(true)); @@ -1337,18 +1337,18 @@ HWTEST_F(ServiceTest, SUB_Service_SessionDeactive_0100, TestSize.Level1) try { service->failedBundles_.clear(); service->successBundlesNum_ = 0; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, ClearSessionData()).WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG))); EXPECT_CALL(*session, GetSessionCnt()).WillOnce(Return(0)); service->SessionDeactive(); EXPECT_TRUE(true); service->isRmConfigFile_ = true; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, ClearSessionData()).WillOnce(Return(BError(BError::Codes::OK))); EXPECT_CALL(*cdConfig, DeleteConfigFile()).WillOnce(Return(false)); EXPECT_CALL(*session, GetSessionCnt()).WillOnce(Return(0)); @@ -1356,9 +1356,9 @@ HWTEST_F(ServiceTest, SUB_Service_SessionDeactive_0100, TestSize.Level1) EXPECT_TRUE(true); service->isRmConfigFile_ = false; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, ClearSessionData()).WillOnce(Return(BError(BError::Codes::OK))); EXPECT_CALL(*session, GetSessionCnt()).WillOnce(Return(0)); service->SessionDeactive(); @@ -1388,17 +1388,17 @@ HWTEST_F(ServiceTest, SUB_Service_SessionDeactive_0200, TestSize.Level1) service->isRmConfigFile_ = false; auto clearRecorder = service->clearRecorder_; service->clearRecorder_ = nullptr; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, ClearSessionData()).WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG))); EXPECT_CALL(*session, GetSessionCnt()).WillOnce(Return(0)); service->SessionDeactive(); EXPECT_TRUE(true); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, ClearSessionData()).WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG))); EXPECT_CALL(*session, GetSessionCnt()).WillOnce(Return(-1)); service->SessionDeactive(); @@ -1497,15 +1497,15 @@ HWTEST_F(ServiceTest, SUB_Service_TimeoutRadarReport_0000, TestSize.Level1) string bundleName; EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); - service->TimeoutRadarReport(IServiceReverse::Scenario::BACKUP, bundleName); + service->TimeoutRadarReport(IServiceReverseType::Scenario::BACKUP, bundleName); EXPECT_TRUE(true); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); - service->TimeoutRadarReport(IServiceReverse::Scenario::RESTORE, bundleName); + service->TimeoutRadarReport(IServiceReverseType::Scenario::RESTORE, bundleName); EXPECT_TRUE(true); - service->TimeoutRadarReport(IServiceReverse::Scenario::UNDEFINED, bundleName); + service->TimeoutRadarReport(IServiceReverseType::Scenario::UNDEFINED, bundleName); EXPECT_TRUE(true); } catch (...) { EXPECT_TRUE(false); diff --git a/tests/unittests/backup_sa/module_ipc/svc_session_manager_test.cpp b/tests/unittests/backup_sa/module_ipc/svc_session_manager_test.cpp index 54c6a506783b0c6ce680b06d19bedd59443689ce..e388a28d178e340106ef434b6dc657be14a79074 100644 --- a/tests/unittests/backup_sa/module_ipc/svc_session_manager_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/svc_session_manager_test.cpp @@ -44,7 +44,7 @@ public: static void TearDownTestCase(void); void SetUp() override {}; void TearDown() override {}; - void Init(IServiceReverse::Scenario scenario); + void Init(IServiceReverseType::Scenario scenario); static inline sptr sessionManagerPtr_ = nullptr; static inline sptr remote_ = nullptr; @@ -67,7 +67,7 @@ void SvcSessionManagerTest::TearDownTestCase(void) remote_ = nullptr; } -void SvcSessionManagerTest::Init(IServiceReverse::Scenario scenario) +void SvcSessionManagerTest::Init(IServiceReverseType::Scenario scenario) { vector bundleNames; vector failedBundles; @@ -96,19 +96,19 @@ HWTEST_F(SvcSessionManagerTest, SUB_backup_sa_session_VerifyCallerAndScenario_01 GTEST_LOG_(INFO) << "SvcSessionManagerTest-begin SUB_backup_sa_session_VerifyCallerAndScenario_0100"; try { EXPECT_TRUE(sessionManagerPtr_ != nullptr); - sessionManagerPtr_->impl_.scenario = IServiceReverse::Scenario::BACKUP; + sessionManagerPtr_->impl_.scenario = IServiceReverseType::Scenario::BACKUP; ErrCode ret = sessionManagerPtr_->VerifyCallerAndScenario(CLIENT_TOKEN_ID, - IServiceReverse::Scenario::RESTORE); + IServiceReverseType::Scenario::RESTORE); EXPECT_TRUE(ret == BError(BError::Codes::SDK_MIXED_SCENARIO).GetCode()); - sessionManagerPtr_->impl_.scenario = IServiceReverse::Scenario::BACKUP; + sessionManagerPtr_->impl_.scenario = IServiceReverseType::Scenario::BACKUP; sessionManagerPtr_->impl_.clientToken = 0; - ret = sessionManagerPtr_->VerifyCallerAndScenario(CLIENT_TOKEN_ID, IServiceReverse::Scenario::BACKUP); + ret = sessionManagerPtr_->VerifyCallerAndScenario(CLIENT_TOKEN_ID, IServiceReverseType::Scenario::BACKUP); EXPECT_TRUE(ret == BError(BError::Codes::SA_REFUSED_ACT).GetCode()); - sessionManagerPtr_->impl_.scenario = IServiceReverse::Scenario::BACKUP; + sessionManagerPtr_->impl_.scenario = IServiceReverseType::Scenario::BACKUP; sessionManagerPtr_->impl_.clientToken = CLIENT_TOKEN_ID; - ret = sessionManagerPtr_->VerifyCallerAndScenario(CLIENT_TOKEN_ID, IServiceReverse::Scenario::BACKUP); + ret = sessionManagerPtr_->VerifyCallerAndScenario(CLIENT_TOKEN_ID, IServiceReverseType::Scenario::BACKUP); EXPECT_TRUE(ret == ERR_OK); } catch (...) { EXPECT_TRUE(false); @@ -141,13 +141,13 @@ HWTEST_F(SvcSessionManagerTest, SUB_backup_sa_session_Active_0100, testing::ext: EXPECT_EQ(res, BError(BError::Codes::SA_INVAL_ARG).GetCode()); newImpl.clientToken = CLIENT_TOKEN_ID; - newImpl.scenario = IServiceReverse::Scenario::UNDEFINED; + newImpl.scenario = IServiceReverseType::Scenario::UNDEFINED; sessionManagerPtr_->impl_.clientToken = 0; res = sessionManagerPtr_->Active(newImpl); EXPECT_EQ(res, BError(BError::Codes::SA_INVAL_ARG).GetCode()); newImpl.clientToken = CLIENT_TOKEN_ID; - newImpl.scenario = IServiceReverse::Scenario::BACKUP; + newImpl.scenario = IServiceReverseType::Scenario::BACKUP; newImpl.clientProxy = nullptr; sessionManagerPtr_->impl_.clientToken = 0; res = sessionManagerPtr_->Active(newImpl); @@ -282,12 +282,12 @@ HWTEST_F(SvcSessionManagerTest, SUB_backup_sa_session_getscenario_0100, testing: try { EXPECT_TRUE(sessionManagerPtr_ != nullptr); sessionManagerPtr_->impl_.clientToken = 0; - IServiceReverse::Scenario scenario = sessionManagerPtr_->GetScenario(); - EXPECT_TRUE(scenario == IServiceReverse::Scenario::UNDEFINED); + IServiceReverseType::Scenario scenario = sessionManagerPtr_->GetScenario(); + EXPECT_TRUE(scenario == IServiceReverseType::Scenario::UNDEFINED); sessionManagerPtr_->impl_.clientToken = CLIENT_TOKEN_ID; scenario = sessionManagerPtr_->GetScenario(); - EXPECT_TRUE(scenario == IServiceReverse::Scenario::UNDEFINED); + EXPECT_TRUE(scenario == IServiceReverseType::Scenario::UNDEFINED); } catch (...) { EXPECT_TRUE(false); GTEST_LOG_(INFO) << "SvcSessionManagerTest-an exception occurred by getscenario."; @@ -320,21 +320,21 @@ HWTEST_F(SvcSessionManagerTest, SUB_backup_sa_session_onBundlefileready_0100, te sessionManagerPtr_->impl_.backupExtNameMap.clear(); sessionManagerPtr_->impl_.clientToken = CLIENT_TOKEN_ID; sessionManagerPtr_->impl_.backupExtNameMap[BUNDLE_NAME] = {}; - sessionManagerPtr_->impl_.scenario = IServiceReverse::Scenario::RESTORE; + sessionManagerPtr_->impl_.scenario = IServiceReverseType::Scenario::RESTORE; fileReady = sessionManagerPtr_->OnBundleFileReady(BUNDLE_NAME); EXPECT_TRUE(fileReady); sessionManagerPtr_->impl_.backupExtNameMap.clear(); sessionManagerPtr_->impl_.clientToken = CLIENT_TOKEN_ID; sessionManagerPtr_->impl_.backupExtNameMap["123"] = {}; - sessionManagerPtr_->impl_.scenario = IServiceReverse::Scenario::BACKUP; + sessionManagerPtr_->impl_.scenario = IServiceReverseType::Scenario::BACKUP; fileReady = sessionManagerPtr_->OnBundleFileReady("123"); EXPECT_TRUE(fileReady); sessionManagerPtr_->impl_.backupExtNameMap.clear(); sessionManagerPtr_->impl_.clientToken = CLIENT_TOKEN_ID; sessionManagerPtr_->impl_.backupExtNameMap[BUNDLE_NAME] = {}; - sessionManagerPtr_->impl_.scenario = IServiceReverse::Scenario::UNDEFINED; + sessionManagerPtr_->impl_.scenario = IServiceReverseType::Scenario::UNDEFINED; fileReady = sessionManagerPtr_->OnBundleFileReady(BUNDLE_NAME); EXPECT_FALSE(fileReady); GTEST_LOG_(INFO) << "SvcSessionManagerTest-end SUB_backup_sa_session_onBundlefileready_0100"; @@ -356,21 +356,21 @@ HWTEST_F(SvcSessionManagerTest, SUB_backup_sa_session_onBundlefileready_0101, te sessionManagerPtr_->impl_.backupExtNameMap.clear(); sessionManagerPtr_->impl_.clientToken = CLIENT_TOKEN_ID; sessionManagerPtr_->impl_.backupExtNameMap[BUNDLE_NAME] = {}; - sessionManagerPtr_->impl_.scenario = IServiceReverse::Scenario::BACKUP; + sessionManagerPtr_->impl_.scenario = IServiceReverseType::Scenario::BACKUP; bool fileReady = sessionManagerPtr_->OnBundleFileReady(BUNDLE_NAME, ""); EXPECT_FALSE(fileReady); sessionManagerPtr_->impl_.backupExtNameMap.clear(); sessionManagerPtr_->impl_.clientToken = CLIENT_TOKEN_ID; sessionManagerPtr_->impl_.backupExtNameMap[BUNDLE_NAME] = {}; - sessionManagerPtr_->impl_.scenario = IServiceReverse::Scenario::BACKUP; + sessionManagerPtr_->impl_.scenario = IServiceReverseType::Scenario::BACKUP; fileReady = sessionManagerPtr_->OnBundleFileReady(BUNDLE_NAME, "test"); EXPECT_FALSE(fileReady); sessionManagerPtr_->impl_.backupExtNameMap.clear(); sessionManagerPtr_->impl_.clientToken = CLIENT_TOKEN_ID; sessionManagerPtr_->impl_.backupExtNameMap[BUNDLE_NAME] = {}; - sessionManagerPtr_->impl_.scenario = IServiceReverse::Scenario::BACKUP; + sessionManagerPtr_->impl_.scenario = IServiceReverseType::Scenario::BACKUP; fileReady = sessionManagerPtr_->OnBundleFileReady(BUNDLE_NAME, string(BConstants::EXT_BACKUP_MANAGE)); EXPECT_FALSE(fileReady); @@ -402,7 +402,7 @@ HWTEST_F(SvcSessionManagerTest, SUB_backup_sa_session_OnBundleExtManageInfo_0100 EXPECT_TRUE(move(ret) == -1); sessionManagerPtr_->impl_.clientToken = CLIENT_TOKEN_ID; - sessionManagerPtr_->impl_.scenario = IServiceReverse::Scenario::RESTORE; + sessionManagerPtr_->impl_.scenario = IServiceReverseType::Scenario::RESTORE; ret = sessionManagerPtr_->OnBundleExtManageInfo(BUNDLE_NAME, UniqueFd(-1)); EXPECT_TRUE(move(ret) == -1); @@ -583,7 +583,7 @@ HWTEST_F(SvcSessionManagerTest, SUB_backup_sa_session_GetExtFileNameRequest_0102 GTEST_LOG_(INFO) << "SvcSessionManagerTest-begin SUB_backup_sa_session_GetExtFileNameRequest_0102"; EXPECT_TRUE(sessionManagerPtr_ != nullptr); sessionManagerPtr_->impl_.clientToken = CLIENT_TOKEN_ID; - sessionManagerPtr_->impl_.scenario = IServiceReverse::Scenario::UNDEFINED; + sessionManagerPtr_->impl_.scenario = IServiceReverseType::Scenario::UNDEFINED; auto fileNameSet = sessionManagerPtr_->GetExtFileNameRequest(BUNDLE_NAME); EXPECT_TRUE(fileNameSet.empty()); GTEST_LOG_(INFO) << "SvcSessionManagerTest-end SUB_backup_sa_session_GetExtFileNameRequest_0102"; @@ -603,7 +603,7 @@ HWTEST_F(SvcSessionManagerTest, SUB_backup_sa_session_GetExtFileNameRequest_0103 GTEST_LOG_(INFO) << "SvcSessionManagerTest-begin SUB_backup_sa_session_GetExtFileNameRequest_0103"; EXPECT_TRUE(sessionManagerPtr_ != nullptr); sessionManagerPtr_->impl_.clientToken = CLIENT_TOKEN_ID; - sessionManagerPtr_->impl_.scenario = IServiceReverse::Scenario::RESTORE; + sessionManagerPtr_->impl_.scenario = IServiceReverseType::Scenario::RESTORE; auto fileNameSet = sessionManagerPtr_->GetExtFileNameRequest(BUNDLE_NAME); EXPECT_FALSE(fileNameSet.empty()); GTEST_LOG_(INFO) << "SvcSessionManagerTest-end SUB_backup_sa_session_GetExtFileNameRequest_0103"; @@ -1009,14 +1009,14 @@ HWTEST_F(SvcSessionManagerTest, SUB_backup_sa_session_NeedToUnloadService_0100, sessionManagerPtr_->impl_.backupExtNameMap.clear(); sessionManagerPtr_->impl_.backupExtNameMap[BUNDLE_NAME] = {}; sessionManagerPtr_->impl_.restoreDataType = RestoreTypeEnum::RESTORE_DATA_WAIT_SEND; - sessionManagerPtr_->impl_.scenario = IServiceReverse::Scenario::RESTORE; + sessionManagerPtr_->impl_.scenario = IServiceReverseType::Scenario::RESTORE; ret = sessionManagerPtr_->NeedToUnloadService(); EXPECT_FALSE(ret); sessionManagerPtr_->impl_.backupExtNameMap.clear(); sessionManagerPtr_->impl_.backupExtNameMap[BUNDLE_NAME] = {}; sessionManagerPtr_->impl_.restoreDataType = RestoreTypeEnum::RESTORE_DATA_WAIT_SEND; - sessionManagerPtr_->impl_.scenario = IServiceReverse::Scenario::BACKUP; + sessionManagerPtr_->impl_.scenario = IServiceReverseType::Scenario::BACKUP; ret = sessionManagerPtr_->NeedToUnloadService(); EXPECT_FALSE(ret); } catch (...) { @@ -1079,7 +1079,7 @@ HWTEST_F(SvcSessionManagerTest, SUB_backup_sa_session_OnBundleFileReady_0200, te try { EXPECT_TRUE(sessionManagerPtr_ != nullptr); sessionManagerPtr_->Deactive(nullptr, true); - Init(IServiceReverse::Scenario::BACKUP); + Init(IServiceReverseType::Scenario::BACKUP); bool fileReady = sessionManagerPtr_->OnBundleFileReady(BUNDLE_NAME, MANAGE_JSON); EXPECT_FALSE(fileReady); fileReady = sessionManagerPtr_->OnBundleFileReady(BUNDLE_NAME, FILE_NAME); @@ -1470,12 +1470,12 @@ HWTEST_F(SvcSessionManagerTest, SUB_backup_sa_session_IsOnAllBundlesFinished_010 EXPECT_FALSE(ret); sessionManagerPtr_->impl_.clientToken = CLIENT_TOKEN_ID; - sessionManagerPtr_->impl_.scenario = IServiceReverse::Scenario::RESTORE; + sessionManagerPtr_->impl_.scenario = IServiceReverseType::Scenario::RESTORE; ret = sessionManagerPtr_->IsOnAllBundlesFinished(); EXPECT_FALSE(ret); sessionManagerPtr_->impl_.clientToken = CLIENT_TOKEN_ID; - sessionManagerPtr_->impl_.scenario = IServiceReverse::Scenario::UNDEFINED; + sessionManagerPtr_->impl_.scenario = IServiceReverseType::Scenario::UNDEFINED; ret = sessionManagerPtr_->IsOnAllBundlesFinished(); EXPECT_FALSE(ret); GTEST_LOG_(INFO) << "SvcSessionManagerTest-end SUB_backup_sa_session_IsOnAllBundlesFinished_0100"; diff --git a/tests/unittests/backup_sa/session/BUILD.gn b/tests/unittests/backup_sa/session/BUILD.gn index 46b847da712d3f4293485fccec930c5b75cdc474..8ac33085fc79956641f90f6df4fee9eb7765cfd8 100644 --- a/tests/unittests/backup_sa/session/BUILD.gn +++ b/tests/unittests/backup_sa/session/BUILD.gn @@ -13,6 +13,7 @@ import("//build/test.gni") import("//foundation/filemanagement/app_file_service/backup.gni") +import("//foundation/filemanagement/app_file_service/app_file_service.gni") ohos_unittest("b_incremental_session_test") { module_out_path = path_module_out_tests @@ -20,6 +21,13 @@ ohos_unittest("b_incremental_session_test") { include_dirs = [ "${path_backup}/frameworks/native/backup_kit_inner/include", "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", + "${path_backup}/services/backup_sa/include", + "${path_backup}/services/backup_sa/include/module_notify", + "${path_backup}/utils/include", + "${path_backup}/utils/src", + "${path_backup}/tests/mock/utils_mock/include", + ".", + "session", ] sources = [ @@ -30,17 +38,26 @@ ohos_unittest("b_incremental_session_test") { "${path_backup}/frameworks/native/backup_kit_inner/src/b_incremental_session_restore_async.cpp", "${path_backup}/frameworks/native/backup_kit_inner/src/service_incremental_reverse.cpp", "${path_backup}/frameworks/native/backup_kit_inner/src/service_reverse.cpp", - "${path_backup}/frameworks/native/backup_kit_inner/src/service_reverse_stub.cpp", "b_incremental_session_test.cpp", "service_proxy_mock.cpp", + "service_client_mock.cpp", + "${path_backup}/tests/mock/utils_mock/src/utils_mock_global_variable.cpp", ] - + deps = [ "${path_backup}/utils:backup_utils", + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner_ipc_stub", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + blocklist = "${path_backup}/cfi_blocklist.txt" + } + defines = [ "LOG_TAG=\"app_file_service\"", "LOG_DOMAIN=0xD200000", @@ -49,12 +66,23 @@ ohos_unittest("b_incremental_session_test") { ] external_deps = [ + "ability_base:want", + "ability_runtime:ability_connect_callback_stub", + "ability_runtime:ability_manager", + "access_token:libaccesstoken_sdk", + "access_token:libtokenid_sdk", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", + "c_utils:utils", + "common_event_service:cesfwk_innerkits", + "jsoncpp:jsoncpp", "c_utils:utils", "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "storage_service:storage_manager_sa_proxy", ] use_exceptions = true diff --git a/tests/unittests/backup_sa/session/b_incremental_session_test.cpp b/tests/unittests/backup_sa/session/b_incremental_session_test.cpp index e074a00e097a24620512974e8358bc27aa184d4a..99646d0e5df2a966f6a20f8c1b9dc4cb72d4e486 100644 --- a/tests/unittests/backup_sa/session/b_incremental_session_test.cpp +++ b/tests/unittests/backup_sa/session/b_incremental_session_test.cpp @@ -20,6 +20,7 @@ #include "b_incremental_restore_session.h" #include "b_incremental_session_restore_async.h" #include "service_proxy_mock.h" +#include "service_client.h" namespace OHOS::FileManagement::Backup { using namespace std; @@ -45,7 +46,7 @@ void IncrementalSessionTest::SetUpTestCase() restoreSession = make_shared(); BIncrementalSessionRestoreAsync::Callbacks callbacks; restoreAsyncSession = make_shared(callbacks); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; } void IncrementalSessionTest::TearDownTestCase() @@ -53,7 +54,7 @@ void IncrementalSessionTest::TearDownTestCase() backupSession = nullptr; restoreSession = nullptr; restoreAsyncSession = nullptr; - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; proxy = nullptr; } @@ -70,14 +71,13 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_0100, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_0100"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; BIncrementalBackupSession::Callbacks callbacks; EXPECT_TRUE(backupSession != nullptr); auto err = backupSession->Init(callbacks); EXPECT_EQ(err, nullptr); - EXPECT_CALL(*proxy, InitIncrementalBackupSession(_)).WillOnce(Return(-1)).WillOnce(Return(0)); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; err = backupSession->Init(callbacks); EXPECT_EQ(err, nullptr); err = backupSession->Init(callbacks); @@ -103,11 +103,11 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_0200, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_0200"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; EXPECT_TRUE(backupSession != nullptr); backupSession->RegisterBackupServiceDied(nullptr); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; backupSession->RegisterBackupServiceDied(nullptr); EXPECT_CALL(*proxy, AsObject()).WillOnce(Return(nullptr)); @@ -132,14 +132,14 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_0300, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_0300"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; vector bundlesToBackup; EXPECT_TRUE(backupSession != nullptr); auto err = backupSession->AppendBundles(bundlesToBackup); EXPECT_EQ(err, BError(BError::Codes::SDK_BROKEN_IPC).GetCode()); EXPECT_CALL(*proxy, AppendBundlesIncrementalBackupSession(_)).WillOnce(Return(0)); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; err = backupSession->AppendBundles(bundlesToBackup); EXPECT_EQ(err, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -162,13 +162,13 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_0400, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_0400"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; EXPECT_TRUE(backupSession != nullptr); auto err = backupSession->Release(); EXPECT_EQ(err, BError(BError::Codes::SDK_BROKEN_IPC).GetCode()); EXPECT_CALL(*proxy, Release()).WillOnce(Return(0)); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; err = backupSession->Release(); EXPECT_EQ(err, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -191,14 +191,14 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_0500, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_0500"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; BIncrementalRestoreSession::Callbacks callbacks; EXPECT_TRUE(restoreSession != nullptr); auto err = restoreSession->Init(callbacks); EXPECT_EQ(err, nullptr); EXPECT_CALL(*proxy, InitRestoreSession(_)).WillOnce(Return(-1)).WillOnce(Return(0)); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; err = restoreSession->Init(callbacks); EXPECT_EQ(err, nullptr); err = restoreSession->Init(callbacks); @@ -224,11 +224,11 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_0600, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_0600"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; EXPECT_TRUE(restoreSession != nullptr); restoreSession->RegisterBackupServiceDied(nullptr); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; restoreSession->RegisterBackupServiceDied(nullptr); EXPECT_CALL(*proxy, AsObject()).WillOnce(Return(nullptr)); @@ -253,16 +253,16 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_0700, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_0700"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; UniqueFd remoteCap1; vector bundlesToRestore; EXPECT_TRUE(restoreSession != nullptr); auto err = restoreSession->AppendBundles(move(remoteCap1), bundlesToRestore); EXPECT_EQ(err, BError(BError::Codes::SDK_BROKEN_IPC).GetCode()); - EXPECT_CALL(*proxy, AppendBundlesRestoreSession(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*proxy, AppendBundlesRestoreSessionRestoreDataWaitReady(_, _, _, _)).WillOnce(Return(0)); UniqueFd remoteCap2; - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; err = restoreSession->AppendBundles(move(remoteCap2), bundlesToRestore); EXPECT_EQ(err, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -285,13 +285,13 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_0800, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_0800"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; EXPECT_TRUE(restoreSession != nullptr); auto err = restoreSession->Release(); EXPECT_EQ(err, BError(BError::Codes::SDK_BROKEN_IPC).GetCode()); EXPECT_CALL(*proxy, Release()).WillOnce(Return(0)); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; err = restoreSession->Release(); EXPECT_EQ(err, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -314,14 +314,14 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_0900, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_0900"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; BFileInfo fileInfo; EXPECT_TRUE(restoreSession != nullptr); auto err = restoreSession->PublishFile(fileInfo); EXPECT_EQ(err, BError(BError::Codes::SDK_BROKEN_IPC).GetCode()); EXPECT_CALL(*proxy, PublishIncrementalFile(_)).WillOnce(Return(0)); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; err = restoreSession->PublishFile(fileInfo); EXPECT_EQ(err, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -345,7 +345,7 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_1000, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_1000"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; string bundleName; string fileName; EXPECT_TRUE(restoreSession != nullptr); @@ -353,7 +353,7 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_1000, testing::e EXPECT_EQ(err, BError(BError::Codes::SDK_BROKEN_IPC).GetCode()); EXPECT_CALL(*proxy, GetIncrementalFileHandle(_, _)).WillOnce(Return(0)); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; err = restoreSession->GetFileHandle(bundleName, fileName); EXPECT_EQ(err, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -376,7 +376,7 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_1100, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_1100"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; UniqueFd remoteCap; vector bundlesToRestore; vector detailInfos; @@ -384,8 +384,8 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_1100, testing::e auto err = restoreSession->AppendBundles(move(remoteCap), bundlesToRestore, detailInfos); EXPECT_EQ(err, BError(BError::Codes::SDK_BROKEN_IPC).GetCode()); - EXPECT_CALL(*proxy, AppendBundlesRestoreSession(_, _, _, _, _)).WillOnce(Return(0)); - ServiceProxy::serviceProxy_ = proxy; + EXPECT_CALL(*proxy, AppendBundlesRestoreSessionRestoreDataWaitSend(_, _, _, _, _)).WillOnce(Return(0)); + ServiceClient::serviceProxy_ = proxy; err = restoreSession->AppendBundles(move(remoteCap), bundlesToRestore, detailInfos); EXPECT_EQ(err, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -408,14 +408,14 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_1200, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_1200"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; BIncrementalSessionRestoreAsync::Callbacks callbacks; EXPECT_TRUE(restoreAsyncSession != nullptr); auto err = restoreAsyncSession->Init(callbacks); EXPECT_EQ(err, nullptr); EXPECT_CALL(*proxy, InitRestoreSession(_)).WillOnce(Return(-1)).WillOnce(Return(0)); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; err = restoreAsyncSession->Init(callbacks); EXPECT_EQ(err, nullptr); err = restoreAsyncSession->Init(callbacks); @@ -441,11 +441,11 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_1300, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_1300"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; EXPECT_TRUE(restoreAsyncSession != nullptr); restoreAsyncSession->RegisterBackupServiceDied(nullptr); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; restoreAsyncSession->RegisterBackupServiceDied(nullptr); EXPECT_CALL(*proxy, AsObject()).WillOnce(Return(nullptr)); @@ -470,16 +470,16 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_1400, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_1400"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; UniqueFd remoteCap1; vector bundlesToRestore; EXPECT_TRUE(restoreAsyncSession != nullptr); auto err = restoreAsyncSession->AppendBundles(move(remoteCap1), bundlesToRestore); EXPECT_EQ(err, BError(BError::Codes::SDK_BROKEN_IPC).GetCode()); - EXPECT_CALL(*proxy, AppendBundlesRestoreSession(_, _, _, _)).WillOnce(Return(0)); + EXPECT_CALL(*proxy, AppendBundlesRestoreSessionRestoreDataWaitReady(_, _, _, _)).WillOnce(Return(0)); UniqueFd remoteCap2; - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; err = restoreAsyncSession->AppendBundles(move(remoteCap2), bundlesToRestore); EXPECT_EQ(err, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -502,14 +502,14 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_1500, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_1500"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; BFileInfo fileInfo; EXPECT_TRUE(restoreAsyncSession != nullptr); auto err = restoreAsyncSession->PublishFile(fileInfo); EXPECT_EQ(err, BError(BError::Codes::SDK_BROKEN_IPC).GetCode()); EXPECT_CALL(*proxy, PublishIncrementalFile(_)).WillOnce(Return(0)); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; err = restoreAsyncSession->PublishFile(fileInfo); EXPECT_EQ(err, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -533,7 +533,7 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_1600, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_1600"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; string bundleName; string fileName; EXPECT_TRUE(restoreAsyncSession != nullptr); @@ -541,7 +541,7 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_1600, testing::e EXPECT_EQ(err, BError(BError::Codes::SDK_BROKEN_IPC).GetCode()); EXPECT_CALL(*proxy, GetIncrementalFileHandle(_, _)).WillOnce(Return(0)); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; err = restoreAsyncSession->GetFileHandle(bundleName, fileName); EXPECT_EQ(err, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -564,7 +564,7 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_1700, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_1700"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; UniqueFd remoteCap; vector bundlesToRestore; vector detailInfos; @@ -572,8 +572,8 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_1700, testing::e auto err = restoreAsyncSession->AppendBundles(move(remoteCap), bundlesToRestore, detailInfos); EXPECT_EQ(err, BError(BError::Codes::SDK_BROKEN_IPC).GetCode()); - EXPECT_CALL(*proxy, AppendBundlesRestoreSession(_, _, _, _, _)).WillOnce(Return(0)); - ServiceProxy::serviceProxy_ = proxy; + EXPECT_CALL(*proxy, AppendBundlesRestoreSessionRestoreDataWaitSend(_, _, _, _, _)).WillOnce(Return(0)); + ServiceClient::serviceProxy_ = proxy; err = restoreAsyncSession->AppendBundles(move(remoteCap), bundlesToRestore, detailInfos); EXPECT_EQ(err, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -596,13 +596,13 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_1800, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_1800"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; EXPECT_TRUE(restoreAsyncSession != nullptr); auto err = restoreAsyncSession->Release(); EXPECT_EQ(err, BError(BError::Codes::SDK_BROKEN_IPC).GetCode()); EXPECT_CALL(*proxy, Release()).WillOnce(Return(0)); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; err = restoreAsyncSession->Release(); EXPECT_EQ(err, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -625,15 +625,15 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_1900, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_1900"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; vector bundlesToBackup; vector infos; EXPECT_TRUE(backupSession != nullptr); auto err = backupSession->AppendBundles(bundlesToBackup, infos); EXPECT_EQ(err, BError(BError::Codes::SDK_BROKEN_IPC).GetCode()); - EXPECT_CALL(*proxy, AppendBundlesIncrementalBackupSession(_, _)).WillOnce(Return(0)); - ServiceProxy::serviceProxy_ = proxy; + EXPECT_CALL(*proxy, AppendBundlesIncrementalBackupSessionWithBundleInfos(_, _)).WillOnce(Return(0)); + ServiceClient::serviceProxy_ = proxy; err = backupSession->AppendBundles(bundlesToBackup, infos); EXPECT_EQ(err, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -656,7 +656,7 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_2000, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_2000"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; BFileInfo fileInfo; UniqueFd fd; EXPECT_TRUE(restoreSession != nullptr); @@ -664,7 +664,7 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_2000, testing::e EXPECT_EQ(err, BError(BError::Codes::SDK_BROKEN_IPC).GetCode()); EXPECT_CALL(*proxy, PublishSAIncrementalFile(_, _)).WillOnce(Return(0)); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; err = restoreSession->PublishSAFile(fileInfo, move(fd)); EXPECT_EQ(err, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -687,14 +687,14 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_2100, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_2100"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; std::string bundleName; EXPECT_TRUE(backupSession != nullptr); auto err = backupSession->Cancel(bundleName); EXPECT_EQ(err, BError(BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK).GetCode()); EXPECT_CALL(*proxy, Cancel(_, _)).WillOnce(DoAll(SetArgReferee<1>(0), Return(0))); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; err = backupSession->Cancel(bundleName); EXPECT_EQ(err, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -717,14 +717,14 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_2200, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_2200"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; std::string bundleName; EXPECT_TRUE(restoreSession != nullptr); auto err = restoreSession->Cancel(bundleName); EXPECT_EQ(err, BError(BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK).GetCode()); EXPECT_CALL(*proxy, Cancel(_, _)).WillOnce(DoAll(SetArgReferee<1>(0), Return(0))); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; err = restoreSession->Cancel(bundleName); EXPECT_EQ(err, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -747,14 +747,14 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_2300, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_2300"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; std::string bundleName; EXPECT_TRUE(restoreAsyncSession != nullptr); auto err = restoreAsyncSession->Cancel(bundleName); EXPECT_EQ(err, BError(BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK).GetCode()); EXPECT_CALL(*proxy, Cancel(_, _)).WillOnce(DoAll(SetArgReferee<1>(0), Return(0))); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; err = restoreAsyncSession->Cancel(bundleName); EXPECT_EQ(err, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -779,14 +779,14 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_2400, testing::e try { std::string errMsg; ErrCode errCode; - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; BIncrementalBackupSession::Callbacks callbacks; EXPECT_TRUE(backupSession != nullptr); auto err = backupSession->Init(callbacks, errMsg, errCode); EXPECT_EQ(err, nullptr); - EXPECT_CALL(*proxy, InitIncrementalBackupSession(_, _)).WillOnce(Return(-1)).WillOnce(Return(0)); - ServiceProxy::serviceProxy_ = proxy; + EXPECT_CALL(*proxy, InitIncrementalBackupSessionWithErrMsg(_, _)).WillOnce(Return(-1)).WillOnce(Return(0)); + ServiceClient::serviceProxy_ = proxy; err = backupSession->Init(callbacks, errMsg, errCode); EXPECT_EQ(err, nullptr); err = backupSession->Init(callbacks, errMsg, errCode); @@ -813,14 +813,14 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_2500, testing::e try { std::string errMsg; ErrCode errCode; - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; BIncrementalRestoreSession::Callbacks callbacks; EXPECT_TRUE(restoreSession != nullptr); auto err = restoreSession->Init(callbacks, errMsg, errCode); EXPECT_EQ(err, nullptr); - EXPECT_CALL(*proxy, InitRestoreSession(_, _)).WillOnce(Return(-1)).WillOnce(Return(0)); - ServiceProxy::serviceProxy_ = proxy; + EXPECT_CALL(*proxy, InitRestoreSessionWithErrMsg(_, _)).WillOnce(Return(-1)).WillOnce(Return(0)); + ServiceClient::serviceProxy_ = proxy; err = restoreSession->Init(callbacks, errMsg, errCode); EXPECT_EQ(err, nullptr); err = restoreSession->Init(callbacks, errMsg, errCode); @@ -845,17 +845,17 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_2600, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_2600"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; EXPECT_TRUE(backupSession != nullptr); auto err = backupSession->GetLocalCapabilities(); EXPECT_EQ(err.Get(), -EPERM); - ServiceProxy::serviceProxy_ = proxy; - EXPECT_CALL(*proxy, GetLocalCapabilitiesForBundleInfos()).WillOnce(Return(UniqueFd(-1))); + ServiceClient::serviceProxy_ = proxy; + EXPECT_CALL(*proxy, GetLocalCapabilitiesForBundleInfos(_)).WillOnce(Return(-1)); err = backupSession->GetLocalCapabilities(); EXPECT_EQ(err.Get(), -EPERM); - EXPECT_CALL(*proxy, GetLocalCapabilitiesForBundleInfos()).WillOnce(Return(UniqueFd(0))); + EXPECT_CALL(*proxy, GetLocalCapabilitiesForBundleInfos(_)).WillOnce(DoAll(testing::SetArgReferee<0>(0),Return(0))); err = backupSession->GetLocalCapabilities(); EXPECT_EQ(err.Get(), 0); } catch (...) { @@ -878,17 +878,17 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_2700, testing::e { GTEST_LOG_(INFO) << "IncrementalSessionTest-begin SUB_b_incremental_session_test_2700"; try { - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; EXPECT_TRUE(restoreSession != nullptr); auto err = restoreSession->GetLocalCapabilities(); EXPECT_EQ(err.Get(), -EPERM); - ServiceProxy::serviceProxy_ = proxy; - EXPECT_CALL(*proxy, GetLocalCapabilitiesForBundleInfos()).WillOnce(Return(UniqueFd(-1))); + ServiceClient::serviceProxy_ = proxy; + EXPECT_CALL(*proxy, GetLocalCapabilitiesForBundleInfos(_)).WillOnce(Return(-1)); err = restoreSession->GetLocalCapabilities(); EXPECT_EQ(err.Get(), -EPERM); - EXPECT_CALL(*proxy, GetLocalCapabilitiesForBundleInfos()).WillOnce(Return(UniqueFd(0))); + EXPECT_CALL(*proxy, GetLocalCapabilitiesForBundleInfos(_)).WillOnce(DoAll(testing::SetArgReferee<0>(0),Return(0))); err = restoreSession->GetLocalCapabilities(); EXPECT_EQ(err.Get(), 0); } catch (...) { diff --git a/tests/unittests/backup_sa/session/service_client_mock.cpp b/tests/unittests/backup_sa/session/service_client_mock.cpp new file mode 100644 index 0000000000000000000000000000000000000000..8e9868f89c42a5419ddf3561d410d45e75ecf67b --- /dev/null +++ b/tests/unittests/backup_sa/session/service_client_mock.cpp @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +#include "service_client.h" +#include "iservice.h" +#include "service_proxy.h" +namespace OHOS::FileManagement::Backup { +using namespace std; + +bool ServiceClient::CheckServiceProxy() +{ + serviceProxy_= ServiceClient::GetInstance(); + bool isNull=false; + if (serviceProxy_!=nullptr){ + isNull=true; + } + return isNull; +} + + +sptr ServiceClient::GetServiceProxyPointer() +{ + return serviceProxy_; +} + +sptr ServiceClient::GetInstance() +{ + + return serviceProxy_; +} + +void ServiceClient::InvaildInstance() +{ + +} + +void ServiceClient::ServiceProxyLoadCallback::OnLoadSystemAbilitySuccess(int32_t systemAbilityId, + const OHOS::sptr &remoteObject) +{ + +} + +void ServiceClient::ServiceProxyLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) +{ + +} +} \ No newline at end of file diff --git a/tests/unittests/backup_sa/session/service_client_mock.h b/tests/unittests/backup_sa/session/service_client_mock.h new file mode 100644 index 0000000000000000000000000000000000000000..95cdcef277be5db426579df12b806bdc7e566e3d --- /dev/null +++ b/tests/unittests/backup_sa/session/service_client_mock.h @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2024 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef TEST_UNITTEST_SERVICE_CLIENT_MOCK_H +#define TEST_UNITTEST_SERVICE_CLIENT_MOCK_H + +#include + +#include "service_client.h" + +namespace OHOS::FileManagement::Backup { +class ServiceClientMock : public ServiceClient { + +public: + MOCK_METHOD0(GetServiceProxyPointer, bool()); + MOCK_METHOD0(GetInstance, sptr()); + MOCK_METHOD0(InvaildInstance, sptr()); + MOCK_METHOD0(InvaildInstance, void()); + MOCK_METHOD0(Start, ErrCode()); + +}; +} // End of namespace OHOS::FileManagement::Backup +#endif // TEST_UNITTEST_SERVICE_PROXY_MOCK_H diff --git a/tests/unittests/backup_sa/session/service_proxy_mock.cpp b/tests/unittests/backup_sa/session/service_proxy_mock.cpp index 41cce333d8a524ee09552d34d4c02dcad095c08d..554663660080bb1142db264fd920514d2cfbf392 100644 --- a/tests/unittests/backup_sa/session/service_proxy_mock.cpp +++ b/tests/unittests/backup_sa/session/service_proxy_mock.cpp @@ -16,154 +16,171 @@ #include "service_proxy.h" #include "b_error/b_error.h" - +#include "utils_mock_global_variable.h" namespace OHOS::FileManagement::Backup { using namespace std; -int32_t ServiceProxy::InitRestoreSession(sptr remote) -{ - return 0; -} -int32_t ServiceProxy::InitRestoreSession(sptr remote, std::string &errMsg) +ErrCode ServiceProxy::AppFileReady(const std::string& fileName,int32_t fd,int32_t appFileReadyErrCode) { - return 0; + return BError(BError::Codes::OK); } -int32_t ServiceProxy::InitBackupSession(sptr remote) + +ErrCode ServiceProxy::AppDone(int32_t appDoneErrCode) { - return 0; + return BError(BError::Codes::OK); } - -int32_t ServiceProxy::InitBackupSession(sptr remote, std::string &errMsg) +ErrCode ServiceProxy::RefreshDataSize(int64_t totalDataSize) { - return 0; + return BError(BError::Codes::OK); } - -ErrCode ServiceProxy::Start() +ErrCode ServiceProxy::AppIncrementalDone(int32_t appIncrementalDoneErrCode) { return BError(BError::Codes::OK); } - -UniqueFd ServiceProxy::GetLocalCapabilities() +ErrCode ServiceProxy::AppIncrementalFileReady(const std::string& fileName,int32_t fd,int32_t manifestFd,int32_t appIncrementalFileReadyErrCode) { - return UniqueFd(-1); + return BError(BError::Codes::OK); } - -ErrCode ServiceProxy::PublishFile(const BFileInfo &fileInfo) +ErrCode ServiceProxy:: PublishSAIncrementalFile(const BFileInfo& fileInfo, int32_t fd) { - return BError(BError::Codes::OK); + return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppFileReady(const string &fileName, UniqueFd fd, int32_t errCode) +ErrCode ServiceProxy:: PublishIncrementalFile(const BFileInfo& fileInfo) { - return BError(BError::Codes::OK); -} + return BError(BError::Codes::OK); +} -ErrCode ServiceProxy::AppDone(ErrCode errCode) +int32_t ServiceProxy::InitRestoreSession(sptr& remote) { - return BError(BError::Codes::OK); + if (!GetMockInitBackupOrRestoreSession()){ + return 0; + } + return 1; } -ErrCode ServiceProxy::ServiceResultReport(const std::string restoreRetInfo, - BackupRestoreScenario scenario, ErrCode errCode) +int32_t ServiceProxy::InitRestoreSessionWithErrMsg(sptr& remote, std::string &errMsg) { - return BError(BError::Codes::OK); + return 0; } -ErrCode ServiceProxy::GetFileHandle(const string &bundleName, const string &fileName) + +int32_t ServiceProxy::InitBackupSessionWithErrMsg(sptr& remote, std::string &errMsg) { - return BError(BError::Codes::OK); + return 0; } -ErrCode ServiceProxy::AppendBundlesRestoreSession(UniqueFd fd, const vector &bundleNames, - const vector &detailInfos, RestoreTypeEnum restoreType, int32_t userId) +ErrCode ServiceProxy::Start() { return BError(BError::Codes::OK); } - -ErrCode ServiceProxy::AppendBundlesRestoreSession(UniqueFd fd, - const vector &bundleNames, - RestoreTypeEnum restoreType, - int32_t userId) +ErrCode ServiceProxy:: AppendBundlesIncrementalBackupSessionWithBundleInfos(const std::vector& bundlesToBackup,const std::vector& bundleInfos) { - return BError(BError::Codes::OK); + return BError(BError::Codes::OK); } - -ErrCode ServiceProxy::AppendBundlesBackupSession(const vector &bundleNames) +ErrCode ServiceProxy:: AppendBundlesIncrementalBackupSession(const std::vector& bundlesToBackup) { return BError(BError::Codes::OK); } - -ErrCode ServiceProxy::AppendBundlesDetailsBackupSession(const std::vector &bundleNames, - const std::vector &detailInfos) +ErrCode ServiceProxy:: Cancel(const std::string& bundleName,int32_t& cancelResult) { return BError(BError::Codes::OK); } - -ErrCode ServiceProxy::Finish() + ErrCode ServiceProxy::PublishFile(const BFileInfo& fileInfo) { return BError(BError::Codes::OK); } - -ErrCode ServiceProxy::Release() +ErrCode ServiceProxy::ReportAppProcessInfo( const std::string& processInfo,BackupRestoreScenario scenario) { - return BError(BError::Codes::OK); + return BError(BError::Codes::OK); } + -ErrCode ServiceProxy::Cancel(std::string bundleName, int32_t &result) +int32_t ServiceProxy::InitBackupSession(sptr& remote) +{ + if (!GetMockInitBackupOrRestoreSession()) + { + return 0; + } + return 1; +} + + ErrCode ServiceProxy::ServiceResultReport( + const std::string& restoreRetInfo, + BackupRestoreScenario scenario, + int32_t serviceResultReportErrCode) { - result = BError(BError::Codes::OK); return BError(BError::Codes::OK); } -UniqueFd ServiceProxy::GetLocalCapabilitiesIncremental(const vector &bundleNames) +ErrCode ServiceProxy:: GetLocalCapabilitiesWithUniqueFd(int32_t& fd) { - return UniqueFd(-1); + return BError(BError::Codes::OK); } - -ErrCode ServiceProxy::GetAppLocalListAndDoIncrementalBackup() +ErrCode ServiceProxy::GetLocalCapabilitiesIncremental( const std::vector& bundleNames, int32_t& fd) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::InitIncrementalBackupSession(sptr remote) + +ErrCode ServiceProxy::GetFileHandle(const string &bundleName, const string &fileName) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::InitIncrementalBackupSession(sptr remote, std::string &errMsg) + ErrCode ServiceProxy::AppendBundlesRestoreSessionRestoreDataWaitSend( + int32_t fd, + const std::vector& bundleNames, + const std::vector& detailInfos, + int32_t restoreType, + int32_t userId) + { + +return BError(BError::Codes::OK); + } + + ErrCode ServiceProxy::AppendBundlesRestoreSessionRestoreDataWaitReady( + int32_t fd, + const std::vector& bundleNames, + int32_t restoreType, + int32_t userId){ + return BError(BError::Codes::OK); + } +ErrCode ServiceProxy::AppendBundlesBackupSession(const vector &bundleNames) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppendBundlesIncrementalBackupSession(const vector &bundlesToBackup) +ErrCode ServiceProxy::AppendBundlesDetailsBackupSession(const std::vector &bundleNames, + const std::vector &detailInfos) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppendBundlesIncrementalBackupSession(const vector &bundlesToBackup, - const std::vector &infos) +ErrCode ServiceProxy::Finish() { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::PublishIncrementalFile(const BFileInfo &fileInfo) +ErrCode ServiceProxy::Release() { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::PublishSAIncrementalFile(const BFileInfo &fileInfo, UniqueFd fd) + +ErrCode ServiceProxy::GetAppLocalListAndDoIncrementalBackup() { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppIncrementalFileReady(const string &fileName, UniqueFd fd, UniqueFd manifestFd, int32_t errCode) +ErrCode ServiceProxy::InitIncrementalBackupSession(sptr& remote) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppIncrementalDone(ErrCode errCode) +ErrCode ServiceProxy::InitIncrementalBackupSessionWithErrMsg(sptr& remote, std::string &errMsg) { return BError(BError::Codes::OK); } @@ -197,44 +214,18 @@ ErrCode ServiceProxy::StopExtTimer(bool &isExtStop) { return BError(BError::Codes::OK); } - -ErrCode ServiceProxy::RefreshDataSize(int64_t totalsize) -{ - return BError(BError::Codes::OK); -} - ErrCode ServiceProxy::UpdateSendRate(std::string &bundleName, int32_t sendRate, bool &result) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::ReportAppProcessInfo(const std::string processInfo, const BackupRestoreScenario sennario) -{ - return BError(BError::Codes::OK); -} - -sptr ServiceProxy::GetServiceProxyPointer() -{ - return serviceProxy_; -} - -sptr ServiceProxy::GetInstance() -{ - return serviceProxy_; -} - -void ServiceProxy::InvaildInstance() {} - -void ServiceProxy::ServiceProxyLoadCallback::OnLoadSystemAbilitySuccess(int32_t, const OHOS::sptr&) {} - -void ServiceProxy::ServiceProxyLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) {} - -UniqueFd ServiceProxy::GetLocalCapabilitiesForBundleInfos() +ErrCode ServiceProxy::GetLocalCapabilitiesForBundleInfos(int32_t &fd) { - return UniqueFd(-1); + fd = -1; + return fd; } -ErrCode ServiceProxy::GetBackupDataSize(bool isPreciseScan, vector bundleNameList) +ErrCode ServiceProxy::GetBackupDataSize(bool isPreciseScan, const vector& bundleNameList) { return BError(BError::Codes::OK); } diff --git a/tests/unittests/backup_sa/session/service_proxy_mock.h b/tests/unittests/backup_sa/session/service_proxy_mock.h index b734c8dac5ed4c0c6a3f0449874f84405f335d47..f44c26e7b80f60b9741159954b389205066afc26 100644 --- a/tests/unittests/backup_sa/session/service_proxy_mock.h +++ b/tests/unittests/backup_sa/session/service_proxy_mock.h @@ -26,48 +26,49 @@ public: explicit ServiceProxyMock(const sptr &impl) : ServiceProxy(impl) {} ~ServiceProxyMock() override {} public: - MOCK_METHOD1(InitRestoreSession, ErrCode(sptr remote)); - MOCK_METHOD2(InitRestoreSession, ErrCode(sptr remote, std::string &errMsg)); - MOCK_METHOD1(InitBackupSession, ErrCode(sptr remote)); - MOCK_METHOD2(InitBackupSession, ErrCode(sptr remote, std::string &errMsg)); + MOCK_METHOD1(InitRestoreSession, ErrCode(sptr& remote)); + MOCK_METHOD2(InitRestoreSessionWithErrMsg, ErrCode(sptr& remote, std::string &errMsg)); + MOCK_METHOD1(InitBackupSession, ErrCode(sptr&remote)); + MOCK_METHOD2(InitBackupSessionWithErrMsg, ErrCode(sptr& remote, std::string &errMsg)); MOCK_METHOD0(Start, ErrCode()); MOCK_METHOD0(AsObject, sptr()); - MOCK_METHOD0(GetLocalCapabilities, UniqueFd()); - MOCK_METHOD0(GetLocalCapabilitiesForBundleInfos, UniqueFd()); + MOCK_METHOD1(GetLocalCapabilitiesForBundleInfos, ErrCode(int32_t&)); MOCK_METHOD1(PublishFile, ErrCode(const BFileInfo &fileInfo)); - MOCK_METHOD2(AppFileReady, ErrCode(const std::string &fileName, UniqueFd fd)); - MOCK_METHOD3(AppFileReady, ErrCode(const std::string &fileName, UniqueFd fd, int32_t errCode)); - MOCK_METHOD1(AppDone, ErrCode(ErrCode errCode)); - MOCK_METHOD3(ServiceResultReport, ErrCode(const std::string restoreRetInfo, - BackupRestoreScenario scenario, ErrCode errCode)); + MOCK_METHOD2(AppFileReady, ErrCode(const std::string &fileName, int32_t fd)); + MOCK_METHOD3(AppFileReady, ErrCode(const std::string &fileName, int32_t fd, int32_t errCode)); + MOCK_METHOD1(AppDone, ErrCode(int32_t errCode)); + MOCK_METHOD2(GetFileHandle, ErrCode(const std::string &bundleName, const std::string &fileName)); - MOCK_METHOD5(AppendBundlesRestoreSession, ErrCode(UniqueFd fd, const std::vector &bundleNames, - const std::vector &detailInfos, RestoreTypeEnum restoreType, int32_t userId)); - MOCK_METHOD4(AppendBundlesRestoreSession, ErrCode(UniqueFd fd, const std::vector &bundleNames, - RestoreTypeEnum restoreType, int32_t userId)); + MOCK_METHOD1(AppendBundlesBackupSession, ErrCode(const std::vector &bundleNames)); MOCK_METHOD0(Finish, ErrCode()); MOCK_METHOD0(Release, ErrCode()); - MOCK_METHOD2(Cancel, ErrCode(std::string bundleName, int32_t &result)); - MOCK_METHOD1(GetLocalCapabilitiesIncremental, UniqueFd(const std::vector &bundleNames)); - MOCK_METHOD1(InitIncrementalBackupSession, ErrCode(sptr remote)); - MOCK_METHOD2(InitIncrementalBackupSession, ErrCode(sptr remote, std::string &errMsg)); + MOCK_METHOD2(Cancel, ErrCode(const std::string & bundleName, int32_t &result)); + MOCK_METHOD2(GetLocalCapabilitiesIncremental, ErrCode(const std::vector &bundleNames,int32_t &fd)); + MOCK_METHOD1(InitIncrementalBackupSession, ErrCode(sptr& remote)); + MOCK_METHOD2(InitIncrementalBackupSessionWithErrMsg, ErrCode(sptr& remote, std::string &errMsg)); MOCK_METHOD1(AppendBundlesIncrementalBackupSession, ErrCode(const std::vector &bundlesToBackup)); - MOCK_METHOD2(AppendBundlesIncrementalBackupSession, + MOCK_METHOD2(AppendBundlesIncrementalBackupSessionWithBundleInfos, ErrCode(const std::vector &bundlesToBackup, const std::vector &infos)); MOCK_METHOD1(PublishIncrementalFile, ErrCode(const BFileInfo &fileInfo)); - MOCK_METHOD2(PublishSAIncrementalFile, ErrCode(const BFileInfo &fileInfo, UniqueFd fd)); - MOCK_METHOD3(AppIncrementalFileReady, ErrCode(const std::string &fileName, UniqueFd fd, UniqueFd manifestFd)); - MOCK_METHOD4(AppIncrementalFileReady, ErrCode(const std::string &fileName, UniqueFd fd, UniqueFd manifestFd, + MOCK_METHOD2(PublishSAIncrementalFile, ErrCode(const BFileInfo &fileInfo, int32_t fd)); + MOCK_METHOD3(AppIncrementalFileReady, ErrCode(const std::string &fileName, int32_t fd, int32_t manifestFd)); + MOCK_METHOD4(AppIncrementalFileReady, ErrCode(const std::string &fileName, int32_t fd, int32_t manifestFd, int32_t errCode)); - MOCK_METHOD1(AppIncrementalDone, ErrCode(ErrCode errCode)); + MOCK_METHOD1(AppIncrementalDone, ErrCode(int32_t errCode)); MOCK_METHOD2(GetIncrementalFileHandle, ErrCode(const std::string &bundleName, const std::string &fileName)); MOCK_METHOD2(GetBackupInfo, ErrCode(BundleName &bundleName, std::string &result)); MOCK_METHOD3(UpdateTimer, ErrCode(BundleName &bundleName, uint32_t timeout, bool &result)); MOCK_METHOD0(GetAppLocalListAndDoIncrementalBackup, ErrCode()); MOCK_METHOD1(StopExtTimer, ErrCode(bool &isExtStop)); MOCK_METHOD1(RefreshDataSize, ErrCode(int64_t totalsize)); - MOCK_METHOD2(GetBackupDataSize, ErrCode(bool isPreciseScan, std::vector bundleNameList)); + MOCK_METHOD5(AppendBundlesRestoreSessionRestoreDataWaitSend, + ErrCode(int32_t, + const std::vector &, + const std::vector &, + int32_t, int32_t)); + MOCK_METHOD4(AppendBundlesRestoreSessionRestoreDataWaitReady, ErrCode(int32_t, const std::vector &, int32_t, int32_t)); + MOCK_METHOD2(GetBackupDataSize, ErrCode(bool isPreciseScan, const std::vector& bundleNameList)); }; } // End of namespace OHOS::FileManagement::Backup #endif // TEST_UNITTEST_SERVICE_PROXY_MOCK_H diff --git a/tests/unittests/backup_tools/BUILD.gn b/tests/unittests/backup_tools/BUILD.gn index 0a0c1d50a5090e3fa56cf0a24ab54176d2790ff6..aa56007902c6596250892920f1137bd8f304952f 100644 --- a/tests/unittests/backup_tools/BUILD.gn +++ b/tests/unittests/backup_tools/BUILD.gn @@ -25,7 +25,6 @@ ohos_unittest("backup_tool_test") { "${path_backup}/frameworks/native/backup_kit_inner/src/b_incremental_data.cpp", "${path_backup}/frameworks/native/backup_kit_inner/src/service_incremental_reverse.cpp", "${path_backup}/frameworks/native/backup_kit_inner/src/service_reverse.cpp", - "${path_backup}/frameworks/native/backup_kit_inner/src/service_reverse_stub.cpp", "${path_backup}/tests/mock/backup_kit_inner/b_session_backup_mock.cpp", "${path_backup}/tools/backup_tool/src/tools_op.cpp", "${path_backup}/tools/backup_tool/src/tools_op_backup.cpp", @@ -50,6 +49,7 @@ ohos_unittest("backup_tool_test") { include_dirs += backup_mock_utils_include deps = [ + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", @@ -91,7 +91,6 @@ ohos_unittest("backup_tool_restore_test") { "${path_backup}/frameworks/native/backup_kit_inner/src/b_incremental_restore_session.cpp", "${path_backup}/frameworks/native/backup_kit_inner/src/service_incremental_reverse.cpp", "${path_backup}/frameworks/native/backup_kit_inner/src/service_reverse.cpp", - "${path_backup}/frameworks/native/backup_kit_inner/src/service_reverse_stub.cpp", "${path_backup}/tests/mock/backup_kit_inner/b_session_restore_async_mock.cpp", "${path_backup}/tests/mock/backup_kit_inner/b_session_restore_mock.cpp", "${path_backup}/tools/backup_tool/src/tools_op.cpp", @@ -108,10 +107,12 @@ ohos_unittest("backup_tool_restore_test") { "${path_backup}/interfaces/inner_api/native/backup_kit_inner", "${path_backup}/tools/backup_tool/include", "${path_backup}/tools/backup_tool/src", + "${target_gen_dir}/interfaces/inner_api/native/backup_kit_inner" ] include_dirs += backup_mock_utils_include deps = [ + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", diff --git a/tests/unittests/backup_tools/backup_tool/tools_op_restore_async_test.cpp b/tests/unittests/backup_tools/backup_tool/tools_op_restore_async_test.cpp index cc797c548c9475a7a4664552ec0d23784e5331e4..51acb74368ae83c271e8cee995c5617988458826 100644 --- a/tests/unittests/backup_tools/backup_tool/tools_op_restore_async_test.cpp +++ b/tests/unittests/backup_tools/backup_tool/tools_op_restore_async_test.cpp @@ -27,7 +27,7 @@ #include "b_error/b_error.h" #include "b_error/b_excep_utils.h" -#include "b_file_info.h" +#include "backup_file_info.h" #include "tools_op_restore_async.cpp" namespace OHOS::FileManagement::Backup { diff --git a/tests/unittests/backup_tools/backup_tool/tools_op_restore_test.cpp b/tests/unittests/backup_tools/backup_tool/tools_op_restore_test.cpp index 6244fabf5afb683e65d7ff5473b68541320186a1..de6e6ba9120ca3437b6ab6947d748b1e8f61633a 100644 --- a/tests/unittests/backup_tools/backup_tool/tools_op_restore_test.cpp +++ b/tests/unittests/backup_tools/backup_tool/tools_op_restore_test.cpp @@ -28,7 +28,7 @@ #include "b_error/b_error.h" #include "b_error/b_excep_utils.h" -#include "b_file_info.h" +#include "backup_file_info.h" #include "tools_op_restore.cpp" namespace OHOS::FileManagement::Backup { diff --git a/tools/backup_tool/src/tools_op_backup.cpp b/tools/backup_tool/src/tools_op_backup.cpp index 745fe725ea3817183dc32b3e5e0f0e2b7d9f8b95..4162af631238ab8650c9941dce6124ef11e7367b 100644 --- a/tools/backup_tool/src/tools_op_backup.cpp +++ b/tools/backup_tool/src/tools_op_backup.cpp @@ -39,7 +39,7 @@ #include "b_resources/b_constants.h" #include "backup_kit_inner.h" #include "base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter/hitrace_meter.h" -#include "service_proxy.h" +#include "service_client.h" #include "tools_op.h" #include "tools_op_backup.h" @@ -240,12 +240,13 @@ static int32_t InitPathCapFile(const string &pathCapFile, vector bundleN fprintf(stderr, "Failed to open file. error: %d %s\n", errno, strerror(errno)); return -EPERM; } - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (!proxy) { fprintf(stderr, "Get an empty backup sa proxy\n"); return -EPERM; } - BFile::SendFile(fdLocal, proxy->GetLocalCapabilities()); + int fd = -1; + BFile::SendFile(fdLocal, proxy->GetLocalCapabilitiesWithUniqueFd(fd)); auto ctx = make_shared(); ctx->session_ = BSessionBackup::Init( diff --git a/tools/backup_tool/src/tools_op_check_sa.cpp b/tools/backup_tool/src/tools_op_check_sa.cpp index 5e781f31699779dfb7988542d342d43aed1c001c..56535dea54d04915c1eb15eb485f83554a1a7593 100644 --- a/tools/backup_tool/src/tools_op_check_sa.cpp +++ b/tools/backup_tool/src/tools_op_check_sa.cpp @@ -17,7 +17,7 @@ #include #include "errors.h" -#include "service_proxy.h" +#include "service_client.h" #include "tools_op.h" #include "tools_op_check_sa.h" @@ -31,7 +31,7 @@ static string GenHelpMsg() static int Exec(map> &mapArgToVal) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (!proxy) { fprintf(stderr, "Get an empty backup sa proxy\n"); return -EFAULT; diff --git a/tools/backup_tool/src/tools_op_incremental_backup.cpp b/tools/backup_tool/src/tools_op_incremental_backup.cpp index 41a97190cacb2010bd8b4ff1ebed9e0b944128ba..c4a2682fcc133663ebe7ae6d9db2c304d7a41786 100644 --- a/tools/backup_tool/src/tools_op_incremental_backup.cpp +++ b/tools/backup_tool/src/tools_op_incremental_backup.cpp @@ -42,7 +42,7 @@ #include "b_resources/b_constants.h" #include "backup_kit_inner.h" #include "base/hiviewdfx/hitrace/interfaces/native/innerkits/include/hitrace_meter/hitrace_meter.h" -#include "service_proxy.h" +#include "service_client.h" #include "tools_op.h" namespace OHOS::FileManagement::Backup { @@ -273,7 +273,7 @@ static int GetLocalCapabilitiesIncremental(shared_ptr ctx, fprintf(stderr, "Failed to open file. error: %d %s\n", errno, strerror(errno)); return -EPERM; } - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (!proxy) { fprintf(stderr, "Get an empty backup sa proxy\n"); return -EPERM; @@ -286,11 +286,13 @@ static int GetLocalCapabilitiesIncremental(shared_ptr ctx, ctx->lastIncrementalData.push_back(data); num++; } - UniqueFd fd = proxy->GetLocalCapabilitiesIncremental(ctx->lastIncrementalData); + int32_t fdVal = -1; + proxy->GetLocalCapabilitiesIncremental(ctx->lastIncrementalData, fdVal); + UniqueFd fd(static_cast(fdVal)); if (fd < 0) { fprintf(stderr, "error GetLocalCapabilitiesIncremental"); } else { - BFile::SendFile(fdLocal, fd); + BFile::SendFile(fdLocal, std::move(fd)); } return 0; } diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 95b58a5ad5851f63727e2c5192bfc25fc293c607..0acecd72e0fa71d06c5278882efcefb8424e798a 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -84,7 +84,10 @@ ohos_shared_library("backup_utils") { "src/b_utils/b_time.cpp", ] - configs = [ ":utils_private_config" ] + configs = [ + ":utils_private_config", + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:public_idl_config", + ] public_configs = [ ":utils_public_config" ] external_deps = [ @@ -106,9 +109,10 @@ ohos_shared_library("backup_utils") { "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", "${path_backup}/utils/include", ] - + print("utils_public_config include_dirs:", configs) deps = [ ":backup_cxx_cppdeps", + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner_ipc_type", "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", "${path_jsoncpp}:jsoncpp", "//third_party/openssl:libcrypto_shared", diff --git a/utils/include/b_radar/b_radar.h b/utils/include/b_radar/b_radar.h index 16d4a17f41050da933bcff018e2195b0e582dc18..a90a34b492ae0ec7e64d0d6f6c53fa650d9c1933 100644 --- a/utils/include/b_radar/b_radar.h +++ b/utils/include/b_radar/b_radar.h @@ -17,7 +17,7 @@ #define OHOS_FILEMGMT_BACKUP_B_RADAR_H #include #include -#include "i_service_reverse.h" +#include "service_reverse_inner_type.h" namespace OHOS::FileManagement::Backup { enum class BizStageBackup : int32_t { @@ -119,7 +119,7 @@ public: enum BizStageBackup bizStage, int32_t resultCode); void RecordRestoreFuncRes(Info &info, const std::string &func, int32_t userId, enum BizStageRestore bizStage, int32_t resultCode); - void RecordStatisticRes(StatInfo &statInfo, int32_t userId, enum IServiceReverse::Scenario scenario, + void RecordStatisticRes(StatInfo &statInfo, int32_t userId, enum IServiceReverseType::Scenario scenario, int32_t succ_cnt, int32_t fail_cnt, int32_t resultCode); private: AppRadar() = default; diff --git a/utils/src/b_radar/b_radar.cpp b/utils/src/b_radar/b_radar.cpp index 1c7f7ac8450ded0c0756ae40d4f69b87ef234dc3..8ab04e1491d3ec690ffcfef741340451193bc042 100644 --- a/utils/src/b_radar/b_radar.cpp +++ b/utils/src/b_radar/b_radar.cpp @@ -23,7 +23,6 @@ #include "b_resources/b_constants.h" #include "b_utils/b_time.h" #include "hisysevent.h" -#include "i_service_reverse.h" namespace OHOS::FileManagement::Backup { int32_t AppRadar::GetUserId() @@ -49,7 +48,7 @@ void AppRadar::RecordDefaultFuncRes(Info &info, const std::string &func, int32_t "PID", getpid(), "FUNC", func, "TIME", TimeUtils::GetCurrentTime(), - "BIZ_SCENE", static_cast(IServiceReverse::Scenario::UNDEFINED), + "BIZ_SCENE", static_cast(IServiceReverseType::Scenario::UNDEFINED), "BIZ_STAGE", static_cast(bizStage), "EXEC_STATUS", info.status, "RESULT_CODE", resultCode, @@ -70,7 +69,7 @@ void AppRadar::RecordBackupFuncRes(Info &info, const std::string &func, int32_t "PID", getpid(), "FUNC", func, "TIME", TimeUtils::GetCurrentTime(), - "BIZ_SCENE", static_cast(IServiceReverse::Scenario::BACKUP), + "BIZ_SCENE", static_cast(IServiceReverseType::Scenario::BACKUP), "BIZ_STAGE", static_cast(bizStage), "EXEC_STATUS", info.status, "RESULT_CODE", resultCode, @@ -91,14 +90,14 @@ void AppRadar::RecordRestoreFuncRes(Info &info, const std::string &func, int32_t "PID", getpid(), "FUNC", func, "TIME", TimeUtils::GetCurrentTime(), - "BIZ_SCENE", static_cast(IServiceReverse::Scenario::RESTORE), + "BIZ_SCENE", static_cast(IServiceReverseType::Scenario::RESTORE), "BIZ_STAGE", static_cast(bizStage), "EXEC_STATUS", info.status, "RESULT_CODE", resultCode, "RESULT_INFO", ss.str()); } -void AppRadar::RecordStatisticRes(StatInfo &statInfo, int32_t userId, enum IServiceReverse::Scenario scenario, +void AppRadar::RecordStatisticRes(StatInfo &statInfo, int32_t userId, enum IServiceReverseType::Scenario scenario, int32_t succ_cnt, int32_t fail_cnt, int32_t resultCode) { std::stringstream ss;