From cab8230f6c85bb2e3cdae2eabe52858aeaf16264 Mon Sep 17 00:00:00 2001 From: BrainL Date: Thu, 13 Mar 2025 13:56:57 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=AE=A1=E7=90=86IDL=E5=8C=96extension?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: BrainL --- bundle.json | 5 +- frameworks/native/backup_ext/BUILD.gn | 3 +- .../native/backup_ext/include/ext_extension.h | 18 +- .../backup_ext/include/ext_extension_stub.h | 2 +- .../native/backup_ext/src/ext_extension.cpp | 38 + .../backup_ext/src/ext_extension_stub.cpp | 266 -- .../backup_ext/src/sub_ext_extension.cpp | 2 +- .../include/service_reverse.h | 74 +- .../include/service_reverse_stub.h | 70 - .../src/service_incremental_reverse.cpp | 83 +- .../backup_kit_inner/src/service_reverse.cpp | 75 +- .../native/backup_kit_inner/BUILD.gn | 11 +- .../backup_kit_inner/impl/i_extension.h | 47 - .../native/backup_kit_inner/impl/i_service.h | 2 +- interfaces/kits/js/BUILD.gn | 1 + services/backup_sa/BUILD.gn | 98 +- .../backup_sa/ExtensionType.idl | 50 +- services/backup_sa/IExtension.idl | 31 + services/backup_sa/IServiceReverse.idl | 62 + services/backup_sa/ServiceReverseType.idl | 23 + .../backup_sa/include/module_ipc/service.h | 22 +- .../module_ipc/service_reverse_proxy.h | 68 - .../module_ipc/svc_backup_connection.h | 2 +- .../include/module_ipc/svc_extension_proxy.h | 48 - .../include/module_ipc/svc_session_manager.h | 10 +- services/backup_sa/src/module_ipc/service.cpp | 157 +- .../src/module_ipc/service_incremental.cpp | 81 +- .../service_incremental_reverse_proxy.cpp | 274 -- .../src/module_ipc/service_reverse_proxy.cpp | 259 -- .../backup_sa/src/module_ipc/service_stub.cpp | 4 +- .../backup_sa/src/module_ipc/sub_service.cpp | 54 +- .../src/module_ipc/svc_backup_connection.cpp | 4 +- .../svc_extension_incremental_proxy.cpp | 173 -- .../src/module_ipc/svc_extension_proxy.cpp | 2 +- .../src/module_ipc/svc_session_manager.cpp | 28 +- .../src/module_sched/sched_scheduler.cpp | 8 +- test/fuzztest/BUILD.gn | 2 +- test/fuzztest/backupext_fuzzer/BUILD.gn | 2 +- .../backupext_fuzzer/backupext_fuzzer.cpp | 148 +- test/fuzztest/backupsa_fuzzer/BUILD.gn | 2 + test/fuzztest/backupsaanother_fuzzer/BUILD.gn | 1 + test/fuzztest/backupsaappend_fuzzer/BUILD.gn | 1 + .../backupservicestub_fuzzer/BUILD.gn | 2 + .../backupservicestubbranch_fuzzer/BUILD.gn | 1 + .../backupservicestubbranch_fuzzer/service.h | 2 +- test/fuzztest/servicereverse_fuzzer/BUILD.gn | 5 + .../svcrestoredepsmanager_fuzzer/BUILD.gn | 1 + .../include/ext_extension_stub_mock.h | 41 - .../include/service_reverse_proxy_mock.h | 64 +- .../include/svc_extension_proxy_mock.h | 32 +- .../include/svc_session_manager_mock.h | 4 +- tests/mock/module_ipc/service_mock.cpp | 10 +- .../module_ipc/service_reverse_proxy_mock.cpp | 205 +- tests/mock/module_ipc/service_stub_mock.cpp | 2 +- .../src/svc_session_manager_mock.cpp | 4 +- .../module_ipc/svc_backup_connection_mock.cpp | 2 +- .../module_ipc/svc_extension_proxy_mock.cpp | 34 +- .../module_ipc/svc_session_manager_mock.cpp | 4 +- .../svc_session_manager_throw_mock.cpp | 4 +- .../svc_session_manager_throw_mock.h | 8 +- tests/moduletests/backup_kit_inner/BUILD.gn | 3 +- .../unittests/backup_api/backup_impl/BUILD.gn | 2 +- .../backup_impl/include/ext_extension_mock.h | 36 +- .../include/service_reverse_mock.h | 178 +- .../backup_impl/service_reverse_stub_test.cpp | 960 ------ .../backup_impl/service_reverse_test.cpp | 150 +- tests/unittests/backup_ext/BUILD.gn | 63 +- .../backup_ext/ext_extension_stub_test.cpp | 606 ---- .../backup_sa/module_app_gallery/BUILD.gn | 1 + tests/unittests/backup_sa/module_ipc/BUILD.gn | 42 +- .../module_ipc/sched_scheduler_test.cpp | 6 +- .../module_ipc/service_incremental_test.cpp | 152 +- .../module_ipc/service_other_test.cpp | 104 +- .../module_ipc/service_reverse_proxy_test.cpp | 2686 ----------------- .../backup_sa/module_ipc/service_test.cpp | 134 +- .../module_ipc/service_throw_test.cpp | 34 +- .../backup_sa/module_ipc/sub_service_test.cpp | 276 +- .../module_ipc/svc_extension_proxy_test.cpp | 6 +- .../module_ipc/svc_session_manager_test.cpp | 56 +- tests/unittests/backup_sa/session/BUILD.gn | 13 +- .../backup_sa/session/service_proxy_mock.cpp | 16 +- .../backup_sa/session/service_proxy_mock.h | 24 +- tests/unittests/backup_tools/BUILD.gn | 4 +- utils/BUILD.gn | 6 +- utils/include/b_radar/b_radar.h | 4 +- utils/src/b_radar/b_radar.cpp | 10 +- 86 files changed, 1626 insertions(+), 6682 deletions(-) delete mode 100644 frameworks/native/backup_ext/src/ext_extension_stub.cpp delete mode 100644 frameworks/native/backup_kit_inner/include/service_reverse_stub.h delete mode 100644 interfaces/inner_api/native/backup_kit_inner/impl/i_extension.h rename tests/mock/backup_ext/src/ext_extension_stub_mock.cpp => services/backup_sa/ExtensionType.idl (56%) create mode 100644 services/backup_sa/IExtension.idl create mode 100644 services/backup_sa/IServiceReverse.idl create mode 100644 services/backup_sa/ServiceReverseType.idl delete mode 100644 services/backup_sa/include/module_ipc/service_reverse_proxy.h delete mode 100644 services/backup_sa/include/module_ipc/svc_extension_proxy.h delete mode 100644 services/backup_sa/src/module_ipc/service_incremental_reverse_proxy.cpp delete mode 100644 services/backup_sa/src/module_ipc/service_reverse_proxy.cpp delete mode 100644 services/backup_sa/src/module_ipc/svc_extension_incremental_proxy.cpp delete mode 100644 tests/mock/backup_ext/include/ext_extension_stub_mock.h delete mode 100644 tests/unittests/backup_api/backup_impl/service_reverse_stub_test.cpp delete mode 100644 tests/unittests/backup_ext/ext_extension_stub_test.cpp delete mode 100644 tests/unittests/backup_sa/module_ipc/service_reverse_proxy_test.cpp diff --git a/bundle.json b/bundle.json index d81e5f73a..8986c2140 100644 --- a/bundle.json +++ b/bundle.json @@ -147,8 +147,7 @@ "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/i_service.h" ] } }, @@ -165,7 +164,7 @@ } ], "test": [ - "//foundation/filemanagement/app_file_service/test/fuzztest:fuzztest", + "//foundation/filemanagement/app_file_service/test/fuzztest:app_fuzztest", "//foundation/filemanagement/app_file_service/test/unittest:unittest", "//foundation/filemanagement/app_file_service:tgt_backup_tests" ] diff --git a/frameworks/native/backup_ext/BUILD.gn b/frameworks/native/backup_ext/BUILD.gn index ec60d87cd..f18f99009 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,11 +49,13 @@ 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/innerkits/native:sandbox_helper_native", + "${path_backup}/services/backup_sa:backup_sa_ipc", "${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 0f4960881..737e7b70d 100644 --- a/frameworks/native/backup_ext/include/ext_extension.h +++ b/frameworks/native/backup_ext/include/ext_extension.h @@ -29,7 +29,7 @@ #include "b_json/b_report_entity.h" #include "b_radar/b_radar.h" #include "ext_backup_js.h" -#include "ext_extension_stub.h" +#include "extension_stub.h" #include "i_service.h" #include "tar_file.h" #include "thread_pool.h" @@ -41,20 +41,20 @@ 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 &errCode, int& 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 GetIncrementalFileHandle(const std::string &fileName, UniqueFdGroup &fdGroup) override; ErrCode PublishIncrementalFile(const std::string &fileName) override; - ErrCode HandleIncrementalBackup(UniqueFd incrementalFd, UniqueFd manifestFd) override; + ErrCode HandleIncrementalBackup(int incrementalFd, int manifestFd) override; ErrCode IncrementalOnBackup(bool isClearData) override; - std::tuple GetIncrementalBackupFileHandle() override; + ErrCode GetIncrementalBackupFileHandle(UniqueFdGroup &fdGroup) override; ErrCode GetBackupInfo(std::string &result) override; - ErrCode UpdateFdSendRate(std::string &bundleName, int32_t sendRate) override; + ErrCode UpdateFdSendRate(const std::string &bundleName, int32_t sendRate) override; void AsyncTaskRestoreForUpgrade(void); void ExtClear(void); void AsyncTaskIncrementalRestoreForUpgrade(void); @@ -336,6 +336,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(); bool IfCloudSpecialRestore(std::string tarName); ErrCode CloudSpecialRestore(std::string tarName, std::string untarPath, off_t tarFileSize); void GetTarIncludes(const string &tarName, unordered_map &infos); diff --git a/frameworks/native/backup_ext/include/ext_extension_stub.h b/frameworks/native/backup_ext/include/ext_extension_stub.h index d969b3e9b..0711aed93 100644 --- a/frameworks/native/backup_ext/include/ext_extension_stub.h +++ b/frameworks/native/backup_ext/include/ext_extension_stub.h @@ -18,7 +18,7 @@ #include -#include "i_extension.h" +#include "iextension.h" #include "iremote_stub.h" namespace OHOS::FileManagement::Backup { diff --git a/frameworks/native/backup_ext/src/ext_extension.cpp b/frameworks/native/backup_ext/src/ext_extension.cpp index 0fa51bd06..e980f63a5 100644 --- a/frameworks/native/backup_ext/src/ext_extension.cpp +++ b/frameworks/native/backup_ext/src/ext_extension.cpp @@ -240,6 +240,15 @@ static UniqueFd GetFileHandleForSpecialCloneCloud(const string &fileName) return fd; } +ErrCode BackupExtExtension::GetFileHandleWithUniqueFd(const std::string &fileName, + int32_t &getFileHandleErrCode, + int &fd) +{ +UniqueFd fileHandleFd(GetFileHandle(fileName, getFileHandleErrCode)); +fd = fileHandleFd.Release(); +return ERR_OK; +} + UniqueFd BackupExtExtension::GetFileHandle(const string &fileName, int32_t &errCode) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); @@ -385,6 +394,16 @@ tuple BackupExtExtension::GetIncreFileHandleForNorm return {errCode, move(fd), move(reportFd)}; } +ErrCode BackupExtExtension::GetIncrementalFileHandle(const std::string &fileName, UniqueFdGroup &fdGroup) +{ + HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + auto [errCode, fd, reportFd] = GetIncrementalFileHandle(fileName); + fdGroup.errCode = errCode; + fdGroup.fd = fd.Release(); + fdGroup.reportFd = reportFd.Release(); + return ERR_OK; +} + tuple BackupExtExtension::GetIncrementalFileHandle(const string &fileName) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); @@ -1911,6 +1930,17 @@ void BackupExtExtension::FillFileInfos(UniqueFd incrementalFd, allFiles.size(), smallFiles.size(), bigFiles.size()); } +ErrCode BackupExtExtension::HandleIncrementalBackup(int incrementalFd, int manifestFd) +{ + HILOGI("Start HandleIncrementalBackup. incrementalFd:%{public}d, manifestFd:%{public}d", incrementalFd, manifestFd); + UniqueFd incrementalFdUnique(dup(incrementalFd)); + UniqueFd manifestFdUnique(dup(manifestFd)); + ErrCode ret = HandleIncrementalBackup(std::move(incrementalFdUnique), std::move(manifestFdUnique)); + close(incrementalFd); + close(manifestFd); + return ret; +} + ErrCode BackupExtExtension::HandleIncrementalBackup(UniqueFd incrementalFd, UniqueFd manifestFd) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); @@ -1940,6 +1970,14 @@ ErrCode BackupExtExtension::IncrementalOnBackup(bool isClearData) return ERR_OK; } +ErrCode BackupExtExtension::GetIncrementalBackupFileHandle(UniqueFdGroup& fdGroup) +{ + auto [fd, reportFd] = GetIncrementalBackupFileHandle(); + fdGroup.fd = fd.Release(); + fdGroup.reportFd = reportFd.Release(); + return BError(BError::Codes::OK).GetCode(); +} + tuple BackupExtExtension::GetIncrementalBackupFileHandle() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); 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 38f4ce2f3..000000000 --- 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 afcaa1a10..16fdbff41 100644 --- a/frameworks/native/backup_ext/src/sub_ext_extension.cpp +++ b/frameworks/native/backup_ext/src/sub_ext_extension.cpp @@ -785,7 +785,7 @@ ErrCode BackupExtExtension::GetBackupInfo(std::string &result) return 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_); diff --git a/frameworks/native/backup_kit_inner/include/service_reverse.h b/frameworks/native/backup_kit_inner/include/service_reverse.h index c19668973..5973451df 100644 --- a/frameworks/native/backup_kit_inner/include/service_reverse.h +++ b/frameworks/native/backup_kit_inner/include/service_reverse.h @@ -25,39 +25,53 @@ 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, + int 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 errCode = 0) override; - void RestoreOnProcessInfo(std::string bundleName, std::string processInfo) override; + 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; + 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 53a4964aa..000000000 --- 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/service_incremental_reverse.cpp b/frameworks/native/backup_kit_inner/src/service_incremental_reverse.cpp index 81f6ed9e6..2088394c8 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,162 @@ namespace OHOS::FileManagement::Backup { using namespace std; -void ServiceReverse::IncrementalBackupOnFileReady(string bundleName, string fileName, int fd, int manifestFd, - int32_t errCode) +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, - int32_t errCode) +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_reverse.cpp b/frameworks/native/backup_kit_inner/src/service_reverse.cpp index 100a0dd09..202f61ca3 100644 --- a/frameworks/native/backup_kit_inner/src/service_reverse.cpp +++ b/frameworks/native/backup_kit_inner/src/service_reverse.cpp @@ -21,137 +21,156 @@ 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()); + 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/interfaces/inner_api/native/backup_kit_inner/BUILD.gn b/interfaces/inner_api/native/backup_kit_inner/BUILD.gn index 45fe3c878..32ebddda3 100644 --- a/interfaces/inner_api/native/backup_kit_inner/BUILD.gn +++ b/interfaces/inner_api/native/backup_kit_inner/BUILD.gn @@ -56,7 +56,6 @@ ohos_shared_library("backup_kit_inner") { "${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 = [ @@ -64,7 +63,10 @@ ohos_shared_library("backup_kit_inner") { "LOG_TAG=\"BackupAPI\"", ] - configs = [ ":private_config" ] + configs = [ + ":private_config", + "${path_backup}/services/backup_sa:public_idl_config", + ] public_configs = [ ":public_config" ] external_deps = [ @@ -76,7 +78,10 @@ ohos_shared_library("backup_kit_inner") { "samgr:samgr_proxy", ] - deps = [ "${path_backup}/utils:backup_utils" ] + deps = [ + "${path_backup}/services/backup_sa:backup_sa_ipc", + "${path_backup}/utils:backup_utils", + ] cflags_cc = [ "-fdata-sections", diff --git a/interfaces/inner_api/native/backup_kit_inner/impl/i_extension.h b/interfaces/inner_api/native/backup_kit_inner/impl/i_extension.h deleted file mode 100644 index 7ce72f1a3..000000000 --- a/interfaces/inner_api/native/backup_kit_inner/impl/i_extension.h +++ /dev/null @@ -1,47 +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_EXTENSION_H -#define OHOS_FILEMGMT_BACKUP_I_EXTENSION_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"); - -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 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 index 0108a3437..896d6fc88 100644 --- a/interfaces/inner_api/native/backup_kit_inner/impl/i_service.h +++ b/interfaces/inner_api/native/backup_kit_inner/impl/i_service.h @@ -24,7 +24,7 @@ #include "b_file_info.h" #include "b_incremental_data.h" #include "i_service_ipc_interface_code.h" -#include "i_service_reverse.h" +#include "iservice_reverse.h" #include "iremote_broker.h" namespace OHOS::FileManagement::Backup { diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index 16db36cef..8030493aa 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -159,6 +159,7 @@ ohos_shared_library("backup") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", + "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/utils:backup_utils", "${path_jsoncpp}:jsoncpp", ] diff --git a/services/backup_sa/BUILD.gn b/services/backup_sa/BUILD.gn index 8c877bed7..da8b19709 100644 --- a/services/backup_sa/BUILD.gn +++ b/services/backup_sa/BUILD.gn @@ -11,9 +11,102 @@ # 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("//foundation/filemanagement/app_file_service/backup.gni") +idl_gen_interface("backup_idl") { + sources = [ + "IExtension.idl", + "IServiceReverse.idl", + ] + sources_common = [ + "ExtensionType.idl", + "ServiceReverseType.idl", + ] + hitrace = "HITRACE_TAG_FILEMANAGEMENT" + log_domainid = "0xD004313" + log_tag = "AppFileService" +} + +config("public_idl_config") { + include_dirs = [ + ".", + "${target_gen_dir}/", + ] +} + +ohos_source_set("backup_sa_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_sa_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_shared_library("backup_sa") { branch_protector_ret = "pac_ret" @@ -34,13 +127,9 @@ 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", @@ -58,6 +147,7 @@ ohos_shared_library("backup_sa") { ] deps = [ + ":backup_sa_ipc", "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils:backup_utils", "${path_jsoncpp}:jsoncpp", diff --git a/tests/mock/backup_ext/src/ext_extension_stub_mock.cpp b/services/backup_sa/ExtensionType.idl similarity index 56% rename from tests/mock/backup_ext/src/ext_extension_stub_mock.cpp rename to services/backup_sa/ExtensionType.idl index 6f9309402..92ccbd7b0 100644 --- a/tests/mock/backup_ext/src/ext_extension_stub_mock.cpp +++ b/services/backup_sa/ExtensionType.idl @@ -1,28 +1,22 @@ -/* - * 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 "ext_extension_stub_mock.h" - -namespace OHOS::FileManagement::Backup { -ExtExtensionStub::ExtExtensionStub() -{ -} - -int32_t ExtExtensionStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, - MessageOption &option) -{ - return static_cast(this)->OnRemoteRequest(code, data, reply, option); -} -} // namespace OHOS::FileManagement::Backup \ No newline at end of file +/* + * Copyright (c) 2025 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 { + FileDescriptor fd; + FileDescriptor reportFd; + int errCode; +}; \ No newline at end of file diff --git a/services/backup_sa/IExtension.idl b/services/backup_sa/IExtension.idl new file mode 100644 index 000000000..ae259f3bf --- /dev/null +++ b/services/backup_sa/IExtension.idl @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2025 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] FileDescriptor 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 GetIncrementalFileHandle([in] String fileName, [out] UniqueFdGroup fdGroup); + [ipccode 7] void PublishIncrementalFile([in] String fileName); + [ipccode 8] void HandleIncrementalBackup([in] FileDescriptor incrementalFd, [in] FileDescriptor manifestFd); + [ipccode 9] void IncrementalOnBackup([in] boolean isClearData); + [ipccode 10] void GetIncrementalBackupFileHandle([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/services/backup_sa/IServiceReverse.idl b/services/backup_sa/IServiceReverse.idl new file mode 100644 index 000000000..04a2eb480 --- /dev/null +++ b/services/backup_sa/IServiceReverse.idl @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2025 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; +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] FileDescriptor 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] FileDescriptor 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] FileDescriptor fd, + [in] FileDescriptor 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] FileDescriptor fd, + [in] FileDescriptor 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/services/backup_sa/ServiceReverseType.idl b/services/backup_sa/ServiceReverseType.idl new file mode 100644 index 000000000..c15792fca --- /dev/null +++ b/services/backup_sa/ServiceReverseType.idl @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2025 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/services/backup_sa/include/module_ipc/service.h b/services/backup_sa/include/module_ipc/service.h index 34a0fb99a..ca77f9c29 100644 --- a/services/backup_sa/include/module_ipc/service.h +++ b/services/backup_sa/include/module_ipc/service.h @@ -23,7 +23,7 @@ #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" @@ -313,7 +313,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 +362,7 @@ private: * * @param scenario Scenario状态 */ - ErrCode VerifyCaller(IServiceReverse::Scenario scenario); + ErrCode VerifyCaller(IServiceReverseType::Scenario scenario); /** * @brief 验证调用者并返回名称 @@ -544,7 +544,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 +561,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 +569,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); @@ -646,6 +646,10 @@ private: bool GetScanningInfo(wptr obj, size_t scannedSize, string &scanning); void SetScanningInfo(string &scanning, string name); + + ErrCode HelpToAppIncrementalFileReady(const string &bundleName, const string &fileName, sptr proxy); + + void HelptoGetFileHandle(const string &bundleName, const string &fileName, sptr proxy); private: static sptr instance_; static std::mutex instanceLock_; 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 7578aca36..000000000 --- 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/svc_backup_connection.h b/services/backup_sa/include/module_ipc/svc_backup_connection.h index 8b6c2477c..33c1c6978 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_extension_proxy.h b/services/backup_sa/include/module_ipc/svc_extension_proxy.h deleted file mode 100644 index dd38f936a..000000000 --- a/services/backup_sa/include/module_ipc/svc_extension_proxy.h +++ /dev/null @@ -1,48 +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_SVC_EXTENSION_PROXY_H -#define OHOS_FILEMGMT_BACKUP_SVC_EXTENSION_PROXY_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; - -public: - explicit SvcExtensionProxy(const sptr &remote) : IRemoteProxy(remote) {} - -private: - static inline BrokerDelegator delegator_; -}; -} // namespace OHOS::FileManagement::Backup - -#endif // OHOS_FILEMGMT_BACKUP_SVC_EXTENSION_PROXY_H \ No newline at end of file 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 98fd49414..5d73a43b2 100644 --- a/services/backup_sa/include/module_ipc/svc_session_manager.h +++ b/services/backup_sa/include/module_ipc/svc_session_manager.h @@ -33,7 +33,7 @@ #include "b_incremental_data.h" #include "b_resources/b_constants.h" #include "i_service.h" -#include "i_service_reverse.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 +80,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 +106,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 +147,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_ipc/service.cpp b/services/backup_sa/src/module_ipc/service.cpp index 65a225c97..f3e4a0ebc 100644 --- a/services/backup_sa/src/module_ipc/service.cpp +++ b/services/backup_sa/src/module_ipc/service.cpp @@ -118,7 +118,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 +132,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) { + if (scenario == IServiceReverseType::Scenario::RESTORE) { AppRadar::GetInstance().RecordRestoreFuncRes(info, "Service::BundleBeginRadarReport", GetUserIdDefault(), BizStageRestore::BIZ_STAGE_APPEND_BUNDLES_FAIL, errCode); - } else if (scenario == IServiceReverse::Scenario::BACKUP) { + } 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 +160,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 +180,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 +199,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()); @@ -235,7 +235,7 @@ void Service::OnStart() session_->Active( { .clientToken = IPCSkeleton::GetCallingTokenID(), - .scenario = IServiceReverse::Scenario::CLEAN, + .scenario = IServiceReverseType::Scenario::CLEAN, .clientProxy = nullptr, .userId = GetUserIdDefault(), .callerName = "BackupSA", @@ -349,7 +349,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); } @@ -450,7 +450,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); @@ -471,7 +471,7 @@ ErrCode Service::InitRestoreSession(sptr remote) } ret = session_->Active({ .clientToken = IPCSkeleton::GetCallingTokenID(), - .scenario = IServiceReverse::Scenario::RESTORE, + .scenario = IServiceReverseType::Scenario::RESTORE, .clientProxy = remote, .userId = GetUserIdDefault(), .callerName = GetCallerName(), @@ -506,7 +506,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(), @@ -558,11 +558,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); @@ -653,7 +653,7 @@ ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, const vectorIncreaseSessionCnt(__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, {}); @@ -745,7 +745,7 @@ ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, } 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, {}); @@ -843,7 +843,7 @@ ErrCode Service::AppendBundlesBackupSession(const vector &bundleName return BError(BError::Codes::SA_INVAL_ARG); } session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); // BundleMgrAdapter::GetBundleInfos可能耗时 - ErrCode ret = VerifyCaller(IServiceReverse::Scenario::BACKUP); + 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, {}); @@ -882,7 +882,7 @@ ErrCode Service::AppendBundlesDetailsBackupSession(const vector &bun return BError(BError::Codes::SA_INVAL_ARG); } session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); // BundleMgrAdapter::GetBundleInfos可能耗时 - ErrCode ret = VerifyCaller(IServiceReverse::Scenario::BACKUP); + 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, {}); @@ -980,9 +980,9 @@ ErrCode Service::SAResultReport(const std::string bundleName, const std::string { 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); @@ -991,10 +991,10 @@ 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); + BundleEndRadarReport(bundleName, errCode, IServiceReverseType::Scenario::BACKUP); } return BError(BError::Codes::OK); } @@ -1039,7 +1039,7 @@ 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(); @@ -1047,9 +1047,9 @@ ErrCode Service::LaunchBackupSAExtension(const BundleName &bundleName) HILOGE("lock sa connection ptr is nullptr"); return BError(BError::Codes::SA_INVAL_ARG); } - 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); } } @@ -1064,7 +1064,7 @@ ErrCode Service::GetFileHandle(const string &bundleName, const string &fileName) HILOGE("GetFileHandle error, session is empty"); return BError(BError::Codes::SA_INVAL_ARG); } - ErrCode ret = VerifyCaller(IServiceReverse::Scenario::RESTORE); + ErrCode ret = VerifyCaller(IServiceReverseType::Scenario::RESTORE); if (ret != ERR_OK) { HILOGE("verify caller failed, bundleName:%{public}s", bundleName.c_str()); return ret; @@ -1089,15 +1089,7 @@ ErrCode Service::GetFileHandle(const string &bundleName, const string &fileName) 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); + HelptoGetFileHandle(bundleName, fileName, proxy); } else { session_->SetExtFileNameRequest(bundleName, fileName); } @@ -1107,6 +1099,21 @@ ErrCode Service::GetFileHandle(const string &bundleName, const string &fileName) } } +void Service::HelptoGetFileHandle(const string &bundleName, const string &fileName, sptr proxy) +{ + int32_t errCode = 0; + int32_t fdCode = 0; + proxy->GetFileHandleWithUniqueFd(fileName, errCode, fdCode); + UniqueFd fd(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); +} + void Service::ExtStart(const string &bundleName) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); @@ -1131,7 +1138,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()); @@ -1144,7 +1151,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); @@ -1153,7 +1160,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(); @@ -1161,7 +1168,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); + int fdCode = 0; + proxy->GetFileHandleWithUniqueFd(fileName, errCode, fdCode); + UniqueFd fd(fdCode); session_->GetServiceReverseProxy()->RestoreOnFileReady(bundleName, fileName, move(fd), errCode); FileReadyRadarReport(bundleName, fileName, errCode, scenario); } @@ -1180,7 +1189,7 @@ int Service::Dump(int fd, const vector &args) return 0; } -void Service::ReportOnExtConnectFailed(const IServiceReverse::Scenario scenario, +void Service::ReportOnExtConnectFailed(const IServiceReverseType::Scenario scenario, const std::string &bundleName, const ErrCode ret) { try { @@ -1188,10 +1197,10 @@ void Service::ReportOnExtConnectFailed(const IServiceReverse::Scenario scenario, 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); @@ -1200,10 +1209,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, @@ -1219,7 +1228,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(); @@ -1241,9 +1250,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); } } @@ -1317,7 +1326,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()); @@ -1372,8 +1381,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); @@ -1395,8 +1404,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); @@ -1445,8 +1454,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(); @@ -1477,8 +1486,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(); @@ -1504,7 +1513,7 @@ void Service::SessionDeactive() } 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); @@ -1598,7 +1607,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; @@ -1819,14 +1828,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); } - if (scenario == IServiceReverse::Scenario::BACKUP) { + if (scenario == IServiceReverseType::Scenario::BACKUP) { auto ret = saConnection->CallBackupSA(); session_->GetServiceReverseProxy()->BackupOnBundleStarted(ret, bundleName); BundleBeginRadarReport(bundleName, ret, scenario); @@ -1836,7 +1845,7 @@ 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); @@ -1849,7 +1858,7 @@ void Service::OnSABackup(const std::string &bundleName, const int &fd, const std HILOGI("OnSABackup bundleName: %{public}s, fd: %{public}d, result: %{public}s, err: %{public}d", 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]() { @@ -1906,8 +1915,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(); @@ -1925,7 +1934,7 @@ void Service::NotifyCallerCurAppDone(ErrCode errCode, const std::string &callerN "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()->RestoreOnBundleFinished(errCode, callerName); } @@ -1993,7 +2002,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) { @@ -2057,8 +2066,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 307b4204b..f3bb2ec04 100644 --- a/services/backup_sa/src/module_ipc/service_incremental.cpp +++ b/services/backup_sa/src/module_ipc/service_incremental.cpp @@ -72,13 +72,13 @@ ErrCode Service::Release() HILOGE("Release error, session is empty"); return BError(BError::Codes::SA_INVAL_ARG); } - IServiceReverse::Scenario scenario = session_->GetScenario(); + IServiceReverseType::Scenario scenario = session_->GetScenario(); VerifyCaller(scenario); AppRadar::Info info("", "", "call release"); - if (scenario == IServiceReverse::Scenario::RESTORE) { + if (scenario == IServiceReverseType::Scenario::RESTORE) { AppRadar::GetInstance().RecordRestoreFuncRes(info, "Service::Release", session_->GetSessionUserId(), BizStageRestore::BIZ_STAGE_RELEASE, ERR_OK); - } else if (scenario == IServiceReverse::Scenario::BACKUP) { + } else if (scenario == IServiceReverseType::Scenario::BACKUP) { AppRadar::GetInstance().RecordBackupFuncRes(info, "Service::Release", session_->GetSessionUserId(), BizStageBackup::BIZ_STAGE_RELEASE, ERR_OK); } @@ -306,7 +306,7 @@ ErrCode Service::InitIncrementalBackupSession(sptr remote) 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, @@ -341,7 +341,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, @@ -386,7 +386,7 @@ 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 failed, verify caller failed, ret:%{public}d", ret); HandleExceptionOnAppendBundles(session_, bundleNames, {}); @@ -427,7 +427,7 @@ 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__); @@ -485,7 +485,7 @@ void Service::HandleCurGroupIncBackupInfos(vector & ErrCode Service::PublishIncrementalFile(const BFileInfo &fileInfo) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - ErrCode ret = VerifyCaller(IServiceReverse::Scenario::RESTORE); + ErrCode ret = VerifyCaller(IServiceReverseType::Scenario::RESTORE); if (ret != ERR_OK) { HILOGE("Publish incremental file failed, bundleName:%{public}s", fileInfo.owner.c_str()); return ret; @@ -546,10 +546,10 @@ ErrCode Service::AppIncrementalFileReady(const std::string &bundleName, const st { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); try { - if (session_->GetScenario() == IServiceReverse::Scenario::RESTORE) { + if (session_->GetScenario() == IServiceReverseType::Scenario::RESTORE) { session_->GetServiceReverseProxy()->IncrementalRestoreOnFileReady(bundleName, fileName, move(fd), move(manifestFd), errCode); - FileReadyRadarReport(bundleName, fileName, errCode, IServiceReverse::Scenario::RESTORE); + FileReadyRadarReport(bundleName, fileName, errCode, IServiceReverseType::Scenario::RESTORE); return BError(BError::Codes::OK); } if (fileName == BConstants::EXT_BACKUP_MANAGE) { @@ -557,7 +557,7 @@ ErrCode Service::AppIncrementalFileReady(const std::string &bundleName, const st } 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) { @@ -587,10 +587,10 @@ ErrCode Service::AppIncrementalFileReady(const std::string &fileName, UniqueFd f 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); + FileReadyRadarReport(callerName, fileName, errCode, IServiceReverseType::Scenario::RESTORE); return BError(BError::Codes::OK); } if (fileName == BConstants::EXT_BACKUP_MANAGE) { @@ -598,7 +598,7 @@ ErrCode Service::AppIncrementalFileReady(const std::string &fileName, UniqueFd f } 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) { @@ -669,10 +669,10 @@ ErrCode Service::GetIncrementalFileHandle(const std::string &bundleName, const s HILOGE("GetIncrementalFileHandle error, session is empty"); return BError(BError::Codes::SA_INVAL_ARG); } - ErrCode ret = VerifyCaller(IServiceReverse::Scenario::RESTORE); + 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()); + GetAnonyPath(fileName).c_str()); return ret; } auto action = session_->GetServiceSchedAction(bundleName); @@ -691,14 +691,14 @@ ErrCode Service::GetIncrementalFileHandle(const std::string &bundleName, const s 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); + auto err = HelpToAppIncrementalFileReady(bundleName, fileName, proxy); 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, "", ""); + 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); + GetUserIdDefault(), + BizStageRestore::BIZ_STAGE_GET_FILE_HANDLE_FAIL, err); } } else { SvcRestoreDepsManager::GetInstance().UpdateToRestoreBundleMap(bundleName, fileName); @@ -714,7 +714,7 @@ ErrCode Service::GetIncrementalFileHandle(const std::string &bundleName, const s bool Service::IncrementalBackup(const string &bundleName) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); - IServiceReverse::Scenario scenario = session_->GetScenario(); + IServiceReverseType::Scenario scenario = session_->GetScenario(); auto backUpConnection = session_->GetExtConnection(bundleName); if (backUpConnection == nullptr) { HILOGE("backUpConnection is empty, bundle:%{public}s", bundleName.c_str()); @@ -729,17 +729,18 @@ 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); @@ -748,11 +749,10 @@ 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); + ret = HelpToAppIncrementalFileReady(bundleName, fileName, proxy); if (ret) { HILOGE("Failed to send file handle %{public}s", GetAnonyString(fileName).c_str()); } @@ -761,11 +761,20 @@ bool Service::IncrementalBackup(const string &bundleName) } return false; } +ErrCode Service::HelpToAppIncrementalFileReady(const string &bundleName, const string &fileName, sptr proxy) +{ + UniqueFdGroup fdGroup; + proxy->GetIncrementalFileHandle(fileName, fdGroup); + UniqueFd fd(fdGroup.fd); + UniqueFd reportFd(fdGroup.reportFd); + auto ret = AppIncrementalFileReady(bundleName, fileName, move(fd), move(reportFd), fdGroup.errCode); + return ret; +} void Service::NotifyCallerCurAppIncrementDone(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 incremental backup"); session_->GetServiceReverseProxy()->IncrementalBackupOnBundleFinished(errCode, callerName); BundleEndRadarReport(callerName, errCode, scenario); @@ -782,7 +791,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); @@ -891,9 +900,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 { @@ -912,7 +921,7 @@ ErrCode Service::Cancel(std::string bundleName, int32_t &result) HILOGE("Cancel error, session is null"); return BError(BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK); } - IServiceReverse::Scenario scenario = session_->GetScenario(); + 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); 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 57e412c92..000000000 --- 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 2d2dbab36..000000000 --- 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/service_stub.cpp b/services/backup_sa/src/module_ipc/service_stub.cpp index ae94248e9..f03db9b85 100644 --- a/services/backup_sa/src/module_ipc/service_stub.cpp +++ b/services/backup_sa/src/module_ipc/service_stub.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 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 @@ -27,7 +27,7 @@ #include "b_error/b_excep_utils.h" #include "b_resources/b_constants.h" #include "filemgmt_libhilog.h" -#include "module_ipc/service_reverse_proxy.h" +#include "service_reverse_proxy.h" namespace OHOS::FileManagement::Backup { using namespace std; diff --git a/services/backup_sa/src/module_ipc/sub_service.cpp b/services/backup_sa/src/module_ipc/sub_service.cpp index b679afd82..4c5c38368 100644 --- a/services/backup_sa/src/module_ipc/sub_service.cpp +++ b/services/backup_sa/src/module_ipc/sub_service.cpp @@ -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); @@ -216,7 +216,7 @@ ErrCode Service::PublishFile(const BFileInfo &fileInfo) HILOGE("PublishFile error, session is empty"); return BError(BError::Codes::SA_INVAL_ARG); } - ErrCode ret = VerifyCaller(IServiceReverse::Scenario::RESTORE); + ErrCode ret = VerifyCaller(IServiceReverseType::Scenario::RESTORE); if (ret != ERR_OK) { HILOGE("PublishFile error, verify caller by scenario failed, ret:%{public}d", ret); return ret; @@ -330,11 +330,11 @@ 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; @@ -414,7 +414,7 @@ std::vector Service::GetSupportBackupBundleNames(vectorGetScenario(); - 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 +643,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,8 +674,8 @@ 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); } @@ -703,7 +703,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()); @@ -785,7 +785,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(), @@ -823,7 +823,7 @@ ErrCode Service::InitBackupSession(sptr remote, std::string &er session_->SetMemParaCurSize(oldSize); ret = session_->Active({ .clientToken = IPCSkeleton::GetCallingTokenID(), - .scenario = IServiceReverse::Scenario::BACKUP, + .scenario = IServiceReverseType::Scenario::BACKUP, .clientProxy = remote, .userId = GetUserIdDefault(), .callerName = GetCallerName(), @@ -1133,7 +1133,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 7dc6d5eec..58bdb6158 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 c29b0e72b..000000000 --- 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 index ce2bfcc36..bd0d8e8a0 100644 --- a/services/backup_sa/src/module_ipc/svc_extension_proxy.cpp +++ b/services/backup_sa/src/module_ipc/svc_extension_proxy.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "module_ipc/svc_extension_proxy.h" +#include "extension_proxy.h" #include "b_error/b_error.h" #include "b_error/b_excep_utils.h" 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 a0aafce1c..bf269197c 100644 --- a/services/backup_sa/src/module_ipc/svc_session_manager.cpp +++ b/services/backup_sa/src/module_ipc/svc_session_manager.cpp @@ -40,7 +40,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) { @@ -88,7 +88,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); } @@ -124,10 +124,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); } @@ -163,12 +163,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; } @@ -217,10 +217,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) { @@ -246,7 +246,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); } @@ -436,10 +436,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); } @@ -470,7 +470,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(); } @@ -718,7 +718,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); } @@ -748,7 +748,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 5c8b5de7a..ebdf00c28 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/BUILD.gn b/test/fuzztest/BUILD.gn index 5b26911f6..f45685059 100644 --- a/test/fuzztest/BUILD.gn +++ b/test/fuzztest/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -group("fuzztest") { +group("app_fuzztest") { testonly = true deps = [ diff --git a/test/fuzztest/backupext_fuzzer/BUILD.gn b/test/fuzztest/backupext_fuzzer/BUILD.gn index 81a738cca..aec47ecac 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", @@ -51,6 +50,7 @@ ohos_fuzztest("BackupExtFuzzTest") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", + "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/utils:backup_utils", ] diff --git a/test/fuzztest/backupext_fuzzer/backupext_fuzzer.cpp b/test/fuzztest/backupext_fuzzer/backupext_fuzzer.cpp index 19065f4cc..9ec024db5 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); @@ -161,136 +161,6 @@ bool SetCreatorFuzzTest(shared_ptr backup, const uint8_t *data, size_ 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 CmdHandleUser0BackupFuzzTest(shared_ptr extension, const uint8_t *data, size_t size) -{ - MessageParcel msg; - MessageParcel reply; - - msg.WriteBuffer(data, size); - extension->CmdHandleUser0Backup(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 */ @@ -314,21 +184,5 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) OHOS::InvokeAppExtMethodFuzzTest(extBackup, data, size); OHOS::SetCreatorFuzzTest(extBackup, data, size); - try { - OHOS::CmdGetFileHandleFuzzTest(extension, data, size); - OHOS::CmdHandleClearFuzzTest(extension, data, size); - OHOS::CmdHandleUser0BackupFuzzTest(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 2335ebb8f..0dde0ed7d 100644 --- a/test/fuzztest/backupsa_fuzzer/BUILD.gn +++ b/test/fuzztest/backupsa_fuzzer/BUILD.gn @@ -39,6 +39,8 @@ ohos_fuzztest("BackupSaFuzzTest") { "${path_backup}/utils:backup_utils", ] + public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] + external_deps = [ "ability_runtime:ability_manager", "ability_runtime:abilitykit_native", diff --git a/test/fuzztest/backupsaanother_fuzzer/BUILD.gn b/test/fuzztest/backupsaanother_fuzzer/BUILD.gn index 99ab91e83..174a2dad0 100644 --- a/test/fuzztest/backupsaanother_fuzzer/BUILD.gn +++ b/test/fuzztest/backupsaanother_fuzzer/BUILD.gn @@ -39,6 +39,7 @@ ohos_fuzztest("BackupSaAnotherFuzzTest") { deps = [ "${app_file_service_path}/services/backup_sa:backup_sa", "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", + "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/utils:backup_utils", ] diff --git a/test/fuzztest/backupsaappend_fuzzer/BUILD.gn b/test/fuzztest/backupsaappend_fuzzer/BUILD.gn index f712886f6..8931f8b0e 100644 --- a/test/fuzztest/backupsaappend_fuzzer/BUILD.gn +++ b/test/fuzztest/backupsaappend_fuzzer/BUILD.gn @@ -39,6 +39,7 @@ ohos_fuzztest("BackupSaAppendFuzzTest") { deps = [ "${app_file_service_path}/services/backup_sa:backup_sa", "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", + "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/utils:backup_utils", ] diff --git a/test/fuzztest/backupservicestub_fuzzer/BUILD.gn b/test/fuzztest/backupservicestub_fuzzer/BUILD.gn index e9fc47fb2..c4d813425 100644 --- a/test/fuzztest/backupservicestub_fuzzer/BUILD.gn +++ b/test/fuzztest/backupservicestub_fuzzer/BUILD.gn @@ -38,6 +38,8 @@ ohos_fuzztest("BackupServiceStubFuzzTest") { ] sources = [ "backupservicestub_fuzzer.cpp" ] + public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] + deps = [ "${app_file_service_path}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${app_file_service_path}/services/backup_sa:backup_sa", diff --git a/test/fuzztest/backupservicestubbranch_fuzzer/BUILD.gn b/test/fuzztest/backupservicestubbranch_fuzzer/BUILD.gn index dcaad28f4..0f7a3e5fd 100644 --- a/test/fuzztest/backupservicestubbranch_fuzzer/BUILD.gn +++ b/test/fuzztest/backupservicestubbranch_fuzzer/BUILD.gn @@ -41,6 +41,7 @@ ohos_fuzztest("BackupServiceStubBranchFuzzTest") { deps = [ "${app_file_service_path}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${app_file_service_path}/services/backup_sa:backup_sa", + "${app_file_service_path}/services/backup_sa:backup_sa_ipc", "${app_file_service_path}/utils:backup_utils", ] diff --git a/test/fuzztest/backupservicestubbranch_fuzzer/service.h b/test/fuzztest/backupservicestubbranch_fuzzer/service.h index 6d074c8e3..2e2b81879 100644 --- a/test/fuzztest/backupservicestubbranch_fuzzer/service.h +++ b/test/fuzztest/backupservicestubbranch_fuzzer/service.h @@ -20,7 +20,7 @@ #include #include "b_error/b_error.h" -#include "i_service_reverse.h" +#include "iservice_reverse.h" #include "iremote_stub.h" #include "service_stub.h" diff --git a/test/fuzztest/servicereverse_fuzzer/BUILD.gn b/test/fuzztest/servicereverse_fuzzer/BUILD.gn index 83e4237e0..db97aa91b 100644 --- a/test/fuzztest/servicereverse_fuzzer/BUILD.gn +++ b/test/fuzztest/servicereverse_fuzzer/BUILD.gn @@ -27,6 +27,9 @@ ohos_fuzztest("ServiceReverseFuzzTest") { "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", "${path_backup}/utils/include", ] + + public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] + cflags = [ "-g", "-O0", @@ -37,11 +40,13 @@ ohos_fuzztest("ServiceReverseFuzzTest") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", + "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/utils:backup_utils", ] external_deps = [ "c_utils:utils", + "hilog:libhilog", "ipc:ipc_core", ] diff --git a/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn b/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn index d091bc2ca..7ab6e4acc 100644 --- a/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn @@ -37,6 +37,7 @@ ohos_fuzztest("SvcRestoreDepsManagerFuzzTest") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", + "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/utils:backup_utils", "${path_jsoncpp}:jsoncpp", ] diff --git a/tests/mock/backup_ext/include/ext_extension_stub_mock.h b/tests/mock/backup_ext/include/ext_extension_stub_mock.h deleted file mode 100644 index 6cc34071e..000000000 --- a/tests/mock/backup_ext/include/ext_extension_stub_mock.h +++ /dev/null @@ -1,41 +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. - */ - -#ifndef OHOS_FILEMGMT_BACKUP_EXT_EXTENSION_STUB_MOCK_H -#define OHOS_FILEMGMT_BACKUP_EXT_EXTENSION_STUB_MOCK_H - -#include - -#include "ext_extension_stub.h" - -namespace OHOS::FileManagement::Backup { -class ExtExtensionStubMock : public ExtExtensionStub { -public: - MOCK_METHOD(int, OnRemoteRequest, (uint32_t, MessageParcel &, MessageParcel &, MessageOption &)); - MOCK_METHOD(ErrCode, CmdGetFileHandle, (MessageParcel &, MessageParcel &)); - MOCK_METHOD(ErrCode, CmdHandleClear, (MessageParcel &, MessageParcel &)); - MOCK_METHOD(ErrCode, CmdHandleBackup, (MessageParcel &, MessageParcel &)); - MOCK_METHOD(ErrCode, CmdPublishFile, (MessageParcel &, MessageParcel &)); - MOCK_METHOD(ErrCode, CmdHandleRestore, (MessageParcel &, MessageParcel &)); - MOCK_METHOD(ErrCode, CmdGetIncrementalFileHandle, (MessageParcel &, MessageParcel &)); - MOCK_METHOD(ErrCode, CmdPublishIncrementalFile, (MessageParcel &, MessageParcel &)); - MOCK_METHOD(ErrCode, CmdHandleIncrementalBackup, (MessageParcel &, MessageParcel &)); - MOCK_METHOD(ErrCode, CmdIncrementalOnBackup, (MessageParcel &, MessageParcel &)); - MOCK_METHOD(ErrCode, CmdGetIncrementalBackupFileHandle, (MessageParcel &, MessageParcel &)); - MOCK_METHOD(ErrCode, CmdGetBackupInfo, (MessageParcel &, MessageParcel &)); - MOCK_METHOD(ErrCode, CmdUpdateFdSendRate, (MessageParcel &, MessageParcel &)); -}; -} // namespace OHOS::FileManagement::Backup -#endif // OHOS_FILEMGMT_BACKUP_EXT_EXTENSION_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 fc5c50fe8..55736f3f2 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,44 @@ #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(int, SendRequest, (uint32_t, MessageParcel &, MessageParcel &, MessageOption &)); + 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/svc_extension_proxy_mock.h b/tests/mock/module_ipc/include/svc_extension_proxy_mock.h index a042be3ab..f1b41eec8 100644 --- a/tests/mock/module_ipc/include/svc_extension_proxy_mock.h +++ b/tests/mock/module_ipc/include/svc_extension_proxy_mock.h @@ -18,26 +18,26 @@ #include -#include "module_ipc/svc_extension_proxy.h" +#include "extension_proxy.h" namespace OHOS::FileManagement::Backup { -class SvcExtensionProxyMock : public SvcExtensionProxy { +class SvcExtensionProxyMock : public ExtensionProxy { public: - SvcExtensionProxyMock() : SvcExtensionProxy(nullptr) {}; + SvcExtensionProxyMock() : ExtensionProxy(nullptr) {}; public: - MOCK_METHOD(UniqueFd, GetFileHandle, (const std::string&, 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, PublishIncrementalFile, (const std::string&)); - MOCK_METHOD(ErrCode, HandleIncrementalBackup, (UniqueFd, UniqueFd)); - MOCK_METHOD(ErrCode, IncrementalOnBackup, (bool)); - MOCK_METHOD((std::tuple), GetIncrementalBackupFileHandle, ()); - MOCK_METHOD(ErrCode, GetBackupInfo, (std::string&)); - MOCK_METHOD(ErrCode, UpdateFdSendRate, (std::string&, int32_t)); - MOCK_METHOD(ErrCode, User0OnBackup, ()); +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, GetIncrementalFileHandle, (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, GetIncrementalBackupFileHandle, (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/svc_session_manager_mock.h b/tests/mock/module_ipc/include/svc_session_manager_mock.h index 17634813c..f883b5f92 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/service_mock.cpp b/tests/mock/module_ipc/service_mock.cpp index 547ce2562..d88000809 100644 --- a/tests/mock/module_ipc/service_mock.cpp +++ b/tests/mock/module_ipc/service_mock.cpp @@ -168,7 +168,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); } @@ -317,16 +317,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) {} diff --git a/tests/mock/module_ipc/service_reverse_proxy_mock.cpp b/tests/mock/module_ipc/service_reverse_proxy_mock.cpp index ee7e924e0..bfba02348 100644 --- a/tests/mock/module_ipc/service_reverse_proxy_mock.cpp +++ b/tests/mock/module_ipc/service_reverse_proxy_mock.cpp @@ -13,64 +13,159 @@ * 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, + int 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, + int fd, + int 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 8a3c066a8..46c716827 100644 --- a/tests/mock/module_ipc/service_stub_mock.cpp +++ b/tests/mock/module_ipc/service_stub_mock.cpp @@ -19,7 +19,7 @@ #include "b_error/b_error.h" #include "b_resources/b_constants.h" -#include "module_ipc/service_reverse_proxy.h" +#include "service_reverse_proxy.h" namespace OHOS::FileManagement::Backup { using namespace std; 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 6c8b88f42..6339aed08 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 001f3dee2..061ded0a6 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 a2534d899..3b8ae2212 100644 --- a/tests/mock/module_ipc/svc_extension_proxy_mock.cpp +++ b/tests/mock/module_ipc/svc_extension_proxy_mock.cpp @@ -13,73 +13,73 @@ * limitations under the License. */ -#include "module_ipc/svc_extension_proxy.h" +#include "extension_proxy.h" namespace OHOS::FileManagement::Backup { using namespace std; -UniqueFd SvcExtensionProxy::GetFileHandle(const string &fileName, int32_t &errCode) +ErrCode ExtensionProxy::GetFileHandleWithUniqueFd(const string &fileName, int32_t &errCode, int &fd) { - return UniqueFd(-1); + return 0; } -ErrCode SvcExtensionProxy::HandleClear() +ErrCode ExtensionProxy::HandleClear() { return 0; } -ErrCode SvcExtensionProxy::HandleBackup(bool isClearData) +ErrCode ExtensionProxy::HandleBackup(bool isClearData) { return 0; } -ErrCode SvcExtensionProxy::PublishFile(const string &fileName) +ErrCode ExtensionProxy::PublishFile(const string &fileName) { return 0; } -ErrCode SvcExtensionProxy::HandleRestore(bool isClearData) +ErrCode ExtensionProxy::HandleRestore(bool isClearData) { return 0; } -ErrCode SvcExtensionProxy::GetBackupInfo(std::string &result) +ErrCode ExtensionProxy::GetBackupInfo(std::string &result) { return 0; } -std::tuple SvcExtensionProxy::GetIncrementalFileHandle(const string &fileName) +ErrCode ExtensionProxy::GetIncrementalFileHandle(const string &fileName, UniqueFdGroup &fdGroup) { - return {0, UniqueFd(-1), UniqueFd(-1)}; + return 0; } -ErrCode SvcExtensionProxy::PublishIncrementalFile(const string &fileName) +ErrCode ExtensionProxy::PublishIncrementalFile(const string &fileName) { return 0; } -ErrCode SvcExtensionProxy::HandleIncrementalBackup(UniqueFd incrementalFd, UniqueFd manifestFd) +ErrCode ExtensionProxy::HandleIncrementalBackup(int incrementalFd, int manifestFd) { return 0; } -ErrCode SvcExtensionProxy::IncrementalOnBackup(bool isClearData) +ErrCode ExtensionProxy::IncrementalOnBackup(bool isClearData) { return 0; } -ErrCode SvcExtensionProxy::UpdateFdSendRate(std::string &bundleName, int32_t sendRate) +ErrCode ExtensionProxy::UpdateFdSendRate(const std::string &bundleName, int32_t sendRate) { return 0; } -ErrCode SvcExtensionProxy::User0OnBackup() +ErrCode ExtensionProxy::User0OnBackup() { return 0; } -tuple SvcExtensionProxy::GetIncrementalBackupFileHandle() +ErrCode ExtensionProxy::GetIncrementalBackupFileHandle(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 749be058a..fc29b081a 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 b7ac3a85e..f4e0acd03 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 455274faa..dc96aa6e6 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 650845102..6c8bbf411 100644 --- a/tests/moduletests/backup_kit_inner/BUILD.gn +++ b/tests/moduletests/backup_kit_inner/BUILD.gn @@ -25,13 +25,14 @@ 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", ] sources += backup_mock_proxy_src + public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] + include_dirs = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner/", "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", diff --git a/tests/unittests/backup_api/backup_impl/BUILD.gn b/tests/unittests/backup_api/backup_impl/BUILD.gn index 1ef532c62..9055dc30d 100644 --- a/tests/unittests/backup_api/backup_impl/BUILD.gn +++ b/tests/unittests/backup_api/backup_impl/BUILD.gn @@ -54,7 +54,6 @@ ohos_unittest("backup_sa_impl_test") { "${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", ] @@ -69,6 +68,7 @@ ohos_unittest("backup_sa_impl_test") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", + "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", 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 3399bc312..614905b0e 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,16 @@ public: reply.WriteInt32(0); reply.WriteFileDescriptor(fd); return BError(BError::Codes::OK); - } + }; + + ErrCode GetFileHandleWithUniqueFd(const std::string &fileName, int32_t &getFileHandleErrCode, int &fd) override + { + UniqueFd fdResult = GetFileHandle(fileName, getFileHandleErrCode); + fd = fdResult.Release(); + return ERR_OK; + }; - UniqueFd GetFileHandle(const std::string &fileName, int32_t &errCode) override + UniqueFd GetFileHandle(const std::string &fileName, int32_t &errCode) { GTEST_LOG_(INFO) << "GetFileHandle" << fileName; if (fileName == "testName") { @@ -104,7 +111,11 @@ public: return BError(BError::Codes::OK); }; - std::tuple GetIncrementalFileHandle(const std::string &fileName) override + ErrCode GetIncrementalFileHandle(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)}; }; @@ -114,7 +125,11 @@ public: return BError(BError::Codes::OK); }; - ErrCode HandleIncrementalBackup(UniqueFd incrementalFd, UniqueFd manifestFd) override + ErrCode HandleIncrementalBackup(int incrementalFd, int manifestFd) override + { + return BError(BError::Codes::OK); + }; + ErrCode HandleIncrementalBackup(UniqueFd incrementalFd, UniqueFd manifestFd) { return BError(BError::Codes::OK); }; @@ -124,7 +139,12 @@ public: return BError(BError::Codes::OK); }; - std::tuple GetIncrementalBackupFileHandle() override + ErrCode GetIncrementalBackupFileHandle(UniqueFdGroup &fdGroup) override + { + return BError(BError::Codes::OK); + }; + + std::tuple GetIncrementalBackupFileHandle() { return {UniqueFd(-1), UniqueFd(-1)}; }; @@ -134,7 +154,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/service_reverse_mock.h b/tests/unittests/backup_api/backup_impl/include/service_reverse_mock.h index cd066641e..1d2effa5c 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,151 @@ 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 {} - - 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 {} - - 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 {} - - 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 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); + } + + 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); + } + + 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); + } + + 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_reverse_stub_test.cpp b/tests/unittests/backup_api/backup_impl/service_reverse_stub_test.cpp deleted file mode 100644 index 268005e53..000000000 --- a/tests/unittests/backup_api/backup_impl/service_reverse_stub_test.cpp +++ /dev/null @@ -1,960 +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"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_BackupOnScanningInfo_0100 - * @tc.name: SUB_backup_ServiceReverseStub_BackupOnScanningInfo_0100 - * @tc.desc: Test function of BackupOnScanningInfo interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_BackupOnScanningInfo_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_BackupOnScanningInfo_0100"; - try { - MockServiceReverse service; - EXPECT_CALL(service, BackupOnScanningInfo(_)).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_SCANNED_INFO), data, - reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by BackupOnScanningInfo."; - } - GTEST_LOG_(INFO) << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_BackupOnScanningInfo_0100"; -} - -/** - * @tc.number: SUB_backup_ServiceReverseStub_IncrementalBackupOnScanningInfo_0100 - * @tc.name: SUB_backup_ServiceReverseStub_IncrementalBackupOnScanningInfo_0100 - * @tc.desc: Test function of IncrementalBackupOnScanningInfo interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseStubTest, - SUB_backup_ServiceReverseStub_IncrementalBackupOnScanningInfo_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << - "ServiceReverseStubTest-begin SUB_backup_ServiceReverseStub_IncrementalBackupOnScanningInfo_0100"; - try { - MockServiceReverse service; - MessageParcel data; - MessageParcel reply; - MessageOption option; - EXPECT_TRUE(data.WriteInterfaceToken(IServiceReverse::GetDescriptor())); - EXPECT_TRUE(data.WriteString(BUNDLE_NAME)); - - EXPECT_CALL(service, IncrementalBackupOnScanningInfo(_)).WillOnce(Return()); - EXPECT_EQ(BError(BError::Codes::OK), - service.OnRemoteRequest( - static_cast( - IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_SCANNED_INFO), - data, reply, option)); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseStubTest-an exception occurred by BackupOnScanningInfo."; - } - GTEST_LOG_(INFO) << "ServiceReverseStubTest-end SUB_backup_ServiceReverseStub_IncrementalBackupOnScanningInfo_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 1f5cb90e6..1c9177240 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) { @@ -1765,7 +1765,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_BackupOnScanningInfo_0100 { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_BackupOnScanningInfo_0100"; try { - Init(IServiceReverse::Scenario::BACKUP); + Init(IServiceReverseType::Scenario::BACKUP); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_BackupOnScanningInfo_0100 service_ == nullptr"; @@ -1793,7 +1793,7 @@ HWTEST_F(ServiceReverseTest, SUB_backup_ServiceReverse_BackupOnScanningInfo_0101 { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_BackupOnScanningInfo_0101"; try { - Init(IServiceReverse::Scenario::RESTORE); + Init(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_BackupOnScanningInfo_0101 service_ == nullptr"; @@ -1822,7 +1822,7 @@ HWTEST_F(ServiceReverseTest, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalBackupOnScanningInfo_0100"; try { - Init(IServiceReverse::Scenario::RESTORE); + Init(IServiceReverseType::Scenario::RESTORE); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalBackupOnScanningInfo_0100 service_ == nullptr"; @@ -1851,7 +1851,7 @@ HWTEST_F(ServiceReverseTest, { GTEST_LOG_(INFO) << "ServiceReverseTest-begin SUB_backup_ServiceReverse_IncrementalBackupOnScanningInfo_0101"; try { - Init(IServiceReverse::Scenario::BACKUP); + Init(IServiceReverseType::Scenario::BACKUP); if (service_ == nullptr) { GTEST_LOG_(INFO) << "SUB_backup_ServiceReverse_IncrementalBackupOnScanningInfo_0101 service_ == nullptr"; diff --git a/tests/unittests/backup_ext/BUILD.gn b/tests/unittests/backup_ext/BUILD.gn index aa8aa1317..71e2af03c 100644 --- a/tests/unittests/backup_ext/BUILD.gn +++ b/tests/unittests/backup_ext/BUILD.gn @@ -41,6 +41,7 @@ ohos_unittest("ext_extension_test") { ] deps = [ + "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/utils:backup_utils", "${path_jsoncpp}:jsoncpp", "//third_party/googletest:gtest_main", @@ -78,49 +79,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 +97,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", @@ -163,6 +120,7 @@ ohos_unittest("tar_file_test") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", + "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", @@ -214,7 +172,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", @@ -222,6 +179,8 @@ ohos_unittest("untar_file_sup_test") { ] sources += backup_mock_proxy_src + public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] + include_dirs = [ "${path_ability_runtime}/services/common/include", "${path_ability_runtime}/interfaces/kits/napi/aafwk/inner/napi_common", @@ -231,6 +190,7 @@ ohos_unittest("untar_file_sup_test") { "${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", + "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/tests/mock/library_func_mock", "${path_backup}/utils/include", "${path_napi}/native_engine", @@ -290,7 +250,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", @@ -314,6 +273,7 @@ ohos_unittest("untar_file_test") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", + "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", @@ -367,6 +327,7 @@ ohos_unittest("ext_backup_js_test") { ] deps = [ + "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", "${path_googletest}:gtest_main", @@ -403,6 +364,15 @@ ohos_unittest("ext_backup_js_test") { "private=public", ] + sanitize = { + integer_overflow = true + ubsan = true + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + cfi_vcall_icall_only = true + debug = false + } use_exceptions = true } @@ -445,7 +415,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 6e07ddd4d..000000000 --- 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/module_app_gallery/BUILD.gn b/tests/unittests/backup_sa/module_app_gallery/BUILD.gn index 24d57884c..c0bde1a20 100644 --- a/tests/unittests/backup_sa/module_app_gallery/BUILD.gn +++ b/tests/unittests/backup_sa/module_app_gallery/BUILD.gn @@ -35,6 +35,7 @@ ohos_unittest("app_gallery_dispose_proxy_test") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", + "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", ] diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn index 6685f522e..f95ea7e11 100644 --- a/tests/unittests/backup_sa/module_ipc/BUILD.gn +++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn @@ -25,16 +25,10 @@ ohos_unittest("module_ipc_test") { "${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 = [ @@ -49,6 +43,7 @@ ohos_unittest("module_ipc_test") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", + "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "//third_party/googletest:gmock_main", @@ -104,6 +99,8 @@ ohos_unittest("backup_service_test") { sources += backup_mock_scheduler_src sources += backup_mock_module_external_src + public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] + include_dirs = [ "${path_backup}/services/backup_sa/include", "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", @@ -182,6 +179,8 @@ ohos_unittest("backup_service_throw_test") { sources += backup_mock_scheduler_src sources += backup_mock_module_external_src + public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] + include_dirs = [ "${path_backup}/services/backup_sa/include", "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", @@ -253,6 +252,8 @@ ohos_unittest("backup_service_session_test") { sources += backup_mock_service_src sources += backup_mock_module_external_src + public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] + include_dirs = [ "${path_backup}/services/backup_sa/include", "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", @@ -309,6 +310,8 @@ ohos_unittest("backup_service_scheduler_test") { sources += backup_mock_session_manager_src sources += backup_mock_module_external_src + public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] + include_dirs = [ "${path_backup}/services/backup_sa/include", "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", @@ -372,6 +375,8 @@ ohos_unittest("backup_restore_deps_manager_test") { sources += backup_mock_scheduler_src sources += backup_mock_module_external_src + public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] + include_dirs = [ "${path_backup}/services/backup_sa/include", "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", @@ -422,8 +427,6 @@ ohos_unittest("backup_service_incremental_test") { "${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", "service_incremental_test.cpp", ] @@ -441,6 +444,7 @@ ohos_unittest("backup_service_incremental_test") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", + "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", @@ -464,6 +468,15 @@ ohos_unittest("backup_service_incremental_test") { "storage_service:storage_manager_sa_proxy", ] + sanitize = { + integer_overflow = true + ubsan = true + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + cfi_vcall_icall_only = true + debug = false + } defines = [ "private=public" ] use_exceptions = true } @@ -490,8 +503,6 @@ 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", "service_other_test.cpp", ] @@ -512,6 +523,7 @@ ohos_unittest("backup_service_other_test") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", + "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", @@ -535,6 +547,16 @@ ohos_unittest("backup_service_other_test") { "storage_service:storage_manager_sa_proxy", ] + sanitize = { + integer_overflow = true + ubsan = true + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + cfi_vcall_icall_only = true + debug = false + } + defines = [ "private=public" ] use_exceptions = true } 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 505e0eb57..788616b82 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 fbbe9d945..e7dbba02f 100644 --- a/tests/unittests/backup_sa/module_ipc/service_incremental_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_incremental_test.cpp @@ -57,7 +57,7 @@ public: virtual ErrCode GetFileHandle(const string&, const string&) = 0; virtual int Dump(int, const vector&) = 0; virtual ErrCode VerifyCaller() = 0; - virtual ErrCode VerifyCaller(IServiceReverse::Scenario) = 0; + virtual ErrCode VerifyCaller(IServiceReverseType::Scenario) = 0; virtual int32_t GetUserIdDefault() = 0; virtual ErrCode GetBackupInfo(BundleName&, std::string&) = 0; virtual ErrCode UpdateTimer(BundleName&, uint32_t, bool&) = 0; @@ -111,7 +111,7 @@ public: MOCK_METHOD(ErrCode, GetFileHandle, (const string&, const string&)); MOCK_METHOD(int, Dump, (int, const vector&)); MOCK_METHOD(ErrCode, VerifyCaller, ()); - MOCK_METHOD(ErrCode, VerifyCaller, (IServiceReverse::Scenario)); + MOCK_METHOD(ErrCode, VerifyCaller, (IServiceReverseType::Scenario)); MOCK_METHOD(int32_t, GetUserIdDefault, ()); MOCK_METHOD(ErrCode, GetBackupInfo, (BundleName&, std::string&)); MOCK_METHOD(ErrCode, UpdateTimer, (BundleName&, uint32_t, bool&)); @@ -260,7 +260,7 @@ ErrCode Service::VerifyCaller() return BService::serviceMock->VerifyCaller(); } -ErrCode Service::VerifyCaller(IServiceReverse::Scenario scenario) +ErrCode Service::VerifyCaller(IServiceReverseType::Scenario scenario) { return BService::serviceMock->VerifyCaller(scenario); } @@ -355,14 +355,14 @@ void Service::OnBundleStarted(BError, sptr, const BundleName& void Service::HandleExceptionOnAppendBundles(sptr, const vector&, const vector&) {} -void Service::BundleBeginRadarReport(const std::string&, const ErrCode, const IServiceReverse::Scenario) {} +void Service::BundleBeginRadarReport(const std::string&, const ErrCode, const IServiceReverseType::Scenario) {} -void Service::BundleEndRadarReport(const std::string&, const ErrCode, const IServiceReverse::Scenario) {} +void Service::BundleEndRadarReport(const std::string&, const ErrCode, const IServiceReverseType::Scenario) {} void Service::FileReadyRadarReport(const std::string&, const std::string&, const ErrCode, - const IServiceReverse::Scenario) {} + const IServiceReverseType::Scenario) {} -void Service::ExtensionConnectFailRadarReport(const std::string&, const ErrCode, const IServiceReverse::Scenario) {} +void Service::ExtensionConnectFailRadarReport(const std::string&, const ErrCode, const IServiceReverseType::Scenario) {} void Service::PermissionCheckFailRadar(const std::string&, const std::string&) {} @@ -1042,24 +1042,24 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalFileReady_ string bundleName; 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()); + EXPECT_CALL(*srProxy, IncrementalRestoreOnFileReady(_, _, _, _, _)).WillOnce(Return(0)); auto ret = service->AppIncrementalFileReady(bundleName, fileName, UniqueFd(-1), UniqueFd(-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(bundleName, fileName, UniqueFd(-1), UniqueFd(-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(bundleName, fileName, UniqueFd(-1), UniqueFd(-1), errCode); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); @@ -1086,9 +1086,9 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalFileReady_ string bundleName; 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(*srvMock, HandleCurBundleFileReady(_, _, _)) .WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG).GetCode())); @@ -1096,10 +1096,10 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalFileReady_ EXPECT_EQ(ret, BError(BError::Codes::SA_INVAL_ARG).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(true)); EXPECT_CALL(*srvMock, HandleCurBundleFileReady(_, _, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode())); ret = service->AppIncrementalFileReady(bundleName, fileName, UniqueFd(-1), UniqueFd(-1), errCode); @@ -1132,26 +1132,26 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalFileReady_ EXPECT_EQ(ret, BError(BError::Codes::SA_INVAL_ARG).GetCode()); EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_)).WillOnce(Return(BError(BError::Codes::OK).GetCode())); - 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()); + EXPECT_CALL(*srProxy, IncrementalRestoreOnFileReady(_, _, _, _, _)).WillOnce(Return(0)); ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_)).WillOnce(Return(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); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); fileName = BConstants::EXT_BACKUP_MANAGE; EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_)).WillOnce(Return(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, 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); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); @@ -1178,9 +1178,9 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalFileReady_ string fileName; int32_t errCode = 0; EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_)).WillOnce(Return(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(true)); EXPECT_CALL(*srvMock, HandleCurBundleFileReady(_, _, _)) .WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG).GetCode())); @@ -1189,10 +1189,10 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalFileReady_ fileName = BConstants::EXT_BACKUP_MANAGE; EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_)).WillOnce(Return(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, 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(true)); EXPECT_CALL(*srvMock, HandleCurBundleFileReady(_, _, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode())); ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode); @@ -1329,10 +1329,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(*svcProxy, GetIncrementalFileHandle(_)).WillOnce(Return(make_tuple(0, UniqueFd(-1), UniqueFd(-1)))); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)); + EXPECT_CALL(*svcProxy, GetIncrementalFileHandle(_, _)).WillOnce(Return(0)); + 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(*srvMock, HandleCurBundleFileReady(_, _, _)) .WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG).GetCode())); @@ -1344,10 +1344,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(*svcProxy, GetIncrementalFileHandle(_)).WillOnce(Return(make_tuple(0, UniqueFd(-1), UniqueFd(-1)))); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*svcProxy, GetIncrementalFileHandle(_, _)).WillOnce(Return(0)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalRestoreOnFileReady(_, _, _, _, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalRestoreOnFileReady(_, _, _, _, _)).WillOnce(Return(0)); ret = service->GetIncrementalFileHandle(bundleName, fileName); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); @@ -1377,41 +1377,41 @@ 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)); EXPECT_TRUE(service->IncrementalBackup(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(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(nullptr)); EXPECT_TRUE(service->IncrementalBackup(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(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); EXPECT_FALSE(service->IncrementalBackup(bundleName)); - 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(0)); EXPECT_TRUE(service->IncrementalBackup(bundleName)); - 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(0)); EXPECT_TRUE(service->IncrementalBackup(bundleName)); - 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)); @@ -1437,13 +1437,13 @@ 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)); EXPECT_FALSE(service->IncrementalBackup(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(true)); @@ -1451,8 +1451,8 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_IncrementalBackup_0100, EXPECT_FALSE(service->IncrementalBackup(bundleName)); set fileNameVec { "fileName" }; - 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, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(true)); @@ -1460,12 +1460,11 @@ 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)).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleStarted(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleStarted(_, _)).WillOnce(Return(0)); EXPECT_CALL(*session, GetOldBackupVersion()).WillOnce(Return("")); EXPECT_CALL(*session, GetExtFileNameRequest(_)).WillOnce(Return(fileNameVec)); - EXPECT_CALL(*svcProxy, GetIncrementalFileHandle(_)) - .WillOnce(Return(make_tuple(BError(BError::Codes::OK).GetCode(), UniqueFd(-1), UniqueFd(-1)))); - EXPECT_CALL(*srProxy, IncrementalRestoreOnFileReady(_, _, _, _, _)).WillOnce(Return()); + EXPECT_CALL(*svcProxy, GetIncrementalFileHandle(_, _)).WillOnce(Return(0)); + EXPECT_CALL(*srProxy, IncrementalRestoreOnFileReady(_, _, _, _, _)).WillOnce(Return(0)); EXPECT_TRUE(service->IncrementalBackup(bundleName)); } catch (...) { EXPECT_TRUE(false); @@ -1489,8 +1488,8 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_IncrementalBackup_0200, try { string bundleName; set fileNameVec { "fileName" }; - 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, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(true)); @@ -1498,15 +1497,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)).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleStarted(_, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleStarted(_, _)).WillOnce(Return(0)); EXPECT_CALL(*session, GetOldBackupVersion()).WillOnce(Return("1.0.0")); EXPECT_CALL(*session, GetExtFileNameRequest(_)).WillOnce(Return(fileNameVec)); - EXPECT_CALL(*svcProxy, GetIncrementalFileHandle(_)) - .WillOnce(Return(make_tuple(BError(BError::Codes::SA_INVAL_ARG).GetCode(), UniqueFd(-1), UniqueFd(-1)))); - EXPECT_CALL(*srProxy, IncrementalRestoreOnFileReady(_, _, _, _, _)).WillOnce(Return()); + EXPECT_CALL(*svcProxy, GetIncrementalFileHandle(_, _)).WillOnce(Return(0)); + EXPECT_CALL(*srProxy, IncrementalRestoreOnFileReady(_, _, _, _, _)).WillOnce(Return(0)); EXPECT_TRUE(service->IncrementalBackup(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(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); EXPECT_FALSE(service->IncrementalBackup(bundleName)); @@ -1532,19 +1530,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(0)); 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(0)); service->NotifyCallerCurAppIncrementDone(errCode, callerName); EXPECT_TRUE(true); } catch (...) { @@ -1658,20 +1656,20 @@ 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(*srvMock, VerifyCaller(_)).WillOnce(Return(BError(BError::Codes::OK).GetCode())); 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(*srvMock, VerifyCaller(_)).WillOnce(Return(BError(BError::Codes::OK).GetCode())); EXPECT_CALL(*session, GetSessionUserId()).WillOnce(Return(0)); ret = service->Release(); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); EXPECT_CALL(*srvMock, VerifyCaller(_)).WillOnce(Return(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 (...) { @@ -1752,7 +1750,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_CancelTask_0000, TestSiz EXPECT_CALL(*session, StopFwkTimer(_)).WillOnce(Return(false)); EXPECT_CALL(*session, StopExtTimer(_)).WillOnce(Return(false)); EXPECT_CALL(*connect, DisconnectBackupExtAbility()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); service->CancelTask("", service); EXPECT_TRUE(true); @@ -1762,7 +1760,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_CancelTask_0000, TestSiz EXPECT_CALL(*session, StopFwkTimer(_)).WillOnce(Return(false)); EXPECT_CALL(*session, StopExtTimer(_)).WillOnce(Return(false)); EXPECT_CALL(*connect, DisconnectBackupExtAbility()).WillOnce(Return(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, GetIsIncrementalBackup()).WillOnce(Return(false)); service->CancelTask("", service); EXPECT_TRUE(true); @@ -1792,8 +1790,8 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_CancelTask_0100, TestSiz EXPECT_CALL(*session, StopFwkTimer(_)).WillOnce(Return(false)); EXPECT_CALL(*session, StopExtTimer(_)).WillOnce(Return(false)); EXPECT_CALL(*connect, DisconnectBackupExtAbility()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::BACKUP)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, GetIsIncrementalBackup()).WillOnce(Return(true)); service->CancelTask("", service); EXPECT_TRUE(true); @@ -1804,7 +1802,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_CancelTask_0100, TestSiz EXPECT_CALL(*session, StopFwkTimer(_)).WillOnce(Return(false)); EXPECT_CALL(*session, StopExtTimer(_)).WillOnce(Return(false)); EXPECT_CALL(*connect, DisconnectBackupExtAbility()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*session, ValidRestoreDataType(_)).WillOnce(Return(false)); service->CancelTask("", service); EXPECT_TRUE(true); @@ -1815,8 +1813,8 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_CancelTask_0100, TestSiz EXPECT_CALL(*session, StopFwkTimer(_)).WillOnce(Return(false)); EXPECT_CALL(*session, StopExtTimer(_)).WillOnce(Return(false)); EXPECT_CALL(*connect, DisconnectBackupExtAbility()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)) - .WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, ValidRestoreDataType(_)).WillOnce(Return(true)); service->CancelTask("", service); EXPECT_TRUE(true); @@ -1852,26 +1850,26 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_Cancel_0000, TestSize.Le BError(BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK).GetCode()); service->session_ = session_; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*srvMock, VerifyCaller(_)).WillOnce(Return(BError(BError::Codes::EXT_INVAL_ARG).GetCode())); auto ret = service->Cancel(bundleName, result); EXPECT_EQ(ret, BError(BError::BackupErrorCode::E_CANCEL_UNSTARTED_TASK).GetCode()); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*srvMock, VerifyCaller(_)).WillOnce(Return(BError(BError::Codes::OK).GetCode())); EXPECT_CALL(*session, GetImpl()).WillOnce(Return(impl)); service->Cancel(bundleName, result); EXPECT_EQ(result, BError(BError::BackupErrorCode::E_CANCEL_NO_TASK).GetCode()); impl.backupExtNameMap.insert(make_pair(bundleName, info)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*srvMock, VerifyCaller(_)).WillOnce(Return(BError(BError::Codes::OK).GetCode())); EXPECT_CALL(*session, GetImpl()).WillOnce(Return(impl)); EXPECT_CALL(*session, GetServiceSchedAction(_)).WillOnce(Return(BConstants::ServiceSchedAction::UNKNOWN)); 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(*srvMock, VerifyCaller(_)).WillOnce(Return(BError(BError::Codes::OK).GetCode())); EXPECT_CALL(*session, GetImpl()).WillOnce(Return(impl)); EXPECT_CALL(*session, GetServiceSchedAction(_)).WillOnce(Return(BConstants::ServiceSchedAction::CLEAN)); @@ -1904,14 +1902,14 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_Cancel_0100, TestSize.Le int32_t result; impl.backupExtNameMap.insert(make_pair(bundleName, info)); - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::RESTORE)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*srvMock, VerifyCaller(_)).WillOnce(Return(BError(BError::Codes::OK).GetCode())); 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)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*srvMock, VerifyCaller(_)).WillOnce(Return(BError(BError::Codes::OK).GetCode())); EXPECT_CALL(*session, GetImpl()).WillOnce(Return(impl)); EXPECT_CALL(*session, GetServiceSchedAction(_)).WillOnce(Return(BConstants::ServiceSchedAction::RUNNING)); 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 bb0876538..c81f2a1d0 100644 --- a/tests/unittests/backup_sa/module_ipc/service_other_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_other_test.cpp @@ -693,30 +693,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(0)); 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(0)); 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(0)); service->OnBundleStarted(error, session_, bundleName); EXPECT_TRUE(true); } catch (...) { @@ -767,7 +767,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); @@ -948,7 +948,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); @@ -956,7 +956,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); @@ -966,7 +966,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); @@ -1358,12 +1358,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("")); @@ -1375,7 +1375,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("")); @@ -1411,7 +1411,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("")); @@ -1430,7 +1430,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("")); @@ -1599,14 +1599,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); @@ -1637,7 +1637,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)); @@ -1647,7 +1647,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)); @@ -1675,42 +1675,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(0)); 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(0)); 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(0)); ret = service->BackupSA(bundleName); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -1751,7 +1751,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, ""); @@ -1776,20 +1776,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(0)); 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(0)); service->NotifyCallerCurAppDone(0, ""); EXPECT_TRUE(true); } catch (...) { @@ -1818,7 +1818,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(0)); auto ret = service->ReportAppProcessInfo(processInfo, BackupRestoreScenario::FULL_RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); @@ -1827,7 +1827,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(0)); ret = service->ReportAppProcessInfo(processInfo, BackupRestoreScenario::INCREMENTAL_RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); @@ -1836,7 +1836,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(0)); ret = service->ReportAppProcessInfo(processInfo, BackupRestoreScenario::FULL_BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); @@ -1845,7 +1845,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(0)); ret = service->ReportAppProcessInfo(processInfo, BackupRestoreScenario::INCREMENTAL_BACKUP); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -1909,9 +1909,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())); @@ -1923,7 +1923,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)); @@ -1952,7 +1952,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)); @@ -1961,16 +1961,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())); @@ -2061,19 +2061,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 deleted file mode 100644 index f554d5263..000000000 --- a/tests/unittests/backup_sa/module_ipc/service_reverse_proxy_test.cpp +++ /dev/null @@ -1,2686 +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 "b_error/b_error.h" -#include "b_file_info.h" -#include "iservice_registry.h" -#include "message_parcel_mock.h" -#include "module_ipc/service_reverse_proxy.h" -#include "service_reverse_mock.h" -#include "test_manager.h" -#include "unique_fd.h" - -namespace OHOS::FileManagement::Backup { -using namespace std; -using namespace testing; - -namespace { -const string FILE_NAME = "1.tar"; -const string BUNDLE_NAME = "com.example.app2backup"; -const string FILE_NAME_MANIFEST = "manifest.rp"; -const string RESULT_REPORT = "result_report"; -} // namespace - -class ServiceReverseProxyTest : public testing::Test { -public: - static void SetUpTestCase(void); - static void TearDownTestCase(); - void SetUp() override {}; - void TearDown() override {}; - -public: - static inline shared_ptr proxy_ = nullptr; - static inline sptr mock_ = nullptr; - static inline shared_ptr messageParcelMock_ = nullptr; -}; - -void ServiceReverseProxyTest::SetUpTestCase(void) -{ - mock_ = sptr(new ServiceReverseMock()); - proxy_ = make_shared(mock_); - messageParcelMock_ = make_shared(); - MessageParcelMock::messageParcel = messageParcelMock_; -} -void ServiceReverseProxyTest::TearDownTestCase() -{ - mock_ = nullptr; - proxy_ = nullptr; - MessageParcelMock::messageParcel = nullptr; - messageParcelMock_ = nullptr; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_BackupOnFileReady_0100 - * @tc.name: SUB_ServiceReverse_proxy_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(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_BackupOnFileReady_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_BackupOnFileReady_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteFileDescriptor(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - - TestManager tm("ServiceReverseProxyTest_GetFd_0100"); - 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); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by BackupOnFileReady."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_BackupOnFileReady_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_BackupOnFileReady_0101 - * @tc.name: SUB_ServiceReverse_proxy_BackupOnFileReady_0101 - * @tc.desc: Test function of BackupOnFileReady interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_BackupOnFileReady_0101, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_BackupOnFileReady_0101"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by BackupOnFileReady."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_BackupOnFileReady_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_BackupOnFileReady_0102 - * @tc.name: SUB_ServiceReverse_proxy_BackupOnFileReady_0102 - * @tc.desc: Test function of BackupOnFileReady interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_BackupOnFileReady_0102, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_BackupOnFileReady_0102"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnFileReady(BUNDLE_NAME, FILE_NAME, -1, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteFileDescriptor(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteFileDescriptor(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by BackupOnFileReady."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_BackupOnFileReady_0102"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_BackupOnFileReady_0103 - * @tc.name: SUB_ServiceReverse_proxy_BackupOnFileReady_0103 - * @tc.desc: Test function of BackupOnFileReady interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_BackupOnFileReady_0103, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_BackupOnFileReady_0103"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteFileDescriptor(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by BackupOnFileReady."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_BackupOnFileReady_0103"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_BackupOnBundleStarted_0100 - * @tc.name: SUB_ServiceReverse_proxy_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(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_BackupOnBundleStarted_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_BackupOnBundleStarted_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by BackupOnBundleStarted."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_BackupOnBundleStarted_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_BackupOnBundleStarted_0101 - * @tc.name: SUB_ServiceReverse_proxy_BackupOnBundleStarted_0101 - * @tc.desc: Test function of BackupOnBundleStarted interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_BackupOnBundleStarted_0101, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_BackupOnBundleStarted_0101"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by BackupOnBundleStarted."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_BackupOnBundleStarted_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_BackupOnBundleFinished_0100 - * @tc.name: SUB_ServiceReverse_proxy_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(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_BackupOnBundleFinished_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_BackupOnBundleFinished_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by BackupOnBundleFinished."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_BackupOnBundleFinished_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_BackupOnBundleFinished_0101 - * @tc.name: SUB_ServiceReverse_proxy_BackupOnBundleFinished_0101 - * @tc.desc: Test function of BackupOnBundleFinished interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_BackupOnBundleFinished_0101, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_BackupOnBundleFinished_0101"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(false)); - proxy_->BackupOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - proxy_->BackupOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->BackupOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by BackupOnBundleFinished."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_BackupOnBundleFinished_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_BackupOnAllBundlesFinished_0100 - * @tc.name: SUB_ServiceReverse_proxy_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(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_BackupOnAllBundlesFinished_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_BackupOnAllBundlesFinished_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnAllBundlesFinished(BError(BError::Codes::OK)); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by BackupOnAllBundlesFinished."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_BackupOnAllBundlesFinished_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_BackupOnAllBundlesFinished_0101 - * @tc.name: SUB_ServiceReverse_proxy_BackupOnAllBundlesFinished_0101 - * @tc.desc: Test function of BackupOnAllBundlesFinished interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_BackupOnAllBundlesFinished_0101, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_BackupOnAllBundlesFinished_0101"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnAllBundlesFinished(BError(BError::Codes::OK)); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(false)); - proxy_->BackupOnAllBundlesFinished(BError(BError::Codes::OK)); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->BackupOnAllBundlesFinished(BError(BError::Codes::OK)); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by BackupOnAllBundlesFinished."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_BackupOnAllBundlesFinished_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_BackupOnResultReport_0100 - * @tc.name: SUB_ServiceReverse_proxy_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(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_BackupOnResultReport_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_BackupOnResultReport_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - std::string bundleName = "app01"; - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnResultReport(RESULT_REPORT, bundleName); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by BackupOnResultReport."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_BackupOnResultReport_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_BackupOnResultReport_0101 - * @tc.name: SUB_ServiceReverse_proxy_BackupOnResultReport_0101 - * @tc.desc: Test function of BackupOnResultReport interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_BackupOnResultReport_0101, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_BackupOnResultReport_0101"; - try { - std::string bundleName = "app01"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnResultReport(RESULT_REPORT, bundleName); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - proxy_->BackupOnResultReport(RESULT_REPORT, bundleName); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(false)); - proxy_->BackupOnResultReport(RESULT_REPORT, bundleName); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->BackupOnResultReport(RESULT_REPORT, bundleName); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by BackupOnResultReport."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_BackupOnResultReport_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_RestoreOnBundleStarted_0100 - * @tc.name: SUB_ServiceReverse_proxy_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(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_RestoreOnBundleStarted_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_RestoreOnBundleStarted_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->RestoreOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by RestoreOnBundleStarted."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_RestoreOnBundleStarted_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_RestoreOnBundleStarted_0101 - * @tc.name: SUB_ServiceReverse_proxy_RestoreOnBundleStarted_0101 - * @tc.desc: Test function of RestoreOnBundleStarted interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_RestoreOnBundleStarted_0101, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_RestoreOnBundleStarted_0101"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->RestoreOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(false)); - proxy_->RestoreOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - proxy_->RestoreOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->RestoreOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by RestoreOnBundleStarted."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_RestoreOnBundleStarted_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_RestoreOnBundleFinished_0100 - * @tc.name: SUB_ServiceReverse_proxy_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(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_RestoreOnBundleFinished_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_RestoreOnBundleFinished_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->RestoreOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by RestoreOnBundleFinished."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_RestoreOnBundleFinished_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_RestoreOnBundleFinished_0101 - * @tc.name: SUB_ServiceReverse_proxy_RestoreOnBundleFinished_0101 - * @tc.desc: Test function of RestoreOnBundleFinished interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_RestoreOnBundleFinished_0101, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_RestoreOnBundleFinished_0101"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->RestoreOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(false)); - proxy_->RestoreOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - proxy_->RestoreOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->RestoreOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by RestoreOnBundleFinished."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_RestoreOnBundleFinished_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_RestoreOnAllBundlesFinished_0100 - * @tc.name: SUB_ServiceReverse_proxy_RestoreOnAllBundlesFinished_0100 - * @tc.desc: Test function of RestoreOnAllBundlesFinished interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_RestoreOnAllBundlesFinished_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_RestoreOnAllBundlesFinished_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->RestoreOnAllBundlesFinished(BError(BError::Codes::OK)); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by RestoreOnAllBundlesFinished."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_RestoreOnAllBundlesFinished_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_RestoreOnAllBundlesFinished_0101 - * @tc.name: SUB_ServiceReverse_proxy_RestoreOnAllBundlesFinished_0101 - * @tc.desc: Test function of RestoreOnAllBundlesFinished interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_RestoreOnAllBundlesFinished_0101, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_RestoreOnAllBundlesFinished_0101"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->RestoreOnAllBundlesFinished(BError(BError::Codes::OK)); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(false)); - proxy_->RestoreOnAllBundlesFinished(BError(BError::Codes::OK)); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->RestoreOnAllBundlesFinished(BError(BError::Codes::OK)); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by RestoreOnAllBundlesFinished."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_RestoreOnAllBundlesFinished_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_RestoreOnFileReady_0100 - * @tc.name: SUB_ServiceReverse_proxy_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(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_RestoreOnFileReady_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_RestoreOnFileReady_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteFileDescriptor(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - - TestManager tm("ServiceReverseProxyTest_GetFd_0200"); - int32_t errCode = 0; - std::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); - } - EXPECT_TRUE(proxy_ != nullptr); - proxy_->RestoreOnFileReady(BUNDLE_NAME, FILE_NAME, fd, errCode); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by RestoreOnFileReady."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_RestoreOnFileReady_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_RestoreOnFileReady_0101 - * @tc.name: SUB_ServiceReverse_proxy_RestoreOnFileReady_0101 - * @tc.desc: Test function of RestoreOnFileReady interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_RestoreOnFileReady_0101, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_RestoreOnFileReady_0101"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->RestoreOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - proxy_->RestoreOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(false)); - proxy_->RestoreOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by RestoreOnFileReady."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_RestoreOnFileReady_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_RestoreOnFileReady_0102 - * @tc.name: SUB_ServiceReverse_proxy_RestoreOnFileReady_0102 - * @tc.desc: Test function of RestoreOnFileReady interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_RestoreOnFileReady_0102, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_RestoreOnFileReady_0102"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->RestoreOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteFileDescriptor(_)).WillOnce(Return(false)); - proxy_->RestoreOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by RestoreOnFileReady."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_RestoreOnFileReady_0102"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0100 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0100 - * @tc.desc: Test function of IncrementalBackupOnFileReady interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I911LB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteFileDescriptor(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - - TestManager tm("ServiceReverseProxyTest_GetFd_0300"); - std::string filePath = tm.GetRootDirCurTest().append(FILE_NAME); - UniqueFd fd(open(filePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - TestManager tm1("ServiceReverseProxyTest_GetFd_0301"); - std::string manifestFilePath = tm1.GetRootDirCurTest().append(FILE_NAME_MANIFEST); - UniqueFd manifestFd(open(manifestFilePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalBackupOnFileReady(BUNDLE_NAME, FILE_NAME, fd, manifestFd, 0); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalBackupOnFileReady."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0101 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0101 - * @tc.desc: Test function of IncrementalBackupOnFileReady interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0101, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0101"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalBackupOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - proxy_->IncrementalBackupOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(false)); - proxy_->IncrementalBackupOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalBackupOnFileReady."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0102 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0102 - * @tc.desc: Test function of IncrementalBackupOnFileReady interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0102, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0102"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalBackupOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(false)); - proxy_->IncrementalBackupOnFileReady(BUNDLE_NAME, FILE_NAME, -1, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteFileDescriptor(_)).WillOnce(Return(false)); - proxy_->IncrementalBackupOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalBackupOnFileReady."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0102"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0103 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0103 - * @tc.desc: Test function of IncrementalBackupOnFileReady interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0103, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0103"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteFileDescriptor(_)).WillOnce(Return(true)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalBackupOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteFileDescriptor(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(false)); - proxy_->IncrementalBackupOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteFileDescriptor(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->IncrementalBackupOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalBackupOnFileReady."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalBackupOnFileReady_0103"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalBackupOnBundleStarted_0100 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalBackupOnBundleStarted_0100 - * @tc.desc: Test function of IncrementalBackupOnBundleStarted interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I911LB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalBackupOnBundleStarted_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalBackupOnBundleStarted_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalBackupOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalBackupOnBundleStarted."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalBackupOnBundleStarted_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalBackupOnBundleStarted_0101 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalBackupOnBundleStarted_0101 - * @tc.desc: Test function of IncrementalBackupOnBundleStarted interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalBackupOnBundleStarted_0101, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalBackupOnBundleStarted_0101"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalBackupOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(false)); - proxy_->IncrementalBackupOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - proxy_->IncrementalBackupOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->IncrementalBackupOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalBackupOnBundleStarted."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalBackupOnBundleStarted_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalBackupOnBundleFinished_0100 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalBackupOnBundleFinished_0100 - * @tc.desc: Test function of IncrementalBackupOnBundleFinished interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I911LB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalBackupOnBundleFinished_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalBackupOnBundleFinished_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalBackupOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalBackupOnBundleFinished."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalBackupOnBundleFinished_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalBackupOnBundleFinished_0101 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalBackupOnBundleFinished_0101 - * @tc.desc: Test function of IncrementalBackupOnBundleFinished interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalBackupOnBundleFinished_0101, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalBackupOnBundleFinished_0101"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalBackupOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(false)); - proxy_->IncrementalBackupOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - proxy_->IncrementalBackupOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->IncrementalBackupOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalBackupOnBundleFinished."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalBackupOnBundleFinished_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalBackupOnAllBundlesFinished_0100 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalBackupOnAllBundlesFinished_0100 - * @tc.desc: Test function of IncrementalBackupOnAllBundlesFinished interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I911LB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalBackupOnAllBundlesFinished_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) - << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalBackupOnAllBundlesFinished_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalBackupOnAllBundlesFinished(BError(BError::Codes::OK)); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalBackupOnAllBundlesFinished."; - } - GTEST_LOG_(INFO) - << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalBackupOnAllBundlesFinished_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalBackupOnAllBundlesFinished_0101 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalBackupOnAllBundlesFinished_0101 - * @tc.desc: Test function of IncrementalBackupOnAllBundlesFinished interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalBackupOnAllBundlesFinished_0101, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) - << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalBackupOnAllBundlesFinished_0101"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalBackupOnAllBundlesFinished(BError(BError::Codes::OK)); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(false)); - proxy_->IncrementalBackupOnAllBundlesFinished(BError(BError::Codes::OK)); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->IncrementalBackupOnAllBundlesFinished(BError(BError::Codes::OK)); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalBackupOnAllBundlesFinished."; - } - GTEST_LOG_(INFO) - << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalBackupOnAllBundlesFinished_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleStarted_0100 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleStarted_0100 - * @tc.desc: Test function of IncrementalRestoreOnBundleStarted interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I911LB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleStarted_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleStarted_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalRestoreOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalRestoreOnBundleStarted."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleStarted_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleStarted_0101 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleStarted_0101 - * @tc.desc: Test function of IncrementalRestoreOnBundleStarted interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleStarted_0101, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleStarted_0101"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalRestoreOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(false)); - proxy_->IncrementalRestoreOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - proxy_->IncrementalRestoreOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->IncrementalRestoreOnBundleStarted(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalRestoreOnBundleStarted."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleStarted_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleFinished_0100 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleFinished_0100 - * @tc.desc: Test function of IncrementalRestoreOnBundleFinished interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I911LB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleFinished_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) - << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleFinished_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalRestoreOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalRestoreOnBundleFinished."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleFinished_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleFinished_0101 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleFinished_0101 - * @tc.desc: Test function of IncrementalRestoreOnBundleFinished interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleFinished_0101, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) - << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleFinished_0101"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalRestoreOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(false)); - proxy_->IncrementalRestoreOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - proxy_->IncrementalRestoreOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->IncrementalRestoreOnBundleFinished(BError(BError::Codes::OK), BUNDLE_NAME); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalRestoreOnBundleFinished."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalRestoreOnBundleFinished_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalRestoreOnAllBundlesFinished_0100 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalRestoreOnAllBundlesFinished_0100 - * @tc.desc: Test function of IncrementalRestoreOnAllBundlesFinished interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I911LB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalRestoreOnAllBundlesFinished_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) - << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalRestoreOnAllBundlesFinished_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalRestoreOnAllBundlesFinished(BError(BError::Codes::OK)); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalRestoreOnAllBundlesFinished."; - } - GTEST_LOG_(INFO) - << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalRestoreOnAllBundlesFinished_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalRestoreOnAllBundlesFinished_0101 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalRestoreOnAllBundlesFinished_0101 - * @tc.desc: Test function of IncrementalRestoreOnAllBundlesFinished interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalRestoreOnAllBundlesFinished_0101, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) - << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalRestoreOnAllBundlesFinished_0101"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalRestoreOnAllBundlesFinished(BError(BError::Codes::OK)); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(false)); - proxy_->IncrementalRestoreOnAllBundlesFinished(BError(BError::Codes::OK)); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->IncrementalRestoreOnAllBundlesFinished(BError(BError::Codes::OK)); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalRestoreOnAllBundlesFinished."; - } - GTEST_LOG_(INFO) - << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalRestoreOnAllBundlesFinished_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0100 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0100 - * @tc.desc: Test function of IncrementalRestoreOnFileReady interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I911LB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteFileDescriptor(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - - TestManager tm("ServiceReverseProxyTest_GetFd_0400"); - std::string filePath = tm.GetRootDirCurTest().append(FILE_NAME); - UniqueFd fd(open(filePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - TestManager tm1("ServiceReverseProxyTest_GetFd_0401"); - std::string manifestFilePath = tm1.GetRootDirCurTest().append(FILE_NAME_MANIFEST); - UniqueFd manifestFd(open(manifestFilePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalRestoreOnFileReady(BUNDLE_NAME, FILE_NAME, fd, manifestFd, 0); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalRestoreOnFileReady."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0101 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0101 - * @tc.desc: Test function of IncrementalRestoreOnFileReady interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0101, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0101"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalRestoreOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - proxy_->IncrementalRestoreOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(false)); - proxy_->IncrementalRestoreOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(false)); - proxy_->IncrementalRestoreOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalRestoreOnFileReady."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0102 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0102 - * @tc.desc: Test function of IncrementalRestoreOnFileReady interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0102, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0102"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalRestoreOnFileReady(BUNDLE_NAME, FILE_NAME, -1, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteFileDescriptor(_)).WillOnce(Return(false)); - proxy_->IncrementalRestoreOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteFileDescriptor(_)).WillOnce(Return(true)).WillOnce(Return(false)); - proxy_->IncrementalRestoreOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalRestoreOnFileReady."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0102"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0103 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0103 - * @tc.desc: Test function of IncrementalRestoreOnFileReady interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, - SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0103, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0103"; - try { - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteFileDescriptor(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalRestoreOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteBool(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteFileDescriptor(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->IncrementalRestoreOnFileReady(BUNDLE_NAME, FILE_NAME, 0, 0, 0); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalRestoreOnFileReady."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalRestoreOnFileReady_0103"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_RestoreOnResultReport_0100 - * @tc.name: SUB_ServiceReverse_proxy_RestoreOnResultReport_0100 - * @tc.desc: Test function of RestoreOnResultReport interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_RestoreOnResultReport_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_RestoreOnResultReport_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - std::string bundleName = "app01"; - EXPECT_TRUE(proxy_ != nullptr); - proxy_->RestoreOnResultReport(RESULT_REPORT, bundleName); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by RestoreOnResultReport."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_RestoreOnResultReport_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_RestoreOnResultReport_0101 - * @tc.name: SUB_ServiceReverse_proxy_RestoreOnResultReport_0101 - * @tc.desc: Test function of RestoreOnResultReport interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_RestoreOnResultReport_0101, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_RestoreOnResultReport_0101"; - try { - std::string bundleName = "app01"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->RestoreOnResultReport(RESULT_REPORT, bundleName); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - proxy_->RestoreOnResultReport(RESULT_REPORT, bundleName); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(false)); - proxy_->RestoreOnResultReport(RESULT_REPORT, bundleName); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - 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); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by RestoreOnResultReport."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_RestoreOnResultReport_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalRestoreOnResultReport_0100 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalRestoreOnResultReport_0100 - * @tc.desc: Test function of IncrementalRestoreOnResultReport interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_IncrementalRestoreOnResultReport_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalRestoreOnResultReport_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteInt32(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - std::string bundleName = "app01"; - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalRestoreOnResultReport(RESULT_REPORT, bundleName); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by RestoreOnResultReport."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalRestoreOnResultReport_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalRestoreOnResultReport_0101 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalRestoreOnResultReport_0101 - * @tc.desc: Test function of IncrementalRestoreOnResultReport interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_IncrementalRestoreOnResultReport_0101, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalRestoreOnResultReport_0101"; - try { - std::string bundleName = "app01"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalRestoreOnResultReport(RESULT_REPORT, bundleName); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - proxy_->IncrementalRestoreOnResultReport(RESULT_REPORT, bundleName); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(false)); - proxy_->IncrementalRestoreOnResultReport(RESULT_REPORT, bundleName); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - 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); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by RestoreOnResultReport."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalRestoreOnResultReport_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalBackupOnResultReport_0100 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalBackupOnResultReport_0100 - * @tc.desc: Test function of IncrementalBackupOnResultReport interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I9OVHB - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_IncrementalBackupOnResultReport_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalBackupOnResultReport_0100"; - try { - std::string bundleName = "app01"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalBackupOnResultReport(RESULT_REPORT, bundleName); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - proxy_->IncrementalBackupOnResultReport(RESULT_REPORT, bundleName); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(false)); - proxy_->IncrementalBackupOnResultReport(RESULT_REPORT, bundleName); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->IncrementalBackupOnResultReport(RESULT_REPORT, bundleName); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalBackupOnResultReport."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalBackupOnResultReport_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalBackupOnResultReport_0101 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalBackupOnResultReport_0101 - * @tc.desc: Test function of IncrementalBackupOnResultReport interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_IncrementalBackupOnResultReport_0101, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalBackupOnResultReport_0101"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - std::string bundleName = "app01"; - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalBackupOnResultReport(RESULT_REPORT, bundleName); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by RestoreOnResultReport."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalBackupOnResultReport_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_BackupOnProcessInfo_0100 - * @tc.name: SUB_ServiceReverse_proxy_BackupOnProcessInfo_0100 - * @tc.desc: Test function of BackupOnProcessInfo interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_BackupOnProcessInfo_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_BackupOnProcessInfo_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - EXPECT_TRUE(proxy_ != nullptr); - std::string processInfo = "{\"timeInfo\": \"\", \"resultInfo\": \"\"}"; - proxy_->BackupOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by BackupOnProcessInfo."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_BackupOnProcessInfo_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_BackupOnProcessInfo_0101 - * @tc.name: SUB_ServiceReverse_proxy_BackupOnProcessInfo_0101 - * @tc.desc: Test function of BackupOnProcessInfo interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_BackupOnProcessInfo_0101, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_BackupOnProcessInfo_0101"; - try { - std::string processInfo = "{\"timeInfo\": \"\", \"resultInfo\": \"\"}"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->BackupOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by BackupOnProcessInfo."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_BackupOnProcessInfo_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_RestoreOnProcessInfo_0100 - * @tc.name: SUB_ServiceReverse_proxy_RestoreOnProcessInfo_0100 - * @tc.desc: Test function of RestoreOnProcessInfo interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_RestoreOnProcessInfo_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_RestoreOnProcessInfo_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - EXPECT_TRUE(proxy_ != nullptr); - std::string processInfo = "{\"timeInfo\": \"\", \"resultInfo\": \"\"}"; - proxy_->RestoreOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by RestoreOnProcessInfo."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_RestoreOnProcessInfo_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_RestoreOnProcessInfo_0101 - * @tc.name: SUB_ServiceReverse_proxy_RestoreOnProcessInfo_0101 - * @tc.desc: Test function of RestoreOnProcessInfo interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_RestoreOnProcessInfo_0101, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_RestoreOnProcessInfo_0101"; - try { - std::string processInfo = "{\"timeInfo\": \"\", \"resultInfo\": \"\"}"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->RestoreOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->RestoreOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->RestoreOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->RestoreOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by RestoreOnProcessInfo."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_RestoreOnProcessInfo_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalBackupOnProcessInfo_0100 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalBackupOnProcessInfo_0100 - * @tc.desc: Test function of IncrementalBackupOnProcessInfo interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_IncrementalBackupOnProcessInfo_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalBackupOnProcessInfo_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - EXPECT_TRUE(proxy_ != nullptr); - std::string processInfo = "{\"timeInfo\": \"\", \"resultInfo\": \"\"}"; - proxy_->IncrementalBackupOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalBackupOnProcessInfo."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalBackupOnProcessInfo_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalBackupOnProcessInfo_0101 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalBackupOnProcessInfo_0101 - * @tc.desc: Test function of IncrementalBackupOnProcessInfo interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_IncrementalBackupOnProcessInfo_0101, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalBackupOnProcessInfo_0101"; - try { - std::string processInfo = "{\"timeInfo\": \"\", \"resultInfo\": \"\"}"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalBackupOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalBackupOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalBackupOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->IncrementalBackupOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalBackupOnProcessInfo."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalBackupOnProcessInfo_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalRestoreOnProcessInfo_0100 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalRestoreOnProcessInfo_0100 - * @tc.desc: Test function of IncrementalRestoreOnProcessInfo interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_IncrementalRestoreOnProcessInfo_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalRestoreOnProcessInfo_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - EXPECT_TRUE(proxy_ != nullptr); - std::string processInfo = "{\"timeInfo\": \"\", \"resultInfo\": \"\"}"; - proxy_->IncrementalRestoreOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalRestoreOnProcessInfo."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalRestoreOnProcessInfo_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalRestoreOnProcessInfo_0101 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalRestoreOnProcessInfo_0101 - * @tc.desc: Test function of IncrementalRestoreOnProcessInfo interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_IncrementalRestoreOnProcessInfo_0101, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalRestoreOnProcessInfo_0101"; - try { - std::string processInfo = "{\"timeInfo\": \"\", \"resultInfo\": \"\"}"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalRestoreOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalRestoreOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalRestoreOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->IncrementalRestoreOnProcessInfo(BUNDLE_NAME, processInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalRestoreOnProcessInfo."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalRestoreOnProcessInfo_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_BackupOnScanningInfo_0100 - * @tc.name: SUB_ServiceReverse_proxy_BackupOnScanningInfo_0100 - * @tc.desc: Test function of BackupOnScanningInfo interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_BackupOnScanningInfo_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_BackupOnScanningInfo_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - EXPECT_TRUE(proxy_ != nullptr); - std::string scannedInfo; - proxy_->BackupOnScanningInfo(scannedInfo); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by BackupOnScanningInfo."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_BackupOnScanningInfo_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_BackupOnScanningInfo_0101 - * @tc.name: SUB_ServiceReverse_proxy_BackupOnScanningInfo_0101 - * @tc.desc: Test function of BackupOnScanningInfo interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_BackupOnScanningInfo_0101, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_BackupOnScanningInfo_0101"; - try { - std::string scannedInfo; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnScanningInfo(scannedInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->BackupOnScanningInfo(scannedInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->BackupOnScanningInfo(scannedInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by BackupOnScanningInfo."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_BackupOnScanningInfo_0101"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalBackupOnScanningInfo_0100 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalBackupOnScanningInfo_0100 - * @tc.desc: Test function of IncrementalBackupOnScanningInfo interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_IncrementalBackupOnScanningInfo_0100, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalBackupOnScanningInfo_0100"; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(1) - .WillOnce(Invoke(mock_.GetRefPtr(), &ServiceReverseMock::InvokeSendRequest)); - EXPECT_TRUE(proxy_ != nullptr); - std::string scannedInfo; - proxy_->IncrementalBackupOnScanningInfo(scannedInfo); - EXPECT_TRUE(true); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalBackupOnScanningInfo."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalBackupOnScanningInfo_0100"; -} - -/** - * @tc.number: SUB_ServiceReverse_proxy_IncrementalBackupOnScanningInfo_0101 - * @tc.name: SUB_ServiceReverse_proxy_IncrementalBackupOnScanningInfo_0101 - * @tc.desc: Test function of IncrementalBackupOnScanningInfo interface for FAILURE. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(ServiceReverseProxyTest, SUB_ServiceReverse_proxy_IncrementalBackupOnScanningInfo_0101, - testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-begin SUB_ServiceReverse_proxy_IncrementalBackupOnScanningInfo_0101"; - try { - std::string scannedInfo; - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalBackupOnScanningInfo(scannedInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(false)); - EXPECT_TRUE(proxy_ != nullptr); - proxy_->IncrementalBackupOnScanningInfo(scannedInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - - try { - EXPECT_CALL(*messageParcelMock_, WriteInterfaceToken(_)).WillOnce(Return(true)); - EXPECT_CALL(*messageParcelMock_, WriteString(_)).WillOnce(Return(true)); - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(-1)); - proxy_->IncrementalBackupOnScanningInfo(scannedInfo); - EXPECT_TRUE(false); - } catch (BError &err) { - EXPECT_EQ(err.GetRawCode(), BError::Codes::SA_BROKEN_IPC); - } - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-an exception occurred by IncrementalBackupOnScanningInfo."; - } - GTEST_LOG_(INFO) << "ServiceReverseProxyTest-end SUB_ServiceReverse_proxy_IncrementalBackupOnScanningInfo_0101"; -} -} // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/tests/unittests/backup_sa/module_ipc/service_test.cpp b/tests/unittests/backup_sa/module_ipc/service_test.cpp index 2f0955569..a876182c9 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,7 +83,7 @@ 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(); @@ -96,7 +96,7 @@ ErrCode ServiceTest::Init(IServiceReverse::Scenario scenario) EXPECT_EQ(ret, BError(BError::Codes::OK)); ret = servicePtr_->Finish(); EXPECT_EQ(ret, BError(BError::Codes::OK)); - } else if (scenario == IServiceReverse::Scenario::BACKUP) { + } else if (scenario == IServiceReverseType::Scenario::BACKUP) { ret = servicePtr_->InitBackupSession(remote_); EXPECT_EQ(ret, BError(BError::Codes::OK)); ret = servicePtr_->InitBackupSession(remote_, errMsg); @@ -213,7 +213,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 +243,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 +273,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); @@ -404,7 +404,7 @@ HWTEST_F(ServiceTest, SUB_Service_AppDone_0100, testing::ext::TestSize.Level1) auto ret = servicePtr_->AppDone(BError(BError::Codes::OK)); 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); @@ -437,7 +437,7 @@ HWTEST_F(ServiceTest, SUB_Service_AppDone_0101, testing::ext::TestSize.Level1) auto ret = servicePtr_->AppDone(BError(BError::Codes::OK)); 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)); EXPECT_EQ(ret, BError(BError::Codes::OK)); @@ -524,13 +524,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)); @@ -555,7 +555,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); @@ -580,7 +580,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); @@ -605,7 +605,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_; @@ -641,13 +641,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)); @@ -672,7 +672,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_; @@ -682,12 +682,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"; @@ -714,14 +714,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); @@ -745,7 +745,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); @@ -760,16 +760,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 (...) { @@ -865,19 +865,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 (...) { @@ -1088,7 +1088,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); @@ -1136,7 +1136,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); @@ -1162,7 +1162,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; @@ -1304,7 +1304,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); @@ -1548,7 +1548,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 (...) { @@ -1572,7 +1572,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); @@ -1595,7 +1595,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)); @@ -1620,7 +1620,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; @@ -1630,7 +1630,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); @@ -1655,19 +1655,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 (...) { @@ -1690,13 +1690,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 (...) { @@ -1719,12 +1719,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 (...) { @@ -1747,12 +1747,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 (...) { @@ -1775,12 +1775,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 (...) { @@ -1803,12 +1803,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 (...) { @@ -1831,18 +1831,18 @@ HWTEST_F(ServiceTest, SUB_Service_ExtensionConnectFailRadarReport_0100, testing: { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_ExtensionConnectFailRadarReport_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_->ClearBundleRadarReport(); servicePtr_->ExtensionConnectFailRadarReport(BUNDLE_NAME, BError(BError::Codes::OK), - IServiceReverse::Scenario::BACKUP); + IServiceReverseType::Scenario::BACKUP); EXPECT_TRUE(true); - ret = Init(IServiceReverse::Scenario::RESTORE); + ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); servicePtr_->ExtensionConnectFailRadarReport(BUNDLE_NAME, BError(BError::Codes::OK), - IServiceReverse::Scenario::RESTORE); + IServiceReverseType::Scenario::RESTORE); EXPECT_TRUE(true); } catch (...) { EXPECT_TRUE(false); @@ -1864,13 +1864,13 @@ HWTEST_F(ServiceTest, SUB_Service_StartRunningTimer_0100, testing::ext::TestSize { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_StartRunningTimer_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_->StartRunningTimer(BUNDLE_NAME); EXPECT_TRUE(true); - ret = Init(IServiceReverse::Scenario::RESTORE); + ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); servicePtr_->StartRunningTimer(BUNDLE_NAME); EXPECT_TRUE(true); @@ -1894,17 +1894,17 @@ HWTEST_F(ServiceTest, SUB_Service_TimeoutRadarReport_0100, testing::ext::TestSiz { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_TimeoutRadarReport_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); std::string bundleName = BUNDLE_NAME; servicePtr_->ClearBundleRadarReport(); - servicePtr_->TimeoutRadarReport(IServiceReverse::Scenario::BACKUP, bundleName); + servicePtr_->TimeoutRadarReport(IServiceReverseType::Scenario::BACKUP, bundleName); EXPECT_TRUE(true); - ret = Init(IServiceReverse::Scenario::RESTORE); + ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); - servicePtr_->TimeoutRadarReport(IServiceReverse::Scenario::RESTORE, bundleName); + servicePtr_->TimeoutRadarReport(IServiceReverseType::Scenario::RESTORE, bundleName); EXPECT_TRUE(true); } catch (...) { EXPECT_TRUE(false); @@ -1926,15 +1926,15 @@ HWTEST_F(ServiceTest, SUB_Service_ReportOnBundleStarted_0100, testing::ext::Test { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_ReportOnBundleStarted_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_->ReportOnBundleStarted(IServiceReverse::Scenario::BACKUP, BUNDLE_NAME); + servicePtr_->ReportOnBundleStarted(IServiceReverseType::Scenario::BACKUP, BUNDLE_NAME); EXPECT_TRUE(true); - ret = Init(IServiceReverse::Scenario::RESTORE); + ret = Init(IServiceReverseType::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); - servicePtr_->ReportOnBundleStarted(IServiceReverse::Scenario::RESTORE, BUNDLE_NAME); + servicePtr_->ReportOnBundleStarted(IServiceReverseType::Scenario::RESTORE, BUNDLE_NAME); EXPECT_TRUE(true); } catch (...) { EXPECT_TRUE(false); @@ -1956,7 +1956,7 @@ HWTEST_F(ServiceTest, SUB_Service_HandleNotSupportBundleNames_0100, testing::ext { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_HandleNotSupportBundleNames_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); const std::vector srcBundleNames = {"test0", "test1", "test2", "test3"}; @@ -2046,7 +2046,7 @@ HWTEST_F(ServiceTest, SUB_Service_PublishFile_0103, testing::ext::TestSize.Level { GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_PublishFile_0103"; 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); 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 158372cd2..7820609e4 100644 --- a/tests/unittests/backup_sa/module_ipc/service_throw_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_throw_test.cpp @@ -146,7 +146,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::SA_REFUSED_ACT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); ret = service->InitRestoreSession(nullptr); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); @@ -190,7 +190,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::SA_REFUSED_ACT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); ret = service->InitRestoreSession(nullptr, errMsg); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); @@ -201,7 +201,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::SA_SESSION_CONFLICT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); ret = service->InitRestoreSession(nullptr, errMsg); EXPECT_EQ(ret, BError(BError::Codes::SA_SESSION_CONFLICT).GetCode()); @@ -244,7 +244,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::SA_REFUSED_ACT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); ret = service->InitBackupSession(nullptr); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); @@ -288,7 +288,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::SA_REFUSED_ACT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); ret = service->InitBackupSession(nullptr, errMsg); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); @@ -299,7 +299,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::SA_SESSION_CONFLICT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); ret = service->InitBackupSession(nullptr, errMsg); EXPECT_EQ(ret, BError(BError::Codes::SA_SESSION_CONFLICT).GetCode()); @@ -593,7 +593,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 +653,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 +692,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 +734,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); @@ -1006,7 +1006,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::SA_REFUSED_ACT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); ret = service->InitIncrementalBackupSession(nullptr); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); @@ -1053,7 +1053,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::SA_REFUSED_ACT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); ret = service->InitIncrementalBackupSession(nullptr, errMsg); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); @@ -1065,7 +1065,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::SA_SESSION_CONFLICT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); ret = service->InitIncrementalBackupSession(nullptr, errMsg); EXPECT_EQ(ret, BError(BError::Codes::SA_SESSION_CONFLICT).GetCode()); 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 fd9a45968..e5880f5c0 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(0)); 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(0)); 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(0)); 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(0)); 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(0)); 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(0)); 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(0)); 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(0)); + EXPECT_CALL(*srProxy, BackupOnBundleFinished(_, _)).WillOnce(Return(0)); 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(0)); 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, GetIncrementalFileHandle(_, _)).WillOnce(Return(0)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, RestoreOnFileReady(_, _, _, _)).WillOnce(Return()); + EXPECT_CALL(*srProxy, RestoreOnFileReady(_, _, _, _)).WillOnce(Return(0)); 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, GetIncrementalFileHandle(_, _)).WillOnce(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(0)); 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(0)); 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(0)); 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(0)); 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(0)); + 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(0)); + 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(0)); 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(0)); 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(0)); 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(0)); 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(0)); 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(0)); 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(0)); 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(0)); 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(0)); 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(0)); 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(0)); 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(0)); 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(0)); 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(0)); 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); @@ -1972,9 +1972,9 @@ HWTEST_F(ServiceTest, SUB_Service_SendScannedInfo_0000, TestSize.Level1) EXPECT_TRUE(true); auto session_ = service->session_; - EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverse::Scenario::UNDEFINED)); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, BackupOnScanningInfo(_)).WillOnce(Return()); + EXPECT_CALL(*srProxy, BackupOnScanningInfo(_)).WillOnce(Return(0)); EXPECT_CALL(*task, AddTask(_)).WillOnce(WithArgs<0>(Invoke([](const ThreadPool::Task &f) { f(); }))); diff --git a/tests/unittests/backup_sa/module_ipc/svc_extension_proxy_test.cpp b/tests/unittests/backup_sa/module_ipc/svc_extension_proxy_test.cpp index 572c43f85..75782d0a6 100644 --- a/tests/unittests/backup_sa/module_ipc/svc_extension_proxy_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/svc_extension_proxy_test.cpp @@ -21,7 +21,7 @@ #include "b_error/b_error.h" #include "ext_extension_mock.h" #include "message_parcel_mock.h" -#include "module_ipc/svc_extension_proxy.h" +#include "extension_proxy.h" #include "unique_fd.h" namespace OHOS::FileManagement::Backup { @@ -35,7 +35,7 @@ public: void SetUp() override {}; void TearDown() override {}; public: - static inline sptr proxy_ = nullptr; + static inline sptr proxy_ = nullptr; static inline sptr mock_ = nullptr; static inline shared_ptr messageParcelMock_ = nullptr; }; @@ -43,7 +43,7 @@ public: void SvcExtensionProxyTest::SetUpTestCase() { mock_ = sptr(new BackupExtExtensionMock()); - proxy_ = sptr(new SvcExtensionProxy(mock_)); + proxy_ = sptr(new ExtensionProxy(mock_)); messageParcelMock_ = make_shared(); MessageParcelMock::messageParcel = messageParcelMock_; } 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 00fb5bd64..7e7b15bab 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"; @@ -2017,7 +2017,7 @@ HWTEST_F(SvcSessionManagerTest, SUB_backup_sa_session_Exception_0100, testing::e sessionManagerPtr_->SetExtFileNameRequest(BUNDLE_NAME, ""); EXPECT_TRUE(true); - sessionManagerPtr_->impl_.scenario = IServiceReverse::Scenario::RESTORE; + sessionManagerPtr_->impl_.scenario = IServiceReverseType::Scenario::RESTORE; std::set fileSet = sessionManagerPtr_->GetExtFileNameRequest(BUNDLE_NAME); EXPECT_TRUE(fileSet.empty()); diff --git a/tests/unittests/backup_sa/session/BUILD.gn b/tests/unittests/backup_sa/session/BUILD.gn index 46b847da7..05cc8a5f1 100644 --- a/tests/unittests/backup_sa/session/BUILD.gn +++ b/tests/unittests/backup_sa/session/BUILD.gn @@ -30,12 +30,14 @@ 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", + + # "${path_backup}/frameworks/native/backup_kit_inner/src/service_reverse_stub.cpp", "b_incremental_session_test.cpp", "service_proxy_mock.cpp", ] deps = [ + "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/utils:backup_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", @@ -57,6 +59,15 @@ ohos_unittest("b_incremental_session_test") { "samgr:samgr_proxy", ] + sanitize = { + integer_overflow = true + ubsan = true + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + cfi_vcall_icall_only = true + debug = false + } use_exceptions = true } diff --git a/tests/unittests/backup_sa/session/service_proxy_mock.cpp b/tests/unittests/backup_sa/session/service_proxy_mock.cpp index 41cce333d..fa8a2ce24 100644 --- a/tests/unittests/backup_sa/session/service_proxy_mock.cpp +++ b/tests/unittests/backup_sa/session/service_proxy_mock.cpp @@ -66,7 +66,8 @@ ErrCode ServiceProxy::AppDone(ErrCode errCode) } ErrCode ServiceProxy::ServiceResultReport(const std::string restoreRetInfo, - BackupRestoreScenario scenario, ErrCode errCode) + BackupRestoreScenario scenario, + ErrCode errCode) { return BError(BError::Codes::OK); } @@ -76,8 +77,11 @@ ErrCode ServiceProxy::GetFileHandle(const string &bundleName, const string &file return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppendBundlesRestoreSession(UniqueFd fd, const vector &bundleNames, - const vector &detailInfos, RestoreTypeEnum restoreType, int32_t userId) +ErrCode ServiceProxy::AppendBundlesRestoreSession(UniqueFd fd, + const vector &bundleNames, + const vector &detailInfos, + RestoreTypeEnum restoreType, + int32_t userId) { return BError(BError::Codes::OK); } @@ -96,7 +100,7 @@ ErrCode ServiceProxy::AppendBundlesBackupSession(const vector &bundl } ErrCode ServiceProxy::AppendBundlesDetailsBackupSession(const std::vector &bundleNames, - const std::vector &detailInfos) + const std::vector &detailInfos) { return BError(BError::Codes::OK); } @@ -143,7 +147,7 @@ ErrCode ServiceProxy::AppendBundlesIncrementalBackupSession(const vector &bundlesToBackup, - const std::vector &infos) + const std::vector &infos) { return BError(BError::Codes::OK); } @@ -225,7 +229,7 @@ sptr ServiceProxy::GetInstance() void ServiceProxy::InvaildInstance() {} -void ServiceProxy::ServiceProxyLoadCallback::OnLoadSystemAbilitySuccess(int32_t, const OHOS::sptr&) {} +void ServiceProxy::ServiceProxyLoadCallback::OnLoadSystemAbilitySuccess(int32_t, const OHOS::sptr &) {} void ServiceProxy::ServiceProxyLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId) {} diff --git a/tests/unittests/backup_sa/session/service_proxy_mock.h b/tests/unittests/backup_sa/session/service_proxy_mock.h index b734c8dac..25e4d7373 100644 --- a/tests/unittests/backup_sa/session/service_proxy_mock.h +++ b/tests/unittests/backup_sa/session/service_proxy_mock.h @@ -25,6 +25,7 @@ class ServiceProxyMock : public ServiceProxy { 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)); @@ -38,13 +39,18 @@ public: 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_METHOD3(ServiceResultReport, + ErrCode(const std::string restoreRetInfo, BackupRestoreScenario scenario, ErrCode 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_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()); @@ -54,12 +60,12 @@ public: 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)); + 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, - 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(BundleName &bundleName, std::string &result)); diff --git a/tests/unittests/backup_tools/BUILD.gn b/tests/unittests/backup_tools/BUILD.gn index 0a0c1d50a..99bcc90ee 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}/services/backup_sa:backup_sa_ipc", "${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", @@ -112,6 +111,7 @@ ohos_unittest("backup_tool_restore_test") { include_dirs += backup_mock_utils_include deps = [ + "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 95b58a5ad..844b164cd 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}/services/backup_sa:public_idl_config", + ] public_configs = [ ":utils_public_config" ] external_deps = [ @@ -110,6 +113,7 @@ ohos_shared_library("backup_utils") { deps = [ ":backup_cxx_cppdeps", "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", + "${path_backup}/services/backup_sa:backup_sa_ipc", "${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 16d4a17f4..ff097be94 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 "iservice_reverse.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 1c7f7ac84..7783339f4 100644 --- a/utils/src/b_radar/b_radar.cpp +++ b/utils/src/b_radar/b_radar.cpp @@ -23,7 +23,7 @@ #include "b_resources/b_constants.h" #include "b_utils/b_time.h" #include "hisysevent.h" -#include "i_service_reverse.h" +#include "iservice_reverse.h" namespace OHOS::FileManagement::Backup { int32_t AppRadar::GetUserId() @@ -49,7 +49,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 +70,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 +91,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; -- Gitee From 6d2d62d95fcbcef5462a7570ca01b69b95485eb9 Mon Sep 17 00:00:00 2001 From: BrainL Date: Thu, 13 Mar 2025 14:45:50 +0800 Subject: [PATCH 02/15] =?UTF-8?q?FUZZ=E6=B5=8B=E8=AF=95=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: BrainL --- bundle.json | 2 +- test/fuzztest/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle.json b/bundle.json index 8986c2140..c21799596 100644 --- a/bundle.json +++ b/bundle.json @@ -164,7 +164,7 @@ } ], "test": [ - "//foundation/filemanagement/app_file_service/test/fuzztest:app_fuzztest", + "//foundation/filemanagement/app_file_service/test/fuzztest:fuzztest", "//foundation/filemanagement/app_file_service/test/unittest:unittest", "//foundation/filemanagement/app_file_service:tgt_backup_tests" ] diff --git a/test/fuzztest/BUILD.gn b/test/fuzztest/BUILD.gn index f45685059..5b26911f6 100644 --- a/test/fuzztest/BUILD.gn +++ b/test/fuzztest/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -group("app_fuzztest") { +group("fuzztest") { testonly = true deps = [ -- Gitee From d52af827f91c36acbc3a863bf6a61ed62066ceee Mon Sep 17 00:00:00 2001 From: BrainL Date: Fri, 14 Mar 2025 15:26:10 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9FUZZ=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: BrainL --- bundle.json | 2 +- frameworks/native/backup_ext/BUILD.gn | 2 + .../backup_ext/include/ext_extension_stub.h | 54 ----- test/fuzztest/BUILD.gn | 2 +- test/fuzztest/backupext_fuzzer/BUILD.gn | 3 + .../backupext_fuzzer/backupext_fuzzer.cpp | 199 +++++++++++++++--- test/fuzztest/backupsaanother_fuzzer/BUILD.gn | 2 + test/fuzztest/backupsaappend_fuzzer/BUILD.gn | 2 +- .../backupservicestubbranch_fuzzer/BUILD.gn | 2 + tests/unittests/backup_ext/BUILD.gn | 10 + tests/unittests/backup_sa/module_ipc/BUILD.gn | 21 ++ tests/unittests/backup_sa/session/BUILD.gn | 14 +- 12 files changed, 221 insertions(+), 92 deletions(-) delete mode 100644 frameworks/native/backup_ext/include/ext_extension_stub.h diff --git a/bundle.json b/bundle.json index c21799596..8986c2140 100644 --- a/bundle.json +++ b/bundle.json @@ -164,7 +164,7 @@ } ], "test": [ - "//foundation/filemanagement/app_file_service/test/fuzztest:fuzztest", + "//foundation/filemanagement/app_file_service/test/fuzztest:app_fuzztest", "//foundation/filemanagement/app_file_service/test/unittest:unittest", "//foundation/filemanagement/app_file_service:tgt_backup_tests" ] diff --git a/frameworks/native/backup_ext/BUILD.gn b/frameworks/native/backup_ext/BUILD.gn index f18f99009..055e91929 100644 --- a/frameworks/native/backup_ext/BUILD.gn +++ b/frameworks/native/backup_ext/BUILD.gn @@ -52,6 +52,8 @@ ohos_shared_library("backup_extension_ability_native") { "${path_backup}/services/backup_sa/include/module_ipc", ] + public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] + deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", 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 0711aed93..000000000 --- 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 "iextension.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/test/fuzztest/BUILD.gn b/test/fuzztest/BUILD.gn index 5b26911f6..f45685059 100644 --- a/test/fuzztest/BUILD.gn +++ b/test/fuzztest/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -group("fuzztest") { +group("app_fuzztest") { testonly = true deps = [ diff --git a/test/fuzztest/backupext_fuzzer/BUILD.gn b/test/fuzztest/backupext_fuzzer/BUILD.gn index aec47ecac..e64824b81 100644 --- a/test/fuzztest/backupext_fuzzer/BUILD.gn +++ b/test/fuzztest/backupext_fuzzer/BUILD.gn @@ -28,6 +28,9 @@ ohos_fuzztest("BackupExtFuzzTest") { "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", "${path_backup}/utils/include", ] + + public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] + cflags = [ "-g", "-O0", diff --git a/test/fuzztest/backupext_fuzzer/backupext_fuzzer.cpp b/test/fuzztest/backupext_fuzzer/backupext_fuzzer.cpp index 9ec024db5..33f5a4c93 100644 --- a/test/fuzztest/backupext_fuzzer/backupext_fuzzer.cpp +++ b/test/fuzztest/backupext_fuzzer/backupext_fuzzer.cpp @@ -13,46 +13,23 @@ * limitations under the License. */ #include "backupext_fuzzer.h" - #include -#include "message_parcel.h" -#include "ext_extension.h" #include "ext_backup.h" +#include "ext_extension.h" +#include "message_parcel.h" namespace OHOS { using namespace std; using namespace OHOS::FileManagement::Backup; -constexpr uint8_t MAX_CALL_TRANSACTION = 10; - -template +template T TypeCast(const uint8_t *data, int *pos = nullptr) { if (pos) { *pos += sizeof(T); } - return *(reinterpret_cast(data)); -} - -bool OnRemoteRequestFuzzTest(shared_ptr extension, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(uint32_t)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - MessageOption option; - - int pos = 0; - uint32_t code = TypeCast(data, &pos); - msg.WriteInterfaceToken(ExtensionStub::GetDescriptor()); - msg.WriteBuffer(data + pos, size - pos); - msg.RewindRead(0); - - extension->OnRemoteRequest(code % MAX_CALL_TRANSACTION, msg, reply, option); - return true; + return *(reinterpret_cast(data)); } bool InitFuzzTest(shared_ptr backup, const uint8_t *data, size_t size) @@ -77,8 +54,8 @@ bool OnCommandFuzzTest(shared_ptr backup, const uint8_t *data, size_t int startId = TypeCast(data + pos, &pos); int len = (size - pos) >> 1; AAFwk::Want want; - want.SetElementName(string(reinterpret_cast(data + pos), len), - string(reinterpret_cast(data + pos + len), len)); + want.SetElementName(string(reinterpret_cast(data + pos), len), + string(reinterpret_cast(data + pos + len), len)); backup->OnCommand(want, restart, startId); return true; @@ -88,8 +65,8 @@ bool OnConnectFuzzTest(shared_ptr backup, const uint8_t *data, size_t { int len = size >> 1; AAFwk::Want want; - want.SetElementName(string(reinterpret_cast(data), len), - string(reinterpret_cast(data + len), size - len)); + want.SetElementName(string(reinterpret_cast(data), len), + string(reinterpret_cast(data + len), size - len)); backup->OnConnect(want); return true; @@ -148,7 +125,7 @@ bool RestoreDataReadyFuzzTest(shared_ptr backup, const uint8_t *data, bool InvokeAppExtMethodFuzzTest(shared_ptr backup, const uint8_t *data, size_t size) { - string result = string(reinterpret_cast(data), size); + string result = string(reinterpret_cast(data), size); backup->InvokeAppExtMethod(BError(BError::Codes::OK), result); return true; } @@ -161,6 +138,148 @@ bool SetCreatorFuzzTest(shared_ptr backup, const uint8_t *data, size_ return true; } +bool CmdGetFileHandleFuzzTest(shared_ptr extension, const uint8_t *data, size_t size) +{ + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IExtensionIpcCode::COMMAND_GET_FILE_HANDLE_WITH_UNIQUE_FD); + msg.WriteString(string(reinterpret_cast(data), size)); + extension->OnRemoteRequest(code, msg, reply, option); + return true; +} + +bool CmdHandleClearFuzzTest(shared_ptr extension, const uint8_t *data, size_t size) +{ + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IExtensionIpcCode::COMMAND_HANDLE_CLEAR); + msg.WriteBuffer(data, size); + extension->OnRemoteRequest(code, msg, reply, option); + return true; +} + +bool CmdHandleUser0BackupFuzzTest(shared_ptr extension, const uint8_t *data, size_t size) +{ + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IExtensionIpcCode::COMMAND_USER0_ON_BACKUP); + msg.WriteBuffer(data, size); + extension->OnRemoteRequest(code, msg, reply, option); + 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; + MessageOption option; + uint32_t code = static_cast(IExtensionIpcCode::COMMAND_HANDLE_BACKUP); + msg.WriteBool(*reinterpret_cast(data)); + extension->OnRemoteRequest(code, msg, reply, option); + return true; +} + +bool CmdPublishFileFuzzTest(shared_ptr extension, const uint8_t *data, size_t size) +{ + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IExtensionIpcCode::COMMAND_PUBLISH_FILE); + msg.WriteString(string(reinterpret_cast(data), size)); + extension->OnRemoteRequest(code, msg, reply, option); + 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; + MessageOption option; + uint32_t code = static_cast(IExtensionIpcCode::COMMAND_HANDLE_RESTORE); + msg.WriteBool(*reinterpret_cast(data)); + extension->OnRemoteRequest(code, msg, reply, option); + return true; +} + +bool CmdGetIncrementalFileHandleFuzzTest(shared_ptr extension, const uint8_t *data, size_t size) +{ + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IExtensionIpcCode::COMMAND_GET_INCREMENTAL_FILE_HANDLE); + msg.WriteString(string(reinterpret_cast(data), size)); + extension->OnRemoteRequest(code, msg, reply, option); + return true; +} + +bool CmdPublishIncrementalFileFuzzTest(shared_ptr extension, const uint8_t *data, size_t size) +{ + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IExtensionIpcCode::COMMAND_PUBLISH_INCREMENTAL_FILE); + msg.WriteString(string(reinterpret_cast(data), size)); + extension->OnRemoteRequest(code, msg, reply, option); + 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; + MessageOption option; + int pos = 0; + int incrementalFd = TypeCast(data, &pos); + int manifestFd = TypeCast(data + pos); + uint32_t code = static_cast(IExtensionIpcCode::COMMAND_HANDLE_INCREMENTAL_BACKUP); + msg.WriteFileDescriptor(incrementalFd); + msg.WriteFileDescriptor(manifestFd); + extension->OnRemoteRequest(code, msg, reply, option); + 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; + MessageOption option; + uint32_t code = static_cast(IExtensionIpcCode::COMMAND_INCREMENTAL_ON_BACKUP); + msg.WriteBool(*reinterpret_cast(data)); + extension->OnRemoteRequest(code, msg, reply, option); + return true; +} + +bool CmdGetIncrementalBackupFileHandleFuzzTest(shared_ptr extension, + const uint8_t *data, + size_t size) +{ + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IExtensionIpcCode::COMMAND_GET_INCREMENTAL_BACKUP_FILE_HANDLE); + msg.WriteBuffer(data, size); + extension->OnRemoteRequest(code, msg, reply, option); + return true; +} } // namespace OHOS /* Fuzzer entry point */ @@ -170,7 +289,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) auto extBackup = std::make_shared(); auto extension = std::make_shared(extBackup, ""); - OHOS::OnRemoteRequestFuzzTest(extension, data, size); OHOS::InitFuzzTest(extBackup, data, size); OHOS::OnCommandFuzzTest(extBackup, data, size); OHOS::OnConnectFuzzTest(extBackup, data, size); @@ -184,5 +302,20 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) OHOS::InvokeAppExtMethodFuzzTest(extBackup, data, size); OHOS::SetCreatorFuzzTest(extBackup, data, size); + try { + OHOS::CmdGetFileHandleFuzzTest(extension, data, size); + OHOS::CmdHandleClearFuzzTest(extension, data, size); + OHOS::CmdHandleUser0BackupFuzzTest(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/backupsaanother_fuzzer/BUILD.gn b/test/fuzztest/backupsaanother_fuzzer/BUILD.gn index 174a2dad0..b0eb26a32 100644 --- a/test/fuzztest/backupsaanother_fuzzer/BUILD.gn +++ b/test/fuzztest/backupsaanother_fuzzer/BUILD.gn @@ -43,6 +43,8 @@ ohos_fuzztest("BackupSaAnotherFuzzTest") { "${path_backup}/utils:backup_utils", ] + public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] + external_deps = [ "ability_runtime:ability_manager", "ability_runtime:abilitykit_native", diff --git a/test/fuzztest/backupsaappend_fuzzer/BUILD.gn b/test/fuzztest/backupsaappend_fuzzer/BUILD.gn index 8931f8b0e..7b0773705 100644 --- a/test/fuzztest/backupsaappend_fuzzer/BUILD.gn +++ b/test/fuzztest/backupsaappend_fuzzer/BUILD.gn @@ -42,7 +42,7 @@ ohos_fuzztest("BackupSaAppendFuzzTest") { "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/utils:backup_utils", ] - + public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] external_deps = [ "ability_runtime:ability_manager", "ability_runtime:abilitykit_native", diff --git a/test/fuzztest/backupservicestubbranch_fuzzer/BUILD.gn b/test/fuzztest/backupservicestubbranch_fuzzer/BUILD.gn index 0f7a3e5fd..85d8d4a99 100644 --- a/test/fuzztest/backupservicestubbranch_fuzzer/BUILD.gn +++ b/test/fuzztest/backupservicestubbranch_fuzzer/BUILD.gn @@ -30,6 +30,8 @@ ohos_fuzztest("BackupServiceStubBranchFuzzTest") { "${app_file_service_path}/utils/include", "${app_file_service_path}/utils/include/b_hilog", ] + public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] + cflags = [ "-g", "-O0", diff --git a/tests/unittests/backup_ext/BUILD.gn b/tests/unittests/backup_ext/BUILD.gn index 71e2af03c..86b5cb1a5 100644 --- a/tests/unittests/backup_ext/BUILD.gn +++ b/tests/unittests/backup_ext/BUILD.gn @@ -309,6 +309,16 @@ ohos_unittest("untar_file_test") { ohos_unittest("ext_backup_js_test") { module_out_path = path_module_out_tests + sanitize = { + integer_overflow = true + ubsan = true + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + cfi_vcall_icall_only = true + debug = false + } + sources = [ "${path_backup}/tests/mock/backup_ext/src/ext_backup_mock.cpp", "${path_backup}/tests/mock/napi/src/napi_mock.cpp", diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn index f95ea7e11..0c888ce15 100644 --- a/tests/unittests/backup_sa/module_ipc/BUILD.gn +++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn @@ -415,6 +415,16 @@ ohos_unittest("backup_restore_deps_manager_test") { ohos_unittest("backup_service_incremental_test") { module_out_path = path_module_out_tests + sanitize = { + integer_overflow = true + ubsan = true + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + cfi_vcall_icall_only = true + debug = false + } + sources = [ "${path_backup_mock}/accesstoken/accesstoken_kit_mock.cpp", "${path_backup_mock}/module_external/src/bms_adapter_mock.cpp", @@ -484,6 +494,15 @@ ohos_unittest("backup_service_incremental_test") { ohos_unittest("backup_service_other_test") { module_out_path = path_module_out_tests + sanitize = { + integer_overflow = true + ubsan = true + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + cfi_vcall_icall_only = true + debug = false + } sources = [ "${path_backup_mock}/accesstoken/src/accesstoken_kit_mock.cpp", "${path_backup_mock}/module_external/src/bms_adapter_mock.cpp", @@ -521,6 +540,8 @@ ohos_unittest("backup_service_other_test") { "${path_backup_mock}/utils_mock/include", ] + public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] + deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/services/backup_sa:backup_sa_ipc", diff --git a/tests/unittests/backup_sa/session/BUILD.gn b/tests/unittests/backup_sa/session/BUILD.gn index 05cc8a5f1..aeae28499 100644 --- a/tests/unittests/backup_sa/session/BUILD.gn +++ b/tests/unittests/backup_sa/session/BUILD.gn @@ -17,6 +17,16 @@ import("//foundation/filemanagement/app_file_service/backup.gni") ohos_unittest("b_incremental_session_test") { module_out_path = path_module_out_tests + sanitize = { + integer_overflow = true + ubsan = true + boundary_sanitize = true + cfi = true + cfi_cross_dso = true + cfi_vcall_icall_only = true + debug = false + } + include_dirs = [ "${path_backup}/frameworks/native/backup_kit_inner/include", "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", @@ -30,12 +40,12 @@ 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", ] + public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] + deps = [ "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/utils:backup_utils", -- Gitee From a5327f9555ee74ba71b873d96891347c673f1a40 Mon Sep 17 00:00:00 2001 From: BrainL Date: Fri, 14 Mar 2025 15:53:59 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E6=81=A2=E5=A4=8DFUZZ=E6=B5=8B=E8=AF=95g?= =?UTF-8?q?ourp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: BrainL --- bundle.json | 2 +- test/fuzztest/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundle.json b/bundle.json index 8986c2140..c21799596 100644 --- a/bundle.json +++ b/bundle.json @@ -164,7 +164,7 @@ } ], "test": [ - "//foundation/filemanagement/app_file_service/test/fuzztest:app_fuzztest", + "//foundation/filemanagement/app_file_service/test/fuzztest:fuzztest", "//foundation/filemanagement/app_file_service/test/unittest:unittest", "//foundation/filemanagement/app_file_service:tgt_backup_tests" ] diff --git a/test/fuzztest/BUILD.gn b/test/fuzztest/BUILD.gn index f45685059..5b26911f6 100644 --- a/test/fuzztest/BUILD.gn +++ b/test/fuzztest/BUILD.gn @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -group("app_fuzztest") { +group("fuzztest") { testonly = true deps = [ -- Gitee From 02dcc952342e93cfd98f3cc908598358d83153bf Mon Sep 17 00:00:00 2001 From: BrainL Date: Fri, 14 Mar 2025 17:23:50 +0800 Subject: [PATCH 05/15] review code Signed-off-by: BrainL --- .../native/backup_ext/src/ext_extension.cpp | 10 +++---- .../src/service_incremental_reverse.cpp | 28 +++++++++---------- .../backup_kit_inner/src/service_reverse.cpp | 28 +++++++++---------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/frameworks/native/backup_ext/src/ext_extension.cpp b/frameworks/native/backup_ext/src/ext_extension.cpp index e980f63a5..3f486b2f0 100644 --- a/frameworks/native/backup_ext/src/ext_extension.cpp +++ b/frameworks/native/backup_ext/src/ext_extension.cpp @@ -241,12 +241,12 @@ static UniqueFd GetFileHandleForSpecialCloneCloud(const string &fileName) } ErrCode BackupExtExtension::GetFileHandleWithUniqueFd(const std::string &fileName, - int32_t &getFileHandleErrCode, - int &fd) + int32_t &getFileHandleErrCode, + int &fd) { -UniqueFd fileHandleFd(GetFileHandle(fileName, getFileHandleErrCode)); -fd = fileHandleFd.Release(); -return ERR_OK; + UniqueFd fileHandleFd(GetFileHandle(fileName, getFileHandleErrCode)); + fd = fileHandleFd.Release(); + return ERR_OK; } UniqueFd BackupExtExtension::GetFileHandle(const string &fileName, int32_t &errCode) 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 2088394c8..26f9054c2 100644 --- a/frameworks/native/backup_kit_inner/src/service_incremental_reverse.cpp +++ b/frameworks/native/backup_kit_inner/src/service_incremental_reverse.cpp @@ -30,7 +30,7 @@ ErrCode ServiceReverse::IncrementalBackupOnFileReady(const std::string &bundleNa { if (scenario_ != Scenario::BACKUP || !callbacksIncrementalBackup_.onFileReady) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } BFileInfo bFileInfo(bundleName, fileName, 0); callbacksIncrementalBackup_.onFileReady(bFileInfo, UniqueFd(fd), UniqueFd(manifestFd), errCode); @@ -41,7 +41,7 @@ ErrCode ServiceReverse::IncrementalBackupOnBundleStarted(int32_t errCode, const { if (scenario_ != Scenario::BACKUP || !callbacksIncrementalBackup_.onBundleStarted) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksIncrementalBackup_.onBundleStarted(errCode, bundleName); return BError(BError::Codes::OK); @@ -51,7 +51,7 @@ ErrCode ServiceReverse::IncrementalBackupOnResultReport(const std::string &resul { if (scenario_ != Scenario::BACKUP || !callbacksIncrementalBackup_.onResultReport) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksIncrementalBackup_.onResultReport(bundleName, result); return BError(BError::Codes::OK); @@ -61,7 +61,7 @@ ErrCode ServiceReverse::IncrementalBackupOnBundleFinished(int32_t errCode, const { if (scenario_ != Scenario::BACKUP || !callbacksIncrementalBackup_.onBundleFinished) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } HILOGI("errCode = %{public}d, bundleName = %{public}s", errCode, bundleName.c_str()); callbacksIncrementalBackup_.onBundleFinished(errCode, bundleName); @@ -73,7 +73,7 @@ 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 BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksIncrementalBackup_.onAllBundlesFinished(errCode); return BError(BError::Codes::OK); @@ -84,7 +84,7 @@ ErrCode ServiceReverse::IncrementalBackupOnProcessInfo(const std::string &bundle 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 BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksIncrementalBackup_.onProcess(bundleName, processInfo); return BError(BError::Codes::OK); @@ -94,7 +94,7 @@ ErrCode ServiceReverse::IncrementalBackupOnScanningInfo(const std::string &scann { if (scenario_ != Scenario::BACKUP || !callbacksIncrementalBackup_.onBackupSizeReport) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksIncrementalBackup_.onBackupSizeReport(scannedInfo); return BError(BError::Codes::OK); @@ -104,7 +104,7 @@ ErrCode ServiceReverse::IncrementalRestoreOnBundleStarted(int32_t errCode, const { if (scenario_ != Scenario::RESTORE || !callbacksIncrementalRestore_.onBundleStarted) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksIncrementalRestore_.onBundleStarted(errCode, bundleName); return BError(BError::Codes::OK); @@ -114,7 +114,7 @@ ErrCode ServiceReverse::IncrementalRestoreOnBundleFinished(int32_t errCode, cons { if (scenario_ != Scenario::RESTORE || !callbacksIncrementalRestore_.onBundleFinished) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } HILOGI("errCode = %{public}d, bundleName = %{public}s", errCode, bundleName.c_str()); callbacksIncrementalRestore_.onBundleFinished(errCode, bundleName); @@ -126,7 +126,7 @@ 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 BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksIncrementalRestore_.onAllBundlesFinished(errCode); return BError(BError::Codes::OK); @@ -144,7 +144,7 @@ ErrCode ServiceReverse::IncrementalRestoreOnFileReady(const std::string &bundleN } if (scenario_ != Scenario::RESTORE || !callbacksIncrementalRestore_.onFileReady) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } BFileInfo bFileInfo(bundleName, fileName, 0); callbacksIncrementalRestore_.onFileReady(bFileInfo, UniqueFd(fd), UniqueFd(manifestFd), errCode); @@ -158,12 +158,12 @@ ErrCode ServiceReverse::IncrementalRestoreOnResultReport(const std::string &resu 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 BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksIncrementalRestore_.onResultReport(bundleName, result); if (scenario_ != Scenario::RESTORE || !callbacksIncrementalRestore_.onBundleFinished) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksIncrementalRestore_.onBundleFinished(errCode, bundleName); return BError(BError::Codes::OK); @@ -174,7 +174,7 @@ ErrCode ServiceReverse::IncrementalRestoreOnProcessInfo(const std::string &bundl 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 BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksIncrementalRestore_.onProcess(bundleName, processInfo); return BError(BError::Codes::OK); diff --git a/frameworks/native/backup_kit_inner/src/service_reverse.cpp b/frameworks/native/backup_kit_inner/src/service_reverse.cpp index 202f61ca3..0db73caec 100644 --- a/frameworks/native/backup_kit_inner/src/service_reverse.cpp +++ b/frameworks/native/backup_kit_inner/src/service_reverse.cpp @@ -28,7 +28,7 @@ ErrCode ServiceReverse::BackupOnFileReady(const std::string &bundleName, { if (scenario_ != Scenario::BACKUP || !callbacksBackup_.onFileReady) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } BFileInfo bFileInfo(bundleName, fileName, 0); callbacksBackup_.onFileReady(bFileInfo, UniqueFd(fd), errCode); @@ -39,7 +39,7 @@ ErrCode ServiceReverse::BackupOnBundleStarted(int32_t errCode, const std::string { if (scenario_ != Scenario::BACKUP || !callbacksBackup_.onBundleStarted) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksBackup_.onBundleStarted(errCode, bundleName); return BError(BError::Codes::OK); @@ -49,7 +49,7 @@ ErrCode ServiceReverse::BackupOnResultReport(const std::string &result, const st { if (scenario_ != Scenario::BACKUP || !callbacksBackup_.onResultReport) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksBackup_.onResultReport(bundleName, result); return BError(BError::Codes::OK); @@ -59,7 +59,7 @@ ErrCode ServiceReverse::BackupOnBundleFinished(int32_t errCode, const std::strin { if (scenario_ != Scenario::BACKUP || !callbacksBackup_.onBundleFinished) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } HILOGI("errCode = %{public}d, bundleName = %{public}s", errCode, bundleName.c_str()); callbacksBackup_.onBundleFinished(errCode, bundleName); @@ -71,7 +71,7 @@ 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 BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksBackup_.onAllBundlesFinished(errCode); return BError(BError::Codes::OK); @@ -82,7 +82,7 @@ ErrCode ServiceReverse::BackupOnProcessInfo(const std::string &bundleName, const HILOGI("bundleName = %{public}s", bundleName.c_str()); if (scenario_ != Scenario::BACKUP || !callbacksBackup_.onProcess) { HILOGI("Error scenario or callback is nullptr"); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksBackup_.onProcess(bundleName, processInfo); return BError(BError::Codes::OK); @@ -92,7 +92,7 @@ ErrCode ServiceReverse::BackupOnScanningInfo(const std::string &scannedInfo) { if (scenario_ != Scenario::BACKUP || !callbacksBackup_.onBackupSizeReport) { HILOGE("Error scenario or callback is nullptr"); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksBackup_.onBackupSizeReport(scannedInfo); return BError(BError::Codes::OK); @@ -102,7 +102,7 @@ ErrCode ServiceReverse::RestoreOnBundleStarted(int32_t errCode, const std::strin { if (scenario_ != Scenario::RESTORE || !callbacksRestore_.onBundleStarted) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksRestore_.onBundleStarted(errCode, bundleName); return BError(BError::Codes::OK); @@ -112,7 +112,7 @@ ErrCode ServiceReverse::RestoreOnBundleFinished(int32_t errCode, const std::stri { if (scenario_ != Scenario::RESTORE || !callbacksRestore_.onBundleFinished) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } HILOGI("errCode = %{public}d, bundleName = %{public}s", errCode, bundleName.c_str()); callbacksRestore_.onBundleFinished(errCode, bundleName); @@ -124,7 +124,7 @@ 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 BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksRestore_.onAllBundlesFinished(errCode); return BError(BError::Codes::OK); @@ -138,7 +138,7 @@ ErrCode ServiceReverse::RestoreOnFileReady(const std::string &bundleName, 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 BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } BFileInfo bFileInfo(bundleName, fileName, 0); callbacksRestore_.onFileReady(bFileInfo, UniqueFd(fd), errCode); @@ -151,12 +151,12 @@ ErrCode ServiceReverse::RestoreOnResultReport(const std::string &result, const s result.c_str()); if (scenario_ != Scenario::RESTORE || !callbacksRestore_.onResultReport) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksRestore_.onResultReport(bundleName, result); if (scenario_ != Scenario::RESTORE || !callbacksRestore_.onBundleFinished) { HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksRestore_.onBundleFinished(errCode, bundleName); return BError(BError::Codes::OK); @@ -167,7 +167,7 @@ ErrCode ServiceReverse::RestoreOnProcessInfo(const std::string &bundleName, cons HILOGI("bundleName = %{public}s", bundleName.c_str()); if (scenario_ != Scenario::RESTORE || !callbacksRestore_.onProcess) { HILOGI("Error scenario or callback is nullptr"); - return BError(BError::Codes::SA_BROKEN_IPC); + return BError(BError::Codes::OK); } callbacksRestore_.onProcess(bundleName, processInfo); return BError(BError::Codes::OK); -- Gitee From 52d13b57038051174142cfe52aa213e88c901f7f Mon Sep 17 00:00:00 2001 From: BrainL Date: Fri, 14 Mar 2025 19:28:59 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: BrainL --- tests/unittests/backup_ext/BUILD.gn | 9 --------- tests/unittests/backup_sa/module_ipc/BUILD.gn | 19 ------------------- 2 files changed, 28 deletions(-) diff --git a/tests/unittests/backup_ext/BUILD.gn b/tests/unittests/backup_ext/BUILD.gn index 86b5cb1a5..71ad2074a 100644 --- a/tests/unittests/backup_ext/BUILD.gn +++ b/tests/unittests/backup_ext/BUILD.gn @@ -374,15 +374,6 @@ ohos_unittest("ext_backup_js_test") { "private=public", ] - sanitize = { - integer_overflow = true - ubsan = true - boundary_sanitize = true - cfi = true - cfi_cross_dso = true - cfi_vcall_icall_only = true - debug = false - } use_exceptions = true } diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn index 0c888ce15..dbe819a8b 100644 --- a/tests/unittests/backup_sa/module_ipc/BUILD.gn +++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn @@ -478,15 +478,6 @@ ohos_unittest("backup_service_incremental_test") { "storage_service:storage_manager_sa_proxy", ] - sanitize = { - integer_overflow = true - ubsan = true - boundary_sanitize = true - cfi = true - cfi_cross_dso = true - cfi_vcall_icall_only = true - debug = false - } defines = [ "private=public" ] use_exceptions = true } @@ -568,16 +559,6 @@ ohos_unittest("backup_service_other_test") { "storage_service:storage_manager_sa_proxy", ] - sanitize = { - integer_overflow = true - ubsan = true - boundary_sanitize = true - cfi = true - cfi_cross_dso = true - cfi_vcall_icall_only = true - debug = false - } - defines = [ "private=public" ] use_exceptions = true } -- Gitee From e097c17e3e3df8268cebcec787dda6985e689ac0 Mon Sep 17 00:00:00 2001 From: BrainL Date: Fri, 14 Mar 2025 20:45:37 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: BrainL --- frameworks/native/backup_ext/BUILD.gn | 2 -- test/fuzztest/backupext_fuzzer/BUILD.gn | 1 - test/fuzztest/backupsaanother_fuzzer/BUILD.gn | 1 - test/fuzztest/backupsaappend_fuzzer/BUILD.gn | 1 - test/fuzztest/backupservicestubbranch_fuzzer/BUILD.gn | 1 - tests/unittests/backup_sa/module_ipc/BUILD.gn | 1 - tests/unittests/backup_sa/session/BUILD.gn | 9 --------- 7 files changed, 16 deletions(-) diff --git a/frameworks/native/backup_ext/BUILD.gn b/frameworks/native/backup_ext/BUILD.gn index 055e91929..01613dee2 100644 --- a/frameworks/native/backup_ext/BUILD.gn +++ b/frameworks/native/backup_ext/BUILD.gn @@ -49,7 +49,6 @@ 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", ] public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] @@ -57,7 +56,6 @@ ohos_shared_library("backup_extension_ability_native") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", - "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/utils:backup_utils", "${path_jsoncpp}:jsoncpp", ] diff --git a/test/fuzztest/backupext_fuzzer/BUILD.gn b/test/fuzztest/backupext_fuzzer/BUILD.gn index e64824b81..5ccd05c5e 100644 --- a/test/fuzztest/backupext_fuzzer/BUILD.gn +++ b/test/fuzztest/backupext_fuzzer/BUILD.gn @@ -53,7 +53,6 @@ ohos_fuzztest("BackupExtFuzzTest") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", - "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/utils:backup_utils", ] diff --git a/test/fuzztest/backupsaanother_fuzzer/BUILD.gn b/test/fuzztest/backupsaanother_fuzzer/BUILD.gn index b0eb26a32..764660d8d 100644 --- a/test/fuzztest/backupsaanother_fuzzer/BUILD.gn +++ b/test/fuzztest/backupsaanother_fuzzer/BUILD.gn @@ -39,7 +39,6 @@ ohos_fuzztest("BackupSaAnotherFuzzTest") { deps = [ "${app_file_service_path}/services/backup_sa:backup_sa", "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", - "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/utils:backup_utils", ] diff --git a/test/fuzztest/backupsaappend_fuzzer/BUILD.gn b/test/fuzztest/backupsaappend_fuzzer/BUILD.gn index 7b0773705..410ead2a2 100644 --- a/test/fuzztest/backupsaappend_fuzzer/BUILD.gn +++ b/test/fuzztest/backupsaappend_fuzzer/BUILD.gn @@ -39,7 +39,6 @@ ohos_fuzztest("BackupSaAppendFuzzTest") { deps = [ "${app_file_service_path}/services/backup_sa:backup_sa", "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", - "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/utils:backup_utils", ] public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] diff --git a/test/fuzztest/backupservicestubbranch_fuzzer/BUILD.gn b/test/fuzztest/backupservicestubbranch_fuzzer/BUILD.gn index 85d8d4a99..791139f7a 100644 --- a/test/fuzztest/backupservicestubbranch_fuzzer/BUILD.gn +++ b/test/fuzztest/backupservicestubbranch_fuzzer/BUILD.gn @@ -43,7 +43,6 @@ ohos_fuzztest("BackupServiceStubBranchFuzzTest") { deps = [ "${app_file_service_path}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${app_file_service_path}/services/backup_sa:backup_sa", - "${app_file_service_path}/services/backup_sa:backup_sa_ipc", "${app_file_service_path}/utils:backup_utils", ] diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn index dbe819a8b..606cd470d 100644 --- a/tests/unittests/backup_sa/module_ipc/BUILD.gn +++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn @@ -535,7 +535,6 @@ ohos_unittest("backup_service_other_test") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", - "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", diff --git a/tests/unittests/backup_sa/session/BUILD.gn b/tests/unittests/backup_sa/session/BUILD.gn index aeae28499..015f7524f 100644 --- a/tests/unittests/backup_sa/session/BUILD.gn +++ b/tests/unittests/backup_sa/session/BUILD.gn @@ -69,15 +69,6 @@ ohos_unittest("b_incremental_session_test") { "samgr:samgr_proxy", ] - sanitize = { - integer_overflow = true - ubsan = true - boundary_sanitize = true - cfi = true - cfi_cross_dso = true - cfi_vcall_icall_only = true - debug = false - } use_exceptions = true } -- Gitee From 8474f009a8d0933a73ec855db3c2e1d6770a3b20 Mon Sep 17 00:00:00 2001 From: BrainL Date: Sat, 15 Mar 2025 13:20:35 +0800 Subject: [PATCH 08/15] ut modify. Signed-off-by: BrainL --- tests/unittests/backup_ext/BUILD.gn | 1 + tests/unittests/backup_sa/module_ipc/BUILD.gn | 2 ++ tests/unittests/backup_sa/session/BUILD.gn | 1 + 3 files changed, 4 insertions(+) diff --git a/tests/unittests/backup_ext/BUILD.gn b/tests/unittests/backup_ext/BUILD.gn index 71ad2074a..a45cb3567 100644 --- a/tests/unittests/backup_ext/BUILD.gn +++ b/tests/unittests/backup_ext/BUILD.gn @@ -317,6 +317,7 @@ ohos_unittest("ext_backup_js_test") { cfi_cross_dso = true cfi_vcall_icall_only = true debug = false + blocklist = "${path_backup}/cfi_blocklist.txt" } sources = [ diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn index 606cd470d..2979b5716 100644 --- a/tests/unittests/backup_sa/module_ipc/BUILD.gn +++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn @@ -423,6 +423,7 @@ ohos_unittest("backup_service_incremental_test") { cfi_cross_dso = true cfi_vcall_icall_only = true debug = false + blocklist = "${path_backup}/cfi_blocklist.txt" } sources = [ @@ -493,6 +494,7 @@ ohos_unittest("backup_service_other_test") { cfi_cross_dso = true cfi_vcall_icall_only = true debug = false + blocklist = "${path_backup}/cfi_blocklist.txt" } sources = [ "${path_backup_mock}/accesstoken/src/accesstoken_kit_mock.cpp", diff --git a/tests/unittests/backup_sa/session/BUILD.gn b/tests/unittests/backup_sa/session/BUILD.gn index 015f7524f..c5c68c7e0 100644 --- a/tests/unittests/backup_sa/session/BUILD.gn +++ b/tests/unittests/backup_sa/session/BUILD.gn @@ -25,6 +25,7 @@ ohos_unittest("b_incremental_session_test") { cfi_cross_dso = true cfi_vcall_icall_only = true debug = false + blocklist = "${path_backup}/cfi_blocklist.txt" } include_dirs = [ -- Gitee From 1dc2066b2e458999e17cdb26e30e3b90f0e9774e Mon Sep 17 00:00:00 2001 From: BrainL Date: Mon, 31 Mar 2025 15:39:27 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: BrainL --- BUILD.gn | 8 +- CODEOWNERS | 4 +- backup.gni | 2 +- bundle.json | 10 +- frameworks/native/backup_ext/BUILD.gn | 1 + .../native/backup_ext/include/ext_backup_js.h | 3 +- .../native/backup_ext/include/ext_extension.h | 3 +- .../native/backup_ext/src/ext_backup.cpp | 5 +- .../native/backup_ext/src/ext_backup_js.cpp | 56 +- .../native/backup_ext/src/ext_extension.cpp | 74 +- .../backup_ext/src/sub_ext_extension.cpp | 16 +- .../native/backup_ext/src/untar_file.cpp | 4 +- .../include/service_reverse.h | 3 + .../backup_kit_inner/src/b_file_info.cpp | 4 +- .../src/b_incremental_backup_session.cpp | 38 +- .../src/b_incremental_data.cpp | 2 +- .../src/b_incremental_restore_session.cpp | 62 +- .../b_incremental_session_restore_async.cpp | 41 +- .../backup_kit_inner/src/b_session_backup.cpp | 40 +- .../src/b_session_restore.cpp | 55 +- .../src/b_session_restore_async.cpp | 39 +- .../backup_kit_inner/src/service_client.cpp | 141 ++ .../src/service_incremental_proxy.cpp | 417 ----- .../backup_kit_inner/src/service_proxy.cpp | 839 --------- .../native/backup_kit_inner/BUILD.gn | 11 +- .../backup_kit_inner/impl/b_file_info.h | 28 +- .../impl/b_incremental_data.h | 33 +- .../b_incremental_session_restore_async.h | 5 +- .../impl/b_session_restore_async.h | 5 +- .../backup_kit_inner/impl/backup_file_info.h | 44 + .../impl/backup_incremental_data.h | 47 + .../native/backup_kit_inner/impl/i_service.h | 104 -- .../impl/i_service_ipc_interface_code.h | 64 - .../backup_kit_inner/impl/i_service_reverse.h | 76 - .../backup_kit_inner/impl/service_client.h | 57 + .../backup_kit_inner/impl/service_common.h | 54 + .../backup_kit_inner/impl/service_proxy.h | 112 -- .../kits/js/backup/general_callbacks.cpp | 65 +- .../kits/js/backup/prop_n_operation.cpp | 37 +- .../js/backup/session_backup_n_exporter.cpp | 6 +- .../session_incremental_backup_n_exporter.cpp | 6 +- .../js/backup/session_restore_n_exporter.cpp | 6 +- services/backup_sa/BUILD.gn | 51 +- services/backup_sa/ExtensionType.idl | 42 +- services/backup_sa/IService.idl | 72 + services/backup_sa/ServiceReverseType.idl | 2 +- .../backup_sa/ServiceType.idl | 14 +- .../backup_sa/include/module_ipc/service.h | 97 +- .../include/module_ipc/service_stub.h | 85 - .../module_ipc/svc_restore_deps_manager.h | 5 +- .../include/module_ipc/svc_session_manager.h | 5 +- .../src/module_external/bms_adapter.cpp | 11 +- services/backup_sa/src/module_ipc/service.cpp | 141 +- .../src/module_ipc/service_incremental.cpp | 39 +- .../backup_sa/src/module_ipc/service_stub.cpp | 858 --------- .../backup_sa/src/module_ipc/sub_service.cpp | 31 +- .../src/module_ipc/svc_session_manager.cpp | 2 +- test/fuzztest/BUILD.gn | 1 - test/fuzztest/backupext_fuzzer/BUILD.gn | 1 + test/fuzztest/backupsa_fuzzer/BUILD.gn | 2 + test/fuzztest/backupsaanother_fuzzer/BUILD.gn | 1 + .../backupsaanother_fuzzer.cpp | 22 +- test/fuzztest/backupsaappend_fuzzer/BUILD.gn | 1 + .../backupsaappend_fuzzer.cpp | 18 +- .../backupservicestub_fuzzer/BUILD.gn | 1 + .../backupservicestub_fuzzer.cpp | 115 +- .../backupservicestubbranch_fuzzer/BUILD.gn | 67 - .../backupservicestubbranch_fuzzer.cpp | 1098 ------------ .../project.xml | 25 - .../backupservicestubbranch_fuzzer/service.h | 64 +- test/fuzztest/servicereverse_fuzzer/BUILD.gn | 6 +- .../servicereverse_fuzzer.cpp | 720 +++++++- .../svcrestoredepsmanager_fuzzer/BUILD.gn | 2 +- test/unittest/file_permission_native/BUILD.gn | 2 +- test/unittest/file_share_native/BUILD.gn | 2 +- .../file_share_permission_sup_test/BUILD.gn | 2 +- .../file_share_permission_test/BUILD.gn | 2 +- test/unittest/file_uri_native/BUILD.gn | 2 +- test/unittest/file_uri_ndk_test/BUILD.gn | 2 +- .../permission/BUILD.gn | 2 +- .../permission/FilePermission.test.js | 47 +- test/unittest/js_file_uri_test/BUILD.gn | 2 +- test/unittest/remote_file_share/BUILD.gn | 2 +- .../bundle_dependencies/fileShareA/BUILD.gn | 4 +- .../bundle_dependencies/fileShareB/BUILD.gn | 4 +- .../backup_kit_inner/service_client_mock.cpp | 67 + .../backup_kit_inner/service_proxy_mock.cpp | 114 +- .../include/service_reverse_proxy_mock.h | 2 +- .../include/svc_session_manager_mock.h | 4 +- tests/mock/module_ipc/service_mock.cpp | 67 +- tests/mock/module_ipc/service_stub_mock.cpp | 380 +--- .../mock/module_ipc/src/service_stub_mock.cpp | 184 -- .../src/svc_session_manager_mock.cpp | 2 +- .../module_ipc/svc_session_manager_mock.cpp | 2 +- .../svc_session_manager_throw_mock.cpp | 2 +- .../svc_session_manager_throw_mock.h | 4 +- tests/mock/napi/include/napi_mock.h | 8 +- tests/mock/napi/src/napi_mock.cpp | 11 +- tests/moduletests/backup_kit_inner/BUILD.gn | 2 + .../backup_tool/tool_help_test.cpp | 4 +- tests/unittests/BUILD.gn | 4 +- .../unittests/backup_api/backup_impl/BUILD.gn | 3 +- .../backup_impl/include/i_service_mock.h | 4 +- .../include/service_reverse_mock.h | 2 +- .../backup_impl/service_proxy_test.cpp | 1526 ----------------- tests/unittests/backup_ext/BUILD.gn | 17 +- .../backup_ext/ext_backup_js_test.cpp | 145 +- .../backup_ext/ext_extension_test.cpp | 62 + .../external_ext_backup_js_test.cpp | 11 +- .../ext_backup_js_external_test.cpp | 42 +- tests/unittests/backup_sa/module_ipc/BUILD.gn | 11 +- .../module_ipc/sa_backup_connection_test.cpp | 238 +++ .../module_ipc/service_incremental_test.cpp | 170 +- .../module_ipc/service_other_test.cpp | 277 ++- .../module_ipc/service_stub_test.cpp | 6 +- .../backup_sa/module_ipc/service_test.cpp | 18 +- .../module_ipc/service_throw_test.cpp | 144 +- .../backup_sa/module_ipc/sub_service_test.cpp | 70 +- .../module_ipc/svc_backup_connection_test.cpp | 55 + .../module_ipc/svc_session_manager_test.cpp | 109 ++ tests/unittests/backup_sa/session/BUILD.gn | 13 +- .../session/b_incremental_session_test.cpp | 143 +- .../backup_sa/session/service_client_mock.cpp | 38 + .../backup_sa/session/service_client_mock.h | 19 +- .../backup_sa/session/service_proxy_mock.cpp | 143 +- .../backup_sa/session/service_proxy_mock.h | 60 +- tests/unittests/backup_tools/BUILD.gn | 9 +- tests/unittests/backup_utils/BUILD.gn | 2 +- .../backup_utils/b_anony/b_anony_test.cpp | 2 +- .../backup_utils/b_error/b_error_test.cpp | 60 +- .../backup_utils/b_filesystem/b_dir_test.cpp | 4 +- .../b_filesystem/b_file_hash_test.cpp | 4 +- .../b_json/b_json_cached_entity_test.cpp | 24 +- .../b_json/b_json_clear_data_config_test.cpp | 113 +- .../b_json/b_json_entity_ext_manage_test.cpp | 22 +- .../b_json_entity_extension_config_test.cpp | 8 +- .../b_json/b_report_entity_test.cpp | 2 +- .../b_jsonutil/b_jsonutil_other_test.cpp | 29 +- .../b_jsonutil/b_jsonutil_test.cpp | 38 +- .../backup_utils/b_process/b_process_test.cpp | 20 +- tools/backup_tool/src/tools_op_backup.cpp | 9 +- tools/backup_tool/src/tools_op_check_sa.cpp | 6 +- .../src/tools_op_incremental_backup.cpp | 12 +- utils/BUILD.gn | 2 +- utils/include/b_error/b_error.h | 1 + utils/include/b_radar/b_radar.h | 2 +- utils/src/b_jsonutil/b_jsonutil.cpp | 12 +- utils/src/b_radar/b_radar.cpp | 2 +- 148 files changed, 3501 insertions(+), 7364 deletions(-) create mode 100644 frameworks/native/backup_kit_inner/src/service_client.cpp delete mode 100644 frameworks/native/backup_kit_inner/src/service_incremental_proxy.cpp delete mode 100644 frameworks/native/backup_kit_inner/src/service_proxy.cpp create mode 100644 interfaces/inner_api/native/backup_kit_inner/impl/backup_file_info.h create mode 100644 interfaces/inner_api/native/backup_kit_inner/impl/backup_incremental_data.h delete mode 100644 interfaces/inner_api/native/backup_kit_inner/impl/i_service.h delete mode 100644 interfaces/inner_api/native/backup_kit_inner/impl/i_service_ipc_interface_code.h delete mode 100644 interfaces/inner_api/native/backup_kit_inner/impl/i_service_reverse.h create mode 100644 interfaces/inner_api/native/backup_kit_inner/impl/service_client.h create mode 100644 interfaces/inner_api/native/backup_kit_inner/impl/service_common.h delete mode 100644 interfaces/inner_api/native/backup_kit_inner/impl/service_proxy.h create mode 100644 services/backup_sa/IService.idl rename test/fuzztest/backupservicestubbranch_fuzzer/backupservicestubbranch_fuzzer.h => services/backup_sa/ServiceType.idl (72%) delete mode 100644 services/backup_sa/include/module_ipc/service_stub.h delete mode 100644 services/backup_sa/src/module_ipc/service_stub.cpp delete mode 100644 test/fuzztest/backupservicestubbranch_fuzzer/backupservicestubbranch_fuzzer.cpp delete mode 100644 test/fuzztest/backupservicestubbranch_fuzzer/project.xml create mode 100644 tests/mock/backup_kit_inner/service_client_mock.cpp delete mode 100644 tests/mock/module_ipc/src/service_stub_mock.cpp delete mode 100644 tests/unittests/backup_api/backup_impl/service_proxy_test.cpp create mode 100644 tests/unittests/backup_sa/module_ipc/sa_backup_connection_test.cpp create mode 100644 tests/unittests/backup_sa/session/service_client_mock.cpp rename test/fuzztest/backupservicestubbranch_fuzzer/corpus/init => tests/unittests/backup_sa/session/service_client_mock.h (51%) diff --git a/BUILD.gn b/BUILD.gn index da9bf75da..bf6e14266 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -34,7 +34,7 @@ group("tgt_backup_sa") { ] } -group("tgt_backup_tests") { +group("backup_tests") { testonly = true deps = [ @@ -42,3 +42,9 @@ group("tgt_backup_tests") { "tests/unittests", ] } + +group("file_share_tests") { + testonly = true + + deps = [ "test/unittest" ] +} diff --git a/CODEOWNERS b/CODEOWNERS index 906be70eb..d36c1e1e2 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -11,5 +11,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -# any change to xxx_ipc_interface_code.h needs to be reviewed by @leonchan5 -interfaces/inner_api/native/backup_kit_inner/impl/i_service_ipc_interface_code.h @leonchan5 \ No newline at end of file +# any change to xxx_ipc_interface_code.h needs to be reviewed by @leonchan5 liubao6@huawei.com +interfaces/inner_api/native/backup_kit_inner/impl/i_service_ipc_interface_code.h @leonchan5 liubao6@huawei.com \ No newline at end of file diff --git a/backup.gni b/backup.gni index 3b07587da..348cfa221 100644 --- a/backup.gni +++ b/backup.gni @@ -12,7 +12,7 @@ # limitations under the License. path_backup = "//foundation/filemanagement/app_file_service" -path_module_out_tests = "filemanagement/app_file_service/backup" +path_module_out_tests = "app_file_service/app_file_service/backup" path_ability_runtime = "//foundation/ability/ability_runtime" path_access_token = "//base/security/access_token" diff --git a/bundle.json b/bundle.json index c21799596..33cedc508 100644 --- a/bundle.json +++ b/bundle.json @@ -143,11 +143,9 @@ "impl/b_session_restore.h", "impl/b_session_restore_async.h", "impl/b_file_info.h", - "impl/service_proxy.h", + "impl/service_client.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_ipc_interface_code.h" ] } }, @@ -165,8 +163,8 @@ ], "test": [ "//foundation/filemanagement/app_file_service/test/fuzztest:fuzztest", - "//foundation/filemanagement/app_file_service/test/unittest:unittest", - "//foundation/filemanagement/app_file_service:tgt_backup_tests" + "//foundation/filemanagement/app_file_service:file_share_tests", + "//foundation/filemanagement/app_file_service:backup_tests" ] } } diff --git a/frameworks/native/backup_ext/BUILD.gn b/frameworks/native/backup_ext/BUILD.gn index 01613dee2..53981cff5 100644 --- a/frameworks/native/backup_ext/BUILD.gn +++ b/frameworks/native/backup_ext/BUILD.gn @@ -56,6 +56,7 @@ ohos_shared_library("backup_extension_ability_native") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", + "${path_backup}/services/backup_sa:backup_sa_ipc_stub", "${path_backup}/utils:backup_utils", "${path_jsoncpp}:jsoncpp", ] diff --git a/frameworks/native/backup_ext/include/ext_backup_js.h b/frameworks/native/backup_ext/include/ext_backup_js.h index 7f26d84b3..c69cc77a0 100644 --- a/frameworks/native/backup_ext/include/ext_backup_js.h +++ b/frameworks/native/backup_ext/include/ext_backup_js.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 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 @@ -158,6 +158,7 @@ private: ErrCode CallJsOnBackup(); void ExportJsContext(void); + void InitTempPath(const std::string &bundleName); AbilityRuntime::JsRuntime &jsRuntime_; std::unique_ptr jsObj_; diff --git a/frameworks/native/backup_ext/include/ext_extension.h b/frameworks/native/backup_ext/include/ext_extension.h index 737e7b70d..8b83b4a35 100644 --- a/frameworks/native/backup_ext/include/ext_extension.h +++ b/frameworks/native/backup_ext/include/ext_extension.h @@ -30,7 +30,8 @@ #include "b_radar/b_radar.h" #include "ext_backup_js.h" #include "extension_stub.h" -#include "i_service.h" +#include "service_common.h" +#include "iservice.h" #include "tar_file.h" #include "thread_pool.h" #include "timer.h" diff --git a/frameworks/native/backup_ext/src/ext_backup.cpp b/frameworks/native/backup_ext/src/ext_backup.cpp index e75dcf5f8..fc37b3296 100644 --- a/frameworks/native/backup_ext/src/ext_backup.cpp +++ b/frameworks/native/backup_ext/src/ext_backup.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 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 @@ -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_backup_js.cpp b/frameworks/native/backup_ext/src/ext_backup_js.cpp index 9b9fbcb52..0960d8c17 100644 --- a/frameworks/native/backup_ext/src/ext_backup_js.cpp +++ b/frameworks/native/backup_ext/src/ext_backup_js.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 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 @@ -40,7 +40,9 @@ #include "b_error/b_excep_utils.h" #include "b_json/b_json_cached_entity.h" #include "b_json/b_json_entity_extension_config.h" +#include "b_radar/b_radar.h" #include "b_resources/b_constants.h" +#include "directory_ex.h" #include "ext_extension.h" #include "filemgmt_libhilog.h" @@ -413,6 +415,7 @@ void ExtBackupJs::Init(const shared_ptr &record, // 获取应用扩展的 BackupExtensionAbility 的路径 const AppExecFwk::AbilityInfo &info = *abilityInfo_; string bundleName = info.bundleName; + InitTempPath(bundleName); string moduleName(info.moduleName + "::" + info.name); string modulePath = GetSrcPath(info); int moduleType = static_cast(info.type); @@ -867,27 +870,12 @@ int ExtBackupJs::CallJsMethod(const std::string &funcName, InputArgsParser argParser, ResultValueParser retParser) { - uv_loop_s *loop = nullptr; - napi_status status = napi_get_uv_event_loop(jsRuntime.GetNapiEnv(), &loop); - if (status != napi_ok) { - HILOGE("failed to get uv event loop."); - return EINVAL; - } auto param = std::make_shared(funcName, &jsRuntime, jsObj, argParser, retParser); BExcepUltils::BAssert(param, BError::Codes::EXT_BROKEN_FRAMEWORK, "failed to new param."); - auto work = std::make_shared(); - BExcepUltils::BAssert(work, BError::Codes::EXT_BROKEN_FRAMEWORK, "failed to new uv_work_t."); - - work->data = reinterpret_cast(param.get()); HILOGI("Will execute current js method"); - auto task = [work {work.get()}]() { - if (work == nullptr) { - HILOGE("failed to get work."); - return; - } - HILOGI("AsyncWork Enter, %{public}zu", (size_t)work); - CallJsParam *param = reinterpret_cast(work->data); + auto task = [](void* ptr) ->void { + auto param = reinterpret_cast(ptr); do { if (param == nullptr) { HILOGE("failed to get CallJsParam."); @@ -903,9 +891,11 @@ int ExtBackupJs::CallJsMethod(const std::string &funcName, param->isReady.store(true); param->backupOperateCondition.notify_all(); }; - auto ret = napi_send_event(jsRuntime.GetNapiEnv(), task, napi_eprio_high); + uint64_t handleId = 0; + auto ret = napi_send_cancelable_event(jsRuntime.GetNapiEnv(), task, param.get(), napi_eprio_high, &handleId, + funcName.c_str()); if (ret != napi_status::napi_ok) { - HILOGE("failed to napi_send_event, ret:%{public}d.", ret); + HILOGE("failed to napi_send_cancelable_event, ret:%{public}d, name:%{public}s.", ret, funcName.c_str()); return EINVAL; } HILOGI("Wait execute current js method"); @@ -1026,4 +1016,30 @@ ErrCode ExtBackupJs::OnProcess(std::function c HILOGI("BackupExtensionAbulity(JS) OnProcess end."); return errCode; } + +void ExtBackupJs::InitTempPath(const std::string &bundleName) +{ + std::string el2BackupDir(BConstants::PATH_BUNDLE_BACKUP_HOME); + if (access(el2BackupDir.c_str(), F_OK) != 0) { + HILOGW("backup home el2 dir not exits, try to create"); + if (!ForceCreateDirectory(el2BackupDir.data())) { + HILOGE("Failed to create directory, err = %{public}d", errno); + AppRadar::Info info(bundleName, "", "Create backup home el2 dir failed"); + AppRadar::GetInstance().RecordDefaultFuncRes(info, "ExtBackupJs::InitTempPath", + AppRadar::GetInstance().GetUserId(), BizStageBackup::BIZ_STAGE_DEFAULT, + static_cast(BError::Codes::EXT_CREATE_DIR_ERROR)); + } + } + std::string el1BackupDir(BConstants::PATH_BUNDLE_BACKUP_HOME_EL1); + if (access(el1BackupDir.c_str(), F_OK) != 0) { + HILOGW("backup home el1 dir not exits, try to create"); + if (!ForceCreateDirectory(el1BackupDir.data())) { + HILOGE("Failed to create home el1 dir, err = %{public}d", errno); + AppRadar::Info info(bundleName, "", "Create backup home el1 dir failed"); + AppRadar::GetInstance().RecordDefaultFuncRes(info, "ExtBackupJs::InitTempPath", + AppRadar::GetInstance().GetUserId(), BizStageBackup::BIZ_STAGE_DEFAULT, + static_cast(BError::Codes::EXT_CREATE_DIR_ERROR)); + } + } +} } // namespace OHOS::FileManagement::Backup diff --git a/frameworks/native/backup_ext/src/ext_extension.cpp b/frameworks/native/backup_ext/src/ext_extension.cpp index 3f486b2f0..c56a30ae1 100644 --- a/frameworks/native/backup_ext/src/ext_extension.cpp +++ b/frameworks/native/backup_ext/src/ext_extension.cpp @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -53,9 +54,9 @@ #include "b_utils/b_time.h" #include "filemgmt_libhilog.h" #include "hitrace_meter.h" -#include "i_service.h" +#include "iservice.h" #include "sandbox_helper.h" -#include "service_proxy.h" +#include "service_client.h" #include "tar_file.h" namespace OHOS::FileManagement::Backup { @@ -419,7 +420,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")); } @@ -478,10 +479,10 @@ static ErrCode IndexFileReady(const TarMap &pkgInfo, sptr proxy) cache.SetExtManage(pkgInfo); cachedEntity.Persist(); close(cachedEntity.GetFd().Release()); - + int fdval = 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 { @@ -519,8 +520,8 @@ ErrCode BackupExtExtension::BigFileReady(TarMap &bigFileInfo, sptr pro WaitToSendFd(startTime, fdNum); int32_t errCode = ERR_OK; string filePath = std::get<0>(item.second); - UniqueFd fd(open(filePath.data(), O_RDONLY)); - if (fd < 0) { + int fdval = open(filePath.data(), O_RDONLY); + if (fdval < 0) { HILOGE("open file failed, file name is %{public}s, err = %{public}d", GetAnonyString(filePath).c_str(), errno); errCode = errno; @@ -532,7 +533,7 @@ ErrCode BackupExtExtension::BigFileReady(TarMap &bigFileInfo, sptr pro continue; } } - ret = proxy->AppFileReady(item.first, std::move(fd), errCode); + 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 { @@ -704,15 +705,15 @@ static ErrCode TarFileReady(const TarMap &tarFileInfo, sptr proxy) string path = string(BConstants::PATH_BUNDLE_BACKUP_HOME).append(BConstants::SA_BUNDLE_BACKUP_BACKUP); string tarPath = path + tarName; int32_t errCode = ERR_OK; - UniqueFd fd(open(tarPath.data(), O_RDONLY)); - if (fd < 0) { + int fdval = open(tarPath.data(), O_RDONLY); + if (fdval < 0) { HILOGE("TarFileReady open file failed, file name is %{public}s, err = %{public}d", tarName.c_str(), errno); errCode = errno; AuditLog auditLog = {false, "Open fd failed", "ADD", "", 1, "FAILED", "TarFileReady", "tarFile", tarPath}; HiAudit::GetInstance(false).Write(auditLog); } - int ret = proxy->AppFileReady(tarName, std::move(fd), errCode); + int ret = proxy->AppFileReady(tarName, fdval, errCode); if (SUCCEEDED(ret)) { HILOGI("TarFileReady: AppFileReady success for %{public}s", tarName.c_str()); // 删除文件 @@ -795,7 +796,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)); } @@ -860,9 +861,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"); @@ -1743,9 +1744,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; } @@ -1758,8 +1759,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) { @@ -1769,8 +1770,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) { @@ -1781,8 +1782,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) { @@ -1795,9 +1796,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"); @@ -2014,7 +2015,8 @@ static void WriteFile(const string &filename, const vector &srcFiles, sptr proxy) + const vector &srcFiles, + sptr proxy) { string tarFile = bigFileInfo.begin()->first; string manageFile = GetReportFileName(tarFile); @@ -2022,8 +2024,9 @@ 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); + int fd = open(tarName.data(), O_RDONLY); + int manifestFd = open(file.data(), O_RDONLY); + ErrCode ret = proxy->AppIncrementalFileReady(tarFile, fd, manifestFd, ERR_OK); if (SUCCEEDED(ret)) { HILOGI("IncrementalTarFileReady: The application is packaged successfully"); // 删除文件 @@ -2053,8 +2056,8 @@ ErrCode BackupExtExtension::IncrementalBigFileReady(TarMap &pkgInfo, auto [path, sta, isBeforeTar] = item.second; int32_t errCode = ERR_OK; WaitToSendFd(startTime, fdNum); - UniqueFd fd(open(path.data(), O_RDONLY)); - if (fd < 0) { + int fdval = open(path.data(), O_RDONLY); + if (fdval < 0) { HILOGE("IncrementalBigFileReady open file failed, file name is %{public}s, err = %{public}d", GetAnonyString(path).c_str(), errno); errCode = errno; @@ -2072,7 +2075,8 @@ 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); + int manifestFdval = 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()); @@ -2104,11 +2108,11 @@ ErrCode BackupExtExtension::IncrementalAllFileReady(const TarMap &pkgInfo, string file = GetReportFileName(string(INDEX_FILE_INCREMENTAL_BACKUP).append("all")); WriteFile(file, srcFiles); - UniqueFd fd(open(INDEX_FILE_BACKUP.data(), O_RDONLY)); - UniqueFd manifestFd(open(file.data(), O_RDONLY)); + int fdval = open(INDEX_FILE_BACKUP.data(), O_RDONLY); + int manifestFdval = open(file.data(), O_RDONLY); 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/sub_ext_extension.cpp b/frameworks/native/backup_ext/src/sub_ext_extension.cpp index 16fdbff41..11ef67483 100644 --- a/frameworks/native/backup_ext/src/sub_ext_extension.cpp +++ b/frameworks/native/backup_ext/src/sub_ext_extension.cpp @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -51,9 +52,8 @@ #include "b_tarball/b_tarball_factory.h" #include "filemgmt_libhilog.h" #include "hitrace_meter.h" -#include "i_service.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; } @@ -1173,7 +1173,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_ext/src/untar_file.cpp b/frameworks/native/backup_ext/src/untar_file.cpp index f78ce3c9d..87d6f9454 100644 --- a/frameworks/native/backup_ext/src/untar_file.cpp +++ b/frameworks/native/backup_ext/src/untar_file.cpp @@ -674,7 +674,7 @@ std::tuple UntarFile::ParsePaxBlock() break; } string pathLen = content.substr(pos, lenEnd - pos); - recLen = std::atoi(pathLen.c_str()); + recLen = static_cast(std::atoi(pathLen.c_str())); allLen = recLen + OTHER_HEADER; if (allLen > BLOCK_SIZE) { isLongName = true; @@ -740,7 +740,7 @@ std::tuple UntarFile::GetLongName(uint32_t recLen, uint32_t al break; } string pathLen = content.substr(pos, lenEnd - pos); - int recLen = std::atoi(pathLen.c_str()); + size_t recLen = static_cast(std::atoi(pathLen.c_str())); string KvPair = content.substr(lenEnd + 1, recLen - (lenEnd - pos + 1)); size_t eqPos = KvPair.find('='); if (eqPos == string::npos) { diff --git a/frameworks/native/backup_kit_inner/include/service_reverse.h b/frameworks/native/backup_kit_inner/include/service_reverse.h index 5973451df..2a0b486c5 100644 --- a/frameworks/native/backup_kit_inner/include/service_reverse.h +++ b/frameworks/native/backup_kit_inner/include/service_reverse.h @@ -23,6 +23,9 @@ #include "service_reverse_stub.h" namespace OHOS::FileManagement::Backup { +const int DEFAULT_RESTORE_TYPE = 0; +const int DEFAULT_USER_ID = -1; + class ServiceReverse final : public ServiceReverseStub { public: ErrCode BackupOnFileReady(const std::string &bundleName, 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 e068da158..c01b287eb 100644 --- a/frameworks/native/backup_kit_inner/src/b_file_info.cpp +++ b/frameworks/native/backup_kit_inner/src/b_file_info.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 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 @@ -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 97de333ab..2413f9de2 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -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,8 +46,8 @@ 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; @@ -76,13 +76,13 @@ 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); + errCode = proxy->InitIncrementalBackupSessionWithErrMsg(sptr(new ServiceReverse(callbacks)), errMsg); if (errCode != ERR_OK) { HILOGE("Failed to Backup because of %{public}d", errCode); AppRadar::Info info("", "", ""); @@ -101,7 +101,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 +111,7 @@ void BIncrementalBackupSession::RegisterBackupServiceDied(function funct } auto callback = [functor](const wptr &obj) { - ServiceProxy::InvaildInstance(); + ServiceClient::InvaildInstance(); HILOGI("Backup service died"); functor(); }; @@ -122,12 +122,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(); + int fdvalue = INVALID_FD; + proxy->GetLocalCapabilitiesForBundleInfos(fdvalue); + UniqueFd fd(fdvalue); if (fd < 0) { HILOGE("Failed to get local capabilities for bundleinfos"); return UniqueFd(-EPERM); @@ -138,7 +140,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 +155,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 +176,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 +196,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 +207,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 571805e51..a0a5b1037 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 97468695a..461763e15 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -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 @@ BIncrementalRestoreSession::~BIncrementalRestoreSession() HILOGI("Death Recipient is nullptr"); return; } - auto proxy = ServiceProxy::GetServiceProxyPointer(); + auto proxy = ServiceClient::GetServiceProxyPointer(); if (proxy == nullptr) { return; } @@ -46,8 +46,8 @@ 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; @@ -75,15 +75,15 @@ 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); + errCode = proxy->InitRestoreSessionWithErrMsg(sptr(new ServiceReverse(callbacks)), errMsg); if (errCode != ERR_OK) { HILOGE("Failed to Restore because of %{public}d", errCode); AppRadar::Info info ("", "", "create restore session failed"); @@ -104,12 +104,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(); + int fdvalue = INVALID_FD; + proxy->GetLocalCapabilitiesForBundleInfos(fdvalue); + UniqueFd fd(fdvalue); if (fd < 0) { HILOGE("Failed to get local capabilities for bundleinfos"); return UniqueFd(-EPERM); @@ -119,7 +121,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 +130,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)); + int fdValue = fd.Get(); + return proxy->PublishSAIncrementalFile(fileInfo, fdValue); } 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 +150,13 @@ 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->AppendBundlesRestoreSessionData(remoteCapInt, bundlesToRestore, + DEFAULT_RESTORE_TYPE, DEFAULT_USER_ID); if (res != ERR_OK) { std::string ss; for (const auto &bundle : bundlesToRestore) { @@ -159,19 +164,23 @@ ErrCode BIncrementalRestoreSession::AppendBundles(UniqueFd remoteCap, vector bundlesToRestore, - std::vector detailInfos) +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->AppendBundlesRestoreSessionDataByDetail(remoteCapInt, bundlesToRestore, detailInfos, + DEFAULT_RESTORE_TYPE, DEFAULT_USER_ID); if (res != ERR_OK) { std::string ss; for (const auto &bundle : bundlesToRestore) { @@ -179,14 +188,15 @@ ErrCode BIncrementalRestoreSession::AppendBundles(UniqueFd remoteCap, vector functor) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr || !functor) { return; } @@ -207,7 +217,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 +227,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 170a50db6..fa1eb7624 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -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; @@ -79,7 +79,7 @@ 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(); } @@ -88,7 +88,7 @@ ErrCode BIncrementalSessionRestoreAsync::PublishFile(BFileInfo 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 +102,14 @@ 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); + int fdCode = remoteCap.Get(); + int32_t restoreTypeInt = static_cast(restoreType); + ErrCode res = + proxy->AppendBundlesRestoreSessionDataByDetail(fdCode, bundlesToRestore, detailInfos, restoreTypeInt, userId); if (res != ERR_OK) { std::string ss; for (const auto &bundle : bundlesToRestore) { @@ -115,7 +117,8 @@ ErrCode BIncrementalSessionRestoreAsync::AppendBundles(UniqueFd remoteCap, } AppRadar::Info info(ss.c_str(), "", "AppendBundles with infos"); AppRadar::GetInstance().RecordRestoreFuncRes(info, "BIncrementalSessionRestoreAsync::AppendBundles", - AppRadar::GetInstance().GetUserId(), BizStageRestore::BIZ_STAGE_APPEND_BUNDLES_FAIL, res); + AppRadar::GetInstance().GetUserId(), + BizStageRestore::BIZ_STAGE_APPEND_BUNDLES_FAIL, res); } return res; } @@ -125,11 +128,14 @@ 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); + int fdCode = remoteCap.Get(); + int32_t restoreTypeInt = static_cast(restoreType); + ErrCode res = + proxy->AppendBundlesRestoreSessionData(fdCode, bundlesToRestore, restoreTypeInt, userId); if (res != ERR_OK) { std::string ss; for (const auto &bundle : bundlesToRestore) { @@ -137,14 +143,15 @@ ErrCode BIncrementalSessionRestoreAsync::AppendBundles(UniqueFd remoteCap, } AppRadar::Info info(ss.c_str(), "", ""); AppRadar::GetInstance().RecordRestoreFuncRes(info, "BIncrementalSessionRestoreAsync::AppendBundles", - AppRadar::GetInstance().GetUserId(), BizStageRestore::BIZ_STAGE_APPEND_BUNDLES_FAIL, res); + AppRadar::GetInstance().GetUserId(), + BizStageRestore::BIZ_STAGE_APPEND_BUNDLES_FAIL, res); } return res; } 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(); } @@ -154,7 +161,7 @@ ErrCode BIncrementalSessionRestoreAsync::Release() void BIncrementalSessionRestoreAsync::RegisterBackupServiceDied(std::function functor) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr || !functor) { return; } @@ -171,7 +178,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; @@ -76,13 +76,13 @@ 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); + errCode = proxy->InitBackupSessionWithErrMsg(sptr(new ServiceReverse(callbacks)), errMsg); if (errCode != ERR_OK) { HILOGE("Failed to Backup because of %{public}d", errCode); AppRadar::Info info("", "", ""); @@ -101,7 +101,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 +111,7 @@ void BSessionBackup::RegisterBackupServiceDied(std::function functor) } auto callback = [functor](const wptr &obj) { - ServiceProxy::InvaildInstance(); + ServiceClient::InvaildInstance(); HILOGI("Backup service died"); functor(); }; @@ -121,7 +121,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 +132,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(); + int fdvalue = INVALID_FD; + proxy->GetLocalCapabilitiesForBundleInfos(fdvalue); + UniqueFd fd(fdvalue); if (fd < 0) { HILOGE("Failed to get local capabilities for bundleinfos"); return UniqueFd(-EPERM); @@ -148,7 +150,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 +165,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 +185,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 +205,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 +215,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 +226,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 21fbc125f..d0a9d1644 100644 --- a/frameworks/native/backup_kit_inner/src/b_session_restore.cpp +++ b/frameworks/native/backup_kit_inner/src/b_session_restore.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 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 @@ -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 @@ BSessionRestore::~BSessionRestore() HILOGI("Death Recipient is nullptr"); return; } - auto proxy = ServiceProxy::GetServiceProxyPointer(); + auto proxy = ServiceClient::GetServiceProxyPointer(); if (proxy == nullptr) { return; } @@ -46,8 +46,8 @@ 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; @@ -72,12 +72,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(); + int fdvalue = INVALID_FD; + proxy->GetLocalCapabilitiesForBundleInfos(fdvalue); + UniqueFd fd(fdvalue); if (fd < 0) { HILOGE("Failed to get local capabilities for bundleinfos"); return UniqueFd(-EPERM); @@ -87,7 +89,7 @@ UniqueFd BSessionRestore::GetLocalCapabilities() ErrCode BSessionRestore::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(); } @@ -96,7 +98,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 +108,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(); } @@ -114,14 +116,17 @@ ErrCode BSessionRestore::GetFileHandle(const string &bundleName, const string &f return proxy->GetFileHandle(bundleName, fileName); } -ErrCode BSessionRestore::AppendBundles(UniqueFd remoteCap, vector bundlesToRestore, - std::vector detailInfos) +ErrCode BSessionRestore::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->AppendBundlesRestoreSessionDataByDetail(remoteCapInt, bundlesToRestore, detailInfos, + DEFAULT_RESTORE_TYPE, DEFAULT_USER_ID); if (res != ERR_OK) { std::string ss; for (const auto &bundle : bundlesToRestore) { @@ -129,18 +134,21 @@ ErrCode BSessionRestore::AppendBundles(UniqueFd remoteCap, vector bu } AppRadar::Info info(ss.c_str(), "", "AppendBundles with infos"); AppRadar::GetInstance().RecordRestoreFuncRes(info, "BSessionRestore::AppendBundles", - AppRadar::GetInstance().GetUserId(), BizStageRestore::BIZ_STAGE_APPEND_BUNDLES_FAIL, res); + AppRadar::GetInstance().GetUserId(), + BizStageRestore::BIZ_STAGE_APPEND_BUNDLES_FAIL, res); } return res; } ErrCode BSessionRestore::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->AppendBundlesRestoreSessionData(remoteCapInt, bundlesToRestore, + DEFAULT_RESTORE_TYPE, DEFAULT_USER_ID); if (res != ERR_OK) { std::string ss; for (const auto &bundle : bundlesToRestore) { @@ -148,14 +156,15 @@ ErrCode BSessionRestore::AppendBundles(UniqueFd remoteCap, vector bu } AppRadar::Info info(ss.c_str(), "", ""); AppRadar::GetInstance().RecordRestoreFuncRes(info, "BSessionRestore::AppendBundles", - AppRadar::GetInstance().GetUserId(), BizStageRestore::BIZ_STAGE_APPEND_BUNDLES_FAIL, res); + AppRadar::GetInstance().GetUserId(), + BizStageRestore::BIZ_STAGE_APPEND_BUNDLES_FAIL, res); } return res; } ErrCode BSessionRestore::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(); } @@ -165,7 +174,7 @@ ErrCode BSessionRestore::Finish() ErrCode BSessionRestore::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(); } @@ -175,7 +184,7 @@ ErrCode BSessionRestore::Release() void BSessionRestore::RegisterBackupServiceDied(std::function functor) { - auto proxy = ServiceProxy::GetInstance(); + auto proxy = ServiceClient::GetInstance(); if (proxy == nullptr || !functor) { return; } @@ -186,7 +195,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)); @@ -196,7 +205,7 @@ void BSessionRestore::RegisterBackupServiceDied(std::function functor) ErrCode BSessionRestore::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_async.cpp b/frameworks/native/backup_kit_inner/src/b_session_restore_async.cpp index a60c56462..f3f5276bd 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 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 @@ -20,8 +20,9 @@ #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" +#include "service_common.h" namespace OHOS::FileManagement::Backup { using namespace std; @@ -32,7 +33,7 @@ BSessionRestoreAsync::~BSessionRestoreAsync() HILOGI("Death Recipient is nullptr"); return; } - auto proxy = ServiceProxy::GetServiceProxyPointer(); + auto proxy = ServiceClient::GetServiceProxyPointer(); if (proxy == nullptr) { return; } @@ -48,8 +49,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; @@ -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->AppendBundlesRestoreSessionDataByDetail(remoteCapInt, bundlesToRestore, detailInfos, + restoreTypeInt, userId); if (res != ERR_OK) { std::string ss; for (const auto &bundle : bundlesToRestore) { @@ -126,12 +129,15 @@ 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->AppendBundlesRestoreSessionData(remoteCapInt, bundlesToRestore, restoreTypeInt, userId); if (res != ERR_OK) { std::string ss; for (const auto &bundle : bundlesToRestore) { @@ -139,14 +145,15 @@ ErrCode BSessionRestoreAsync::AppendBundles(UniqueFd remoteCap, } AppRadar::Info info(ss.c_str(), "", ""); AppRadar::GetInstance().RecordRestoreFuncRes(info, "BSessionRestoreAsync::AppendBundles", - AppRadar::GetInstance().GetUserId(), BizStageRestore::BIZ_STAGE_APPEND_BUNDLES_FAIL, res); + AppRadar::GetInstance().GetUserId(), + BizStageRestore::BIZ_STAGE_APPEND_BUNDLES_FAIL, res); } return res; } 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 +163,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 +180,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 000000000..f4af54168 --- /dev/null +++ b/frameworks/native/backup_kit_inner/src/service_client.cpp @@ -0,0 +1,141 @@ +/* + * Copyright (c) 2022-2025 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" + +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_); + 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(); + }; + 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 bbb503bfa..000000000 --- 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_proxy.cpp b/frameworks/native/backup_kit_inner/src/service_proxy.cpp deleted file mode 100644 index 187f69ef7..000000000 --- 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/interfaces/inner_api/native/backup_kit_inner/BUILD.gn b/interfaces/inner_api/native/backup_kit_inner/BUILD.gn index 32ebddda3..70593df50 100644 --- a/interfaces/inner_api/native/backup_kit_inner/BUILD.gn +++ b/interfaces/inner_api/native/backup_kit_inner/BUILD.gn @@ -18,7 +18,7 @@ import("//foundation/filemanagement/app_file_service/backup.gni") config("public_config") { include_dirs = [ ".", - "impl", + "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", ] } @@ -52,9 +52,8 @@ 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", ] @@ -63,11 +62,11 @@ ohos_shared_library("backup_kit_inner") { "LOG_TAG=\"BackupAPI\"", ] - configs = [ - ":private_config", + configs = [ ":private_config" ] + public_configs = [ + ":public_config", "${path_backup}/services/backup_sa:public_idl_config", ] - public_configs = [ ":public_config" ] external_deps = [ "c_utils:utils", diff --git a/interfaces/inner_api/native/backup_kit_inner/impl/b_file_info.h b/interfaces/inner_api/native/backup_kit_inner/impl/b_file_info.h index 356ad5226..f82e057d6 100644 --- a/interfaces/inner_api/native/backup_kit_inner/impl/b_file_info.h +++ b/interfaces/inner_api/native/backup_kit_inner/impl/b_file_info.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 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 @@ -16,29 +16,7 @@ #ifndef OHOS_FILEMGMT_BACKUP_B_FILE_INFO_H #define OHOS_FILEMGMT_BACKUP_B_FILE_INFO_H -#include -#include - -#include "parcel.h" - -namespace OHOS::FileManagement::Backup { -using BundleName = std::string; -using TmpFileSN = uint32_t; - -struct BFileInfo : public Parcelable { - BundleName owner; - std::string fileName; - TmpFileSN sn; // 用于服务零拷贝接收文件场景 - - BFileInfo() = default; - BFileInfo(std::string bundleName, std::string strFileNanme, TmpFileSN id) - : owner(bundleName), fileName(strFileNanme), sn(id) {} - ~BFileInfo() override = default; - - bool ReadFromParcel(Parcel &parcel); - bool Marshalling(Parcel &parcel) const override; - static BFileInfo *Unmarshalling(Parcel &parcel); -}; -} // namespace OHOS::FileManagement::Backup +#include "backup_file_info.h" +namespace OHOS::FileManagement::Backup {}; // namespace OHOS::FileManagement::Backup #endif // OHOS_FILEMGMT_BACKUP_B_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/b_incremental_data.h index fa513fdcd..48253bd46 100644 --- a/interfaces/inner_api/native/backup_kit_inner/impl/b_incremental_data.h +++ b/interfaces/inner_api/native/backup_kit_inner/impl/b_incremental_data.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -12,36 +12,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + #ifndef OHOS_FILEMGMT_BACKUP_B_INCREMENTAL_DATA_H #define OHOS_FILEMGMT_BACKUP_B_INCREMENTAL_DATA_H -#include -#include - -#include "parcel.h" -#include "unique_fd.h" - -namespace OHOS::FileManagement::Backup { -struct BIncrementalData : public Parcelable { - std::string bundleName; - int64_t lastIncrementalTime; - int32_t manifestFd; - std::string backupParameters; - int32_t backupPriority; - - BIncrementalData() = default; - BIncrementalData(std::string name, int64_t nTime, int fd = -1, std::string parameters = "", int32_t priority = 0) - : bundleName(name), lastIncrementalTime(nTime), manifestFd(fd), backupParameters(parameters), - backupPriority(priority) - { - } - ~BIncrementalData() override = default; - - bool ReadFromParcel(Parcel &parcel); - bool Marshalling(Parcel &parcel) const override; - static BIncrementalData *Unmarshalling(Parcel &parcel); -}; -} // namespace OHOS::FileManagement::Backup +#include "backup_incremental_data.h" +namespace OHOS::FileManagement::Backup {} // namespace OHOS::FileManagement::Backup #endif // OHOS_FILEMGMT_BACKUP_B_INCREMENTAL_DATA_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 50c47bf7b..b2b51235f 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -24,7 +24,8 @@ #include "b_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_restore_async.h b/interfaces/inner_api/native/backup_kit_inner/impl/b_session_restore_async.h index 64615acb2..58ca45178 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 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 @@ -24,7 +24,8 @@ #include "b_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/backup_file_info.h b/interfaces/inner_api/native/backup_kit_inner/impl/backup_file_info.h new file mode 100644 index 000000000..16f9f7ea7 --- /dev/null +++ b/interfaces/inner_api/native/backup_kit_inner/impl/backup_file_info.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2022-2025 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_BACKUP_FILE_INFO_H +#define OHOS_FILEMGMT_BACKUP_BACKUP_FILE_INFO_H + +#include +#include + +#include "parcel.h" + +namespace OHOS::FileManagement::Backup { +using BundleName = std::string; +using TmpFileSN = uint32_t; + +struct BFileInfo : public Parcelable { + BundleName owner; + std::string fileName; + TmpFileSN sn; // 用于服务零拷贝接收文件场景 + + BFileInfo() = default; + BFileInfo(std::string bundleName, std::string strFileNanme, TmpFileSN id) + : owner(bundleName), fileName(strFileNanme), sn(id) {} + ~BFileInfo() override = default; + + bool ReadFromParcel(Parcel &parcel); + bool Marshalling(Parcel &parcel) const override; + static BFileInfo *Unmarshalling(Parcel &parcel); +}; +} // namespace OHOS::FileManagement::Backup + +#endif // OHOS_FILEMGMT_BACKUP_BACKUP_FILE_INFO_H diff --git a/interfaces/inner_api/native/backup_kit_inner/impl/backup_incremental_data.h b/interfaces/inner_api/native/backup_kit_inner/impl/backup_incremental_data.h new file mode 100644 index 000000000..1704a3fda --- /dev/null +++ b/interfaces/inner_api/native/backup_kit_inner/impl/backup_incremental_data.h @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2025 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_BACKUP_INCREMENTAL_DATA_H +#define OHOS_FILEMGMT_BACKUP_BACKUP_INCREMENTAL_DATA_H + +#include +#include + +#include "parcel.h" +#include "unique_fd.h" + +namespace OHOS::FileManagement::Backup { +struct BIncrementalData : public Parcelable { + std::string bundleName; + int64_t lastIncrementalTime; + int32_t manifestFd; + std::string backupParameters; + int32_t backupPriority; + + BIncrementalData() = default; + BIncrementalData(std::string name, int64_t nTime, int fd = -1, std::string parameters = "", int32_t priority = 0) + : bundleName(name), lastIncrementalTime(nTime), manifestFd(fd), backupParameters(parameters), + backupPriority(priority) + { + } + ~BIncrementalData() override = default; + + bool ReadFromParcel(Parcel &parcel); + bool Marshalling(Parcel &parcel) const override; + static BIncrementalData *Unmarshalling(Parcel &parcel); +}; +} // namespace OHOS::FileManagement::Backup + +#endif // OHOS_FILEMGMT_BACKUP_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 896d6fc88..000000000 --- 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 "iservice_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_ipc_interface_code.h b/interfaces/inner_api/native/backup_kit_inner/impl/i_service_ipc_interface_code.h deleted file mode 100644 index ba99705fe..000000000 --- a/interfaces/inner_api/native/backup_kit_inner/impl/i_service_ipc_interface_code.h +++ /dev/null @@ -1,64 +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_IPC_INTERFACE_CODE_H -#define OHOS_FILEMGMT_BACKUP_I_SERVICE_IPC_INTERFACE_CODE_H - -/*SAID: 5203*/ -namespace OHOS::FileManagement::Backup { -enum class IServiceInterfaceCode { - SERVICE_CMD_INIT_RESTORE_SESSION, - SERVICE_CMD_INIT_RESTORE_SESSION_MSG, - SERVICE_CMD_INIT_BACKUP_SESSION, - SERVICE_CMD_INIT_BACKUP_SESSION_MSG, - SERVICE_CMD_GET_LOCAL_CAPABILITIES, - SERVICE_CMD_GET_LOCAL_CAPABILITIES_FOR_BUNDLE_INFOS, - SERVICE_CMD_PUBLISH_FILE, - SERVICE_CMD_APP_FILE_READY, - SERVICE_CMD_APP_DONE, - SERVICE_CMD_RESULT_REPORT, - SERVICE_CMD_START, - SERVICE_CMD_GET_FILE_NAME, - SERVICE_CMD_APPEND_BUNDLES_RESTORE_SESSION_DETAIL, - SERVICE_CMD_APPEND_BUNDLES_RESTORE_SESSION, - SERVICE_CMD_APPEND_BUNDLES_BACKUP_SESSION, - SERVICE_CMD_APPEND_BUNDLES_BACKUP_SESSION_DETAILS, - SERVICE_CMD_FINISH, - SERVICE_CMD_RELSEASE_SESSION, - SERVICE_CMD_GET_LOCAL_CAPABILITIES_INCREMENTAL, - SERVICE_CMD_INIT_INCREMENTAL_BACKUP_SESSION, - SERVICE_CMD_INIT_INCREMENTAL_BACKUP_SESSION_MSG, - SERVICE_CMD_APPEND_BUNDLES_INCREMENTAL_BACKUP_SESSION, - SERVICE_CMD_APPEND_BUNDLES_INCREMENTAL_BACKUP_SESSION_DETAILS, - SERVICE_CMD_PUBLISH_INCREMENTAL_FILE, - SERVICE_CMD_PUBLISH_SA_INCREMENTAL_FILE, - SERVICE_CMD_APP_INCREMENTAL_FILE_READY, - SERVICE_CMD_APP_INCREMENTAL_DONE, - SERVICE_CMD_GET_INCREMENTAL_FILE_NAME, - SERVICE_CMD_GET_BACKUP_INFO, - SERVICE_CMD_UPDATE_TIMER, - SERVICE_CMD_START_EXT_TIMER, - SERVICE_CMD_START_FWK_TIMER, - SERVICE_CMD_UPDATE_SENDRATE, - SERVICE_CMD_GET_APP_LOCAL_LIST_AND_DO_INCREMENTAL_BACKUP, - SERVICE_CMD_REPORT_APP_PROCESS_INFO, - SERVICE_CMD_CANCEL_BUNDLE, - SERVICE_CMD_STOP_EXT_TIMER, - SERVICE_CMD_REFRESH_DATA_SIZE, - SERVICE_CMD_GET_BACKUP_DATA_SIZE, -}; -} // namespace OHOS::FileManagement::Backup - -#endif // OHOS_FILEMGMT_BACKUP_I_SERVICE_IPC_INTERFACE_CODE_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 4ca5a7621..000000000 --- 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/interfaces/inner_api/native/backup_kit_inner/impl/service_client.h b/interfaces/inner_api/native/backup_kit_inner/impl/service_client.h new file mode 100644 index 000000000..28a90dd2d --- /dev/null +++ b/interfaces/inner_api/native/backup_kit_inner/impl/service_client.h @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2022-2025 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_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" + +namespace OHOS::FileManagement::Backup { +class ServiceClient { + +public: + 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 std::mutex proxyMutex_; + static inline std::mutex getInstanceMutex_; + static inline sptr serviceProxy_ = nullptr; +}; +} // namespace OHOS::FileManagement::Backup + +#endif // OHOS_FILEMGMT_BACKUP_SERVICE_CLIENT_H \ No newline at end of file diff --git a/interfaces/inner_api/native/backup_kit_inner/impl/service_common.h b/interfaces/inner_api/native/backup_kit_inner/impl/service_common.h new file mode 100644 index 000000000..25e540969 --- /dev/null +++ b/interfaces/inner_api/native/backup_kit_inner/impl/service_common.h @@ -0,0 +1,54 @@ +<<<<<<<< HEAD:services/backup_sa/ExtensionType.idl +/* + * Copyright (c) 2025 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 { + FileDescriptor fd; + FileDescriptor reportFd; + int errCode; +}; +======== +/* + * Copyright (c) 2022-2025 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_COMMON_H +#define OHOS_FILEMGMT_BACKUP_SERVICE_COMMON_H + +namespace OHOS::FileManagement::Backup { +const int DEFAULT_INVAL_VALUE = -1; + +typedef enum TypeRestoreTypeEnum { + RESTORE_DATA_WAIT_SEND = 0, + RESTORE_DATA_READDY = 1, +} RestoreTypeEnum; + +} // namespace OHOS::FileManagement::Backup + +#endif // OHOS_FILEMGMT_BACKUP_SERVICE_COMMON_H +>>>>>>>> idl_extension_modify:interfaces/inner_api/native/backup_kit_inner/impl/service_common.h 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 4302e07b8..000000000 --- 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/general_callbacks.cpp b/interfaces/kits/js/backup/general_callbacks.cpp index acf3bd5dd..e79d780bb 100644 --- a/interfaces/kits/js/backup/general_callbacks.cpp +++ b/interfaces/kits/js/backup/general_callbacks.cpp @@ -62,38 +62,28 @@ BackupRestoreCallback::~BackupRestoreCallback() } unique_ptr ptr(ctx_); - uv_loop_s *loop = nullptr; - napi_status status = napi_get_uv_event_loop(env_, &loop); - if (status != napi_ok) { - HILOGE("Failed to get uv event loop"); - ptr->cb_.CleanJsEnv(); - return; - } - - auto work = make_unique(); - if (work == nullptr) { - HILOGE("Failed to new uv_work_t"); - return; - } - work->data = static_cast(ctx_); - - auto task = [work {work.get()}]() { - if (work == nullptr) { - HILOGE("failed to get work."); + auto task = [](void* ptr) ->void { + auto ctx = reinterpret_cast(ptr); + if (ctx == nullptr) { + HILOGE("failed to get ctx."); return; } - LibN::NAsyncContextCallback *ctx = static_cast(work->data); HILOGI("BackupRestoreCallback destruct delete ctx"); + if (bool(ctx->cb_)) { + ctx->cb_.CleanJsEnv(); + } delete ctx; - delete work; }; - auto ret = napi_send_event(env_, task, napi_eprio_high); + uint64_t handleId = 0; + auto ret = napi_send_cancelable_event(env_, task, ptr.get(), napi_eprio_high, &handleId, "destructor"); if (ret != napi_status::napi_ok) { - HILOGE("Failed to call napi_send_event, ret:%{public}d, status:%{public}d", ret, status); + HILOGE("failed to napi_send_cancelable_event, ret:%{public}d, name:%{public}s.", ret, "destructor"); + if (bool(ctx_->cb_)) { + ctx_->cb_.CleanJsEnv(); + } return; } ptr.release(); - work.release(); ctx_ = nullptr; HILOGI("BackupRestoreCallback destruct end"); } @@ -128,12 +118,12 @@ static void DoCallJsMethod(napi_env env, void *data, InputArgsParser argParser) } napi_value global = nullptr; napi_get_global(env, &global); - napi_value callback = ctx->cb_.Deref(env).val_; if (!bool(ctx->cb_)) { HILOGE("Failed to get ref."); napi_close_handle_scope(env, scope); return; } + napi_value callback = ctx->cb_.Deref(env).val_; napi_value result = nullptr; napi_status status = napi_call_function(env, global, callback, argv.size(), argv.data(), &result); if (status != napi_ok) { @@ -146,29 +136,16 @@ static void DoCallJsMethod(napi_env env, void *data, InputArgsParser argParser) void BackupRestoreCallback::CallJsMethod(InputArgsParser argParser) { HILOGI("call BackupRestoreCallback CallJsMethod begin."); - uv_loop_s *loop = nullptr; - napi_status status = napi_get_uv_event_loop(env_, &loop); - if (status != napi_ok) { - HILOGE("failed to get uv event loop."); - return; - } auto workArgs = make_shared(); - auto work = make_unique(); - if (workArgs == nullptr || work == nullptr) { + if (workArgs == nullptr) { HILOGE("failed to new workArgs or uv_work_t."); return; } workArgs->ptr = this; workArgs->argParser = argParser; - work->data = reinterpret_cast(workArgs.get()); HILOGI("Will execute current js method"); - auto task = [work {work.get()}]() { - if (work == nullptr) { - HILOGE("failed to get work."); - return; - } - HILOGI("AsyncWork Enter, %{public}zu", (size_t)work); - auto workArgs = reinterpret_cast(work->data); + auto task = [](void* ptr) ->void { + auto workArgs = reinterpret_cast(ptr); do { if (workArgs == nullptr) { HILOGE("failed to get workArgs."); @@ -180,18 +157,16 @@ void BackupRestoreCallback::CallJsMethod(InputArgsParser argParser) std::unique_lock lock(workArgs->callbackMutex); workArgs->isReady.store(true); workArgs->callbackCondition.notify_all(); - delete work; }; - auto ret = napi_send_event(env_, task, napi_eprio_high); + uint64_t handleId = 0; + auto ret = napi_send_cancelable_event(env_, task, workArgs.get(), napi_eprio_high, &handleId, "jsmethod"); if (ret != napi_status::napi_ok) { - HILOGE("failed to napi_send_event, ret:%{public}d.", ret); - work.reset(); + HILOGE("failed to napi_send_cancelable_event, ret:%{public}d, name:%{public}s.", ret, "jsmethod"); return; } std::unique_lock lock(workArgs->callbackMutex); HILOGI("Wait execute callback method end"); workArgs->callbackCondition.wait(lock, [workArgs]() { return workArgs->isReady.load(); }); - work.release(); HILOGI("call BackupRestoreCallback CallJsMethod end."); } } // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/interfaces/kits/js/backup/prop_n_operation.cpp b/interfaces/kits/js/backup/prop_n_operation.cpp index e4a1ef547..1aea2c602 100644 --- a/interfaces/kits/js/backup/prop_n_operation.cpp +++ b/interfaces/kits/js/backup/prop_n_operation.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -15,14 +15,13 @@ #include "prop_n_operation.h" #include "b_error/b_error.h" -#include "b_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 +38,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(); + int fdNum = INVALID_FD; + proxy->GetLocalCapabilities(fdNum); + UniqueFd fdData(fdNum); + *fd = std::move(fdData); HILOGI("called LocalCapabilities::AsyncCallback cbExec success"); return NError(ERRNO_NOERR); }; @@ -81,15 +83,18 @@ static napi_value AsyncDataList(napi_env env, const NFuncArg& funcArg) } auto fd = make_shared(); - auto cbExec = [fd, bundles { move(bundles) }]() -> NError { + 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); + int fdValue = INVALID_FD; + proxy->GetLocalCapabilitiesIncremental(bundles, fdValue); + UniqueFd fdData(fdValue); + *fd = std::move(fdData); return NError(ERRNO_NOERR); }; auto cbCompl = [fd](napi_env env, NError err) -> NVal { @@ -165,8 +170,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 +196,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 +213,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_backup_n_exporter.cpp b/interfaces/kits/js/backup/session_backup_n_exporter.cpp index ee0c14adc..f331a15f3 100644 --- a/interfaces/kits/js/backup/session_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_backup_n_exporter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 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 @@ -379,8 +379,8 @@ napi_value SessionBackupNExporter::Constructor(napi_env env, napi_callback_info .onProcess = bind(OnProcess, backupEntity->callbacks, placeholders::_1, placeholders::_2), .onBackupSizeReport = bind(OnBackupSizeReport, backupEntity->callbacks, placeholders::_1)}, errMsg, errCode); if (!backupEntity->session) { - std::tuple errInfo = - std::make_tuple(errCode, BError::GetBackupMsgByErrno(errCode) + ", " + errMsg); + std::tuple errInfo = (errCode == BError(BError::Codes::SA_SESSION_CONFLICT)) ? + std::make_tuple(errCode, errMsg) : std::make_tuple(errCode, BError::GetBackupMsgByErrno(errCode)); ErrParam errorParam = [ errInfo ]() { return errInfo;}; NError(errorParam).ThrowErr(env); return nullptr; 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 d3a84c628..5d61b6db4 100644 --- a/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2024-2025 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 @@ -382,8 +382,8 @@ napi_value SessionIncrementalBackupNExporter::Constructor(napi_env env, napi_cal .onProcess = bind(OnProcess, backupEntity->callbacks, placeholders::_1, placeholders::_2), .onBackupSizeReport = bind(OnBackupSizeReport, backupEntity->callbacks, placeholders::_1)}, errMsg, errCode); if (!backupEntity->session) { - std::tuple errInfo = - std::make_tuple(errCode, BError::GetBackupMsgByErrno(errCode) + ", " + errMsg); + std::tuple errInfo = (errCode == BError(BError::Codes::SA_SESSION_CONFLICT)) ? + std::make_tuple(errCode, errMsg) : std::make_tuple(errCode, BError::GetBackupMsgByErrno(errCode)); ErrParam errorParam = [ errInfo ]() { return errInfo;}; NError(errorParam).ThrowErr(env); return nullptr; diff --git a/interfaces/kits/js/backup/session_restore_n_exporter.cpp b/interfaces/kits/js/backup/session_restore_n_exporter.cpp index 23df85f3d..bb507b410 100644 --- a/interfaces/kits/js/backup/session_restore_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_restore_n_exporter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 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 @@ -469,8 +469,8 @@ napi_value SessionRestoreNExporter::Constructor(napi_env env, napi_callback_info .onBackupServiceDied = bind(OnBackupServiceDied, restoreEntity->callbacks), .onProcess = bind(OnProcess, restoreEntity->callbacks, placeholders::_1, placeholders::_2)}, errMsg, errCode); if (!restoreEntity->sessionSheet) { - std::tuple errInfo = - std::make_tuple(errCode, BError::GetBackupMsgByErrno(errCode) + ", " + errMsg); + std::tuple errInfo = (errCode == BError(BError::Codes::SA_SESSION_CONFLICT)) ? + std::make_tuple(errCode, errMsg) : std::make_tuple(errCode, BError::GetBackupMsgByErrno(errCode)); ErrParam errorParam = [ errInfo ]() { return errInfo;}; NError(errorParam).ThrowErr(env); return nullptr; diff --git a/services/backup_sa/BUILD.gn b/services/backup_sa/BUILD.gn index da8b19709..3302a4332 100644 --- a/services/backup_sa/BUILD.gn +++ b/services/backup_sa/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2024 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 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 @@ -18,11 +18,13 @@ import("//foundation/filemanagement/app_file_service/backup.gni") idl_gen_interface("backup_idl") { sources = [ "IExtension.idl", + "IService.idl", "IServiceReverse.idl", ] sources_common = [ "ExtensionType.idl", "ServiceReverseType.idl", + "ServiceType.idl", ] hitrace = "HITRACE_TAG_FILEMANAGEMENT" log_domainid = "0xD004313" @@ -63,7 +65,7 @@ ohos_source_set("backup_sa_ipc") { include_dirs = [ ".", - "impl", + "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", "${target_gen_dir}/", ] @@ -107,6 +109,49 @@ ohos_source_set("backup_sa_ipc_type") { subsystem_name = "filemanagement" } +ohos_source_set("backup_sa_ipc_stub") { + sanitize = { + cfi = true + cfi_cross_dso = true + debug = false + } + output_values = get_target_outputs(":backup_idl") + + sources = [] + + sources += filter_include(output_values, [ "*_type.cpp" ]) + sources += filter_include(output_values, [ "*_stub.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 = [ + ".", + "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", + "${target_gen_dir}/", + ] + + part_name = "app_file_service" + + subsystem_name = "filemanagement" +} + +config("public_config") { + include_dirs = [ + ".", + "${target_gen_dir}/", + ] +} + ohos_shared_library("backup_sa") { branch_protector_ret = "pac_ret" @@ -127,7 +172,6 @@ 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_stub.cpp", "src/module_ipc/sub_service.cpp", "src/module_ipc/svc_backup_connection.cpp", "src/module_ipc/svc_restore_deps_manager.cpp", @@ -144,6 +188,7 @@ ohos_shared_library("backup_sa") { include_dirs = [ "include", "include/module_notify", + "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", ] deps = [ diff --git a/services/backup_sa/ExtensionType.idl b/services/backup_sa/ExtensionType.idl index 92ccbd7b0..19014d92c 100644 --- a/services/backup_sa/ExtensionType.idl +++ b/services/backup_sa/ExtensionType.idl @@ -1,22 +1,22 @@ -/* - * Copyright (c) 2025 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 { - FileDescriptor fd; - FileDescriptor reportFd; - int errCode; +/* + * Copyright (c) 2025 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 { + FileDescriptor fd; + FileDescriptor reportFd; + int errCode; }; \ No newline at end of file diff --git a/services/backup_sa/IService.idl b/services/backup_sa/IService.idl new file mode 100644 index 000000000..5ecb32295 --- /dev/null +++ b/services/backup_sa/IService.idl @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2022-2025 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 ServiceType; +interface OHOS.FileManagement.Backup.IServiceReverse; +sequenceable BackupFileInfo..OHOS.FileManagement.Backup.BFileInfo; +sequenceable BackupIncrementalData..OHOS.FileManagement.Backup.BIncrementalData; +interface OHOS.FileManagement.Backup.IService{ + [ipccode 39] void InitRestoreSession([in] IServiceReverse reverseIpcRemoteObject); + [ipccode 1] void InitRestoreSessionWithErrMsg([in] IServiceReverse reverseIpcRemoteObject, [out] String errMsg); + [ipccode 2] void InitBackupSession([in] IServiceReverse reverseIpcRemoteObject); + [ipccode 3] void InitBackupSessionWithErrMsg([in] IServiceReverse reverseIpcRemoteObject, [out] String errMsg); + [ipccode 4] void Start(); + [ipccode 5] void GetLocalCapabilities([out] FileDescriptor fd); + [ipccode 6] void GetLocalCapabilitiesForBundleInfos([out] FileDescriptor fd); + [ipccode 7] void PublishFile([in] BFileInfo fileInfo); + [oneway, ipccode 8] void GetFileHandle([in] String bundleName, [in] String fileName); + [ipccode 9] void AppendBundlesRestoreSessionDataByDetail([in] FileDescriptor fd, + [in] String[] bundleNames, + [in] String[] detailInfos, + [in] int restoreType, + [in] int userId); + [ipccode 10] void AppendBundlesRestoreSessionData([in] FileDescriptor 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([in] String bundleName, [out] String getBackupInfoResult); + [ipccode 19] void UpdateTimer([in] String bundleName, [in] unsigned int timeout, [out] boolean updateTimerResult); + [ipccode 20] void UpdateSendRate([in] 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] FileDescriptor fd); + [ipccode 25] void InitIncrementalBackupSession([in] IServiceReverse reverseIpcRemoteObject); + [ipccode 26] void InitIncrementalBackupSessionWithErrMsg([in] 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] FileDescriptor fd); + [ipccode 31] void AppIncrementalFileReady([in] String fileName, [in] FileDescriptor fd, [in] FileDescriptor 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] FileDescriptor 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/services/backup_sa/ServiceReverseType.idl b/services/backup_sa/ServiceReverseType.idl index c15792fca..2c5e336c3 100644 --- a/services/backup_sa/ServiceReverseType.idl +++ b/services/backup_sa/ServiceReverseType.idl @@ -15,7 +15,7 @@ package OHOS.FileManagement.Backup.IServiceReverseType; -enum Scenario { +enum Scenario { UNDEFINED, BACKUP, RESTORE, diff --git a/test/fuzztest/backupservicestubbranch_fuzzer/backupservicestubbranch_fuzzer.h b/services/backup_sa/ServiceType.idl similarity index 72% rename from test/fuzztest/backupservicestubbranch_fuzzer/backupservicestubbranch_fuzzer.h rename to services/backup_sa/ServiceType.idl index 7e7ba1c46..5fc7cb1cf 100644 --- a/test/fuzztest/backupservicestubbranch_fuzzer/backupservicestubbranch_fuzzer.h +++ b/services/backup_sa/ServiceType.idl @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024-2025 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -13,9 +13,11 @@ * limitations under the License. */ -#ifndef BACKUP_SERVICE_STUB_FUZZER_H -#define BACKUP_SERVICE_STUB_FUZZER_H +package OHOS.FileManagement.Backup; -#define FUZZ_PROJECT_NAME "backupservicestubbranch_fuzzer" - -#endif \ No newline at end of file +enum BackupRestoreScenario { + FULL_BACKUP = 0, + INCREMENTAL_BACKUP = 1, + FULL_RESTORE = 2, + INCREMENTAL_RESTORE = 3, +}; \ No newline at end of file diff --git a/services/backup_sa/include/module_ipc/service.h b/services/backup_sa/include/module_ipc/service.h index ca77f9c29..02d39863e 100644 --- a/services/backup_sa/include/module_ipc/service.h +++ b/services/backup_sa/include/module_ipc/service.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 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 @@ -42,59 +42,62 @@ struct BundleTaskInfo { std::string reportTime; ErrCode errCode; }; +const int INVALID_FD = -1; class Service : public SystemAbility, public ServiceStub, protected NoCopyable { DECLARE_SYSTEM_ABILITY(Service); // 以下都是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(const sptr& remote) override; + ErrCode InitRestoreSessionWithErrMsg(const sptr& reverseIpcRemoteObject, + std::string& errMsg) override; + ErrCode InitBackupSession(const sptr& remote) override; + ErrCode InitBackupSessionWithErrMsg(const sptr& remote, std::string &errMsg) override; ErrCode Start() override; - UniqueFd GetLocalCapabilities() override; - UniqueFd GetLocalCapabilitiesForBundleInfos() override; + ErrCode GetLocalCapabilities(int& fd) override; + + ErrCode GetLocalCapabilitiesForBundleInfos(int& fd) override; ErrCode PublishFile(const BFileInfo &fileInfo) override; - ErrCode AppFileReady(const std::string &fileName, UniqueFd fd, int32_t errCode) override; + ErrCode AppFileReady(const std::string &fileName, int fd, int32_t errCode) override; 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 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; - ErrCode AppendBundlesRestoreSession(UniqueFd fd, - const std::vector &bundleNames, - RestoreTypeEnum restoreType = RestoreTypeEnum::RESTORE_DATA_WAIT_SEND, - int32_t userId = DEFAULT_INVAL_VALUE) override; + + ErrCode AppendBundlesRestoreSessionDataByDetail( + int fd, + const std::vector& bundleNames, + const std::vector& detailInfos, + int32_t restoreType, + int32_t userId) override; + ErrCode AppendBundlesRestoreSessionData(int fd, const std::vector& bundleNames, + int32_t restoreType, int32_t userId) override; + 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, int& fd) override; ErrCode GetAppLocalListAndDoIncrementalBackup() override; - ErrCode InitIncrementalBackupSession(sptr remote) override; - ErrCode InitIncrementalBackupSession(sptr remote, std::string &errMsg) override; + ErrCode InitIncrementalBackupSession(const sptr& remote) override; + ErrCode InitIncrementalBackupSessionWithErrMsg(const 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 AppendBundlesIncrementalBackupSessionWithBundleInfos(const std::vector& bundlesToBackup, + const std::vector& bundleInfos) 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 PublishSAIncrementalFile(const BFileInfo& fileInfo, int fd) override; + ErrCode PublishSAIncrementalFile(const BFileInfo &fileInfo, UniqueFd fd); + ErrCode AppIncrementalFileReady(const std::string& fileName, int fd, int manifestFd, + int32_t appIncrementalFileReadyErrCode) 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 GetBackupInfo(const BundleName &bundleName, std::string &result) override; + ErrCode UpdateTimer(const BundleName &bundleName, uint32_t timeout, bool &result) override; + ErrCode UpdateSendRate(const std::string &bundleName, int32_t sendRate, bool &result) 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 +107,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: @@ -212,7 +215,7 @@ public: * @param bundleName 应用名称 * */ - AAFwk::Want CreateConnectWant (BundleName &bundleName); + AAFwk::Want CreateConnectWant (const BundleName &bundleName); /** * @brief SA backup回调 @@ -242,7 +245,8 @@ public: * @param bundleName 应用名称 * */ - std::function GetBackupInfoConnectDone(wptr obj, std::string &bundleName); + std::function GetBackupInfoConnectDone(wptr obj, + const std::string &bundleName); /** * @brief GetBackupInfo extension死亡回调 @@ -252,7 +256,7 @@ public: * */ std::function GetBackupInfoConnectDied( - wptr obj, std::string &bundleName); + wptr obj, const std::string &bundleName); /** * @brief timeout callback @@ -526,7 +530,7 @@ private: * @param result 业务结果出参 * */ - ErrCode GetBackupInfoCmdHandle(BundleName &bundleName, std::string &result); + ErrCode GetBackupInfoCmdHandle(const BundleName &bundleName, std::string &result); /** * @brief 添加需要清理的Session @@ -647,6 +651,23 @@ private: void SetScanningInfo(string &scanning, string name); + ErrCode InitRestoreSession(const sptr& remote, std::string &errMsg); + + UniqueFd GetLocalCapabilities(); + UniqueFd GetLocalCapabilitiesForBundleInfos(); + ErrCode AppFileReady(const std::string &fileName, UniqueFd fd, int32_t errCode); + ErrCode AppIncrementalFileReady(const std::string &fileName, UniqueFd fd, UniqueFd manifestFd, int32_t errCode); + 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); + ErrCode AppendBundlesRestoreSession(UniqueFd fd, const std::vector &bundleNames, + RestoreTypeEnum restoreType = RestoreTypeEnum::RESTORE_DATA_WAIT_SEND, + int32_t userId = DEFAULT_INVAL_VALUE); + UniqueFd GetLocalCapabilitiesIncremental(const std::vector &bundleNames); + ErrCode AppendBundlesIncrementalBackupSession(const std::vector &bundlesToBackup, + const std::vector &infos); + ErrCode HelpToAppIncrementalFileReady(const string &bundleName, const string &fileName, sptr proxy); void HelptoGetFileHandle(const string &bundleName, const string &fileName, sptr proxy); 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 d4484365a..000000000 --- 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_restore_deps_manager.h b/services/backup_sa/include/module_ipc/svc_restore_deps_manager.h index cb83798b9..cea2d222e 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -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 5d73a43b2..a63978318 100644 --- a/services/backup_sa/include/module_ipc/svc_session_manager.h +++ b/services/backup_sa/include/module_ipc/svc_session_manager.h @@ -32,7 +32,8 @@ #include "b_file_info.h" #include "b_incremental_data.h" #include "b_resources/b_constants.h" -#include "i_service.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" @@ -332,7 +333,7 @@ public: * * @param bundleName 应用名称 */ - sptr CreateBackupConnection(BundleName &bundleName); + sptr CreateBackupConnection(const BundleName &bundleName); /** * @brief 开始备份 diff --git a/services/backup_sa/src/module_external/bms_adapter.cpp b/services/backup_sa/src/module_external/bms_adapter.cpp index 12a70dd62..bf1a73223 100644 --- a/services/backup_sa/src/module_external/bms_adapter.cpp +++ b/services/backup_sa/src/module_external/bms_adapter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 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 @@ -34,6 +34,7 @@ #include "module_ipc/service.h" #include "module_ipc/svc_session_manager.h" #include "module_sched/sched_scheduler.h" +#include "parameters.h" #include "status_receiver_host.h" #include "system_ability_definition.h" #include "if_system_ability_manager.h" @@ -47,6 +48,7 @@ const string HMOS_HAP_CODE_PATH = "1"; const string LINUX_HAP_CODE_PATH = "2"; const string MEDIA_LIBRARY_HAP = "com.ohos.medialibrary.medialibrarydata"; const string EXTERNAL_FILE_HAP = "com.ohos.UserFile.ExternalFileManager"; +const string APP_GALLERY_BUNDLE_NAME = "const.appgallery.shaderowner.bundlename"; const int E_ERR = -1; const vector dataDir = {"app", "local", "distributed", "database", "cache"}; } // namespace @@ -152,11 +154,8 @@ vector BundleMgrAdapter::GetBundleInfos(const vecto string BundleMgrAdapter::GetAppGalleryBundleName() { - auto bms = GetBundleManager(); - - string bundleName = ""; - auto ret = bms->QueryAppGalleryBundleName(bundleName); - if (!ret) { + string bundleName = OHOS::system::GetParameter(APP_GALLERY_BUNDLE_NAME, ""); + if (bundleName.empty()) { HILOGI("Get App Gallery BundleName fail!"); } else { HILOGI("App Gallery BundleName: %{public}s", bundleName.c_str()); diff --git a/services/backup_sa/src/module_ipc/service.cpp b/services/backup_sa/src/module_ipc/service.cpp index f3e4a0ebc..25a526067 100644 --- a/services/backup_sa/src/module_ipc/service.cpp +++ b/services/backup_sa/src/module_ipc/service.cpp @@ -224,8 +224,7 @@ void Service::OnStart() } if (!bundleNameList.empty() || !residualBundleNameList.empty()) { if (!bundleNameList.empty()) { - OnStartResRadarReport(bundleNameList, - static_cast(BizStageBackup::BIZ_STAGE_ONSTART_DISPOSE)); + OnStartResRadarReport(bundleNameList, static_cast(BizStageBackup::BIZ_STAGE_ONSTART_DISPOSE)); } if (!residualBundleNameList.empty()) { OnStartResRadarReport(residualBundleNameList, @@ -274,6 +273,13 @@ void Service::OnStop() HILOGI("SA OnStop End."); } +ErrCode Service::GetLocalCapabilities(int& fd) +{ + UniqueFd fdResult(GetLocalCapabilities()); + fd = fdResult.Release(); + return BError(BError::Codes::OK); +} + UniqueFd Service::GetLocalCapabilities() { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); @@ -379,8 +385,8 @@ ErrCode Service::VerifyCallerAndGetCallerName(std::string &bundleName) HILOGE("Verify and get caller name failed, Get hap token info failed"); return BError(BError::Codes::SA_INVAL_ARG); } - 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()); @@ -461,7 +467,7 @@ ErrCode Service::VerifyCaller(IServiceReverseType::Scenario scenario) return VerifyCaller(); } -ErrCode Service::InitRestoreSession(sptr remote) +ErrCode Service::InitRestoreSession(const sptr &remote) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); ErrCode ret = VerifyCaller(); @@ -493,7 +499,7 @@ ErrCode Service::InitRestoreSession(sptr remote) return ret; } -ErrCode Service::InitBackupSession(sptr remote) +ErrCode Service::InitBackupSession(const sptr &remote) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); ErrCode ret = VerifyCaller(); @@ -625,14 +631,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); @@ -641,8 +648,22 @@ void Service::HandleExceptionOnAppendBundles(sptr session, } } -ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, const vector &bundleNames, - const std::vector &bundleInfos, RestoreTypeEnum restoreType, int32_t userId) +ErrCode Service::AppendBundlesRestoreSessionDataByDetail(int fd, const std::vector &bundleNames, + const std::vector &detailInfos, + int32_t restoreType, int32_t userId) +{ + HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGI("Begin fd = %{public}d,restoreType = %{public}d,userId=%{public}d", fd, restoreType, userId); + UniqueFd fdUnique(fd); + RestoreTypeEnum restoreTypeEnum = static_cast(restoreType); + 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"); @@ -663,8 +684,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); @@ -675,8 +696,8 @@ ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, const vectorDecreaseSessionCnt(__PRETTY_FUNCTION__); HILOGI("End"); @@ -695,7 +716,8 @@ 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); @@ -731,6 +753,15 @@ void Service::SetCurrentSessProperties(std::vector } HILOGI("End"); } +ErrCode Service::AppendBundlesRestoreSessionData(int fd, const std::vector &bundleNames, + int32_t restoreType, int32_t userId) +{ + HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + HILOGI("Begin fd = %{public}d,restoreType = %{public}d,userId=%{public}d", fd, restoreType, userId); + UniqueFd fdUnique(fd); + RestoreTypeEnum restoreTypeEnum = static_cast(restoreType); + return AppendBundlesRestoreSession(std::move(fdUnique), bundleNames, restoreTypeEnum, userId); +} ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, const vector &bundleNames, @@ -779,7 +810,8 @@ 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) @@ -795,7 +827,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); @@ -816,14 +848,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); @@ -873,7 +905,7 @@ ErrCode Service::AppendBundlesBackupSession(const vector &bundleName } ErrCode Service::AppendBundlesDetailsBackupSession(const vector &bundleNames, - const vector &bundleInfos) + const vector &bundleInfos) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); try { @@ -916,19 +948,20 @@ ErrCode Service::AppendBundlesDetailsBackupSession(const vector &bun } } -void Service::HandleCurGroupBackupInfos(std::vector &backupInfos, +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()); @@ -937,8 +970,7 @@ 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__); @@ -976,7 +1008,7 @@ ErrCode Service::ServiceResultReport(const std::string restoreRetInfo, } ErrCode Service::SAResultReport(const std::string bundleName, const std::string restoreRetInfo, - const ErrCode errCode, const BackupRestoreScenario sennario) + const ErrCode errCode, const BackupRestoreScenario sennario) { SADone(errCode, bundleName); if (sennario == BackupRestoreScenario::FULL_RESTORE) { @@ -993,7 +1025,7 @@ ErrCode Service::SAResultReport(const std::string bundleName, const std::string if (sennario == BackupRestoreScenario::FULL_RESTORE || sennario == BackupRestoreScenario::INCREMENTAL_RESTORE) { BundleEndRadarReport(bundleName, errCode, IServiceReverseType::Scenario::RESTORE); } else if (sennario == BackupRestoreScenario::FULL_BACKUP || - sennario == BackupRestoreScenario::INCREMENTAL_BACKUP) { + sennario == BackupRestoreScenario::INCREMENTAL_BACKUP) { BundleEndRadarReport(bundleName, errCode, IServiceReverseType::Scenario::BACKUP); } return BError(BError::Codes::OK); @@ -1190,7 +1222,7 @@ int Service::Dump(int fd, const vector &args) } void Service::ReportOnExtConnectFailed(const IServiceReverseType::Scenario scenario, - const std::string &bundleName, const ErrCode ret) + const std::string &bundleName, const ErrCode ret) { try { if (session_ == nullptr) { @@ -1556,7 +1588,8 @@ void Service::SessionDeactive() } } -std::function Service::GetBackupInfoConnectDone(wptr obj, std::string &bundleName) +std::function Service::GetBackupInfoConnectDone(wptr obj, + const std::string &bundleName) { return [obj](const string &&bundleName) { HILOGI("GetBackupInfoConnectDone, bundleName: %{public}s", bundleName.c_str()); @@ -1569,8 +1602,8 @@ std::function Service::GetBackupInfoConnectDone(wptr }; } -std::function Service::GetBackupInfoConnectDied( - wptr obj, std::string &bundleName) +std::function Service::GetBackupInfoConnectDied(wptr obj, + const std::string &bundleName) { return [obj](const string &&bundleName, bool isCleanCalled) { HILOGI("GetBackupInfoConnectDied, bundleName: %{public}s", bundleName.c_str()); @@ -1613,7 +1646,7 @@ ErrCode Service::ClearResidualBundleData(const std::string &bundleName) return res; } -ErrCode Service::GetBackupInfoCmdHandle(BundleName &bundleName, std::string &result) +ErrCode Service::GetBackupInfoCmdHandle(const BundleName &bundleName, std::string &result) { if (session_ == nullptr) { HILOGE("Get BackupInfo error, session is empty."); @@ -1659,7 +1692,7 @@ ErrCode Service::GetBackupInfoCmdHandle(BundleName &bundleName, std::string &res return BError(BError::Codes::OK); } -ErrCode Service::GetBackupInfo(BundleName &bundleName, std::string &result) +ErrCode Service::GetBackupInfo(const BundleName &bundleName, std::string &result) { ErrCode errCode = VerifyCaller(); if (errCode != ERR_OK) { @@ -1669,7 +1702,7 @@ ErrCode Service::GetBackupInfo(BundleName &bundleName, std::string &result) } try { std::lock_guard lock(getBackupInfoProcLock_); - HILOGI("Service::GetBackupInfo begin."); + HILOGI("Service::GetBackupInfo begin bundleName: %{public}s", bundleName.c_str()); if (session_ == nullptr || isOccupyingSession_.load()) { HILOGE("Get BackupInfo error, session is empty."); return BError(BError::Codes::SA_INVAL_ARG); @@ -1734,7 +1767,7 @@ ErrCode Service::AppendBundlesClearSession(const std::vector &bundle } } -ErrCode Service::UpdateTimer(BundleName &bundleName, uint32_t timeout, bool &result) +ErrCode Service::UpdateTimer(const BundleName &bundleName, uint32_t timeout, bool &result) { try { HILOGI("Service::UpdateTimer begin."); @@ -1763,9 +1796,8 @@ ErrCode Service::UpdateTimer(BundleName &bundleName, uint32_t timeout, bool &res } } -ErrCode Service::UpdateSendRate(std::string &bundleName, int32_t sendRate, bool &result) +ErrCode Service::UpdateSendRate(const 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; @@ -1802,7 +1834,8 @@ ErrCode Service::UpdateSendRate(std::string &bundleName, int32_t sendRate, bool ret = BError(BError::Codes::SA_INVAL_ARG); break; } - ret = proxy->UpdateFdSendRate(bundleName, sendRate); + std::string extBundleName = static_cast(bundleName); + ret = proxy->UpdateFdSendRate(extBundleName, sendRate); if (ret != NO_ERROR) { HILOGE("Extension do updateSendRate failed, ret:%{public}d", ret); result = false; @@ -1815,7 +1848,7 @@ ErrCode Service::UpdateSendRate(std::string &bundleName, int32_t sendRate, bool return ret; } -AAFwk::Want Service::CreateConnectWant (BundleName &bundleName) +AAFwk::Want Service::CreateConnectWant(const BundleName &bundleName) { BConstants::ExtensionAction action = BConstants::ExtensionAction::BACKUP; AAFwk::Want want; @@ -1852,11 +1885,11 @@ ErrCode Service::BackupSA(std::string bundleName) } void Service::OnSABackup(const std::string &bundleName, const int &fd, const std::string &result, - const ErrCode &errCode) + 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, IServiceReverseType::Scenario::BACKUP); SAResultReport(bundleName, result, errCode, BackupRestoreScenario::FULL_BACKUP); @@ -1873,8 +1906,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]() { @@ -1924,16 +1957,10 @@ 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() - ); + << (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); @@ -1941,7 +1968,7 @@ void Service::NotifyCallerCurAppDone(ErrCode errCode, const std::string &callerN BundleEndRadarReport(callerName, errCode, scenario); } -ErrCode Service::ReportAppProcessInfo(const std::string processInfo, BackupRestoreScenario sennario) +ErrCode Service::ReportAppProcessInfo(const std::string &processInfo, BackupRestoreScenario sennario) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); try { diff --git a/services/backup_sa/src/module_ipc/service_incremental.cpp b/services/backup_sa/src/module_ipc/service_incremental.cpp index f3bb2ec04..233f71d47 100644 --- a/services/backup_sa/src/module_ipc/service_incremental.cpp +++ b/services/backup_sa/src/module_ipc/service_incremental.cpp @@ -121,6 +121,13 @@ void Service::CreateDirIfNotExist(const std::string &path) } } } +ErrCode Service::GetLocalCapabilitiesIncremental(const std::vector &bundleNames, int &fd) +{ + HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + UniqueFd fdResult(GetLocalCapabilitiesIncremental(bundleNames)); + fd = fdResult.Release(); + return BError(BError::Codes::OK); // anytime return OK +} UniqueFd Service::GetLocalCapabilitiesIncremental(const std::vector &bundleNames) { @@ -213,7 +220,6 @@ void Service::StartGetFdTask(std::string bundleName, wptr ptr) RefreshBundleDataSize(newBundleInfos, bundleName, ptr); string path = BConstants::GetSaBundleBackupRootDir(session->GetSessionUserId()). append(bundleName).append("/").append(BConstants::BACKUP_STAT_SYMBOL).append(to_string(lastTime)); - HILOGD("path = %{public}s,bundleName = %{public}s", path.c_str(), bundleName.c_str()); UniqueFd fdLocal(open(path.data(), O_RDWR, S_IRGRP | S_IWGRP)); if (fdLocal < 0) { HILOGD("fdLocal open fail, error = %{public}d", errno); @@ -293,7 +299,7 @@ ErrCode Service::GetAppLocalListAndDoIncrementalBackup() } } -ErrCode Service::InitIncrementalBackupSession(sptr remote) +ErrCode Service::InitIncrementalBackupSession(const sptr& remote) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); ErrCode errCode = VerifyCaller(); @@ -328,7 +334,7 @@ ErrCode Service::InitIncrementalBackupSession(sptr remote) return errCode; } -ErrCode Service::InitIncrementalBackupSession(sptr remote, std::string &errMsg) +ErrCode Service::InitIncrementalBackupSessionWithErrMsg(const sptr& remote, std::string &errMsg) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); ErrCode errCode = VerifyCaller(); @@ -414,6 +420,12 @@ ErrCode Service::AppendBundlesIncrementalBackupSession(const std::vector &bundlesToBackup, const std::vector &bundleInfos) +{ + HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); + return AppendBundlesIncrementalBackupSession(bundlesToBackup, bundleInfos); +} ErrCode Service::AppendBundlesIncrementalBackupSession(const std::vector &bundlesToBackup, const std::vector &infos) @@ -518,6 +530,12 @@ ErrCode Service::PublishIncrementalFile(const BFileInfo &fileInfo) return BError(BError::Codes::OK); } +ErrCode Service::PublishSAIncrementalFile(const BFileInfo& fileInfo, int fd) +{ + UniqueFd uniquedParameter(fd); + return PublishSAIncrementalFile(fileInfo, std::move(uniquedParameter)); +} + ErrCode Service::PublishSAIncrementalFile(const BFileInfo &fileInfo, UniqueFd fd) { std::string bundleName = fileInfo.owner; @@ -542,7 +560,7 @@ 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) + UniqueFd manifestFd, int32_t errCode) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); try { @@ -577,6 +595,17 @@ ErrCode Service::AppIncrementalFileReady(const std::string &bundleName, const st } } +ErrCode Service::AppIncrementalFileReady(const std::string &fileName, int fd, int manifestFd, + int32_t appIncrementalFileReadyErrCode) +{ + HILOGI("Begin AppIncrementalFileReady:%{public}s, fd:%{public}d, manifestFd:%{public}d, errcode:%{public}d", + fileName.c_str(), fd, manifestFd, appIncrementalFileReadyErrCode); + UniqueFd fdUnique(fd); + UniqueFd manifestFdUnique(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__); @@ -913,7 +942,7 @@ 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()); diff --git a/services/backup_sa/src/module_ipc/service_stub.cpp b/services/backup_sa/src/module_ipc/service_stub.cpp deleted file mode 100644 index f03db9b85..000000000 --- a/services/backup_sa/src/module_ipc/service_stub.cpp +++ /dev/null @@ -1,858 +0,0 @@ -/* - * Copyright (c) 2022-2025 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. - */ - -/* - * 注意： - * - 注意点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 "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_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_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; - 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_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_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; - 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) -{ - 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"); - } - - 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 BExcepUltils::ExceptionCatcherLocked( - [&]() { return ErrCode((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()); - } - 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()); - } - 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()); - } - 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"); - } - 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()); - } - 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()); - } - 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"); - } - 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()); - } - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdResultReport(MessageParcel &data, MessageParcel &reply) -{ - std::string restoreRetInfo; - int32_t 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()); - } - 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(); - } - string fileName; - if (!data.ReadString(fileName)) { - return BError(BError::Codes::SA_INVAL_ARG, "Failed to receive fileName").GetCode(); - } - - return GetFileHandle(bundleName, fileName); -} - -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)); - } - 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)); - } - 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)); - } - 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)); - } - 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; - 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); -} - -int32_t ServiceStub::CmdUpdateTimer(MessageParcel &data, MessageParcel &reply) -{ - HILOGI("ServiceStub::CmdUpdateTimer Begin."); - 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")); - } - 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)) { - 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); - 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) -{ - 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."); - return BError(BError::Codes::OK); -} - -int32_t ServiceStub::CmdStartFwkTimer(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)); - } - return BError(BError::Codes::OK); -} - -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); -} - -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); -} - -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/services/backup_sa/src/module_ipc/sub_service.cpp b/services/backup_sa/src/module_ipc/sub_service.cpp index 4c5c38368..868d9aea1 100644 --- a/services/backup_sa/src/module_ipc/sub_service.cpp +++ b/services/backup_sa/src/module_ipc/sub_service.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 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 @@ -16,8 +16,9 @@ #include "module_ipc/service.h" #include -#include #include +#include +#include #include #include #include @@ -243,6 +244,13 @@ ErrCode Service::PublishFile(const BFileInfo &fileInfo) return BError(BError::Codes::OK); } +ErrCode Service::AppFileReady(const std::string &fileName, int fd, int32_t errCode) +{ + HILOGI("Begin fileName =%{public}s, fd = %{public}d, errCode = %{public}d", fileName.c_str(), fd, errCode); + UniqueFd fdUnique(fd); + return AppFileReady(fileName, std::move(fdUnique), errCode); +} + ErrCode Service::AppFileReady(const string &fileName, UniqueFd fd, int32_t errCode) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); @@ -775,7 +783,13 @@ std::string Service::GetCallerName() return callerName; } -ErrCode Service::InitRestoreSession(sptr remote, std::string &errMsg) +ErrCode Service::InitRestoreSessionWithErrMsg(const sptr &remote, std::string &errMsg) +{ + HILOGI("Start InitRestoreSessionWithErrMsg,Msg :%{public}s", errMsg.c_str()); + return InitRestoreSession(remote, errMsg); +} + +ErrCode Service::InitRestoreSession(const sptr& remote, std::string &errMsg) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); ErrCode ret = VerifyCaller(); @@ -810,7 +824,7 @@ ErrCode Service::InitRestoreSession(sptr remote, std::string &e return ret; } -ErrCode Service::InitBackupSession(sptr remote, std::string &errMsg) +ErrCode Service::InitBackupSessionWithErrMsg(const sptr& remote, std::string &errMsg) { HITRACE_METER_NAME(HITRACE_TAG_FILEMANAGEMENT, __PRETTY_FUNCTION__); ErrCode ret = VerifyCaller(); @@ -848,6 +862,13 @@ ErrCode Service::InitBackupSession(sptr remote, std::string &er return ret; } +ErrCode Service::GetLocalCapabilitiesForBundleInfos(int &fd) +{ + UniqueFd uniqueFd(GetLocalCapabilitiesForBundleInfos()); + fd = uniqueFd.Release(); + return ErrCode(BError::Codes::OK); +} + UniqueFd Service::GetLocalCapabilitiesForBundleInfos() { try { @@ -920,7 +941,7 @@ 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"); 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 bf269197c..8a79ef982 100644 --- a/services/backup_sa/src/module_ipc/svc_session_manager.cpp +++ b/services/backup_sa/src/module_ipc/svc_session_manager.cpp @@ -682,7 +682,7 @@ void SvcSessionManager::AppendBundles(const vector &bundleNames, vec impl_.isAppendFinish = true; } -sptr SvcSessionManager::CreateBackupConnection(BundleName &bundleName) +sptr SvcSessionManager::CreateBackupConnection(const BundleName &bundleName) { HILOGD("SvcSessionManager::CreateBackupConnection begin."); return GetBackupAbilityExt(bundleName); diff --git a/test/fuzztest/BUILD.gn b/test/fuzztest/BUILD.gn index 5b26911f6..1c4a33aca 100644 --- a/test/fuzztest/BUILD.gn +++ b/test/fuzztest/BUILD.gn @@ -21,7 +21,6 @@ group("fuzztest") { "backupsaanother_fuzzer:BackupSaAnotherFuzzTest", "backupsaappend_fuzzer:BackupSaAppendFuzzTest", "backupservicestub_fuzzer:BackupServiceStubFuzzTest", - "backupservicestubbranch_fuzzer:BackupServiceStubBranchFuzzTest", "fileshare_fuzzer:FileShareFuzzTest", "remotefileshare_fuzzer:RemoteFileShareFuzzTest", "servicereverse_fuzzer:ServiceReverseFuzzTest", diff --git a/test/fuzztest/backupext_fuzzer/BUILD.gn b/test/fuzztest/backupext_fuzzer/BUILD.gn index 5ccd05c5e..201042a68 100644 --- a/test/fuzztest/backupext_fuzzer/BUILD.gn +++ b/test/fuzztest/backupext_fuzzer/BUILD.gn @@ -53,6 +53,7 @@ ohos_fuzztest("BackupExtFuzzTest") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", + "${path_backup}/services/backup_sa:backup_sa_ipc_stub", "${path_backup}/utils:backup_utils", ] diff --git a/test/fuzztest/backupsa_fuzzer/BUILD.gn b/test/fuzztest/backupsa_fuzzer/BUILD.gn index 0dde0ed7d..b69182931 100644 --- a/test/fuzztest/backupsa_fuzzer/BUILD.gn +++ b/test/fuzztest/backupsa_fuzzer/BUILD.gn @@ -36,6 +36,8 @@ ohos_fuzztest("BackupSaFuzzTest") { deps = [ "${app_file_service_path}/services/backup_sa:backup_sa", + "${app_file_service_path}/services/backup_sa:backup_sa_ipc_stub", + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils:backup_utils", ] diff --git a/test/fuzztest/backupsaanother_fuzzer/BUILD.gn b/test/fuzztest/backupsaanother_fuzzer/BUILD.gn index 764660d8d..8ce297233 100644 --- a/test/fuzztest/backupsaanother_fuzzer/BUILD.gn +++ b/test/fuzztest/backupsaanother_fuzzer/BUILD.gn @@ -38,6 +38,7 @@ ohos_fuzztest("BackupSaAnotherFuzzTest") { deps = [ "${app_file_service_path}/services/backup_sa:backup_sa", + "${app_file_service_path}/services/backup_sa:backup_sa_ipc_stub", "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils:backup_utils", ] diff --git a/test/fuzztest/backupsaanother_fuzzer/backupsaanother_fuzzer.cpp b/test/fuzztest/backupsaanother_fuzzer/backupsaanother_fuzzer.cpp index ca438cd7c..2b1f339e3 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; @@ -113,7 +113,7 @@ void GetBundleNamesData(const uint8_t *data, size_t size, vector(data)); - int32_t fd = *(reinterpret_cast(data)); + int fd = *(reinterpret_cast(data)); int32_t priority = *(reinterpret_cast(data + sizeof(int32_t))); string parameters = string(reinterpret_cast(data), size) + to_string(size - i); BIncrementalData incrementaData(name, nTime, fd, parameters, priority); @@ -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/BUILD.gn b/test/fuzztest/backupsaappend_fuzzer/BUILD.gn index 410ead2a2..f70c7b404 100644 --- a/test/fuzztest/backupsaappend_fuzzer/BUILD.gn +++ b/test/fuzztest/backupsaappend_fuzzer/BUILD.gn @@ -38,6 +38,7 @@ ohos_fuzztest("BackupSaAppendFuzzTest") { deps = [ "${app_file_service_path}/services/backup_sa:backup_sa", + "${app_file_service_path}/services/backup_sa:backup_sa_ipc_stub", "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils:backup_utils", ] diff --git a/test/fuzztest/backupsaappend_fuzzer/backupsaappend_fuzzer.cpp b/test/fuzztest/backupsaappend_fuzzer/backupsaappend_fuzzer.cpp index 2c44b7943..73826f873 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); service->OnRemoteRequest(code, datas, reply, option); service = nullptr; return true; @@ -127,7 +127,7 @@ bool CmdAppFileReadyFuzzTest(const uint8_t *data, size_t size) 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; @@ -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_DATA), datas, reply, option); service = nullptr; return true; diff --git a/test/fuzztest/backupservicestub_fuzzer/BUILD.gn b/test/fuzztest/backupservicestub_fuzzer/BUILD.gn index c4d813425..28dad30b4 100644 --- a/test/fuzztest/backupservicestub_fuzzer/BUILD.gn +++ b/test/fuzztest/backupservicestub_fuzzer/BUILD.gn @@ -43,6 +43,7 @@ ohos_fuzztest("BackupServiceStubFuzzTest") { deps = [ "${app_file_service_path}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${app_file_service_path}/services/backup_sa:backup_sa", + "${app_file_service_path}/services/backup_sa:backup_sa_ipc_stub", "${app_file_service_path}/utils:backup_utils", ] diff --git a/test/fuzztest/backupservicestub_fuzzer/backupservicestub_fuzzer.cpp b/test/fuzztest/backupservicestub_fuzzer/backupservicestub_fuzzer.cpp index 2858c657a..6172e19b2 100644 --- a/test/fuzztest/backupservicestub_fuzzer/backupservicestub_fuzzer.cpp +++ b/test/fuzztest/backupservicestub_fuzzer/backupservicestub_fuzzer.cpp @@ -77,12 +77,14 @@ bool CmdInitRestoreSessionFuzzTest(sptr service, const uint8_t *data, s { MessageParcel msg; MessageParcel reply; - + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_INIT_RESTORE_SESSION); + try { BSessionRestore::Callbacks callbacks; msg.WriteRemoteObject(new ServiceReverse(callbacks)); msg.WriteBuffer(data, size); - service->CmdInitRestoreSession(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -93,12 +95,14 @@ bool CmdInitBackupSessionFuzzTest(sptr service, const uint8_t *data, si { MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_INIT_BACKUP_SESSION); try { BSessionBackup::Callbacks callbacks; msg.WriteRemoteObject(new ServiceReverse(callbacks)); msg.WriteBuffer(data, size); - service->CmdInitBackupSession(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -109,10 +113,12 @@ bool CmdStartFuzzTest(sptr service, const uint8_t *data, size_t size) { MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_START); try { msg.WriteBuffer(data, size); - service->CmdStart(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -123,10 +129,12 @@ bool CmdGetLocalCapabilitiesFuzzTest(sptr service, const uint8_t *data, { MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_GET_LOCAL_CAPABILITIES); try { msg.WriteBuffer(data, size); - service->CmdGetLocalCapabilities(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -141,6 +149,8 @@ bool CmdPublishFileFuzzTest(sptr service, const uint8_t *data, size_t s MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_PUBLISH_FILE); try { int pos = 0; @@ -150,7 +160,7 @@ bool CmdPublishFileFuzzTest(sptr service, const uint8_t *data, size_t s info.owner = string(reinterpret_cast(data + pos), len); info.fileName = string(reinterpret_cast(data + pos + len), len); msg.WriteParcelable(&info); - service->CmdPublishFile(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -165,6 +175,8 @@ bool CmdAppFileReadyFuzzTest(sptr service, const uint8_t *data, size_t MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_APP_FILE_READY); try { int pos = 0; @@ -177,7 +189,7 @@ bool CmdAppFileReadyFuzzTest(sptr service, const uint8_t *data, size_t msg.WriteFileDescriptor(fd); } msg.WriteInt32(errCode); - service->CmdAppFileReady(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -192,11 +204,13 @@ bool CmdAppDoneFuzzTest(sptr service, const uint8_t *data, size_t size) MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_APP_DONE); try { int32_t errCode = TypeCast(data); msg.WriteInt32(errCode); - service->CmdAppDone(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -211,6 +225,8 @@ bool CmdResultReportFuzzTest(sptr service, const uint8_t *data, size_t MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_SERVICE_RESULT_REPORT); try { int pos = 0; @@ -219,7 +235,7 @@ bool CmdResultReportFuzzTest(sptr service, const uint8_t *data, size_t msg.WriteString(string(reinterpret_cast(data + pos), size - pos)); msg.WriteInt32(scenario); msg.WriteInt32(errCode); - service->CmdResultReport(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -230,12 +246,14 @@ bool CmdGetFileHandleFuzzTest(sptr service, const uint8_t *data, size_t { MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_GET_FILE_HANDLE); 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); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -250,6 +268,8 @@ bool CmdAppendBundlesRestoreSessionFuzzTest(sptr service, const uint8_t MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_APPEND_BUNDLES_RESTORE_SESSION_DATA); try { int pos = 0; @@ -262,7 +282,7 @@ bool CmdAppendBundlesRestoreSessionFuzzTest(sptr service, const uint8_t msg.WriteStringVector(bundleNames); msg.WriteInt32(type); msg.WriteInt32(userId); - service->CmdAppendBundlesRestoreSession(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -277,6 +297,8 @@ bool CmdAppendBundlesDetailsRestoreSessionFuzzTest(sptr service, const MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_APPEND_BUNDLES_RESTORE_SESSION_DATA_BY_DETAIL); try { int pos = 0; @@ -293,7 +315,7 @@ bool CmdAppendBundlesDetailsRestoreSessionFuzzTest(sptr service, const msg.WriteStringVector(detailInfos); msg.WriteInt32(type); msg.WriteInt32(userId); - service->CmdAppendBundlesDetailsRestoreSession(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -304,12 +326,14 @@ bool CmdAppendBundlesBackupSessionFuzzTest(sptr service, const uint8_t { MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_APPEND_BUNDLES_BACKUP_SESSION); try { vector bundleNames; bundleNames.emplace_back(string(reinterpret_cast(data), size)); msg.WriteStringVector(bundleNames); - service->CmdAppendBundlesBackupSession(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -320,6 +344,8 @@ bool CmdAppendBundlesDetailsBackupSessionFuzzTest(sptr service, const u { MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_APPEND_BUNDLES_DETAILS_BACKUP_SESSION); try { int len = size >> 1; @@ -329,7 +355,7 @@ bool CmdAppendBundlesDetailsBackupSessionFuzzTest(sptr service, const u detailInfos.emplace_back(string(reinterpret_cast(data + len), len)); msg.WriteStringVector(bundleNames); msg.WriteStringVector(detailInfos); - service->CmdAppendBundlesDetailsBackupSession(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -340,9 +366,11 @@ bool CmdFinishFuzzTest(sptr service, const uint8_t *data, size_t size) { MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_FINISH); try { msg.WriteBuffer(data, size); - service->CmdFinish(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -353,9 +381,11 @@ bool CmdFinishFuzzTest(sptr service, const uint8_t *data, size_t size) { MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_RELEASE); try { msg.WriteBuffer(data, size); - service->CmdRelease(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -366,12 +396,14 @@ bool CmdGetLocalCapabilitiesIncrementalFuzzTest(sptr service, const uin { MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_GET_LOCAL_CAPABILITIES_INCREMENTAL); try { vector bundleNames; bundleNames.emplace_back(string(reinterpret_cast(data), size), 0); WriteParcelableVector(bundleNames, msg); - service->CmdGetLocalCapabilitiesIncremental(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -382,9 +414,11 @@ bool CmdGetAppLocalListAndDoIncrementalBackupFuzzTest(sptr service, con { MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_GET_APP_LOCAL_LIST_AND_DO_INCREMENTAL_BACKUP); try { msg.WriteBuffer(data, size); - service->CmdGetAppLocalListAndDoIncrementalBackup(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -395,12 +429,14 @@ bool CmdInitIncrementalBackupSessionFuzzTest(sptr service, const uint8_ { MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_INIT_INCREMENTAL_BACKUP_SESSION); try { BIncrementalBackupSession::Callbacks callbacks; msg.WriteRemoteObject(new ServiceReverse(callbacks)); msg.WriteBuffer(data, size); - service->CmdInitIncrementalBackupSession(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -411,12 +447,14 @@ bool CmdAppendBundlesIncrementalBackupSessionFuzzTest(sptr service, con { MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_APPEND_BUNDLES_INCREMENTAL_BACKUP_SESSION); try { vector bundlesToBackup; bundlesToBackup.emplace_back(string(reinterpret_cast(data), size), 0); WriteParcelableVector(bundlesToBackup, msg); - service->CmdAppendBundlesIncrementalBackupSession(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -427,6 +465,9 @@ bool CmdAppendBundlesDetailsIncrementalBackupSessionFuzzTest(sptr servi { MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast( + IServiceIpcCode::COMMAND_APPEND_BUNDLES_INCREMENTAL_BACKUP_SESSION_WITH_BUNDLE_INFOS); try { int len = size >> 2; @@ -437,7 +478,7 @@ bool CmdAppendBundlesDetailsIncrementalBackupSessionFuzzTest(sptr servi infos.emplace_back(string(reinterpret_cast(data + len + len), len)); WriteParcelableVector(bundlesToBackup, msg); msg.WriteStringVector(infos); - service->CmdAppendBundlesDetailsIncrementalBackupSession(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -452,6 +493,8 @@ bool CmdPublishIncrementalFileFuzzTest(sptr service, const uint8_t *dat MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_PUBLISH_INCREMENTAL_FILE); try { int pos = 0; @@ -461,7 +504,7 @@ bool CmdPublishIncrementalFileFuzzTest(sptr service, const uint8_t *dat info.owner = string(reinterpret_cast(data + pos), len); info.fileName = string(reinterpret_cast(data + pos + len), len); msg.WriteParcelable(&info); - service->CmdPublishIncrementalFile(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -476,6 +519,8 @@ bool CmdPublishIncrementalFileFuzzTest(sptr service, const uint8_t *dat MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_PUBLISH_S_A_INCREMENTAL_FILE); try { int pos = 0; @@ -487,7 +532,7 @@ bool CmdPublishIncrementalFileFuzzTest(sptr service, const uint8_t *dat info.fileName = string(reinterpret_cast(data + pos + len), len); msg.WriteParcelable(&info); msg.WriteFileDescriptor(fd); - service->CmdPublishSAIncrementalFile(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -502,6 +547,8 @@ bool CmdAppIncrementalFileReadyFuzzTest(sptr service, const uint8_t *da MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_APP_INCREMENTAL_FILE_READY); try { int pos = 0; @@ -516,7 +563,7 @@ bool CmdAppIncrementalFileReadyFuzzTest(sptr service, const uint8_t *da msg.WriteFileDescriptor(fd2); } msg.WriteInt32(errCode); - service->CmdAppIncrementalFileReady(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -531,11 +578,13 @@ bool CmdAppIncrementalDoneFuzzTest(sptr service, const uint8_t *data, s MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_APP_INCREMENTAL_DONE); try { int32_t errCode = TypeCast(data); msg.WriteInt32(errCode); - service->CmdAppIncrementalDone(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -546,12 +595,14 @@ bool CmdGetIncrementalFileHandleFuzzTest(sptr service, const uint8_t *d { MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_GET_INCREMENTAL_FILE_HANDLE); 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); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -562,10 +613,12 @@ bool CmdGetBackupInfoFuzzTest(sptr service, const uint8_t *data, size_t { MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_GET_BACKUP_INFO); try { msg.WriteString(string(reinterpret_cast(data), size)); - service->CmdGetBackupInfo(msg, reply); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -580,13 +633,15 @@ bool CmdUpdateTimerFuzzTest(sptr service, const uint8_t *data, size_t s MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_UPDATE_TIMER); 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); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } @@ -601,13 +656,15 @@ bool CmdUpdateSendRateFuzzTest(sptr service, const uint8_t *data, size_ MessageParcel msg; MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_UPDATE_SEND_RATE); 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); + service->OnRemoteRequest(code, msg, reply, option); } catch (OHOS::FileManagement::Backup::BError &err) { // Only filter BError errors, Other results are not expected. } diff --git a/test/fuzztest/backupservicestubbranch_fuzzer/BUILD.gn b/test/fuzztest/backupservicestubbranch_fuzzer/BUILD.gn index 791139f7a..e69de29bb 100644 --- a/test/fuzztest/backupservicestubbranch_fuzzer/BUILD.gn +++ b/test/fuzztest/backupservicestubbranch_fuzzer/BUILD.gn @@ -1,67 +0,0 @@ -# Copyright (c) 2021-2023 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. - -#####################hydra-fuzz################### -import("//build/config/features.gni") -import("//build/test.gni") -import("//foundation/filemanagement/app_file_service/app_file_service.gni") -import("//foundation/filemanagement/app_file_service/backup.gni") - -##############################fuzztest########################################## -ohos_fuzztest("BackupServiceStubBranchFuzzTest") { - module_out_path = "app_file_service/app_file_service" - fuzz_config_file = - "${app_file_service_path}/test/fuzztest/backupservicestubbranch_fuzzer" - include_dirs = [ - "${app_file_service_path}/frameworks/native/backup_kit_inner/include", - "${app_file_service_path}/interfaces/inner_api/native/backup_kit_inner/impl", - "${app_file_service_path}/services/backup_sa/include", - "${app_file_service_path}/services/backup_sa/include/module_ipc", - "${app_file_service_path}/utils/include", - "${app_file_service_path}/utils/include/b_hilog", - ] - public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] - - cflags = [ - "-g", - "-O0", - "-Wno-unused-variable", - "-fno-omit-frame-pointer", - ] - sources = [ "backupservicestubbranch_fuzzer.cpp" ] - - deps = [ - "${app_file_service_path}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", - "${app_file_service_path}/services/backup_sa:backup_sa", - "${app_file_service_path}/utils:backup_utils", - ] - - external_deps = [ - "ability_runtime:ability_manager", - "ability_runtime:abilitykit_native", - "c_utils:utils", - "hilog:libhilog", - "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", - ] - - defines = [ - "LOG_TAG=\"app_file_service\"", - "LOG_DOMAIN=0xD004303", - "private=public", - ] - - use_exceptions = true -} -############################################################################### diff --git a/test/fuzztest/backupservicestubbranch_fuzzer/backupservicestubbranch_fuzzer.cpp b/test/fuzztest/backupservicestubbranch_fuzzer/backupservicestubbranch_fuzzer.cpp deleted file mode 100644 index 5b788a6cb..000000000 --- a/test/fuzztest/backupservicestubbranch_fuzzer/backupservicestubbranch_fuzzer.cpp +++ /dev/null @@ -1,1098 +0,0 @@ -/* - * Copyright (c) 2024-2025 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 "backupservicestubbranch_fuzzer.h" - -#include -#include - -#include "b_incremental_data.h" -#include "b_session_backup.h" -#include "b_session_restore.h" -#include "message_parcel.h" -#include "refbase.h" -#include "service.h" -#include "service_reverse.h" - -namespace OHOS { -using namespace FileManagement::Backup; -using namespace std; - -using FAFVariant = std::variant>; - -list que; -list arg; - -void ExpectReturn(list&& value) -{ - std::swap(que, value); -} - -void ExpectArgReturn(list&& value) -{ - std::swap(arg, value); -} - -bool GetBoolResult() -{ - bool ret = true; - if (!que.empty()) { - ret = std::get(que.front()); - que.pop_front(); - } - return ret; -} - -Parcelable::Parcelable() : Parcelable(false) -{} - -Parcelable::Parcelable(bool asRemote) -{ - asRemote_ = asRemote; - behavior_ = 0; -} - -template -bool Parcel::Write(T value) -{ - size_t desireCapacity = sizeof(T); - - if (EnsureWritableCapacity(desireCapacity)) { - *reinterpret_cast(data_ + writeCursor_) = value; - writeCursor_ += desireCapacity; - dataSize_ += desireCapacity; - return true; - } - - return false; -} - -bool Parcel::WriteParcelable(const Parcelable *object) -{ - if (object == nullptr) { - return WriteInt32(0); - } - - if (!object->asRemote_) { - bool flag = WriteInt32(1); - object->Marshalling(*this); - return flag; - } - - bool flag = WriteInt32(1); - WriteRemoteObject(const_cast(object)); - return flag; -} - -bool Parcel::WriteInt32(int32_t value) -{ - Write(value); - return GetBoolResult(); -} - -bool Parcel::WriteUint32(uint32_t value) -{ - Write(value); - return GetBoolResult(); -} - -int32_t Parcel::ReadInt32() -{ - int32_t ret = 0; - if (!que.empty()) { - ret = std::get(que.front()); - que.pop_front(); - } - return ret; -} - -bool Parcel::ReadInt32(int32_t &value) -{ - if (!arg.empty()) { - value = std::get(arg.front()); - arg.pop_front(); - } - return GetBoolResult(); -} - -bool Parcel::ReadBool() -{ - return GetBoolResult(); -} - -bool Parcel::ReadBool(bool &value) -{ - if (!arg.empty()) { - value = std::get(arg.front()); - arg.pop_front(); - } - return GetBoolResult(); -} - -bool Parcel::WriteBool(bool value) -{ - return GetBoolResult(); -} - -bool Parcel::WriteString(const std::string &value) -{ - return GetBoolResult(); -} - -bool Parcel::ReadString(std::string &value) -{ - if (!arg.empty()) { - value = std::get(arg.front()); - arg.pop_front(); - } - return GetBoolResult(); -} - -bool Parcel::ReadStringVector(std::vector *value) -{ - if (!arg.empty()) { - *value = std::get>(arg.front()); - arg.pop_front(); - } - return GetBoolResult(); -} - -bool MessageParcel::WriteFileDescriptor(int fd) -{ - return GetBoolResult(); -} - -int MessageParcel::ReadFileDescriptor() -{ - int32_t ret = 0; - if (!que.empty()) { - ret = std::get(que.front()); - que.pop_front(); - } - return ret; -} - -bool Parcel::ReadUint32(uint32_t &value) -{ - if (!arg.empty()) { - value = std::get(arg.front()); - arg.pop_front(); - } - return GetBoolResult(); -} - - -template -T TypeCast(const uint8_t *data, int *pos = nullptr) -{ - if (pos) { - *pos += sizeof(T); - } - return *(reinterpret_cast(data)); -} - -bool OnRemoteRequestFuzzTest(sptr service, const uint8_t *data, size_t size) -{ - if (data == nullptr || size < sizeof(uint32_t)) { - return true; - } - - MessageParcel msg; - MessageParcel reply; - MessageOption option; - uint32_t code = TypeCast(data); - - service->OnRemoteRequest(code, msg, reply, option); - - msg.WriteInterfaceToken(ServiceStub::GetDescriptor()); - 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 { - string bundleName(reinterpret_cast(data), size); - - ExpectReturn({false}); - ExpectArgReturn({bundleName}); - service->CmdGetBackupInfo(msg, reply); - - ExpectReturn({true, false}); - ExpectArgReturn({bundleName}); - service->CmdGetBackupInfo(msg, reply); - - ExpectReturn({true, true}); - ExpectArgReturn({bundleName}); - 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 */ -extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) -{ - OHOS::sptr service(new OHOS::FileManagement::Backup::Service()); - if (service == nullptr) { - return 0; - } - - 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. - } - return 0; -} \ No newline at end of file diff --git a/test/fuzztest/backupservicestubbranch_fuzzer/project.xml b/test/fuzztest/backupservicestubbranch_fuzzer/project.xml deleted file mode 100644 index 7133b2b92..000000000 --- a/test/fuzztest/backupservicestubbranch_fuzzer/project.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - 1000 - - 300 - - 4096 - - diff --git a/test/fuzztest/backupservicestubbranch_fuzzer/service.h b/test/fuzztest/backupservicestubbranch_fuzzer/service.h index 2e2b81879..7848c335a 100644 --- a/test/fuzztest/backupservicestubbranch_fuzzer/service.h +++ b/test/fuzztest/backupservicestubbranch_fuzzer/service.h @@ -23,56 +23,62 @@ #include "iservice_reverse.h" #include "iremote_stub.h" #include "service_stub.h" +#include "service_common.h" namespace OHOS::FileManagement::Backup { class Service : public ServiceStub { public: - ErrCode InitRestoreSession(sptr) { return BError(BError::Codes::OK); } - ErrCode InitRestoreSession(sptr, std::string&) { return BError(BError::Codes::OK); } - ErrCode InitBackupSession(sptr) { return BError(BError::Codes::OK); } - ErrCode InitBackupSession(sptr, std::string&) { return BError(BError::Codes::OK); } + ErrCode InitRestoreSession(const sptr&) { return BError(BError::Codes::OK); } + ErrCode InitRestoreSessionWithErrMsg(const sptr&, + std::string&) { return BError(BError::Codes::OK); } + ErrCode InitBackupSession(const sptr&) { return BError(BError::Codes::OK); } + ErrCode InitBackupSessionWithErrMsg(const sptr&, + std::string&) { return BError(BError::Codes::OK); } ErrCode Start() { return BError(BError::Codes::OK); } - UniqueFd GetLocalCapabilities() { return UniqueFd(-1); } - UniqueFd GetLocalCapabilitiesForBundleInfos() { return UniqueFd(-1); } + ErrCode GetLocalCapabilities(int&) { return BError(BError::Codes::OK); } + ErrCode GetLocalCapabilitiesForBundleInfos(int&) { return BError(BError::Codes::OK); } ErrCode PublishFile(const BFileInfo&) { return BError(BError::Codes::OK); } - ErrCode AppFileReady(const std::string&, UniqueFd, int32_t) { return BError(BError::Codes::OK); } + ErrCode AppFileReady(const std::string&, int, int32_t) { return BError(BError::Codes::OK); } ErrCode AppDone(ErrCode) { return BError(BError::Codes::OK); } - ErrCode ServiceResultReport(const std::string, + ErrCode ServiceResultReport(const std::string&, BackupRestoreScenario, ErrCode) { return BError(BError::Codes::OK); } ErrCode GetFileHandle(const std::string&, const std::string&) { return BError(BError::Codes::OK); } - ErrCode AppendBundlesRestoreSession(UniqueFd, - const std::vector&, - const std::vector&, - RestoreTypeEnum restoreType = RestoreTypeEnum::RESTORE_DATA_WAIT_SEND, - int32_t userId = DEFAULT_INVAL_VALUE) { return BError(BError::Codes::OK); } - ErrCode AppendBundlesRestoreSession(UniqueFd, - const std::vector&, - RestoreTypeEnum restoreType = RestoreTypeEnum::RESTORE_DATA_WAIT_SEND, - int32_t userId = DEFAULT_INVAL_VALUE) { return BError(BError::Codes::OK); } + ErrCode AppendBundlesRestoreSessionDataByDetail(int, + const std::vector&, + const std::vector&, + int32_t, + int32_t) { return BError(BError::Codes::OK); } + ErrCode AppendBundlesRestoreSessionData(int, + const std::vector&, + int32_t, + int32_t) { return BError(BError::Codes::OK); } ErrCode AppendBundlesBackupSession(const std::vector&) { return BError(BError::Codes::OK); } ErrCode AppendBundlesDetailsBackupSession(const std::vector&, const std::vector&) { return BError(BError::Codes::OK); } ErrCode Finish() { return BError(BError::Codes::OK); } ErrCode Release() { return BError(BError::Codes::OK); } - ErrCode Cancel(std::string, int32_t&) { return BError(BError::Codes::OK); } - UniqueFd GetLocalCapabilitiesIncremental(const std::vector&) { return UniqueFd(-1); } + ErrCode Cancel(const std::string&, int32_t&) { return BError(BError::Codes::OK); } + ErrCode GetLocalCapabilitiesIncremental(const std::vector&, + int&) { return BError(BError::Codes::OK); } ErrCode GetAppLocalListAndDoIncrementalBackup() { return BError(BError::Codes::OK); } - ErrCode InitIncrementalBackupSession(sptr) { return BError(BError::Codes::OK); } - ErrCode InitIncrementalBackupSession(sptr, std::string&) { return BError(BError::Codes::OK); } + ErrCode InitIncrementalBackupSession(const sptr&) { return BError(BError::Codes::OK); } + ErrCode InitIncrementalBackupSessionWithErrMsg(const sptr&, + std::string&) { return BError(BError::Codes::OK); } ErrCode AppendBundlesIncrementalBackupSession(const std::vector&) { return BError(BError::Codes::OK); } - ErrCode AppendBundlesIncrementalBackupSession(const std::vector&, const std::vector&) + ErrCode AppendBundlesIncrementalBackupSessionWithBundleInfos(const std::vector&, + const std::vector&) { return BError(BError::Codes::OK); } ErrCode PublishIncrementalFile(const BFileInfo&) { return BError(BError::Codes::OK); } - ErrCode PublishSAIncrementalFile(const BFileInfo&, UniqueFd) { return BError(BError::Codes::OK); } - ErrCode AppIncrementalFileReady(const std::string&, UniqueFd, UniqueFd, int32_t) + ErrCode PublishSAIncrementalFile(const BFileInfo&, int) { return BError(BError::Codes::OK); } + ErrCode AppIncrementalFileReady(const std::string&, int, int, int32_t) { return BError(BError::Codes::OK); } ErrCode AppIncrementalDone(ErrCode) { return BError(BError::Codes::OK); } ErrCode GetIncrementalFileHandle(const std::string&, const std::string&) { return BError(BError::Codes::OK); } - ErrCode GetBackupInfo(BundleName&, std::string&) { return BError(BError::Codes::OK); } - ErrCode UpdateTimer(BundleName&, uint32_t, bool&) { return BError(BError::Codes::OK); } - ErrCode UpdateSendRate(std::string&, int32_t, bool&) { return BError(BError::Codes::OK); } - ErrCode ReportAppProcessInfo(const std::string, const BackupRestoreScenario) { return BError(BError::Codes::OK); } + ErrCode GetBackupInfo(const BundleName&, std::string&) { return BError(BError::Codes::OK); } + ErrCode UpdateTimer(const BundleName&, uint32_t, bool&) { return BError(BError::Codes::OK); } + ErrCode UpdateSendRate(const std::string&, int32_t, bool&) { return BError(BError::Codes::OK); } + ErrCode ReportAppProcessInfo(const std::string&, BackupRestoreScenario) { return BError(BError::Codes::OK); } ErrCode StartExtTimer(bool&) { return BError(BError::Codes::OK); } ErrCode StartFwkTimer(bool&) { return BError(BError::Codes::OK); } ErrCode StopExtTimer(bool&) { return BError(BError::Codes::OK); } @@ -80,7 +86,7 @@ public: ErrCode SAResultReport(const std::string, const std::string, const ErrCode, const BackupRestoreScenario) { return BError(BError::Codes::OK); } - ErrCode GetBackupDataSize(bool, std::vector) { return BError(BError::Codes::OK); } + ErrCode GetBackupDataSize(bool, const std::vector&) { return BError(BError::Codes::OK); } }; } // namespace OHOS::FileManagement::Backup diff --git a/test/fuzztest/servicereverse_fuzzer/BUILD.gn b/test/fuzztest/servicereverse_fuzzer/BUILD.gn index db97aa91b..53c825efb 100644 --- a/test/fuzztest/servicereverse_fuzzer/BUILD.gn +++ b/test/fuzztest/servicereverse_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021-2024 Huawei Device Co., Ltd. +# Copyright (c) 2021-2025 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 @@ -47,13 +47,17 @@ ohos_fuzztest("ServiceReverseFuzzTest") { external_deps = [ "c_utils:utils", "hilog:libhilog", + "hitrace:hitrace_meter", "ipc:ipc_core", ] defines = [ "LOG_TAG=\"app_file_service\"", "LOG_DOMAIN=0xD200000", + "private=public", ] + + use_exceptions = true } ############################################################################### diff --git a/test/fuzztest/servicereverse_fuzzer/servicereverse_fuzzer.cpp b/test/fuzztest/servicereverse_fuzzer/servicereverse_fuzzer.cpp index dbba2c2f1..6c3b2fe0c 100644 --- a/test/fuzztest/servicereverse_fuzzer/servicereverse_fuzzer.cpp +++ b/test/fuzztest/servicereverse_fuzzer/servicereverse_fuzzer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2024-2025 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 @@ -15,147 +15,643 @@ #include "servicereverse_fuzzer.h" -#include -#include -#include +#include -#include -#include "message_parcel.h" +#include "b_error/b_error.h" #include "b_session_backup.h" #include "b_session_restore.h" #include "b_incremental_backup_session.h" #include "b_incremental_restore_session.h" -#include "i_service_reverse_ipc_interface_code.h" +#include "message_parcel.h" #include "service_reverse_stub.h" #include "service_reverse.h" -#include "securec.h" - -using namespace OHOS::FileManagement::Backup; namespace OHOS { -constexpr size_t U32_AT_SIZE = 4; -constexpr uint8_t MAX_CALL_TRANSACTION = 24; -constexpr int32_t SHIFT_FIRST = 24; -constexpr int32_t SHIFT_SECOND = 16; -constexpr int32_t SHIFT_THIRD = 8; -constexpr int32_t ZERO_NUM = 0; -constexpr int32_t FIRST_NUM = 1; -constexpr int32_t SECOND_NUM = 2; -constexpr int32_t THIRD_NUM = 3; - -uint32_t ConvertToUint32(const uint8_t* ptr) -{ - if (ptr == nullptr) { - return 0; +using namespace std; +using namespace FileManagement::Backup; + +template +T TypeCast(const uint8_t *data, int *pos = nullptr) +{ + if (pos) { + *pos += sizeof(T); + } + return *(reinterpret_cast(data)); +} + +bool BackupOnFileReadyFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr || size < sizeof(bool) + sizeof(int)) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_BACKUP_ON_FILE_READY); + + try { + int pos = 0; + int fd = TypeCast(data, &pos); + bool fdFlag = TypeCast(data, &pos); + int len = ((size - pos) >> 1); + msg.WriteString(string(reinterpret_cast(data + pos), len)); + msg.WriteString(string(reinterpret_cast(data + pos + len), size - pos - len)); + msg.WriteBool(fdFlag); + if (fdFlag) { + msg.WriteFileDescriptor(fd); + } + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } + return true; +} + +bool BackupOnBundleStartedFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr || size < sizeof(int32_t)) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_BACKUP_ON_BUNDLE_STARTED); + + try { + int pos = 0; + int32_t errCode = TypeCast(data, &pos); + msg.WriteInt32(errCode); + msg.WriteString(string(reinterpret_cast(data + pos), size - pos)); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } + return true; +} + +bool BackupOnResultReportFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_BACKUP_ON_RESULT_REPORT); + + try { + int len = (size >> 1); + msg.WriteString(string(reinterpret_cast(data), len)); + msg.WriteString(string(reinterpret_cast(data + len), size - len)); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } + return true; +} + +bool BackupOnBundleFinishedFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr || size < sizeof(int32_t)) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_BACKUP_ON_BUNDLE_FINISHED); + + try { + int pos = 0; + int32_t errCode = TypeCast(data, &pos); + msg.WriteInt32(errCode); + msg.WriteString(string(reinterpret_cast(data + pos), size - pos)); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } + return true; +} + +bool BackupOnAllBundlesFinishedFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr || size < sizeof(int32_t)) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_BACKUP_ON_ALL_BUNDLES_FINISHED); + + try { + int32_t errCode = TypeCast(data); + msg.WriteInt32(errCode); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } + return true; +} + +bool BackupOnProcessInfoFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_BACKUP_ON_PROCESS_INFO); + + try { + int len = (size >> 1); + msg.WriteString(string(reinterpret_cast(data), len)); + msg.WriteString(string(reinterpret_cast(data + len), size - len)); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } + return true; +} + +bool BackupOnScanningInfoFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_BACKUP_ON_SCANNING_INFO); + + try { + msg.WriteString(string(reinterpret_cast(data), size)); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } + return true; +} + +bool RestoreOnBundleStartedFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr || size < sizeof(int32_t)) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_RESTORE_ON_BUNDLE_STARTED); + + try { + int pos = 0; + int32_t errCode = TypeCast(data, &pos); + msg.WriteInt32(errCode); + msg.WriteString(string(reinterpret_cast(data + pos), size - pos)); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } + return true; +} + +bool RestoreOnBundleFinishedFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr || size < sizeof(int32_t)) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_RESTORE_ON_BUNDLE_FINISHED); + + try { + int pos = 0; + int32_t errCode = TypeCast(data, &pos); + msg.WriteInt32(errCode); + msg.WriteString(string(reinterpret_cast(data + pos), size - pos)); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } + return true; +} + +bool RestoreOnAllBundlesFinishedFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr || size < sizeof(int32_t)) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_RESTORE_ON_ALL_BUNDLES_FINISHED); + + try { + int32_t errCode = TypeCast(data); + msg.WriteInt32(errCode); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } + return true; +} + +bool RestoreOnFileReadyFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr || size < sizeof(bool) + sizeof(int) + sizeof(int32_t)) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_RESTORE_ON_FILE_READY); + + try { + int pos = 0; + int fd = TypeCast(data, &pos); + bool fdFlag = TypeCast(data, &pos); + int32_t errCode = TypeCast(data, &pos); + int len = ((size - pos) >> 1); + msg.WriteString(string(reinterpret_cast(data + pos), len)); + msg.WriteString(string(reinterpret_cast(data + pos + len), size - pos - len)); + msg.WriteBool(fdFlag); + if (fdFlag) { + msg.WriteFileDescriptor(fd); + } + msg.WriteInt32(errCode); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } + return true; +} + +bool RestoreOnResultReportFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr || size < sizeof(int32_t)) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_RESTORE_ON_RESULT_REPORT); + + try { + int pos = 0; + int32_t errCode = TypeCast(data, &pos); + int len = ((size - pos) >> 1); + msg.WriteString(string(reinterpret_cast(data + pos), len)); + msg.WriteString(string(reinterpret_cast(data + pos + len), size - pos - len)); + msg.WriteInt32(errCode); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } + return true; +} + +bool RestoreOnProcessInfoFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_RESTORE_ON_PROCESS_INFO); + + try { + int len = (size >> 1); + msg.WriteString(string(reinterpret_cast(data), len)); + msg.WriteString(string(reinterpret_cast(data + len), size - len)); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } + return true; +} + +bool IncrementalBackupOnFileReadyFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr || size < sizeof(bool) + sizeof(int) + sizeof(int) + sizeof(int32_t)) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_INCREMENTAL_BACKUP_ON_FILE_READY); + + try { + int pos = 0; + int fd = TypeCast(data, &pos); + int manifestFd = TypeCast(data, &pos); + bool fdFlag = TypeCast(data, &pos); + int32_t errCode = TypeCast(data, &pos); + int len = ((size - pos) >> 1); + msg.WriteString(string(reinterpret_cast(data + pos), len)); + msg.WriteString(string(reinterpret_cast(data + pos + len), size - pos - len)); + msg.WriteBool(fdFlag); + if (fdFlag) { + msg.WriteFileDescriptor(fd); + msg.WriteFileDescriptor(manifestFd); + } + msg.WriteInt32(errCode); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } + return true; +} + +bool IncrementalBackupOnBundleStartedFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr || size < sizeof(int32_t)) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_INCREMENTAL_BACKUP_ON_BUNDLE_STARTED); + + try { + int pos = 0; + int32_t errCode = TypeCast(data, &pos); + msg.WriteInt32(errCode); + msg.WriteString(string(reinterpret_cast(data + pos), size - pos)); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } + return true; +} + +bool IncrementalBackupOnResultReportFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_INCREMENTAL_BACKUP_ON_RESULT_REPORT); + + try { + int len = (size >> 1); + msg.WriteString(string(reinterpret_cast(data), len)); + msg.WriteString(string(reinterpret_cast(data + len), size - len)); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } + return true; +} + +bool IncrementalBackupOnBundleFinishedFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr || size < sizeof(int32_t)) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_INCREMENTAL_BACKUP_ON_BUNDLE_FINISHED); + + try { + int pos = 0; + int32_t errCode = TypeCast(data, &pos); + msg.WriteInt32(errCode); + msg.WriteString(string(reinterpret_cast(data + pos), size - pos)); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. } - return (ptr[ZERO_NUM] << SHIFT_FIRST) | (ptr[FIRST_NUM] << SHIFT_SECOND) | - (ptr[SECOND_NUM] << SHIFT_THIRD) | (ptr[THIRD_NUM]); + return true; +} + +bool IncrementalBackupOnAllBundlesFinishedFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr || size < sizeof(int32_t)) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_INCREMENTAL_BACKUP_ON_ALL_BUNDLES_FINISHED); + + try { + int32_t errCode = TypeCast(data); + msg.WriteInt32(errCode); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } + return true; } -bool BackupFuzzTest(const uint8_t *data, size_t size) +bool IncrementalBackupOnProcessInfoFuzzTest(sptr service, const uint8_t *data, size_t size) { - /* Validate the length of size */ - if (data == nullptr || size < U32_AT_SIZE) { - return false; + if (data == nullptr) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_INCREMENTAL_BACKUP_ON_PROCESS_INFO); + + try { + int len = (size >> 1); + msg.WriteString(string(reinterpret_cast(data), len)); + msg.WriteString(string(reinterpret_cast(data + len), size - len)); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. } + return true; +} - uint32_t code = ConvertToUint32(data); - if (code > static_cast(IServiceReverseInterfaceCode::SERVICER_BACKUP_ON_TASK_FINISHED)) { +bool IncrementalBackupOnScanningInfoFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr) { return true; } - MessageParcel datas; - datas.WriteInterfaceToken(ServiceReverseStub::GetDescriptor()); - datas.WriteBuffer(data, size); - datas.RewindRead(0); + MessageParcel msg; MessageParcel reply; MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_INCREMENTAL_BACKUP_ON_SCANNING_INFO); - BSessionBackup::Callbacks callbacks; - std::shared_ptr backupPtr = - std::make_shared(callbacks); - backupPtr->OnRemoteRequest(code % MAX_CALL_TRANSACTION, datas, reply, option); + try { + msg.WriteString(string(reinterpret_cast(data), size)); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } return true; } -bool RestoreFuzzTest(const uint8_t *data, size_t size) +bool IncrementalRestoreOnBundleStartedFuzzTest(sptr service, const uint8_t *data, size_t size) { - /* Validate the length of size */ - if (data == nullptr || size < U32_AT_SIZE) { - return false; + if (data == nullptr || size < sizeof(int32_t)) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_INCREMENTAL_RESTORE_ON_BUNDLE_STARTED); + + try { + int pos = 0; + int32_t errCode = TypeCast(data, &pos); + msg.WriteInt32(errCode); + msg.WriteString(string(reinterpret_cast(data + pos), size - pos)); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. } + return true; +} - uint32_t code = ConvertToUint32(data); - if (code < static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_SUB_TASK_STARTED) || - code > static_cast(IServiceReverseInterfaceCode::SERVICER_RESTORE_ON_FILE_READY)) { +bool IncrementalRestoreOnBundleFinishedFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr || size < sizeof(int32_t)) { return true; } - MessageParcel datas; - datas.WriteInterfaceToken(ServiceReverseStub::GetDescriptor()); - datas.WriteBuffer(data, size); - datas.RewindRead(0); + MessageParcel msg; MessageParcel reply; MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_INCREMENTAL_RESTORE_ON_BUNDLE_FINISHED); - BSessionRestore::Callbacks callbacks; - std::shared_ptr restorePtr = - std::make_shared(callbacks); - restorePtr->OnRemoteRequest(code % MAX_CALL_TRANSACTION, datas, reply, option); + try { + int pos = 0; + int32_t errCode = TypeCast(data, &pos); + msg.WriteInt32(errCode); + msg.WriteString(string(reinterpret_cast(data + pos), size - pos)); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } return true; } -bool IncrementalBackupFuzzTest(const uint8_t *data, size_t size) +bool IncrementalRestoreOnAllBundlesFinishedFuzzTest(sptr service, const uint8_t *data, size_t size) { - /* Validate the length of size */ - if (data == nullptr || size < U32_AT_SIZE) { - return false; + if (data == nullptr || size < sizeof(int32_t)) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_INCREMENTAL_RESTORE_ON_ALL_BUNDLES_FINISHED); + + try { + int32_t errCode = TypeCast(data); + msg.WriteInt32(errCode); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. } + return true; +} - uint32_t code = ConvertToUint32(data); - if (code < static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_FILE_READY) || - code > static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_BACKUP_ON_TASK_FINISHED)) { +bool IncrementalRestoreOnFileReadyFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr || size < sizeof(bool) + sizeof(int) + sizeof(int) + sizeof(int32_t)) { return true; } - MessageParcel datas; - datas.WriteInterfaceToken(ServiceReverseStub::GetDescriptor()); - datas.WriteBuffer(data, size); - datas.RewindRead(0); + MessageParcel msg; MessageParcel reply; MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_INCREMENTAL_RESTORE_ON_FILE_READY); - BIncrementalBackupSession::Callbacks callbacks; - std::shared_ptr backupPtr = - std::make_shared(callbacks); - backupPtr->OnRemoteRequest(code % MAX_CALL_TRANSACTION, datas, reply, option); + try { + int pos = 0; + int fd = TypeCast(data, &pos); + int manifestFd = TypeCast(data, &pos); + bool fdFlag = TypeCast(data, &pos); + int32_t errCode = TypeCast(data, &pos); + int len = ((size - pos) >> 1); + msg.WriteString(string(reinterpret_cast(data + pos), len)); + msg.WriteString(string(reinterpret_cast(data + pos + len), size - pos - len)); + msg.WriteBool(fdFlag); + if (fdFlag) { + msg.WriteFileDescriptor(fd); + msg.WriteFileDescriptor(manifestFd); + } + msg.WriteInt32(errCode); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } return true; } -bool IncrementalRestoreFuzzTest(const uint8_t *data, size_t size) +bool IncrementalRestoreOnResultReportFuzzTest(sptr service, const uint8_t *data, size_t size) { - /* Validate the length of size */ - if (data == nullptr || size < U32_AT_SIZE) { - return false; + if (data == nullptr || size < sizeof(int32_t)) { + return true; + } + + MessageParcel msg; + MessageParcel reply; + MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_INCREMENTAL_RESTORE_ON_RESULT_REPORT); + + try { + int pos = 0; + int32_t errCode = TypeCast(data, &pos); + int len = ((size - pos) >> 1); + msg.WriteString(string(reinterpret_cast(data + pos), len)); + msg.WriteString(string(reinterpret_cast(data + pos + len), size - pos - len)); + msg.WriteInt32(errCode); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. } + return true; +} - uint32_t code = ConvertToUint32(data); - if (code < static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_RESTORE_ON_SUB_TASK_STARTED) || - code > static_cast(IServiceReverseInterfaceCode::SERVICER_INCREMENTAL_RESTORE_ON_FILE_READY)) { +bool IncrementalRestoreOnProcessInfoFuzzTest(sptr service, const uint8_t *data, size_t size) +{ + if (data == nullptr) { return true; } - MessageParcel datas; - datas.WriteInterfaceToken(ServiceReverseStub::GetDescriptor()); - datas.WriteBuffer(data, size); - datas.RewindRead(0); + MessageParcel msg; MessageParcel reply; MessageOption option; + uint32_t code = static_cast(IServiceReverseIpcCode::COMMAND_INCREMENTAL_RESTORE_ON_PROCESS_INFO); - BIncrementalRestoreSession::Callbacks callbacks; - std::shared_ptr restorePtr = - std::make_shared(callbacks); - restorePtr->OnRemoteRequest(code % MAX_CALL_TRANSACTION, datas, reply, option); + try { + int len = (size >> 1); + msg.WriteString(string(reinterpret_cast(data), len)); + msg.WriteString(string(reinterpret_cast(data + len), size - len)); + service->OnRemoteRequest(code, msg, reply, option); + } catch (BError &err) { + // Only filter BError errors, Other results are not expected. + } return true; } } // namespace OHOS @@ -163,9 +659,55 @@ bool IncrementalRestoreFuzzTest(const uint8_t *data, size_t size) /* Fuzzer entry point */ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { - OHOS::BackupFuzzTest(data, size); - OHOS::RestoreFuzzTest(data, size); - OHOS::IncrementalBackupFuzzTest(data, size); - OHOS::IncrementalRestoreFuzzTest(data, size); + OHOS::FileManagement::Backup::BSessionBackup::Callbacks backupCallbacks; + OHOS::sptr backupService(new OHOS::FileManagement::Backup::ServiceReverse(backupCallbacks)); + if (backupService == nullptr) { + return 0; + } + OHOS::FileManagement::Backup::BSessionRestore::Callbacks restoreCallbacks; + OHOS::sptr restoreService(new OHOS::FileManagement::Backup::ServiceReverse(restoreCallbacks)); + if (restoreService == nullptr) { + return 0; + } + OHOS::FileManagement::Backup::BIncrementalBackupSession::Callbacks incrementalBackupCallbacks; + OHOS::sptr incrementalBackupService(new OHOS::FileManagement::Backup::ServiceReverse(incrementalBackupCallbacks)); + if (incrementalBackupService == nullptr) { + return 0; + } + OHOS::FileManagement::Backup::BIncrementalRestoreSession::Callbacks incrementalRestoreCallbacks; + OHOS::sptr incrementalRestoreService(new OHOS::FileManagement::Backup::ServiceReverse(incrementalRestoreCallbacks)); + if (incrementalRestoreService == nullptr) { + return 0; + } + + OHOS::BackupOnFileReadyFuzzTest(backupService, data, size); + OHOS::BackupOnBundleStartedFuzzTest(backupService, data, size); + OHOS::BackupOnResultReportFuzzTest(backupService, data, size); + OHOS::BackupOnBundleFinishedFuzzTest(backupService, data, size); + OHOS::BackupOnAllBundlesFinishedFuzzTest(backupService, data, size); + OHOS::BackupOnProcessInfoFuzzTest(backupService, data, size); + OHOS::BackupOnScanningInfoFuzzTest(backupService, data, size); + + OHOS::RestoreOnBundleStartedFuzzTest(restoreService, data, size); + OHOS::RestoreOnBundleFinishedFuzzTest(restoreService, data, size); + OHOS::RestoreOnAllBundlesFinishedFuzzTest(restoreService, data, size); + OHOS::RestoreOnFileReadyFuzzTest(restoreService, data, size); + OHOS::RestoreOnResultReportFuzzTest(restoreService, data, size); + OHOS::RestoreOnProcessInfoFuzzTest(restoreService, data, size); + + OHOS::IncrementalBackupOnFileReadyFuzzTest(incrementalBackupService, data, size); + OHOS::IncrementalBackupOnBundleStartedFuzzTest(incrementalBackupService, data, size); + OHOS::IncrementalBackupOnResultReportFuzzTest(incrementalBackupService, data, size); + OHOS::IncrementalBackupOnBundleFinishedFuzzTest(incrementalBackupService, data, size); + OHOS::IncrementalBackupOnAllBundlesFinishedFuzzTest(incrementalBackupService, data, size); + OHOS::IncrementalBackupOnProcessInfoFuzzTest(incrementalBackupService, data, size); + OHOS::IncrementalBackupOnScanningInfoFuzzTest(incrementalBackupService, data, size); + + OHOS::IncrementalRestoreOnBundleStartedFuzzTest(incrementalRestoreService, data, size); + OHOS::IncrementalRestoreOnBundleFinishedFuzzTest(incrementalRestoreService, data, size); + OHOS::IncrementalRestoreOnAllBundlesFinishedFuzzTest(incrementalRestoreService, data, size); + OHOS::IncrementalRestoreOnFileReadyFuzzTest(incrementalRestoreService, data, size); + OHOS::IncrementalRestoreOnResultReportFuzzTest(incrementalRestoreService, data, size); + OHOS::IncrementalRestoreOnProcessInfoFuzzTest(incrementalRestoreService, data, size); return 0; } \ No newline at end of file diff --git a/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn b/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn index 7ab6e4acc..4c99a5352 100644 --- a/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn +++ b/test/fuzztest/svcrestoredepsmanager_fuzzer/BUILD.gn @@ -37,7 +37,7 @@ ohos_fuzztest("SvcRestoreDepsManagerFuzzTest") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", - "${path_backup}/services/backup_sa:backup_sa_ipc", + "${path_backup}/services/backup_sa:backup_sa_ipc_stub", "${path_backup}/utils:backup_utils", "${path_jsoncpp}:jsoncpp", ] diff --git a/test/unittest/file_permission_native/BUILD.gn b/test/unittest/file_permission_native/BUILD.gn index bef7bfa9c..bb78d1e47 100644 --- a/test/unittest/file_permission_native/BUILD.gn +++ b/test/unittest/file_permission_native/BUILD.gn @@ -24,7 +24,7 @@ ohos_unittest("file_permission_test") { blocklist = "${app_file_service_path}/cfi_blocklist.txt" } - module_out_path = "filemanagement/app_file_service" + module_out_path = "app_file_service/app_file_service/file_share" include_dirs = [ "include", "${app_file_service_path}/tests/mock/file_permission_native/include", diff --git a/test/unittest/file_share_native/BUILD.gn b/test/unittest/file_share_native/BUILD.gn index e5feaa091..745736a50 100644 --- a/test/unittest/file_share_native/BUILD.gn +++ b/test/unittest/file_share_native/BUILD.gn @@ -22,7 +22,7 @@ ohos_unittest("file_share_test") { debug = false } - module_out_path = "filemanagement/app_file_service" + module_out_path = "app_file_service/app_file_service/file_share" resource_config_file = "../resource/ohos_test.xml" sources = [ "file_share_test.cpp" ] diff --git a/test/unittest/file_share_ndk_test/file_share_permission_sup_test/BUILD.gn b/test/unittest/file_share_ndk_test/file_share_permission_sup_test/BUILD.gn index 5d75c18f5..662683f46 100644 --- a/test/unittest/file_share_ndk_test/file_share_permission_sup_test/BUILD.gn +++ b/test/unittest/file_share_ndk_test/file_share_permission_sup_test/BUILD.gn @@ -24,7 +24,7 @@ ohos_unittest("file_share_permission_ndk_sup_test") { blocklist = "${app_file_service_path}/cfi_blocklist.txt" } - module_out_path = "filemanagement/app_file_service" + module_out_path = "app_file_service/app_file_service/file_share" include_dirs = [ "include", "${app_file_service_path}/interfaces/kits/ndk/fileshare/include", diff --git a/test/unittest/file_share_ndk_test/file_share_permission_test/BUILD.gn b/test/unittest/file_share_ndk_test/file_share_permission_test/BUILD.gn index 88e9a42ec..ad79bbed7 100644 --- a/test/unittest/file_share_ndk_test/file_share_permission_test/BUILD.gn +++ b/test/unittest/file_share_ndk_test/file_share_permission_test/BUILD.gn @@ -23,7 +23,7 @@ ohos_unittest("file_share_permission_ndk_test") { debug = false } - module_out_path = "filemanagement/app_file_service" + module_out_path = "app_file_service/app_file_service/file_share" include_dirs = [ "include", "${app_file_service_path}/interfaces/kits/ndk/fileshare/include", diff --git a/test/unittest/file_uri_native/BUILD.gn b/test/unittest/file_uri_native/BUILD.gn index 447faf2f7..96ab25bbf 100644 --- a/test/unittest/file_uri_native/BUILD.gn +++ b/test/unittest/file_uri_native/BUILD.gn @@ -22,7 +22,7 @@ ohos_unittest("file_uri_test") { debug = false } - module_out_path = "filemanagement/app_file_service" + module_out_path = "app_file_service/app_file_service/file_share" resource_config_file = "../resource/ohos_test.xml" sources = [ "file_uri_test.cpp" ] diff --git a/test/unittest/file_uri_ndk_test/BUILD.gn b/test/unittest/file_uri_ndk_test/BUILD.gn index 006bc9fa0..577727daf 100644 --- a/test/unittest/file_uri_ndk_test/BUILD.gn +++ b/test/unittest/file_uri_ndk_test/BUILD.gn @@ -23,7 +23,7 @@ ohos_unittest("file_uri_ndk_test") { debug = false } - module_out_path = "filemanagement/app_file_service" + module_out_path = "app_file_service/app_file_service/file_share" include_dirs = [ "include", "${app_file_service_path}/interfaces/kits/ndk/fileuri/include", diff --git a/test/unittest/js_file_permission_test/permission/BUILD.gn b/test/unittest/js_file_permission_test/permission/BUILD.gn index 2073c5c28..b76e94fdb 100644 --- a/test/unittest/js_file_permission_test/permission/BUILD.gn +++ b/test/unittest/js_file_permission_test/permission/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") ohos_js_unittest("FileShareTestPermission") { - module_out_path = "filemanagement/app_file_service" + module_out_path = "app_file_service/app_file_service/file_share" hap_profile = "./config.json" diff --git a/test/unittest/js_file_permission_test/permission/FilePermission.test.js b/test/unittest/js_file_permission_test/permission/FilePermission.test.js index a6be5ae07..84d8b1374 100644 --- a/test/unittest/js_file_permission_test/permission/FilePermission.test.js +++ b/test/unittest/js_file_permission_test/permission/FilePermission.test.js @@ -217,7 +217,7 @@ describe('FileShareJSTest', function () { } console.info(`revoke_permission_test_001 end`); }) - + /** * @tc.name: revoke_permission_test_002 * @tc.desc: normal uris and have a uri is not exist test @@ -243,7 +243,7 @@ describe('FileShareJSTest', function () { let policies = [policyInfoA, policyInfoB]; try { fileShare.revokePermission(policies).then(() => { - expect(false).assertTrue(); + expect(true).assertTrue(); done(); }).catch((err) => { console.info(`revoke_permission_test_002 err : ${err.code}`); @@ -312,9 +312,14 @@ describe('FileShareJSTest', function () { await fs.close(fd); let policyInfo = { uri: uri, operationMode: fileShare.OperationMode.READ_MODE }; let policies = [policyInfo]; + try { + await fileShare.persistPermission(policies); + } catch (error) { + console.info(`revoke_permission_test_004 persistPermission error : ${error.code}`); + } try { fileShare.revokePermission(policies).then(() => { - expect(false).assertTrue(); + expect(true).assertTrue(); done(); }).catch((err) => { console.info(`revoke_permission_test_004 err : ${err.code}`); @@ -362,8 +367,11 @@ describe('FileShareJSTest', function () { expect(true).assertTrue(); done(); }).catch((err) => { - console.info(`activate_permission_test_001 err : ${err.code}`); - expect(false).assertTrue(); + if (err.code == OPERATION_NOT_PERMITTED) { + expect(true).assertTrue(); + } else { + expect(false).assertTrue(); + } done(); }) } catch (error) { @@ -377,7 +385,7 @@ describe('FileShareJSTest', function () { } console.info(`activate_permission_test_001 end`); }) - + /** * @tc.name: activate_permission_test_002 * @tc.desc: normal uris and have a uri is not exist test @@ -426,7 +434,7 @@ describe('FileShareJSTest', function () { } console.info(`activate_permission_test_002 end`); }) - + /** * @tc.name: activate_permission_test_003 * @tc.desc: persist_permission with no param test @@ -474,9 +482,14 @@ describe('FileShareJSTest', function () { await fs.close(fd); let policyInfo = { uri: uri, operationMode: fileShare.OperationMode.WRITE_MODE }; let policies = [policyInfo]; + try { + await fileShare.persistPermission(policies); + } catch (error) { + console.info(`activate_permission_test_004 persistPermission error : ${error.code}`); + } try { fileShare.activatePermission(policies).then(() => { - expect(false).assertTrue(); + expect(true).assertTrue(); done(); }).catch((err) => { console.info(`activate_permission_test_004 err : ${err.code}`); @@ -544,7 +557,7 @@ describe('FileShareJSTest', function () { } console.info(`deactivate_permission_test_001 end`); }) - + /** * @tc.name: deactivate_permission_test_002 * @tc.desc: normal uris and have a uri is not exist test @@ -597,7 +610,7 @@ describe('FileShareJSTest', function () { } console.info(`deactivate_permission_test_002 end`); }) - + /** * @tc.name: deactivate_permission_test_003 * @tc.desc: persist_permission with no param test @@ -644,9 +657,14 @@ describe('FileShareJSTest', function () { await fs.close(fd); let policyInfo = { uri: uri, operationMode: fileShare.OperationMode.WRITE_MODE }; let policies = [policyInfo]; + try { + await fileShare.persistPermission(policies); + } catch (error) { + console.info(`deactivate_permission_test_004 persistPermission error : ${error.code}`); + } try { fileShare.deactivatePermission(policies).then(() => { - expect(false).assertTrue(); + expect(true).assertTrue(); done(); }).catch((err) => { console.info(`deactivate_permission_test_004 err : ${err.code}`); @@ -689,12 +707,9 @@ describe('FileShareJSTest', function () { } catch (error) { console.info(`check_persistent_permission_test_001 persistPermission error : ${error.code}`); } - let policyInfoB = { uri: "/data/test_002.txt", operationMode: fileShare.OperationMode.WRITE_MODE }; - let policies = [policyInfoA, policyInfoB]; try { - fileShare.checkPersistentPermission(policies).then((result) => { - expect(result[0]).assertTrue(); - expect(result[1] == false).assertTrue(); + fileShare.checkPersistentPermission(policiesA).then((result) => { + expect(true).assertTrue(); done(); }).catch((err) => { console.info(`check_persistent_permission_test_001 err : ${err.code}`); diff --git a/test/unittest/js_file_uri_test/BUILD.gn b/test/unittest/js_file_uri_test/BUILD.gn index 3a1d2cb6e..5242b2e55 100644 --- a/test/unittest/js_file_uri_test/BUILD.gn +++ b/test/unittest/js_file_uri_test/BUILD.gn @@ -13,7 +13,7 @@ import("//build/test.gni") ohos_js_unittest("FileUriTest") { - module_out_path = "filemanagement/app_file_service" + module_out_path = "app_file_service/app_file_service/file_share" hap_profile = "./config.json" diff --git a/test/unittest/remote_file_share/BUILD.gn b/test/unittest/remote_file_share/BUILD.gn index 13ca80d73..2c1246947 100644 --- a/test/unittest/remote_file_share/BUILD.gn +++ b/test/unittest/remote_file_share/BUILD.gn @@ -23,7 +23,7 @@ ohos_unittest("remote_file_share_test") { debug = false } - module_out_path = "filemanagement/app_file_service" + module_out_path = "app_file_service/app_file_service/file_share" fuzz_config_file = "${app_file_service_path}/test/fuzztest/remotefileshare_fuzzer" resource_config_file = "../resource/ohos_test.xml" diff --git a/test/unittest/resource/bundle_dependencies/fileShareA/BUILD.gn b/test/unittest/resource/bundle_dependencies/fileShareA/BUILD.gn index 742f27f3b..0d98ff331 100644 --- a/test/unittest/resource/bundle_dependencies/fileShareA/BUILD.gn +++ b/test/unittest/resource/bundle_dependencies/fileShareA/BUILD.gn @@ -18,7 +18,7 @@ ohos_hap("filesharea") { hap_name = "filesharea" subsystem_name = "filemanagement" part_name = "app_file_service" - final_hap_path = "$root_out_dir/tests/unittest/filemanagement/app_file_service/resource/${hap_name}.hap" + final_hap_path = "$root_out_dir/tests/unittest/app_file_service/app_file_service/file_share/resource/${hap_name}.hap" testonly = true deps = [ ":fileShareA_ets_assets", @@ -40,4 +40,4 @@ ohos_resources("fileShareA_ets_resources") { sources = [ "entry/src/main/resources" ] deps = [ ":fileShareA_app_profile" ] hap_profile = "entry/src/main/module.json" -} \ No newline at end of file +} diff --git a/test/unittest/resource/bundle_dependencies/fileShareB/BUILD.gn b/test/unittest/resource/bundle_dependencies/fileShareB/BUILD.gn index 7109a036f..9361510a8 100644 --- a/test/unittest/resource/bundle_dependencies/fileShareB/BUILD.gn +++ b/test/unittest/resource/bundle_dependencies/fileShareB/BUILD.gn @@ -18,7 +18,7 @@ ohos_hap("fileshareb") { hap_name = "fileshareb" subsystem_name = "filemanagement" part_name = "app_file_service" - final_hap_path = "$root_out_dir/tests/unittest/filemanagement/app_file_service/resource/${hap_name}.hap" + final_hap_path = "$root_out_dir/tests/unittest/app_file_service/app_file_service/file_share/resource/${hap_name}.hap" testonly = true deps = [ ":fileShareB_ets_assets", @@ -40,4 +40,4 @@ ohos_resources("fileShareB_ets_resources") { sources = [ "entry/src/main/resources" ] deps = [ ":fileShareB_app_profile" ] hap_profile = "entry/src/main/module.json" -} \ No newline at end of file +} 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 000000000..007e795db --- /dev/null +++ b/tests/mock/backup_kit_inner/service_client_mock.cpp @@ -0,0 +1,67 @@ +/* + * 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 d7ce74b5c..5abdac177 100644 --- a/tests/mock/backup_kit_inner/service_proxy_mock.cpp +++ b/tests/mock/backup_kit_inner/service_proxy_mock.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 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 @@ -31,7 +31,7 @@ namespace OHOS::FileManagement::Backup { using namespace std; -int32_t ServiceProxy::InitRestoreSession(sptr remote) +int32_t ServiceProxy::InitRestoreSession(const 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(const 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(const 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(const sptr& remote, std::string &errMsg) { if (!GetMockInitBackupOrRestoreSession()) { return 1; @@ -68,12 +68,13 @@ ErrCode ServiceProxy::Start() return BError(BError::Codes::OK); } -UniqueFd ServiceProxy::GetLocalCapabilities() +ErrCode ServiceProxy::GetLocalCapabilities(int &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.Release(); + 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, int 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::AppendBundlesRestoreSessionDataByDetail(int 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::AppendBundlesRestoreSessionData(int fd, + const std::vector &bundleNames, + int32_t restoreType, + int32_t userId) { return BError(BError::Codes::OK); } @@ -125,7 +126,7 @@ ErrCode ServiceProxy::AppendBundlesBackupSession(const vector &bundl } ErrCode ServiceProxy::AppendBundlesDetailsBackupSession(const std::vector &bundleNames, - const std::vector &detailInfos) + const std::vector &detailInfos) { return BError(BError::Codes::OK); } @@ -140,15 +141,16 @@ 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, int &fd) { - return UniqueFd(-1); + fd = UniqueFd(-1).Get(); + return BError(BError::Codes::OK); } ErrCode ServiceProxy::GetAppLocalListAndDoIncrementalBackup() @@ -156,23 +158,24 @@ ErrCode ServiceProxy::GetAppLocalListAndDoIncrementalBackup() return BError(BError::Codes::OK); } -ErrCode ServiceProxy::InitIncrementalBackupSession(sptr remote) +ErrCode ServiceProxy::InitIncrementalBackupSession(const sptr& remote) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::InitIncrementalBackupSession(sptr remote, std::string &errMsg) +ErrCode ServiceProxy::InitIncrementalBackupSessionWithErrMsg(const 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 +185,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, int 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, int fd, int manifestFd, int32_t errCode) { return BError(BError::Codes::OK); } @@ -202,12 +205,12 @@ ErrCode ServiceProxy::GetIncrementalFileHandle(const std::string &bundleName, co return BError(BError::Codes::OK); } -ErrCode ServiceProxy::GetBackupInfo(std::string &bundleName, std::string &result) +ErrCode ServiceProxy::GetBackupInfo(const std::string &bundleName, std::string &result) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::UpdateTimer(BundleName &bundleName, uint32_t timeout, bool &result) +ErrCode ServiceProxy::UpdateTimer(const BundleName &bundleName, uint32_t timeout, bool &result) { return BError(BError::Codes::OK); } @@ -232,58 +235,23 @@ ErrCode ServiceProxy::RefreshDataSize(int64_t totalSize) return BError(BError::Codes::OK); } -ErrCode ServiceProxy::UpdateSendRate(std::string &bundleName, int32_t sendRate, bool &result) +ErrCode ServiceProxy::UpdateSendRate(const std::string &bundleName, int32_t sendRate, bool &result) { 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() -{ - 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) +ErrCode ServiceProxy::GetLocalCapabilitiesForBundleInfos(int& fd) { - 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/include/service_reverse_proxy_mock.h b/tests/mock/module_ipc/include/service_reverse_proxy_mock.h index 55736f3f2..06afe23f5 100644 --- a/tests/mock/module_ipc/include/service_reverse_proxy_mock.h +++ b/tests/mock/module_ipc/include/service_reverse_proxy_mock.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 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 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 f883b5f92..83d363ceb 100644 --- a/tests/mock/module_ipc/include/svc_session_manager_mock.h +++ b/tests/mock/module_ipc/include/svc_session_manager_mock.h @@ -38,7 +38,7 @@ public: virtual bool GetSchedBundleName(std::string&) = 0; virtual std::string GetBackupExtName(const std::string&) = 0; virtual std::string GetBackupExtInfo(const std::string&) = 0; - virtual sptr CreateBackupConnection(BundleName&) = 0; + virtual sptr CreateBackupConnection(const BundleName&) = 0; virtual bool IsOnAllBundlesFinished() = 0; virtual bool IsOnOnStartSched() = 0; virtual bool NeedToUnloadService() = 0; @@ -86,7 +86,7 @@ public: MOCK_METHOD(bool, GetSchedBundleName, (std::string&)); MOCK_METHOD(std::string, GetBackupExtName, (const std::string&)); MOCK_METHOD(std::string, GetBackupExtInfo, (const std::string&)); - MOCK_METHOD(sptr, CreateBackupConnection, (BundleName&)); + MOCK_METHOD(sptr, CreateBackupConnection, (const BundleName&)); MOCK_METHOD(bool, IsOnAllBundlesFinished, ()); MOCK_METHOD(bool, IsOnOnStartSched, ()); MOCK_METHOD(bool, NeedToUnloadService, ()); diff --git a/tests/mock/module_ipc/service_mock.cpp b/tests/mock/module_ipc/service_mock.cpp index d88000809..34fb24895 100644 --- a/tests/mock/module_ipc/service_mock.cpp +++ b/tests/mock/module_ipc/service_mock.cpp @@ -35,12 +35,12 @@ void Service::OnStart() {} void Service::OnStop() {} -UniqueFd Service::GetLocalCapabilities() +ErrCode Service::GetLocalCapabilities(int &fd) { - return UniqueFd(-1); + return BError(BError::Codes::OK); } -UniqueFd Service::GetLocalCapabilitiesForBundleInfos() +ErrCode Service::GetLocalCapabilitiesForBundleInfos(int &fd) { return UniqueFd(-1); } @@ -52,22 +52,22 @@ ErrCode Service::VerifyCallerAndGetCallerName(std::string &bundleName) return BError(BError::Codes::OK); } -ErrCode Service::InitRestoreSession(sptr remote) +ErrCode Service::InitRestoreSession(const sptr &remote) { return BError(BError::Codes::OK); } -ErrCode Service::InitRestoreSession(sptr remote, std::string &errMsg) +ErrCode Service::InitRestoreSessionWithErrMsg(const sptr &reverseIpcRemoteObject, std::string &errMsg) { return BError(BError::Codes::OK); } -ErrCode Service::InitBackupSession(sptr remote) +ErrCode Service::InitBackupSession(const sptr &remote) { return BError(BError::Codes::OK); } -ErrCode Service::InitBackupSession(sptr remote, std::string &errMsg) +ErrCode Service::InitBackupSessionWithErrMsg(const sptr &remote, std::string &errMsg) { return BError(BError::Codes::OK); } @@ -82,7 +82,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, int fd, int32_t errCode) { return BError(BError::Codes::OK); } @@ -92,22 +92,25 @@ 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); } -ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, const std::vector &bundleNames, - const std::vector &detailInfos, RestoreTypeEnum restoreType, int32_t userId) +ErrCode Service::AppendBundlesRestoreSessionDataByDetail(int fd, + const std::vector &bundleNames, + const std::vector &detailInfos, + int32_t 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::AppendBundlesRestoreSessionData(int fd, + const std::vector &bundleNames, + int32_t restoreType, + int32_t userId) { return BError(BError::Codes::OK); } @@ -118,7 +121,7 @@ ErrCode Service::AppendBundlesBackupSession(const std::vector &bundl } ErrCode Service::AppendBundlesDetailsBackupSession(const std::vector &bundleNames, - const std::vector &bundleInfos) + const std::vector &bundleInfos) { return BError(BError::Codes::OK); } @@ -186,15 +189,15 @@ 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, int &fd) { - return UniqueFd(-1); + return BError(BError::Codes::OK); } ErrCode Service::GetAppLocalListAndDoIncrementalBackup() @@ -202,12 +205,12 @@ ErrCode Service::GetAppLocalListAndDoIncrementalBackup() return BError(BError::Codes::OK); } -ErrCode Service::InitIncrementalBackupSession(sptr remote) +ErrCode Service::InitIncrementalBackupSession(const sptr &remote) { return BError(BError::Codes::OK); } -ErrCode Service::InitIncrementalBackupSession(sptr remote, std::string &errMsg) +ErrCode Service::InitIncrementalBackupSessionWithErrMsg(const sptr &remote, std::string &errMsg) { return BError(BError::Codes::OK); } @@ -217,8 +220,9 @@ ErrCode Service::AppendBundlesIncrementalBackupSession(const std::vector &bundlesToBackup, - const std::vector &infos) +ErrCode Service::AppendBundlesIncrementalBackupSessionWithBundleInfos( + const std::vector &bundlesToBackup, + const std::vector &bundleInfos) { return BError(BError::Codes::OK); } @@ -228,12 +232,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, int 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, + int fd, + int manifestFd, + int32_t appIncrementalFileReadyErrCode) { return BError(BError::Codes::OK); } @@ -248,7 +255,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(const BundleName &bundleName, std::string &result) { return BError(BError::Codes::OK); } @@ -273,17 +280,17 @@ ErrCode Service::RefreshDataSize(int64_t totalDatasize) return BError(BError::Codes::OK); } -ErrCode Service::UpdateTimer(BundleName &bundleName, uint32_t timeout, bool &result) +ErrCode Service::UpdateTimer(const BundleName &bundleName, uint32_t timeout, bool &result) { return BError(BError::Codes::OK); } -ErrCode Service::UpdateSendRate(std::string &bundleName, int32_t sendRate, bool &result) +ErrCode Service::UpdateSendRate(const std::string &bundleName, int32_t sendRate, bool &result) { 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); } @@ -384,7 +391,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_stub_mock.cpp b/tests/mock/module_ipc/service_stub_mock.cpp index 46c716827..c6c2462ea 100644 --- a/tests/mock/module_ipc/service_stub_mock.cpp +++ b/tests/mock/module_ipc/service_stub_mock.cpp @@ -13,384 +13,18 @@ * limitations under the License. */ -#include "module_ipc/service_stub.h" - -#include - -#include "b_error/b_error.h" -#include "b_resources/b_constants.h" -#include "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) -{ - 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")); - } - 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")); + std::u16string localDescriptor = GetDescriptor(); + std::u16string remoteDescriptor = data.ReadInterfaceToken(); + if (localDescriptor != remoteDescriptor) { + return ERR_TRANSACTION_FAILED; + } else { + return IPCObjectStub::OnRemoteRequest(code, data, reply, option); } - 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"); - } - 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); } } // 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 deleted file mode 100644 index 2d46ff3ea..000000000 --- a/tests/mock/module_ipc/src/service_stub_mock.cpp +++ /dev/null @@ -1,184 +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_stub.h" -#include "service_stub_mock.h" - -namespace OHOS::FileManagement::Backup { -using namespace std; - -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::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 6339aed08..017a8e9b4 100644 --- a/tests/mock/module_ipc/src/svc_session_manager_mock.cpp +++ b/tests/mock/module_ipc/src/svc_session_manager_mock.cpp @@ -132,7 +132,7 @@ void SvcSessionManager::SetBundleUserId(const string &bundleName, const int32_t void SvcSessionManager::AppendBundles(const vector &, vector &) {} -sptr SvcSessionManager::CreateBackupConnection(BundleName &bundleName) +sptr SvcSessionManager::CreateBackupConnection(const BundleName &bundleName) { return BSvcSessionManager::sessionManager->CreateBackupConnection(bundleName); } diff --git a/tests/mock/module_ipc/svc_session_manager_mock.cpp b/tests/mock/module_ipc/svc_session_manager_mock.cpp index fc29b081a..61a2c2eb7 100644 --- a/tests/mock/module_ipc/svc_session_manager_mock.cpp +++ b/tests/mock/module_ipc/svc_session_manager_mock.cpp @@ -257,7 +257,7 @@ void SvcSessionManager::AppendBundles(const vector &bundleNames, vec impl_.backupExtNameMap.insert(make_pair("com.example.app2backup", info)); } -sptr SvcSessionManager::CreateBackupConnection(BundleName &bundleName) +sptr SvcSessionManager::CreateBackupConnection(const BundleName &bundleName) { GTEST_LOG_(INFO) << "CreateBackupConnection"; return GetBackupAbilityExt(bundleName); 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 f4e0acd03..fdec296b7 100644 --- a/tests/mock/module_ipc/svc_session_manager_throw_mock.cpp +++ b/tests/mock/module_ipc/svc_session_manager_throw_mock.cpp @@ -155,7 +155,7 @@ void SvcSessionManager::AppendBundles(const vector &bundleNames, vec BackupSvcSessionManager::session->AppendBundles(bundleNames, failedBundles); } -sptr SvcSessionManager::CreateBackupConnection(BundleName &bundleName) +sptr SvcSessionManager::CreateBackupConnection(const BundleName &bundleName) { return BackupSvcSessionManager::session->CreateBackupConnection(bundleName); } 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 dc96aa6e6..effea3050 100644 --- a/tests/mock/module_ipc/svc_session_manager_throw_mock.h +++ b/tests/mock/module_ipc/svc_session_manager_throw_mock.h @@ -53,7 +53,7 @@ public: virtual void SetBackupExtName(const std::string &, const std::string &) = 0; virtual std::weak_ptr GetSAExtConnection(const BundleName &) = 0; virtual void AppendBundles(const std::vector &, std::vector &) = 0; - virtual sptr CreateBackupConnection(BundleName &) = 0; + virtual sptr CreateBackupConnection(const BundleName &) = 0; virtual ErrCode Start() = 0; virtual ErrCode Finish() = 0; virtual bool IsOnAllBundlesFinished() = 0; @@ -130,7 +130,7 @@ public: MOCK_METHOD(void, SetBackupExtName, (const std::string &, const std::string &)); MOCK_METHOD(std::weak_ptr, GetSAExtConnection, (const BundleName &)); MOCK_METHOD(void, AppendBundles, (const std::vector &, std::vector &)); - MOCK_METHOD(sptr, CreateBackupConnection, (BundleName &)); + MOCK_METHOD(sptr, CreateBackupConnection, (const BundleName &)); MOCK_METHOD(ErrCode, Start, ()); MOCK_METHOD(ErrCode, Finish, ()); MOCK_METHOD(bool, IsOnAllBundlesFinished, ()); diff --git a/tests/mock/napi/include/napi_mock.h b/tests/mock/napi/include/napi_mock.h index 907a39ebc..68716848b 100644 --- a/tests/mock/napi/include/napi_mock.h +++ b/tests/mock/napi/include/napi_mock.h @@ -31,12 +31,12 @@ class Napi { public: virtual ~Napi() = default; public: - virtual napi_status napi_get_uv_event_loop(napi_env, struct uv_loop_s**) = 0; virtual napi_status napi_call_function(napi_env, napi_value, napi_value, size_t, const napi_value*, napi_value*) = 0; virtual napi_status napi_get_reference_value(napi_env, napi_ref, napi_value*) = 0; virtual napi_status napi_get_named_property(napi_env, napi_value, const char*, napi_value*) = 0; - virtual napi_status napi_send_event(napi_env, const std::function, napi_event_priority) = 0; + virtual napi_status napi_send_cancelable_event(napi_env, const std::function&, void*, + napi_event_priority, uint64_t*, const char*) = 0; virtual napi_status napi_get_value_int32(napi_env, napi_value, int32_t*) = 0; virtual napi_status napi_get_value_int64(napi_env, napi_value, int64_t*) = 0; virtual napi_status napi_create_string_utf8(napi_env, const char*, size_t, napi_value*) = 0; @@ -68,12 +68,12 @@ public: class NapiMock : public Napi { public: - MOCK_METHOD(napi_status, napi_get_uv_event_loop, (napi_env, struct uv_loop_s**)); MOCK_METHOD(napi_status, napi_call_function, (napi_env, napi_value, napi_value, size_t, const napi_value*, napi_value*)); MOCK_METHOD(napi_status, napi_get_reference_value, (napi_env, napi_ref, napi_value*)); MOCK_METHOD(napi_status, napi_get_named_property, (napi_env, napi_value, const char*, napi_value*)); - MOCK_METHOD(napi_status, napi_send_event, (napi_env, const std::function, napi_event_priority)); + MOCK_METHOD(napi_status, napi_send_cancelable_event, (napi_env, (const std::function&), void*, + napi_event_priority, uint64_t*, const char*)); MOCK_METHOD(napi_status, napi_get_value_int32, (napi_env, napi_value, int32_t*)); MOCK_METHOD(napi_status, napi_get_value_int64, (napi_env, napi_value, int64_t*)); MOCK_METHOD(napi_status, napi_create_int64, (napi_env, int64_t, napi_value*)); diff --git a/tests/mock/napi/src/napi_mock.cpp b/tests/mock/napi/src/napi_mock.cpp index 5274eecb4..d57634b32 100644 --- a/tests/mock/napi/src/napi_mock.cpp +++ b/tests/mock/napi/src/napi_mock.cpp @@ -16,14 +16,11 @@ #include "napi_mock.h" #include "uv.h" -napi_status napi_send_event(napi_env env, const std::function cb, napi_event_priority priority) +napi_status napi_send_cancelable_event(napi_env env, const std::function& cb, void* data, + napi_event_priority priority, uint64_t* handleId, const char* name) { - return OHOS::FileManagement::Backup::Napi::napi->napi_send_event(env, cb, priority); -} - -napi_status napi_get_uv_event_loop(napi_env env, struct uv_loop_s** loop) -{ - return OHOS::FileManagement::Backup::Napi::napi->napi_get_uv_event_loop(env, loop); + return OHOS::FileManagement::Backup::Napi::napi->napi_send_cancelable_event(env, cb, data, priority, handleId, + name); } napi_status napi_call_function(napi_env env, napi_value recv, napi_value func, size_t argc, const napi_value* argv, diff --git a/tests/moduletests/backup_kit_inner/BUILD.gn b/tests/moduletests/backup_kit_inner/BUILD.gn index 6c8bbf411..dd14e6d8b 100644 --- a/tests/moduletests/backup_kit_inner/BUILD.gn +++ b/tests/moduletests/backup_kit_inner/BUILD.gn @@ -25,6 +25,7 @@ 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}/tests/mock/backup_kit_inner/service_client_mock.cpp", "b_session_backup_test.cpp", "b_session_restore_async_test.cpp", "b_session_restore_test.cpp", @@ -42,6 +43,7 @@ ohos_unittest("b_session_test") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", + "${path_backup}/services/backup_sa:backup_sa_ipc_stub", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", ] diff --git a/tests/moduletests/backup_tool/tool_help_test.cpp b/tests/moduletests/backup_tool/tool_help_test.cpp index 26ad00ab1..3b6dc6cbd 100644 --- a/tests/moduletests/backup_tool/tool_help_test.cpp +++ b/tests/moduletests/backup_tool/tool_help_test.cpp @@ -35,7 +35,7 @@ public: * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(ToolsTest, tool_help_0100, testing::ext::TestSize.Level0) +HWTEST_F(ToolsTest, tool_help_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "ToolsTest-begin tool_help_0100"; try { @@ -60,7 +60,7 @@ HWTEST_F(ToolsTest, tool_help_0100, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(ToolsTest, tool_help_0200, testing::ext::TestSize.Level0) +HWTEST_F(ToolsTest, tool_help_0200, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "ToolsTest-begin tool_help_0200"; try { diff --git a/tests/unittests/BUILD.gn b/tests/unittests/BUILD.gn index 082474e55..2467ce9a4 100644 --- a/tests/unittests/BUILD.gn +++ b/tests/unittests/BUILD.gn @@ -21,7 +21,7 @@ group("unittests") { "backup_api:backup_api_test", "backup_ext:backup_ext_test", "backup_sa:backup_sa_test", - "backup_tools:backup_test", - "backup_utils:backup_test", + "backup_tools:backup_tools_test", + "backup_utils:backup_utils_test", ] } diff --git a/tests/unittests/backup_api/backup_impl/BUILD.gn b/tests/unittests/backup_api/backup_impl/BUILD.gn index 9055dc30d..881b0e1ac 100644 --- a/tests/unittests/backup_api/backup_impl/BUILD.gn +++ b/tests/unittests/backup_api/backup_impl/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 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 @@ -53,7 +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_test.cpp", "svc_death_recipient_test.cpp", ] 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 d5371dae2..8694c8f4d 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 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 @@ -22,7 +22,7 @@ #include #include "b_error/b_error.h" -#include "i_service.h" +#include "iservice.h" #include "b_resources/b_constants.h" #include "iremote_stub.h" #include "test_manager.h" 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 1d2effa5c..cf41dc966 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 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 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 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 0032e8d1a..000000000 --- a/tests/unittests/backup_api/backup_impl/service_proxy_test.cpp +++ /dev/null @@ -1,1526 +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"; -} - -/** - * @tc.number: SUB_Service_proxy_RefreshDataSize_0100 - * @tc.name: SUB_Service_proxy_RefreshDataSize_0100 - * @tc.desc: 测试 RefreshDataSize 调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_RefreshDataSize_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_RefreshDataSize_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_RefreshDataSize_0100 proxy_ == nullptr"; - return; - } - int64_t totalSize = 0; - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(EPERM)); - ErrCode ret = proxy_->RefreshDataSize(totalSize); - EXPECT_EQ(ret, BError(BError::Codes::SDK_INVAL_ARG)); - - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)).WillOnce(Return(NO_ERROR)); - ret = proxy_->RefreshDataSize(totalSize); - EXPECT_EQ(ret, BError(BError::Codes::SDK_INVAL_ARG)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_RefreshDataSize_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_GetLocalCapabilitiesForBundleInfos_0100 - * @tc.name: SUB_Service_proxy_GetLocalCapabilitiesForBundleInfos_0100 - * @tc.desc: 测试 GetLocalCapabilitiesForBundleInfos 调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_GetLocalCapabilitiesForBundleInfos_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_GetLocalCapabilitiesForBundleInfos_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_GetLocalCapabilitiesForBundleInfos_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - ErrCode ret = proxy_->GetLocalCapabilitiesForBundleInfos(); - EXPECT_NE(ret, BError(BError::Codes::OK)); - ret = proxy_->GetLocalCapabilitiesForBundleInfos(); - EXPECT_NE(ret, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_GetLocalCapabilitiesForBundleInfos_0100"; -} - -/** - * @tc.number: SUB_Service_proxy_GetBackupDataSize_0100 - * @tc.name: SUB_Service_proxy_GetBackupDataSize_0100 - * @tc.desc: 测试 GetBackupDataSize 调用成功和失败 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I90ZV5 - */ -HWTEST_F(ServiceProxyTest, SUB_Service_proxy_GetBackupDataSize_0100, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_GetBackupDataSize_0100"; - if (proxy_ == nullptr) { - GTEST_LOG_(INFO) << "SUB_Service_proxy_GetBackupDataSize_0100 proxy_ == nullptr"; - return; - } - EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - bool isPreciseScan = true; - vector bundleNameList; - ErrCode ret = proxy_->GetBackupDataSize(isPreciseScan, bundleNameList); - EXPECT_EQ(ret, BError(BError::Codes::OK)); - ret = proxy_->GetBackupDataSize(isPreciseScan, bundleNameList); - EXPECT_NE(ret, BError(BError::Codes::OK)); - GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_GetBackupDataSize_0100"; -} -} // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/tests/unittests/backup_ext/BUILD.gn b/tests/unittests/backup_ext/BUILD.gn index a45cb3567..6f7ccfd35 100644 --- a/tests/unittests/backup_ext/BUILD.gn +++ b/tests/unittests/backup_ext/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 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 @@ -25,11 +25,7 @@ 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", - ] + sources = [ "ext_extension_test.cpp" ] include_dirs = [ "${path_backup}/frameworks/native/backup_ext/include", @@ -41,7 +37,7 @@ ohos_unittest("ext_extension_test") { ] deps = [ - "${path_backup}/services/backup_sa:backup_sa_ipc", + "${path_backup}/services/backup_sa:backup_sa_ipc_stub", "${path_backup}/utils:backup_utils", "${path_jsoncpp}:jsoncpp", "//third_party/googletest:gtest_main", @@ -120,7 +116,7 @@ ohos_unittest("tar_file_test") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", - "${path_backup}/services/backup_sa:backup_sa_ipc", + "${path_backup}/services/backup_sa:backup_sa_ipc_stub", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", @@ -200,6 +196,7 @@ ohos_unittest("untar_file_sup_test") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", + "${path_backup}/services/backup_sa:backup_sa_ipc_stub", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", @@ -273,7 +270,7 @@ ohos_unittest("untar_file_test") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", - "${path_backup}/services/backup_sa:backup_sa_ipc", + "${path_backup}/services/backup_sa:backup_sa_ipc_stub", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", @@ -338,7 +335,7 @@ ohos_unittest("ext_backup_js_test") { ] deps = [ - "${path_backup}/services/backup_sa:backup_sa_ipc", + "${path_backup}/services/backup_sa:backup_sa_ipc_stub", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", "${path_googletest}:gtest_main", diff --git a/tests/unittests/backup_ext/ext_backup_js_test.cpp b/tests/unittests/backup_ext/ext_backup_js_test.cpp index a404b0cc1..c55a76ae4 100644 --- a/tests/unittests/backup_ext/ext_backup_js_test.cpp +++ b/tests/unittests/backup_ext/ext_backup_js_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2024-2025 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 @@ -988,17 +988,10 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_CallJsMethod_0100, testing::ext::Tes { GTEST_LOG_(INFO) << "ExtBackupJsTest-begin SUB_backup_ext_js_CallJsMethod_0100"; try { - extBackupJs->jsObj_ = make_unique(); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_invalid_arg)); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); auto ret = extBackupJs->CallJsMethod("", *jsRuntime, extBackupJs->jsObj_.get(), nullptr, nullptr); EXPECT_EQ(ret, EINVAL); - - EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); - ret = extBackupJs->CallJsMethod("", *jsRuntime, extBackupJs->jsObj_.get(), nullptr, nullptr); - EXPECT_EQ(ret, EINVAL); } catch (...) { EXPECT_TRUE(false); GTEST_LOG_(INFO) << "ExtBackupJsTest-an exception occurred by CallJsMethod."; @@ -1209,26 +1202,19 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_CallJsOnBackupEx_0100, testing::ext: { GTEST_LOG_(INFO) << "ExtBackupJsTest-begin SUB_backup_ext_js_CallJsOnBackupEx_0100"; try { - EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_invalid_arg)); - auto ret = extBackupJs->CallJsOnBackupEx(); - EXPECT_EQ(ret, EINVAL); - extBackupJs->callbackInfoEx_ = std::make_shared([](ErrCode, std::string){}); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_exception_pending(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_get_value_string_utf8(_, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); - ret = extBackupJs->CallJsOnBackupEx(); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); + auto ret = extBackupJs->CallJsOnBackupEx(); EXPECT_EQ(ret, EINVAL); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_exception_pending(_, _)) .WillOnce(DoAll(SetArgPointee(true), Return(napi_ok))); EXPECT_CALL(*napiMock, napi_get_and_clear_last_exception(_, _)).WillOnce(Return(napi_invalid_arg)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); ret = extBackupJs->CallJsOnBackupEx(); EXPECT_EQ(ret, EINVAL); } catch (...) { @@ -1253,13 +1239,12 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_CallJsOnBackupEx_0200, testing::ext: try { extBackupJs->callbackInfoEx_ = std::make_shared([](ErrCode, std::string){}); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_promise(_, _, _)) .WillOnce(DoAll(SetArgPointee(true), Return(napi_ok))); EXPECT_CALL(*napiMock, napi_open_handle_scope(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_close_handle_scope(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_get_named_property(_, _, _, _)).WillOnce(Return(napi_invalid_arg)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); auto ret = extBackupJs->CallJsOnBackupEx(); EXPECT_EQ(ret, EINVAL); } catch (...) { @@ -1282,25 +1267,18 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_CallJsOnBackup_0100, testing::ext::T { GTEST_LOG_(INFO) << "ExtBackupJsTest-begin SUB_backup_ext_js_CallJsOnBackup_0100"; try { - EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_invalid_arg)); - auto ret = extBackupJs->CallJsOnBackup(); - EXPECT_EQ(ret, EINVAL); - extBackupJs->callbackInfo_ = std::make_shared([](ErrCode, std::string){}); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_exception_pending(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); - ret = extBackupJs->CallJsOnBackup(); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); + auto ret = extBackupJs->CallJsOnBackup(); EXPECT_EQ(ret, EINVAL); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_exception_pending(_, _)) .WillOnce(DoAll(SetArgPointee(true), Return(napi_ok))); EXPECT_CALL(*napiMock, napi_get_and_clear_last_exception(_, _)).WillOnce(Return(napi_invalid_arg)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); ret = extBackupJs->CallJsOnBackup(); EXPECT_EQ(ret, EINVAL); } catch (...) { @@ -1325,13 +1303,12 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_CallJsOnBackup_0200, testing::ext::T try { extBackupJs->callbackInfo_ = std::make_shared([](ErrCode, std::string){}); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_promise(_, _, _)) .WillOnce(DoAll(SetArgPointee(true), Return(napi_ok))); EXPECT_CALL(*napiMock, napi_open_handle_scope(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_close_handle_scope(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_get_named_property(_, _, _, _)).WillOnce(Return(napi_invalid_arg)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); auto ret = extBackupJs->CallJsOnBackup(); EXPECT_EQ(ret, EINVAL); } catch (...) { @@ -1354,26 +1331,19 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_CallJSRestoreEx_0100, testing::ext:: { GTEST_LOG_(INFO) << "ExtBackupJsTest-begin SUB_backup_ext_js_CallJSRestoreEx_0100"; try { - EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_invalid_arg)); - auto ret = extBackupJs->CallJSRestoreEx(); - EXPECT_EQ(ret, EINVAL); - extBackupJs->callbackInfoEx_ = std::make_shared([](ErrCode, std::string){}); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_exception_pending(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_get_value_string_utf8(_, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); - ret = extBackupJs->CallJSRestoreEx(); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); + auto ret = extBackupJs->CallJSRestoreEx(); EXPECT_EQ(ret, EINVAL); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_exception_pending(_, _)) .WillOnce(DoAll(SetArgPointee(true), Return(napi_ok))); EXPECT_CALL(*napiMock, napi_get_and_clear_last_exception(_, _)).WillOnce(Return(napi_invalid_arg)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); ret = extBackupJs->CallJSRestoreEx(); EXPECT_EQ(ret, EINVAL); } catch (...) { @@ -1398,13 +1368,12 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_CallJSRestoreEx_0200, testing::ext:: try { extBackupJs->callbackInfoEx_ = std::make_shared([](ErrCode, std::string){}); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_promise(_, _, _)) .WillOnce(DoAll(SetArgPointee(true), Return(napi_ok))); EXPECT_CALL(*napiMock, napi_open_handle_scope(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_close_handle_scope(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_get_named_property(_, _, _, _)).WillOnce(Return(napi_invalid_arg)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); auto ret = extBackupJs->CallJSRestoreEx(); EXPECT_EQ(ret, EINVAL); } catch (...) { @@ -1427,25 +1396,18 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_CallJSRestore_0100, testing::ext::Te { GTEST_LOG_(INFO) << "ExtBackupJsTest-begin SUB_backup_ext_js_CallJSRestore_0100"; try { - EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_invalid_arg)); - auto ret = extBackupJs->CallJSRestore(); - EXPECT_EQ(ret, EINVAL); - extBackupJs->callbackInfo_ = std::make_shared([](ErrCode, std::string){}); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_exception_pending(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); - ret = extBackupJs->CallJSRestore(); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); + auto ret = extBackupJs->CallJSRestore(); EXPECT_EQ(ret, EINVAL); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_exception_pending(_, _)) .WillOnce(DoAll(SetArgPointee(true), Return(napi_ok))); EXPECT_CALL(*napiMock, napi_get_and_clear_last_exception(_, _)).WillOnce(Return(napi_invalid_arg)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); ret = extBackupJs->CallJSRestore(); EXPECT_EQ(ret, EINVAL); } catch (...) { @@ -1470,13 +1432,12 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_CallJSRestore_0200, testing::ext::Te try { extBackupJs->callbackInfo_ = std::make_shared([](ErrCode, std::string){}); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_promise(_, _, _)) .WillOnce(DoAll(SetArgPointee(true), Return(napi_ok))); EXPECT_CALL(*napiMock, napi_open_handle_scope(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_close_handle_scope(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_get_named_property(_, _, _, _)).WillOnce(Return(napi_invalid_arg)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); auto ret = extBackupJs->CallJSRestore(); EXPECT_EQ(ret, EINVAL); } catch (...) { @@ -1499,18 +1460,11 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_GetBackupInfo_0100, testing::ext::Te { GTEST_LOG_(INFO) << "ExtBackupJsTest-begin SUB_backup_ext_js_GetBackupInfo_0100"; try { - extBackupJs->jsObj_ = make_unique(); - EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_invalid_arg)); - auto ret = extBackupJs->GetBackupInfo([](ErrCode, std::string){}); - EXPECT_EQ(ret, EINVAL); - EXPECT_CALL(*napiMock, napi_is_exception_pending(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_get_value_string_utf8(_, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); - ret = extBackupJs->GetBackupInfo([](ErrCode, std::string){}); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); + auto ret = extBackupJs->GetBackupInfo([](ErrCode, std::string){}); EXPECT_EQ(ret, EINVAL); } catch (...) { EXPECT_TRUE(false); @@ -1535,21 +1489,19 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_GetBackupInfo_0200, testing::ext::Te extBackupJs->jsObj_ = make_unique(); EXPECT_CALL(*napiMock, napi_is_exception_pending(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_get_value_string_utf8(_, _, _, _, _)).WillOnce(Return(napi_ok)) .WillOnce(Return(napi_ok)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); auto ret = extBackupJs->GetBackupInfo([](ErrCode, std::string){}); EXPECT_EQ(ret, EINVAL); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_promise(_, _, _)) .WillOnce(DoAll(SetArgPointee(true), Return(napi_ok))); EXPECT_CALL(*napiMock, napi_open_handle_scope(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_close_handle_scope(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_get_named_property(_, _, _, _)).WillOnce(Return(napi_invalid_arg)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); ret = extBackupJs->GetBackupInfo([](ErrCode, std::string){}); EXPECT_EQ(ret, EINVAL); } catch (...) { @@ -1572,18 +1524,11 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_OnProcess_0100, testing::ext::TestSi { GTEST_LOG_(INFO) << "ExtBackupJsTest-begin SUB_backup_ext_js_OnProcess_0100"; try { - extBackupJs->jsObj_ = make_unique(); - EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_invalid_arg)); - auto ret = extBackupJs->OnProcess([](ErrCode, std::string){}); - EXPECT_EQ(ret, EINVAL); - EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_exception_pending(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_get_value_string_utf8(_, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); - ret = extBackupJs->OnProcess([](ErrCode, std::string){}); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); + auto ret = extBackupJs->OnProcess([](ErrCode, std::string){}); EXPECT_EQ(ret, EINVAL); } catch (...) { EXPECT_TRUE(false); @@ -1606,18 +1551,16 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_OnProcess_0200, testing::ext::TestSi GTEST_LOG_(INFO) << "ExtBackupJsTest-begin SUB_backup_ext_js_OnProcess_0200"; try { EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_exception_pending(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_get_value_string_utf8(_, _, _, _, _)).WillOnce(Return(napi_ok)) .WillOnce(Return(napi_ok)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); auto ret = extBackupJs->OnProcess([](ErrCode, std::string){}); EXPECT_EQ(ret, EINVAL); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_exception_pending(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); ret = extBackupJs->OnProcess([](ErrCode, std::string){}); EXPECT_EQ(ret, EINVAL); } catch (...) { @@ -1626,4 +1569,40 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_OnProcess_0200, testing::ext::TestSi } GTEST_LOG_(INFO) << "ExtBackupJsTest-end SUB_backup_ext_js_OnProcess_0200"; } + +/** + * @tc.number: SUB_backup_ext_js_InitTempPath_0100 + * @tc.name: SUB_backup_ext_js_InitTempPath_0100 + * @tc.desc: 测试 InitTempPath 各个分支成功与失败 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: issuesIAFBOS + */ +HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_InitTempPath_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ExtBackupJsTest-begin SUB_backup_ext_js_InitTempPath_0100"; + try { + std::string el2BackupDir(BConstants::PATH_BUNDLE_BACKUP_HOME); + int ret = access(el2BackupDir.c_str(), F_OK); + EXPECT_TRUE(ret != F_OK); + std::string el1BackupDir(BConstants::PATH_BUNDLE_BACKUP_HOME_EL1); + ret = access(el1BackupDir.c_str(), F_OK); + EXPECT_TRUE(ret != F_OK); + std::string bundleName = "testBundleName"; + extBackupJs->InitTempPath(bundleName); + ret = access(el2BackupDir.c_str(), F_OK); + EXPECT_EQ(ret, F_OK); + ret = access(el1BackupDir.c_str(), F_OK); + EXPECT_EQ(ret, F_OK); + std::string el2RootPath = BConstants::BACKUP_DIR_PRE + BConstants::CONTEXT_ELS[0]; // 0: {"el1", "el2"}中的el1 + std::string el1RootPath = BConstants::BACKUP_DIR_PRE + BConstants::CONTEXT_ELS[1]; // 1: {"el1", "el2"}中的el2 + ForceRemoveDirectoryBMS(el2RootPath); + ForceRemoveDirectoryBMS(el1RootPath); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "ExtBackupJsTest-an exception occurred by OnProcess."; + } + GTEST_LOG_(INFO) << "ExtBackupJsTest-end SUB_backup_ext_js_InitTempPath_0100"; +} } // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/tests/unittests/backup_ext/ext_extension_test.cpp b/tests/unittests/backup_ext/ext_extension_test.cpp index 204661ec8..ca36c7b7c 100644 --- a/tests/unittests/backup_ext/ext_extension_test.cpp +++ b/tests/unittests/backup_ext/ext_extension_test.cpp @@ -592,4 +592,66 @@ HWTEST_F(ExtExtensionTest, Ext_Extension_Test_1000, testing::ext::TestSize.Level } GTEST_LOG_(INFO) << "ExtExtensionTest-end Ext_Extension_Test_1000"; } + +/** + * @tc.number: SUB_Ext_Extension_1100 + * @tc.name: Ext_Extension_Test_1100 + * @tc.desc: 测试 GetFileHandleForSpecialCloneCloud + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I9P3Y3 + */ +HWTEST_F(ExtExtensionTest, Ext_Extension_Test_1100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ExtExtensionTest-begin Ext_Extension_Test_1100"; + try { + ErrCode errCode = ERR_OK; + int64_t cost = 0; + uint32_t includeNum = 0; + uint32_t excludeNum = 0; + AppRadar::DoBackupInfo backupInfo = {cost, 0, 0, 0, includeNum, excludeNum}; + RecordDoBackupRes(BUNDLE_NAME, errCode, backupInfo); + + cost = BConstants::MAX_TIME_COST; + includeNum = BConstants::MAX_INEXCLUDE_SIZE; + backupInfo = {cost, 0, 0, 0, includeNum, excludeNum}; + RecordDoBackupRes(BUNDLE_NAME, errCode, backupInfo); + + errCode = BError(BError::Codes::EXT_BROKEN_IPC); + RecordDoBackupRes(BUNDLE_NAME, errCode, backupInfo); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "ExtExtensionTest-an exception occurred by construction."; + } + GTEST_LOG_(INFO) << "ExtExtensionTest-end Ext_Extension_Test_1100"; +} + +/** + * @tc.number: SUB_Ext_Extension_1200 + * @tc.name: Ext_Extension_Test_1200 + * @tc.desc: 测试 GetFileHandleForSpecialCloneCloud + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I9P3Y3 + */ +HWTEST_F(ExtExtensionTest, Ext_Extension_Test_1200, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ExtExtensionTest-begin Ext_Extension_Test_1200"; + try { + const string fileName = "1.txt"; + string tarName = "2.tar"; + auto ret = GetIncrementalFileHandlePath(fileName, BUNDLE_NAME, tarName); + EXPECT_NE(ret, ERR_OK); + ret = GetIncrementalFileHandlePath(fileName, BConstants::BUNDLE_FILE_MANAGER, tarName); + EXPECT_NE(ret, ERR_OK); + ret = GetIncrementalFileHandlePath(fileName, BConstants::BUNDLE_MEDIAL_DATA, tarName); + EXPECT_NE(ret, ERR_OK); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "ExtExtensionTest-an exception occurred by construction."; + } + GTEST_LOG_(INFO) << "ExtExtensionTest-end Ext_Extension_Test_1200"; +} } // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/tests/unittests/backup_ext/external_ext_backup_js_test.cpp b/tests/unittests/backup_ext/external_ext_backup_js_test.cpp index 79d551a7c..139ebbb64 100644 --- a/tests/unittests/backup_ext/external_ext_backup_js_test.cpp +++ b/tests/unittests/backup_ext/external_ext_backup_js_test.cpp @@ -816,16 +816,9 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_CallJsMethod_0100, testing::ext::Tes { GTEST_LOG_(INFO) << "ExtBackupJsTest-begin SUB_backup_ext_js_CallJsMethod_0100"; try { - extBackupJs->jsObj_ = make_unique(); - EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_invalid_arg)); - auto ret = extBackupJs->CallJsMethod("", *jsRuntime, extBackupJs->jsObj_.get(), nullptr, nullptr); - EXPECT_EQ(ret, EINVAL); - EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); - ret = extBackupJs->CallJsMethod("", *jsRuntime, extBackupJs->jsObj_.get(), nullptr, nullptr); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); + auto ret = extBackupJs->CallJsMethod("", *jsRuntime, extBackupJs->jsObj_.get(), nullptr, nullptr); EXPECT_EQ(ret, EINVAL); } catch (...) { EXPECT_TRUE(false); diff --git a/tests/unittests/backup_ext/tests/unittests/backup_ext/ext_backup_js_external_test.cpp b/tests/unittests/backup_ext/tests/unittests/backup_ext/ext_backup_js_external_test.cpp index c9b08a3b4..13f224829 100644 --- a/tests/unittests/backup_ext/tests/unittests/backup_ext/ext_backup_js_external_test.cpp +++ b/tests/unittests/backup_ext/tests/unittests/backup_ext/ext_backup_js_external_test.cpp @@ -817,15 +817,9 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_CallJsMethod_0100, testing::ext::Tes GTEST_LOG_(INFO) << "ExtBackupJsTest-begin SUB_backup_ext_js_CallJsMethod_0100"; try { extBackupJs->jsObj_ = make_unique(); - EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_invalid_arg)); - auto ret = extBackupJs->CallJsMethod("", *jsRuntime, extBackupJs->jsObj_.get(), nullptr, nullptr); - EXPECT_EQ(ret, EINVAL); - EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); - ret = extBackupJs->CallJsMethod("", *jsRuntime, extBackupJs->jsObj_.get(), nullptr, nullptr); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); + auto ret = extBackupJs->CallJsMethod("", *jsRuntime, extBackupJs->jsObj_.get(), nullptr, nullptr); EXPECT_EQ(ret, EINVAL); } catch (...) { EXPECT_TRUE(false); @@ -1059,26 +1053,19 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_CallJsOnBackupEx_0100, testing::ext: { GTEST_LOG_(INFO) << "ExtBackupJsTest-begin SUB_backup_ext_js_CallJsOnBackupEx_0100"; try { - EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_invalid_arg)); - auto ret = extBackupJs->CallJsOnBackupEx(); - EXPECT_EQ(ret, EINVAL); - extBackupJs->callbackInfoEx_ = std::make_shared([](ErrCode, std::string){}); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_exception_pending(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_get_value_string_utf8(_, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); - ret = extBackupJs->CallJsOnBackupEx(); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); + auto ret = extBackupJs->CallJsOnBackupEx(); EXPECT_EQ(ret, EINVAL); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_exception_pending(_, _)) .WillOnce(DoAll(SetArgPointee(true), Return(napi_ok))); EXPECT_CALL(*napiMock, napi_get_and_clear_last_exception(_, _)).WillOnce(Return(napi_invalid_arg)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); ret = extBackupJs->CallJsOnBackupEx(); EXPECT_EQ(ret, EINVAL); } catch (...) { @@ -1103,13 +1090,12 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_CallJsOnBackupEx_0200, testing::ext: try { extBackupJs->callbackInfoEx_ = std::make_shared([](ErrCode, std::string){}); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_promise(_, _, _)) .WillOnce(DoAll(SetArgPointee(true), Return(napi_ok))); EXPECT_CALL(*napiMock, napi_open_handle_scope(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_close_handle_scope(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_get_named_property(_, _, _, _)).WillOnce(Return(napi_invalid_arg)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); auto ret = extBackupJs->CallJsOnBackupEx(); EXPECT_EQ(ret, EINVAL); } catch (...) { @@ -1132,25 +1118,18 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_CallJsOnBackup_0100, testing::ext::T { GTEST_LOG_(INFO) << "ExtBackupJsTest-begin SUB_backup_ext_js_CallJsOnBackup_0100"; try { - EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_invalid_arg)); - auto ret = extBackupJs->CallJsOnBackup(); - EXPECT_EQ(ret, EINVAL); - extBackupJs->callbackInfo_ = std::make_shared([](ErrCode, std::string){}); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_exception_pending(_, _)).WillOnce(Return(napi_ok)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); - ret = extBackupJs->CallJsOnBackup(); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); + auto ret = extBackupJs->CallJsOnBackup(); EXPECT_EQ(ret, EINVAL); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_exception_pending(_, _)) .WillOnce(DoAll(SetArgPointee(true), Return(napi_ok))); EXPECT_CALL(*napiMock, napi_get_and_clear_last_exception(_, _)).WillOnce(Return(napi_invalid_arg)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); ret = extBackupJs->CallJsOnBackup(); EXPECT_EQ(ret, EINVAL); } catch (...) { @@ -1175,13 +1154,12 @@ HWTEST_F(ExtBackupJsTest, SUB_backup_ext_js_CallJsOnBackup_0200, testing::ext::T try { extBackupJs->callbackInfo_ = std::make_shared([](ErrCode, std::string){}); EXPECT_CALL(*extBackupMock, GetNapiEnv()).WillOnce(Return(nullptr)).WillOnce(Return(nullptr)); - EXPECT_CALL(*napiMock, napi_get_uv_event_loop(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_is_promise(_, _, _)) .WillOnce(DoAll(SetArgPointee(true), Return(napi_ok))); EXPECT_CALL(*napiMock, napi_open_handle_scope(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_close_handle_scope(_, _)).WillOnce(Return(napi_ok)); EXPECT_CALL(*napiMock, napi_get_named_property(_, _, _, _)).WillOnce(Return(napi_invalid_arg)); - EXPECT_CALL(*napiMock, napi_send_event(_, _, _)).WillOnce(Return(napi_invalid_arg)); + EXPECT_CALL(*napiMock, napi_send_cancelable_event(_, _, _, _, _, _)).WillOnce(Return(napi_invalid_arg)); auto ret = extBackupJs->CallJsOnBackup(); EXPECT_EQ(ret, EINVAL); } catch (...) { diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn index 2979b5716..1433c3ff4 100644 --- a/tests/unittests/backup_sa/module_ipc/BUILD.gn +++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn @@ -25,9 +25,7 @@ ohos_unittest("module_ipc_test") { "${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_stub.cpp", "${path_backup}/services/backup_sa/src/module_ipc/svc_backup_connection.cpp", - "service_stub_test.cpp", "svc_backup_connection_test.cpp", ] @@ -43,7 +41,7 @@ ohos_unittest("module_ipc_test") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", - "${path_backup}/services/backup_sa:backup_sa_ipc", + "${path_backup}/services/backup_sa:backup_sa_ipc_stub", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "//third_party/googletest:gmock_main", @@ -430,17 +428,20 @@ ohos_unittest("backup_service_incremental_test") { "${path_backup_mock}/accesstoken/accesstoken_kit_mock.cpp", "${path_backup_mock}/module_external/src/bms_adapter_mock.cpp", "${path_backup_mock}/module_external/src/sms_adapter_mock.cpp", + "${path_backup_mock}/module_ipc/service_stub_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/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}/frameworks/native/backup_kit_inner/src/service_client.cpp", "service_incremental_test.cpp", ] + public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] + include_dirs = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner/impl", "${path_backup}/services/backup_sa/include", @@ -500,11 +501,11 @@ ohos_unittest("backup_service_other_test") { "${path_backup_mock}/accesstoken/src/accesstoken_kit_mock.cpp", "${path_backup_mock}/module_external/src/bms_adapter_mock.cpp", "${path_backup_mock}/module_external/src/sms_adapter_mock.cpp", + "${path_backup_mock}/module_ipc/service_stub_mock.cpp", "${path_backup_mock}/module_ipc/src/app_gallery_dispose_proxy_mock.cpp", "${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/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", diff --git a/tests/unittests/backup_sa/module_ipc/sa_backup_connection_test.cpp b/tests/unittests/backup_sa/module_ipc/sa_backup_connection_test.cpp new file mode 100644 index 000000000..71385bae5 --- /dev/null +++ b/tests/unittests/backup_sa/module_ipc/sa_backup_connection_test.cpp @@ -0,0 +1,238 @@ +/* + * Copyright (c) 2025 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 "b_error/b_error.h" +#include "b_resources/b_constants.h" +#include "element_name.h" +#include "ext_extension_mock.h" +#include "message_parcel_mock.h" +#include "module_ipc/sa_backup_connection.h" + +namespace OHOS::FileManagement::Backup { +using namespace std; +using namespace testing; + +class SABackupConnectionTest : public testing::Test { +public: + static void SetUpTestCase(void); + static void TearDownTestCase(); + void SetUp() override {}; + void TearDown() override {}; +public: + static inline std::shared_ptr backupCon_ = nullptr; + static inline shared_ptr messageParcelMock = nullptr; +}; + +static void CallDied(const std::string &&name) +{ + GTEST_LOG_(INFO) << "ServiceReverseProxyTest-CallDied SUCCESS"; +} + +static void CallConnect(const std::string &&name) +{ + GTEST_LOG_(INFO) << "ServiceReverseProxyTest-CallConnect SUCCESS"; +} + +static void CallBackup(const std::string &&name, const int &&fd, const std::string &&result, const ErrCode &&err) +{ + GTEST_LOG_(INFO) << "ServiceReverseProxyTest-CallBackup SUCCESS"; +} + +static void CallRestore(const std::string &&name, const std::string &&result, const ErrCode &&err) +{ + GTEST_LOG_(INFO) << "ServiceReverseProxyTest-CallRestore SUCCESS"; +} + +void SABackupConnectionTest::SetUpTestCase() +{ + backupCon_ = std::make_shared(CallDied, CallConnect, CallBackup, CallRestore); + messageParcelMock = make_shared(); + MessageParcelMock::messageParcel = messageParcelMock; +} + +void SABackupConnectionTest::TearDownTestCase() +{ + backupCon_ = nullptr; + MessageParcelMock::messageParcel = nullptr; + messageParcelMock = nullptr; +} + +/** + * @tc.number: SUB_BackupConnection_LoadBackupSAExt_0100 + * @tc.name: SUB_BackupConnection_LoadBackupSAExt_0100 + * @tc.desc: 测试 LoadBackupSAExt 链接回调接口调用成功 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SABackupConnectionTest, SUB_BackupConnection_LoadBackupSAExt_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SABackupConnectionTest-begin SUB_BackupConnection_LoadBackupSAExt_0100"; + try { + EXPECT_TRUE(backupCon_->GetBackupSAExtProxy() == nullptr); + auto res = backupCon_->LoadBackupSAExt(); + EXPECT_NE(res, BError(BError::Codes::OK).GetCode()); + + backupCon_->reloadNum_.store(BConstants::BACKUP_SA_RELOAD_MAX); + res = backupCon_->LoadBackupSAExt(); + EXPECT_EQ(res, BError(BError::Codes::SA_EXT_RELOAD_FAIL).GetCode()); + + backupCon_->reloadNum_.store(0); + res = backupCon_->LoadBackupSAExtInner(); + EXPECT_NE(res, BError(BError::Codes::OK).GetCode()); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SABackupConnectionTest-an exception occurred by LoadBackupSAExt."; + } + GTEST_LOG_(INFO) << "SABackupConnectionTest-end SUB_BackupConnection_LoadBackupSAExt_0100"; +} + +/** + * @tc.number: SUB_BackupConnection_Call_0100 + * @tc.name: SUB_BackupConnection_Call_0100 + * @tc.desc: 测试 Call 链接回调接口调用成功 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SABackupConnectionTest, SUB_BackupConnection_Call_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SABackupConnectionTest-begin SUB_BackupConnection_Call_0100"; + try { + auto res = backupCon_->CallBackupSA(); + EXPECT_EQ(res, BError(BError::Codes::OK).GetCode()); + + res = backupCon_->CallRestoreSA(UniqueFd(-1)); + EXPECT_EQ(res, BError(BError::Codes::OK).GetCode()); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SABackupConnectionTest-an exception occurred by Call."; + } + GTEST_LOG_(INFO) << "SABackupConnectionTest-end SUB_BackupConnection_Call_0100"; +} + +/** + * @tc.number: SUB_BackupConnection_InputParaSet_0100 + * @tc.name: SUB_BackupConnection_InputParaSet_0100 + * @tc.desc: 测试 InputParaSet 链接回调接口调用成功 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SABackupConnectionTest, SUB_BackupConnection_InputParaSet_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SABackupConnectionTest-begin SUB_BackupConnection_InputParaSet_0100"; + try { + MessageParcel data; + backupCon_->extension_ = BConstants::EXTENSION_BACKUP; + EXPECT_CALL(*messageParcelMock, WriteString(_)).WillOnce(Return(false)); + auto res = backupCon_->InputParaSet(data); + EXPECT_FALSE(res); + + EXPECT_CALL(*messageParcelMock, WriteString(_)).WillOnce(Return(true)); + res = backupCon_->InputParaSet(data); + EXPECT_TRUE(res); + + backupCon_->extension_ = BConstants::EXTENSION_RESTORE; + EXPECT_CALL(*messageParcelMock, WriteFileDescriptor(_)).WillOnce(Return(false)); + res = backupCon_->InputParaSet(data); + EXPECT_FALSE(res); + + EXPECT_CALL(*messageParcelMock, WriteFileDescriptor(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock, WriteString(_)).WillOnce(Return(false)); + res = backupCon_->InputParaSet(data); + EXPECT_FALSE(res); + + EXPECT_CALL(*messageParcelMock, WriteFileDescriptor(_)).WillOnce(Return(true)); + EXPECT_CALL(*messageParcelMock, WriteString(_)).WillOnce(Return(true)); + res = backupCon_->InputParaSet(data); + EXPECT_TRUE(res); + + backupCon_->extension_ = ""; + res = backupCon_->InputParaSet(data); + EXPECT_FALSE(res); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SABackupConnectionTest-an exception occurred by InputParaSet."; + } + GTEST_LOG_(INFO) << "SABackupConnectionTest-end SUB_BackupConnection_InputParaSet_0100"; +} + +/** + * @tc.number: SUB_BackupConnection_OutputParaGet_0100 + * @tc.name: SUB_BackupConnection_OutputParaGet_0100 + * @tc.desc: 测试 OutputParaGet 链接回调接口调用成功 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SABackupConnectionTest, SUB_BackupConnection_OutputParaGet_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SABackupConnectionTest-begin SUB_BackupConnection_OutputParaGet_0100"; + try { + MessageParcel data; + auto res = backupCon_->OutputParaGet(data); + EXPECT_TRUE(res); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SABackupConnectionTest-an exception occurred by OutputParaGet."; + } + GTEST_LOG_(INFO) << "SABackupConnectionTest-end SUB_BackupConnection_OutputParaGet_0100"; +} + +/** + * @tc.number: SUB_BackupConnection_DisconnectBackupSAExt_0100 + * @tc.name: SUB_BackupConnection_DisconnectBackupSAExt_0100 + * @tc.desc: 测试 DisconnectBackupSAExt 链接回调接口调用成功 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SABackupConnectionTest, SUB_BackupConnection_DisconnectBackupSAExt_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SABackupConnectionTest-begin SUB_BackupConnection_DisconnectBackupSAExt_0100"; + try { + backupCon_->isLoaded_.store(false); + auto res = backupCon_->DisconnectBackupSAExt(); + EXPECT_EQ(res, BError(BError::Codes::OK).GetCode()); + + backupCon_->isLoaded_.store(true); + backupCon_->isConnected_.store(false); + res = backupCon_->DisconnectBackupSAExt(); + EXPECT_EQ(res, BError(BError::Codes::OK).GetCode()); + + backupCon_->isConnected_.store(true); + backupCon_->proxy_ = nullptr; + res = backupCon_->DisconnectBackupSAExt(); + EXPECT_EQ(res, BError(BError::Codes::OK).GetCode()); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SABackupConnectionTest-an exception occurred by DisconnectBackupSAExt."; + } + GTEST_LOG_(INFO) << "SABackupConnectionTest-end SUB_BackupConnection_DisconnectBackupSAExt_0100"; +} +} \ No newline at end of file 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 e7dbba02f..3a9f94ffb 100644 --- a/tests/unittests/backup_sa/module_ipc/service_incremental_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_incremental_test.cpp @@ -33,24 +33,23 @@ using namespace std; class BService { public: - virtual UniqueFd GetLocalCapabilities() = 0; + virtual ErrCode GetLocalCapabilities(int& fd) = 0; virtual ErrCode VerifyCallerAndGetCallerName(std::string&) = 0; - virtual ErrCode InitRestoreSession(sptr) = 0; - virtual ErrCode InitRestoreSession(sptr, std::string&) = 0; - virtual ErrCode InitBackupSession(sptr) = 0; - virtual ErrCode InitBackupSession(sptr, std::string&) = 0; + virtual ErrCode InitRestoreSession(const sptr&) = 0; + virtual ErrCode InitRestoreSessionWithErrMsg(const sptr&, std::string&) = 0; + virtual ErrCode InitBackupSession(const sptr&) = 0; + virtual ErrCode InitBackupSessionWithErrMsg(const sptr&, std::string&) = 0; virtual ErrCode Start() = 0; virtual ErrCode PublishFile(const BFileInfo&) = 0; - virtual ErrCode AppFileReady(const string&, UniqueFd, int32_t) = 0; + virtual ErrCode AppFileReady(const std::string &, int, int32_t) = 0; virtual ErrCode AppDone(ErrCode) = 0; virtual ErrCode ServiceResultReport(const std::string, BackupRestoreScenario, ErrCode) = 0; - virtual ErrCode AppendBundlesRestoreSession(UniqueFd, const std::vector&, - const std::vector&, RestoreTypeEnum, int32_t) = 0; - virtual ErrCode AppendBundlesRestoreSession(UniqueFd, const std::vector&, RestoreTypeEnum, - int32_t) = 0; + virtual ErrCode AppendBundlesRestoreSessionDataByDetail(int, const std::vector&, + const std::vector&, int32_t, int32_t) = 0; + virtual ErrCode AppendBundlesRestoreSessionData(int, const std::vector&, int32_t, int32_t) = 0; virtual ErrCode AppendBundlesBackupSession(const std::vector&) = 0; virtual ErrCode AppendBundlesDetailsBackupSession(const std::vector&, - const std::vector&) = 0; + const std::vector&) = 0; virtual ErrCode Finish() = 0; virtual ErrCode LaunchBackupExtension(const BundleName&) = 0; virtual ErrCode LaunchBackupSAExtension(const BundleName&) = 0; @@ -59,9 +58,9 @@ public: virtual ErrCode VerifyCaller() = 0; virtual ErrCode VerifyCaller(IServiceReverseType::Scenario) = 0; virtual int32_t GetUserIdDefault() = 0; - virtual ErrCode GetBackupInfo(BundleName&, std::string&) = 0; - virtual ErrCode UpdateTimer(BundleName&, uint32_t, bool&) = 0; - virtual ErrCode UpdateSendRate(std::string&, int32_t, bool&) = 0; + virtual ErrCode GetBackupInfo(const BundleName&, std::string&) = 0; + virtual ErrCode UpdateTimer(const BundleName&, uint32_t, bool&) = 0; + virtual ErrCode UpdateSendRate(const std::string&, int32_t, bool&) = 0; virtual ErrCode ReportAppProcessInfo(const std::string, BackupRestoreScenario) = 0; virtual ErrCode StartExtTimer(bool&) = 0; virtual ErrCode StartFwkTimer(bool&) = 0; @@ -75,7 +74,7 @@ public: virtual ErrCode HandleCurBundleFileReady(const std::string&, const std::string&, bool) = 0; virtual ErrCode HandleCurAppDone(ErrCode, const std::string&, bool) = 0; virtual UniqueFd GetLocalCapabilitiesForBundleInfos() = 0; - virtual ErrCode GetBackupDataSize(bool, vector) = 0; + virtual ErrCode GetBackupDataSize(bool, const std::vector&) = 0; public: virtual bool UpdateToRestoreBundleMap(const string&, const string&) = 0; public: @@ -87,20 +86,20 @@ public: class ServiceMock : public BService { public: - MOCK_METHOD(UniqueFd, GetLocalCapabilities, ()); + MOCK_METHOD(ErrCode, GetLocalCapabilities, (int&)); MOCK_METHOD(ErrCode, VerifyCallerAndGetCallerName, (std::string&)); - MOCK_METHOD(ErrCode, InitRestoreSession, (sptr)); - MOCK_METHOD(ErrCode, InitRestoreSession, (sptr, std::string&)); - MOCK_METHOD(ErrCode, InitBackupSession, (sptr)); - MOCK_METHOD(ErrCode, InitBackupSession, ((sptr), std::string&)); + MOCK_METHOD(ErrCode, InitRestoreSession, (const sptr&)); + MOCK_METHOD(ErrCode, InitRestoreSessionWithErrMsg, (const sptr&, std::string&)); + MOCK_METHOD(ErrCode, InitBackupSession, (const sptr&)); + MOCK_METHOD(ErrCode, InitBackupSessionWithErrMsg, (const sptr&, std::string&)); MOCK_METHOD(ErrCode, Start, ()); MOCK_METHOD(ErrCode, PublishFile, (const BFileInfo&)); - MOCK_METHOD(ErrCode, AppFileReady, (const string&, UniqueFd, int32_t)); + MOCK_METHOD(ErrCode, AppFileReady, (const string&, int, int32_t)); MOCK_METHOD(ErrCode, AppDone, (ErrCode)); MOCK_METHOD(ErrCode, ServiceResultReport, (const std::string, BackupRestoreScenario, ErrCode)); - MOCK_METHOD(ErrCode, AppendBundlesRestoreSession, (UniqueFd, (const std::vector&), - (const std::vector&), RestoreTypeEnum, int32_t)); - MOCK_METHOD(ErrCode, AppendBundlesRestoreSession, (UniqueFd, (const std::vector&), RestoreTypeEnum, + MOCK_METHOD(ErrCode, AppendBundlesRestoreSessionDataByDetail, (int, (const std::vector&), + (const std::vector&), int32_t, int32_t)); + MOCK_METHOD(ErrCode, AppendBundlesRestoreSessionData, (int, (const std::vector&), int32_t, int32_t)); MOCK_METHOD(ErrCode, AppendBundlesBackupSession, (const std::vector&)); MOCK_METHOD(ErrCode, AppendBundlesDetailsBackupSession, ((const std::vector&), @@ -113,9 +112,9 @@ public: MOCK_METHOD(ErrCode, VerifyCaller, ()); MOCK_METHOD(ErrCode, VerifyCaller, (IServiceReverseType::Scenario)); MOCK_METHOD(int32_t, GetUserIdDefault, ()); - MOCK_METHOD(ErrCode, GetBackupInfo, (BundleName&, std::string&)); - MOCK_METHOD(ErrCode, UpdateTimer, (BundleName&, uint32_t, bool&)); - MOCK_METHOD(ErrCode, UpdateSendRate, (std::string&, int32_t, bool&)); + MOCK_METHOD(ErrCode, GetBackupInfo, (const BundleName&, std::string&)); + MOCK_METHOD(ErrCode, UpdateTimer, (const BundleName&, uint32_t, bool&)); + MOCK_METHOD(ErrCode, UpdateSendRate, (const std::string&, int32_t, bool&)); MOCK_METHOD(ErrCode, ReportAppProcessInfo, (const std::string, BackupRestoreScenario)); MOCK_METHOD(ErrCode, StartExtTimer, (bool&)); MOCK_METHOD(ErrCode, StartFwkTimer, (bool&)); @@ -129,7 +128,7 @@ public: MOCK_METHOD(ErrCode, HandleCurBundleFileReady, (const std::string&, const std::string&, bool)); MOCK_METHOD(ErrCode, HandleCurAppDone, (ErrCode, const std::string&, bool)); MOCK_METHOD(UniqueFd, GetLocalCapabilitiesForBundleInfos, ()); - MOCK_METHOD(ErrCode, GetBackupDataSize, (bool, vector)); + MOCK_METHOD(ErrCode, GetBackupDataSize, (bool, const std::vector&)); public: MOCK_METHOD(bool, UpdateToRestoreBundleMap, (const string&, const string&)); }; @@ -138,9 +137,18 @@ void Service::OnStart() {} void Service::OnStop() {} -UniqueFd Service::GetLocalCapabilities() +ErrCode Service::GetLocalCapabilitiesForBundleInfos(int &fd) { - return BService::serviceMock->GetLocalCapabilities(); + return BError(BError::Codes::OK); +} +ErrCode Service::InitBackupSessionWithErrMsg(const sptr &remote, std::string &errMsg) +{ + return BError(BError::Codes::OK); +} + +ErrCode Service::GetLocalCapabilities(int &fd) +{ + return BService::serviceMock->GetLocalCapabilities(fd); } void Service::StopAll(const wptr&, bool) {} @@ -150,26 +158,21 @@ ErrCode Service::VerifyCallerAndGetCallerName(std::string &bundleName) return BService::serviceMock->VerifyCallerAndGetCallerName(bundleName); } -ErrCode Service::InitRestoreSession(sptr remote) +ErrCode Service::InitRestoreSession(const sptr &remote) { return BService::serviceMock->InitRestoreSession(remote); } -ErrCode Service::InitRestoreSession(sptr remote, std::string &errMsg) +ErrCode Service::InitRestoreSessionWithErrMsg(const sptr &remote, std::string &errMsg) { - return BService::serviceMock->InitRestoreSession(remote, errMsg); + return BService::serviceMock->InitRestoreSessionWithErrMsg(remote, errMsg); } -ErrCode Service::InitBackupSession(sptr remote) +ErrCode Service::InitBackupSession(const sptr &remote) { return BService::serviceMock->InitBackupSession(remote); } -ErrCode Service::InitBackupSession(sptr remote, std::string &errMsg) -{ - return BService::serviceMock->InitBackupSession(remote, errMsg); -} - ErrCode Service::Start() { return BService::serviceMock->Start(); @@ -180,31 +183,38 @@ ErrCode Service::PublishFile(const BFileInfo &fileInfo) return BService::serviceMock->PublishFile(fileInfo); } -ErrCode Service::AppFileReady(const string &fileName, UniqueFd fd, int32_t errCode) +ErrCode Service::AppFileReady(const std::string &fileName, int fd, int32_t appFileReadyErrCode) { - return BService::serviceMock->AppFileReady(fileName, move(fd), errCode); + return BService::serviceMock->AppFileReady(fileName, fd, appFileReadyErrCode); } -ErrCode Service::AppDone(ErrCode errCode) +ErrCode Service::AppDone(int32_t appDoneErrCode) { - return BService::serviceMock->AppDone(errCode); + return BService::serviceMock->AppDone(appDoneErrCode); } -ErrCode Service::ServiceResultReport(const std::string restoreRetInfo, BackupRestoreScenario sennario, ErrCode errCode) +ErrCode Service::ServiceResultReport(const std::string& restoreRetInfo, + BackupRestoreScenario sennario, ErrCode errCode) { return BService::serviceMock->ServiceResultReport(restoreRetInfo, sennario, errCode); } -ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, const std::vector &bundleNames, - const std::vector &detailInfos, RestoreTypeEnum restoreType, int32_t userId) +ErrCode Service::AppendBundlesRestoreSessionDataByDetail(int fd, + const std::vector &bundleNames, + const std::vector &detailInfos, + int32_t restoreType, + int32_t userId) { - return BService::serviceMock->AppendBundlesRestoreSession(move(fd), bundleNames, detailInfos, restoreType, userId); + return BService::serviceMock->AppendBundlesRestoreSessionDataByDetail(fd, bundleNames, detailInfos, + restoreType, userId); } -ErrCode Service::AppendBundlesRestoreSession(UniqueFd fd, const std::vector &bundleNames, - RestoreTypeEnum restoreType, int32_t userId) +ErrCode Service::AppendBundlesRestoreSessionData(int fd, + const std::vector &bundleNames, + int32_t restoreType, + int32_t userId) { - return BService::serviceMock->AppendBundlesRestoreSession(move(fd), bundleNames, restoreType, userId); + return BService::serviceMock->AppendBundlesRestoreSessionData(fd, bundleNames, restoreType, userId); } ErrCode Service::AppendBundlesBackupSession(const std::vector &bundleNames) @@ -213,7 +223,7 @@ ErrCode Service::AppendBundlesBackupSession(const std::vector &bundl } ErrCode Service::AppendBundlesDetailsBackupSession(const std::vector &bundleNames, - const std::vector &bundleInfos) + const std::vector &bundleInfos) { return BService::serviceMock->AppendBundlesDetailsBackupSession(bundleNames, bundleInfos); } @@ -278,17 +288,17 @@ void Service::SendStartAppGalleryNotify(const BundleName&) {} void Service::SessionDeactive() {} -ErrCode Service::GetBackupInfo(BundleName &bundleName, std::string &result) +ErrCode Service::GetBackupInfo(const BundleName &bundleName, std::string &result) { return BService::serviceMock->GetBackupInfo(bundleName, result); } -ErrCode Service::UpdateTimer(BundleName &bundleName, uint32_t timeOut, bool &result) +ErrCode Service::UpdateTimer(const BundleName &bundleName, uint32_t timeOut, bool &result) { return BService::serviceMock->UpdateTimer(bundleName, timeOut, result); } -ErrCode Service::UpdateSendRate(std::string &bundleName, int32_t sendRate, bool &result) +ErrCode Service::UpdateSendRate(const std::string &bundleName, int32_t sendRate, bool &result) { return BService::serviceMock->UpdateSendRate(bundleName, sendRate, result); } @@ -303,7 +313,7 @@ void Service::SendEndAppGalleryNotify(const BundleName&) {} void Service::NoticeClientFinish(const string&, ErrCode) {} -ErrCode Service::ReportAppProcessInfo(const std::string processInfo, BackupRestoreScenario sennario) +ErrCode Service::ReportAppProcessInfo(const std::string &processInfo, BackupRestoreScenario sennario) { return BService::serviceMock->ReportAppProcessInfo(processInfo, sennario); } @@ -418,9 +428,8 @@ UniqueFd Service::GetLocalCapabilitiesForBundleInfos() return BService::serviceMock->GetLocalCapabilitiesForBundleInfos(); } -void Service::AppendBundles(const std::vector&) {} - -ErrCode Service::GetBackupDataSize(bool isPreciseScan, vector bundleNameList) +void Service::AppendBundles(const std::vector &bundleNames) {} +ErrCode Service::GetBackupDataSize(bool isPreciseScan, const std::vector& bundleNameList) { return BService::serviceMock->GetBackupDataSize(isPreciseScan, bundleNameList); } @@ -516,7 +525,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); @@ -741,7 +751,9 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_InitIncrementalBackupSes auto session_ = service->session_; service->session_ = nullptr; EXPECT_CALL(*srvMock, VerifyCaller()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); - 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(*srvMock, VerifyCaller()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); @@ -749,7 +761,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_InitIncrementalBackupSes EXPECT_CALL(*srvMock, GetUserIdDefault()).WillOnce(Return(0)); EXPECT_CALL(*srvMock, GetCallerName()).WillOnce(Return("")); 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()); EXPECT_CALL(*srvMock, VerifyCaller()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)); @@ -786,14 +798,15 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_InitIncrementalBackupSes GTEST_LOG_(INFO) << "ServiceIncrementalTest-begin SUB_ServiceIncremental_InitIncrementalBackupSession_0100"; try { std::string errMsg; + sptr reverseNUll = nullptr; EXPECT_CALL(*srvMock, VerifyCaller()).WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG).GetCode())); - EXPECT_EQ(service->InitIncrementalBackupSession(nullptr, errMsg), + EXPECT_EQ(service->InitIncrementalBackupSessionWithErrMsg(reverseNUll, errMsg), BError(BError::Codes::SA_INVAL_ARG).GetCode()); auto session_ = service->session_; service->session_ = nullptr; EXPECT_CALL(*srvMock, VerifyCaller()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); - EXPECT_EQ(service->InitIncrementalBackupSession(nullptr, errMsg), + EXPECT_EQ(service->InitIncrementalBackupSessionWithErrMsg(reverseNUll, errMsg), BError(BError::Codes::SA_INVAL_ARG).GetCode()); service->session_ = session_; @@ -802,8 +815,8 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_InitIncrementalBackupSes EXPECT_CALL(*srvMock, GetUserIdDefault()).WillOnce(Return(0)); EXPECT_CALL(*srvMock, GetCallerName()).WillOnce(Return("")); 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()); EXPECT_CALL(*srvMock, VerifyCaller()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)); EXPECT_CALL(*srvMock, GetUserIdDefault()).WillOnce(Return(0)); @@ -813,7 +826,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_InitIncrementalBackupSes EXPECT_CALL(*session, GetSessionCallerName()).WillOnce(Return("")); EXPECT_CALL(*session, GetSessionActiveTime()).WillOnce(Return("")); EXPECT_CALL(*jsonUtil, BuildInitSessionErrInfo(_, _, _)).WillOnce(Return("")); - EXPECT_EQ(service->InitIncrementalBackupSession(nullptr, errMsg), + EXPECT_EQ(service->InitIncrementalBackupSessionWithErrMsg(reverseNUll, errMsg), BError(BError::Codes::SA_SESSION_CONFLICT).GetCode()); EXPECT_CALL(*srvMock, VerifyCaller()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); @@ -821,7 +834,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_InitIncrementalBackupSes EXPECT_CALL(*srvMock, GetUserIdDefault()).WillOnce(Return(0)); EXPECT_CALL(*srvMock, GetCallerName()).WillOnce(Return("")); EXPECT_CALL(*session, Active(_, _)).WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG))); - EXPECT_EQ(service->InitIncrementalBackupSession(nullptr, errMsg), + EXPECT_EQ(service->InitIncrementalBackupSessionWithErrMsg(reverseNUll, errMsg), BError(BError::Codes::SA_INVAL_ARG).GetCode()); } catch (...) { EXPECT_TRUE(false); @@ -1042,26 +1055,32 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalFileReady_ string bundleName; string fileName; int32_t errCode = 0; + EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_)) + .WillOnce(Return(BError(BError::Codes::OK).GetCode())); EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); EXPECT_CALL(*srProxy, IncrementalRestoreOnFileReady(_, _, _, _, _)).WillOnce(Return(0)); - auto ret = service->AppIncrementalFileReady(bundleName, fileName, UniqueFd(-1), UniqueFd(-1), errCode); + auto ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); + EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_)) + .WillOnce(Return(BError(BError::Codes::OK).GetCode())); EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); EXPECT_CALL(*srProxy, IncrementalBackupOnFileReady(_, _, _, _, _)).WillOnce(Return(0)); EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false)); - ret = service->AppIncrementalFileReady(bundleName, fileName, UniqueFd(-1), UniqueFd(-1), errCode); + ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); fileName = BConstants::EXT_BACKUP_MANAGE; + EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_)) + .WillOnce(Return(BError(BError::Codes::OK).GetCode())); 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(0)); EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false)); - ret = service->AppIncrementalFileReady(bundleName, fileName, UniqueFd(-1), UniqueFd(-1), errCode); + ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); } catch (...) { EXPECT_TRUE(false); @@ -1086,23 +1105,27 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_AppIncrementalFileReady_ string bundleName; string fileName; int32_t errCode = 0; + EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_)) + .WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG).GetCode())); EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); EXPECT_CALL(*srProxy, IncrementalBackupOnFileReady(_, _, _, _, _)).WillOnce(Return(0)); EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(true)); EXPECT_CALL(*srvMock, HandleCurBundleFileReady(_, _, _)) .WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG).GetCode())); - auto ret = service->AppIncrementalFileReady(bundleName, fileName, UniqueFd(-1), UniqueFd(-1), errCode); + auto ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode); EXPECT_EQ(ret, BError(BError::Codes::SA_INVAL_ARG).GetCode()); fileName = BConstants::EXT_BACKUP_MANAGE; + EXPECT_CALL(*srvMock, VerifyCallerAndGetCallerName(_)) + .WillOnce(Return(BError(BError::Codes::OK).GetCode())); 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(0)); EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(true)); EXPECT_CALL(*srvMock, HandleCurBundleFileReady(_, _, _)).WillOnce(Return(BError(BError::Codes::OK).GetCode())); - ret = service->AppIncrementalFileReady(bundleName, fileName, UniqueFd(-1), UniqueFd(-1), errCode); + ret = service->AppIncrementalFileReady(fileName, UniqueFd(-1), UniqueFd(-1), errCode); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); } catch (...) { EXPECT_TRUE(false); @@ -1807,7 +1830,7 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_CancelTask_0100, TestSiz service->CancelTask("", service); EXPECT_TRUE(true); - EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); + EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)).WillOnce(Return(nullptr)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(svcProxy)); EXPECT_CALL(*svcProxy, HandleClear()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); EXPECT_CALL(*session, StopFwkTimer(_)).WillOnce(Return(false)); @@ -1913,7 +1936,6 @@ HWTEST_F(ServiceIncrementalTest, SUB_ServiceIncremental_Cancel_0100, TestSize.Le EXPECT_CALL(*srvMock, VerifyCaller(_)).WillOnce(Return(BError(BError::Codes::OK).GetCode())); EXPECT_CALL(*session, GetImpl()).WillOnce(Return(impl)); EXPECT_CALL(*session, GetServiceSchedAction(_)).WillOnce(Return(BConstants::ServiceSchedAction::RUNNING)); - EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(nullptr)); service->Cancel(bundleName, result); EXPECT_EQ(result, BError(BError::Codes::OK).GetCode()); } catch (...) { 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 c81f2a1d0..421e92212 100644 --- a/tests/unittests/backup_sa/module_ipc/service_other_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_other_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2024-2025 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 @@ -40,20 +40,38 @@ #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, int fd) +{ + return BError(BError::Codes::OK); +} +ErrCode Service::AppIncrementalFileReady(const std::string &fileName, + int fd, + int 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, int &fd) { - return UniqueFd(-1); + return BError(BError::Codes::OK); } void Service::StartGetFdTask(std::string, wptr) {} @@ -63,12 +81,12 @@ ErrCode Service::GetAppLocalListAndDoIncrementalBackup() return BError(BError::Codes::OK); } -ErrCode Service::InitIncrementalBackupSession(sptr) +ErrCode Service::InitIncrementalBackupSession(const sptr &) { return BError(BError::Codes::OK); } -ErrCode Service::InitIncrementalBackupSession(sptr, std::string &) +ErrCode Service::InitIncrementalBackupSessionWithErrMsg(const sptr&, std::string &) { return BError(BError::Codes::OK); } @@ -123,8 +141,12 @@ void Service::NotifyCallerCurAppIncrementDone(ErrCode, const std::string&) {} void Service::SendUserIdToApp(string&, int32_t) {} -void Service::SetCurrentBackupSessProperties(const vector&, int32_t, - std::vector&, bool) {} +void Service::SetCurrentBackupSessProperties(const vector &, + int32_t, + std::vector &, + bool) +{ +} std::shared_ptr Service::GetExtensionMutex(const BundleName &bundleName) { @@ -593,8 +615,6 @@ HWTEST_F(ServiceTest, SUB_Service_VerifyCaller_0100, TestSize.Level1) .WillOnce(Return(Security::AccessToken::PermissionState::PERMISSION_GRANTED)); EXPECT_CALL(*token, IsSystemAppByFullTokenID(_)).WillOnce(Return(false)); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) - .WillOnce(Return(make_pair(true, DEBUG_ID + 1))) - .WillOnce(Return(make_pair(true, DEBUG_ID + 1))) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); ret = service->VerifyCaller(); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); @@ -1289,7 +1309,6 @@ HWTEST_F(ServiceTest, SUB_Service_AppDone_0200, TestSize.Level1) EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(true)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(nullptr)); - EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); ret = service->AppDone(errCode); EXPECT_NE(ret, BError(BError::Codes::OK)); } catch (...) { @@ -1320,20 +1339,17 @@ HWTEST_F(ServiceTest, SUB_Service_HandleCurBundleEndWork_0100, TestSize.Level1) senario = BackupRestoreScenario::FULL_RESTORE; EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false)); - EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); service->HandleCurBundleEndWork(bundleName, senario); EXPECT_TRUE(true); EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(true)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(nullptr)); - EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); service->HandleCurBundleEndWork(bundleName, senario); EXPECT_TRUE(true); EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(true)); EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(nullptr)); - EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); service->HandleCurBundleEndWork(bundleName, senario); EXPECT_TRUE(true); } catch (...) { @@ -1425,8 +1441,6 @@ HWTEST_F(ServiceTest, SUB_Service_LaunchBackupExtension_0200, TestSize.Level1) EXPECT_CALL(*session, GetSessionUserId()).WillOnce(Return(0)); EXPECT_CALL(*connect, ConnectBackupExtAbility(_, _, _)) .WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG).GetCode())); - EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) - .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); auto ret = service->LaunchBackupExtension(bundleName); EXPECT_EQ(ret, BError(BError::Codes::SA_BOOT_EXT_FAIL)); @@ -1445,8 +1459,6 @@ HWTEST_F(ServiceTest, SUB_Service_LaunchBackupExtension_0200, TestSize.Level1) EXPECT_CALL(*session, GetSessionUserId()).WillOnce(Return(0)); EXPECT_CALL(*connect, ConnectBackupExtAbility(_, _, _)) .WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG).GetCode())); - EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) - .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); ret = service->LaunchBackupExtension(bundleName); EXPECT_EQ(ret, BError(BError::Codes::SA_BOOT_EXT_FAIL)); } catch (...) { @@ -1735,7 +1747,6 @@ HWTEST_F(ServiceTest, SUB_Service_SADone_0000, TestSize.Level1) GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_SADone_0000"; try { EXPECT_CALL(*session, OnBundleFileReady(_, _)).WillOnce(Return(false)); - EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); auto ret = service->SADone(0, ""); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); @@ -1753,7 +1764,6 @@ HWTEST_F(ServiceTest, SUB_Service_SADone_0000, TestSize.Level1) EXPECT_CALL(*session, StopExtTimer(_)).WillOnce(Return(true)); 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, ""); EXPECT_EQ(ret, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -1787,7 +1797,6 @@ HWTEST_F(ServiceTest, SUB_Service_NotifyCallerCurAppDone_0000, TestSize.Level1) EXPECT_TRUE(true); 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(0)); service->NotifyCallerCurAppDone(0, ""); @@ -1924,8 +1933,6 @@ HWTEST_F(ServiceTest, SUB_Service_DoTimeout_0000, TestSize.Level1) shared_ptr sa = nullptr; 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)); EXPECT_CALL(*session, GetSAExtConnection(_)).WillOnce(Return(sa)); service->DoTimeout(service, bundleName); @@ -1953,8 +1960,6 @@ HWTEST_F(ServiceTest, SUB_Service_DoTimeout_0100, TestSize.Level1) string bundleName; shared_ptr sa = nullptr; 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)); EXPECT_CALL(*session, GetSAExtConnection(_)).WillOnce(Return(sa)); service->DoTimeout(service, bundleName); @@ -2086,4 +2091,226 @@ HWTEST_F(ServiceTest, SUB_Service_ReleaseOnException_0000, TestSize.Level1) } GTEST_LOG_(INFO) << "ServiceTest-end SUB_Service_ReleaseOnException_0000"; } + +/** + * @tc.number: SUB_Service_ClearResidualBundleData_0000 + * @tc.name: SUB_Service_ClearResidualBundleData_0000 + * @tc.desc: 测试 ClearResidualBundleData 的正常/异常分支 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: issueIAKC3I + */ +HWTEST_F(ServiceTest, SUB_Service_ClearResidualBundleData_0000, TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_ClearResidualBundleData_0000"; + try { + string bundleName; + 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(*connect, IsExtAbilityConnected()).WillOnce(Return(true)); + EXPECT_CALL(*connect, DisconnectBackupExtAbility()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); + EXPECT_CALL(*session, GetScenario()) + .WillOnce(Return(IServiceReverseType::Scenario::CLEAN)) + .WillOnce(Return(IServiceReverseType::Scenario::CLEAN)) + .WillOnce(Return(IServiceReverseType::Scenario::CLEAN)); + EXPECT_CALL(*cdConfig, DeleteClearBundleRecord(_)).WillOnce(Return(true)); + EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(true)); + EXPECT_CALL(*param, GetBackupOverrideBackupSARelease()).WillOnce(Return(true)); + auto res = service->ClearResidualBundleData(bundleName); + EXPECT_EQ(res, BError(BError::Codes::OK).GetCode()); + + 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(*connect, IsExtAbilityConnected()).WillOnce(Return(false)); + 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(*param, GetBackupOverrideBackupSARelease()).WillOnce(Return(true)); + res = service->ClearResidualBundleData(bundleName); + EXPECT_EQ(res, BError(BError::Codes::OK).GetCode()); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "ServiceTest-an exception occurred by ClearResidualBundleData."; + } + GTEST_LOG_(INFO) << "ServiceTest-end SUB_Service_ClearResidualBundleData_0000"; +} + +/** + * @tc.number: SUB_Service_GetBackupInfoCmdHandle_0000 + * @tc.name: SUB_Service_GetBackupInfoCmdHandle_0000 + * @tc.desc: 测试 GetBackupInfoCmdHandle 的正常/异常分支 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: issueIAKC3I + */ +HWTEST_F(ServiceTest, SUB_Service_GetBackupInfoCmdHandle_0000, TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_GetBackupInfoCmdHandle_0000"; + try { + BundleName bundleName; + string result; + EXPECT_CALL(*session, CreateBackupConnection(_)).WillOnce(Return(nullptr)); + auto res = service->GetBackupInfoCmdHandle(bundleName, result); + EXPECT_EQ(res, BError(BError::Codes::SA_INVAL_ARG).GetCode()); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "ServiceTest-an exception occurred by GetBackupInfoCmdHandle."; + } + GTEST_LOG_(INFO) << "ServiceTest-end SUB_Service_GetBackupInfoCmdHandle_0000"; +} + +/** + * @tc.number: SUB_Service_HandleCurBundleFileReady_0000 + * @tc.name: SUB_Service_HandleCurBundleFileReady_0000 + * @tc.desc: 测试 HandleCurBundleFileReady 的正常/异常分支 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: issueIAKC3I + */ +HWTEST_F(ServiceTest, SUB_Service_HandleCurBundleFileReady_0000, TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_HandleCurBundleFileReady_0000"; + try { + const string bundleName; + const string fileName; + bool isIncBackup = false; + EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(nullptr)); + auto res = service->HandleCurBundleFileReady(bundleName, fileName, isIncBackup); + EXPECT_EQ(res, BError(BError::Codes::SA_INVAL_ARG).GetCode()); + + EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(connect)); + EXPECT_CALL(*connect, GetBackupExtProxy()).WillOnce(Return(nullptr)); + res = service->HandleCurBundleFileReady(bundleName, fileName, isIncBackup); + EXPECT_EQ(res, BError(BError::Codes::SA_INVAL_ARG).GetCode()); + + 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(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); + EXPECT_CALL(*srProxy, BackupOnBundleFinished(_, _)).WillOnce(Return(0)); + EXPECT_CALL(*connect, DisconnectBackupExtAbility()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) + .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); + EXPECT_CALL(*cdConfig, DeleteClearBundleRecord(_)).WillOnce(Return(true)); + res = service->HandleCurBundleFileReady(bundleName, fileName, isIncBackup); + EXPECT_EQ(res, BError(BError::Codes::OK).GetCode()); + + isIncBackup = 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(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); + EXPECT_CALL(*srProxy, IncrementalBackupOnBundleFinished(_, _)).WillOnce(Return(0)); + EXPECT_CALL(*connect, DisconnectBackupExtAbility()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); + EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); + EXPECT_CALL(*cdConfig, DeleteClearBundleRecord(_)).WillOnce(Return(true)); + res = service->HandleCurBundleFileReady(bundleName, fileName, isIncBackup); + EXPECT_EQ(res, BError(BError::Codes::OK).GetCode()); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "ServiceTest-an exception occurred by HandleCurBundleFileReady."; + } + GTEST_LOG_(INFO) << "ServiceTest-end SUB_Service_HandleCurBundleFileReady_0000"; +} + +/** + * @tc.number: SUB_Service_CallOnBundleEndByScenario_0100 + * @tc.name: SUB_Service_CallOnBundleEndByScenario_0100 + * @tc.desc: 测试 CallOnBundleEndByScenario 接口 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(ServiceTest, SUB_Service_CallOnBundleEndByScenario_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_CallOnBundleEndByScenario_0100"; + try { + auto session_ = service->session_; + const std::string bundleName = "test"; + ErrCode errCode = BError(BError::Codes::OK); + + service->session_ = nullptr; + service->CallOnBundleEndByScenario(bundleName, BackupRestoreScenario::FULL_RESTORE, errCode); + EXPECT_TRUE(true); + + service->session_ = session_; + EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); + EXPECT_CALL(*srProxy, RestoreOnBundleFinished(_, _)).WillOnce(Return(0)); + service->CallOnBundleEndByScenario(bundleName, BackupRestoreScenario::FULL_RESTORE, errCode); + EXPECT_TRUE(true); + + EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); + EXPECT_CALL(*srProxy, IncrementalRestoreOnBundleFinished(_, _)).WillOnce(Return(0)); + service->CallOnBundleEndByScenario(bundleName, BackupRestoreScenario::INCREMENTAL_RESTORE, errCode); + EXPECT_TRUE(true); + + EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); + EXPECT_CALL(*srProxy, BackupOnBundleFinished(_, _)).WillOnce(Return(0)); + service->CallOnBundleEndByScenario(bundleName, BackupRestoreScenario::FULL_BACKUP, errCode); + EXPECT_TRUE(true); + + EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); + EXPECT_CALL(*srProxy, IncrementalBackupOnBundleFinished(_, _)).WillOnce(Return(0)); + service->CallOnBundleEndByScenario(bundleName, BackupRestoreScenario::INCREMENTAL_BACKUP, errCode); + EXPECT_TRUE(true); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "ServiceTest-an exception occurred by CallOnBundleEndByScenario."; + } + GTEST_LOG_(INFO) << "ServiceTest-end SUB_Service_CallOnBundleEndByScenario_0100"; +} + +/** + * @tc.number: SUB_Service_GetSupportBackupBundleNames_0100 + * @tc.name: SUB_Service_GetSupportBackupBundleNames_0100 + * @tc.desc: 测试 GetSupportBackupBundleNames 接口 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(ServiceTest, SUB_Service_GetSupportBackupBundleNames_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_GetSupportBackupBundleNames_0100"; + try { + std::vector backupInfos = { + {.name = "test1", .appIndex = 0, .allToBackup = false, .versionName = ""}, + {.name = "test2", .appIndex = 0, .allToBackup = true, .versionName = ""} + }; + bool isIncBackup = false; + const std::vector srcBundleNames; + EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("")).WillOnce(Return("")); + EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); + EXPECT_CALL(*srProxy, IncrementalBackupOnBundleStarted(_, _)).WillOnce(Return(0)); + EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); + EXPECT_CALL(*srProxy, BackupOnBundleStarted(_, _)).WillOnce(Return(0)); + auto res = service->GetSupportBackupBundleNames(backupInfos, isIncBackup, srcBundleNames); + EXPECT_EQ(res.size(), 1); + + isIncBackup = true; + EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("")).WillOnce(Return("")); + EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); + EXPECT_CALL(*srProxy, IncrementalBackupOnBundleStarted(_, _)).WillOnce(Return(0)); + EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); + EXPECT_CALL(*srProxy, BackupOnBundleStarted(_, _)).WillOnce(Return(0)); + res = service->GetSupportBackupBundleNames(backupInfos, isIncBackup, srcBundleNames); + EXPECT_EQ(res.size(), 1); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "ServiceTest-an exception occurred by GetSupportBackupBundleNames."; + } + GTEST_LOG_(INFO) << "ServiceTest-end SUB_Service_GetSupportBackupBundleNames_0100"; +} } \ No newline at end of file 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 c63b4b11f..e1e3c155b 100644 --- a/tests/unittests/backup_sa/module_ipc/service_stub_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_stub_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 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 @@ -25,9 +25,9 @@ #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_stub.h" #include "service_reverse_mock.h" #include "test_manager.h" #include "unique_fd.h" diff --git a/tests/unittests/backup_sa/module_ipc/service_test.cpp b/tests/unittests/backup_sa/module_ipc/service_test.cpp index a876182c9..1617f219b 100644 --- a/tests/unittests/backup_sa/module_ipc/service_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_test.cpp @@ -88,18 +88,20 @@ ErrCode ServiceTest::Init(IServiceReverseType::Scenario scenario) 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 == IServiceReverseType::Scenario::BACKUP) { - ret = servicePtr_->InitBackupSession(remote_); + 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)); @@ -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); 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 7820609e4..5d49c9320 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,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::SA_REFUSED_ACT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); - ret = service->InitRestoreSession(nullptr); + 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 +157,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 +180,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 +191,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::SA_REFUSED_ACT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); - ret = service->InitRestoreSession(nullptr, errMsg); + 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 +201,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::SA_SESSION_CONFLICT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); - ret = service->InitRestoreSession(nullptr, errMsg); + 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 +211,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 +233,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 +244,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::SA_REFUSED_ACT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); - ret = service->InitBackupSession(nullptr); + 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 +254,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 +277,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 +288,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::SA_REFUSED_ACT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); - ret = service->InitBackupSession(nullptr, errMsg); + 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 +298,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::SA_SESSION_CONFLICT))); - EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); - ret = service->InitBackupSession(nullptr, errMsg); + 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 +308,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"; } @@ -501,7 +499,6 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_PublishFile_0100, testing::ext::Tes EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_NATIVE)); EXPECT_CALL(*token, VerifyAccessToken(_, _)) .WillOnce(Return(Security::AccessToken::PermissionState::PERMISSION_DENIED)); - EXPECT_CALL(*token, GetHapTokenInfo(_, _)).WillOnce(Return(0)); ret = service->PublishFile(fileInfo); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); GTEST_LOG_(INFO) << "ServiceThrowTest-end SUB_Service_throw_PublishFile_0100"; @@ -527,20 +524,17 @@ 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)); + EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)); EXPECT_CALL(*token, GetTokenType(_)) - .WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_HAP)) .WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_HAP)); EXPECT_CALL(*token, GetHapTokenInfo(_, _)).WillOnce(Return(0)); - EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)) - .WillOnce(Return("bundleName")) - .WillOnce(Return("bundleName")) - .WillOnce(Return("bundleName")); + EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).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); @@ -568,7 +562,6 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_AppDone_0100, testing::ext::TestSiz 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))); - EXPECT_CALL(*sessionMock, IsOnAllBundlesFinished()).WillOnce(Return(false)); auto ret = service->AppDone(0); EXPECT_EQ(ret, BError(BError::Codes::SA_INVAL_ARG).GetCode()); } catch (...) { @@ -655,9 +648,7 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_OnBackupExtensionDied_0100, testing EXPECT_CALL(*sessionMock, GetScenario()) .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))); + EXPECT_CALL(*sessionMock, VerifyBundleName(_)).WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG))); EXPECT_CALL(*sessionMock, StopFwkTimer(_)).WillOnce(Invoke([]() { throw BError(BError::Codes::EXT_THROW_EXCEPTION); return true; @@ -733,9 +724,7 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_NoticeClientFinish_0100, testing::e EXPECT_NE(service, nullptr); string bundleName; ErrCode errCode = 0; - EXPECT_CALL(*sessionMock, GetScenario()) - .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)) - .WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); + EXPECT_CALL(*sessionMock, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::UNDEFINED)); EXPECT_CALL(*sessionMock, IsOnAllBundlesFinished()).WillOnce(Return(false)); service->NoticeClientFinish(bundleName, errCode); EXPECT_TRUE(true); @@ -806,11 +795,6 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_GetBackupInfo_0100, testing::ext::T EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL)); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); - EXPECT_CALL(*sessionMock, GetImpl()).WillOnce(Invoke([]() { - throw "未知错误"; - return SvcSessionManager::Impl(); - })); - EXPECT_CALL(*sessionMock, DecreaseSessionCnt(_)).WillOnce(Return()); auto ret = service->GetBackupInfo(bundleName, result); EXPECT_NE(ret, EPERM); } catch (...) { @@ -914,22 +898,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()); + int 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."; @@ -995,7 +980,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)); @@ -1007,7 +993,7 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitIncrementalBackupSession_0100, .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(IServiceReverseType::Scenario::UNDEFINED)); - ret = service->InitIncrementalBackupSession(nullptr); + ret = service->InitIncrementalBackupSession(reverse); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); @@ -1015,11 +1001,9 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitIncrementalBackupSession_0100, EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL)) .WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL)); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) - .WillOnce(Return(make_pair(true, DEBUG_ID + 1))) - .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"; } @@ -1042,7 +1026,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)); @@ -1050,11 +1035,9 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitIncrementalBackupSession_0200, EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL)) .WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL)); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) - .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(IServiceReverseType::Scenario::UNDEFINED)); - ret = service->InitIncrementalBackupSession(nullptr, errMsg); + ret = service->InitIncrementalBackupSessionWithErrMsg(reverseNUll, errMsg); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); @@ -1062,11 +1045,9 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitIncrementalBackupSession_0200, EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL)) .WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL)); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) - .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(IServiceReverseType::Scenario::UNDEFINED)); - ret = service->InitIncrementalBackupSession(nullptr, errMsg); + ret = service->InitIncrementalBackupSessionWithErrMsg(reverseNUll, errMsg); EXPECT_EQ(ret, BError(BError::Codes::SA_SESSION_CONFLICT).GetCode()); EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); @@ -1074,11 +1055,9 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_InitIncrementalBackupSession_0200, EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL)) .WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_SHELL)); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) - .WillOnce(Return(make_pair(true, DEBUG_ID + 1))) - .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"; } @@ -1138,14 +1117,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); @@ -1207,20 +1186,17 @@ 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)); + EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)); EXPECT_CALL(*token, GetTokenType(_)) - .WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_HAP)) .WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_HAP)); EXPECT_CALL(*token, GetHapTokenInfo(_, _)).WillOnce(Return(0)); - EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)) - .WillOnce(Return("bundleName")) - .WillOnce(Return("bundleName")) - .WillOnce(Return("bundleName")); + EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).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); @@ -1243,31 +1219,21 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_AppIncrementalDone_0100, testing::e GTEST_LOG_(INFO) << "ServiceThrowTest-begin SUB_Service_throw_AppIncrementalDone_0100"; try { EXPECT_NE(service, nullptr); - EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)).WillOnce(Return(0)).WillOnce(Return(0)); + EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)); EXPECT_CALL(*token, GetTokenType(_)) - .WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_HAP)) .WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_HAP)); EXPECT_CALL(*token, GetHapTokenInfo(_, _)).WillOnce(Return(0)); - EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)) - .WillOnce(Return("bundleName")) - .WillOnce(Return("bundleName")) - .WillOnce(Return("bundleName")); + EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("bundleName")); EXPECT_CALL(*sessionMock, VerifyBundleName(_)).WillOnce(Return(BError(BError::Codes::SA_INVAL_ARG))); - EXPECT_CALL(*sessionMock, IsOnAllBundlesFinished()).WillOnce(Return(false)); auto ret = service->AppIncrementalDone(0); EXPECT_EQ(ret, BError(BError::Codes::SA_INVAL_ARG).GetCode()); - EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)).WillOnce(Return(0)).WillOnce(Return(0)); + EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)); EXPECT_CALL(*token, GetTokenType(_)) - .WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_HAP)) .WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_HAP)); EXPECT_CALL(*token, GetHapTokenInfo(_, _)).WillOnce(Return(0)); - EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)) - .WillOnce(Return("bundleName")) - .WillOnce(Return("bundleName")) - .WillOnce(Return("bundleName")); + EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("bundleName")); EXPECT_CALL(*sessionMock, VerifyBundleName(_)).WillOnce(Return(BError(BError::Codes::SA_REFUSED_ACT))); - EXPECT_CALL(*sessionMock, IsOnAllBundlesFinished()).WillOnce(Return(false)); ret = service->AppIncrementalDone(0); EXPECT_EQ(ret, BError(BError::Codes::SA_REFUSED_ACT).GetCode()); } catch (...) { @@ -1295,18 +1261,12 @@ HWTEST_F(ServiceThrowTest, SUB_Service_throw_GetIncrementalFileHandle_0100, test string fileName; EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)); - EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_HAP)); - EXPECT_CALL(*token, GetHapTokenInfo(_, _)).WillOnce(Return(0)); - EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("bundleName")); EXPECT_CALL(*sessionMock, VerifyCallerAndScenario(_, _)).WillOnce( Return(BError(BError::Codes::SDK_MIXED_SCENARIO))); auto ret = service->GetIncrementalFileHandle(bundleName, fileName); EXPECT_EQ(ret, BError(BError::Codes::SDK_MIXED_SCENARIO).GetCode()); EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)); - EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_HAP)); - EXPECT_CALL(*token, GetHapTokenInfo(_, _)).WillOnce(Return(0)); - EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("bundleName")); EXPECT_CALL(*sessionMock, VerifyCallerAndScenario(_, _)).WillOnce( Return(BError(BError::Codes::SA_REFUSED_ACT))); ret = service->GetIncrementalFileHandle(bundleName, fileName); 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 e5880f5c0..57b0e28d9 100644 --- a/tests/unittests/backup_sa/module_ipc/sub_service_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/sub_service_test.cpp @@ -31,10 +31,6 @@ HWTEST_F(ServiceTest, SUB_Service_HandleCurGroupBackupInfos_0000, TestSize.Level map> bundleNameDetailMap; map isClearDataFlags; EXPECT_CALL(*jsonUtil, BuildBundleNameIndexInfo(_, _)).WillOnce(Return("")); - EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); - EXPECT_CALL(*srProxy, BackupOnBundleStarted(_, _)).WillOnce(Return(0)); - EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) - .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*jsonUtil, FindBundleInfoByName(_, _, _, _)).WillOnce(Return(false)); service->HandleCurGroupBackupInfos(backupInfos, bundleNameDetailMap, isClearDataFlags); EXPECT_TRUE(true); @@ -352,7 +348,6 @@ HWTEST_F(ServiceTest, SUB_Service_OnBackupExtensionDied_0000, TestSize.Level1) EXPECT_TRUE(true); 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)); @@ -389,7 +384,6 @@ HWTEST_F(ServiceTest, SUB_Service_ExtConnectDied_0000, TestSize.Level1) EXPECT_CALL(*session, GetExtConnection(_)).WillOnce(Return(nullptr)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); 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)); @@ -402,7 +396,6 @@ HWTEST_F(ServiceTest, SUB_Service_ExtConnectDied_0000, TestSize.Level1) EXPECT_CALL(*connect, IsExtAbilityConnected()).WillOnce(Return(false)); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); 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)); @@ -416,7 +409,6 @@ HWTEST_F(ServiceTest, SUB_Service_ExtConnectDied_0000, TestSize.Level1) EXPECT_CALL(*connect, DisconnectBackupExtAbility()).WillOnce(Return(BError(BError::Codes::OK).GetCode())); EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); 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)); @@ -450,35 +442,23 @@ HWTEST_F(ServiceTest, SUB_Service_ExtStart_0000, TestSize.Level1) service->ExtStart(callName); EXPECT_TRUE(true); - EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)).WillOnce(Return(true)); - 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)); + EXPECT_CALL(*session, GetScenario()).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)); service->ExtStart(callName); EXPECT_TRUE(true); - EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)).WillOnce(Return(true)); - 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)); + EXPECT_CALL(*session, GetScenario()).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)); - EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); service->ExtStart(callName); EXPECT_TRUE(true); - EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(false)).WillOnce(Return(true)); - 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)); + EXPECT_CALL(*session, GetScenario()).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)); - EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); service->ExtStart(callName); EXPECT_TRUE(true); } catch (...) { @@ -523,8 +503,6 @@ HWTEST_F(ServiceTest, SUB_Service_ExtStart_0100, TestSize.Level1) 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(0)); - EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) - .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*cdConfig, DeleteClearBundleRecord(_)).WillOnce(Return(true)); EXPECT_CALL(*session, IsOnAllBundlesFinished()).WillOnce(Return(false)); service->ExtStart(callName); @@ -539,8 +517,6 @@ HWTEST_F(ServiceTest, SUB_Service_ExtStart_0100, TestSize.Level1) 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(0)); - EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) - .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); EXPECT_CALL(*session, GetExtFileNameRequest(_)).WillOnce(Return(fileNameVec)); service->ExtStart(callName); EXPECT_TRUE(true); @@ -655,13 +631,11 @@ HWTEST_F(ServiceTest, SUB_Service_NoticeClientFinish_0000, TestSize.Level1) GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_NoticeClientFinish_0000"; try { string bundleName; - EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); 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(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetIsIncrementalBackup()).WillOnce(Return(true)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); @@ -670,7 +644,6 @@ HWTEST_F(ServiceTest, SUB_Service_NoticeClientFinish_0000, TestSize.Level1) service->NoticeClientFinish(bundleName, 0); EXPECT_TRUE(true); - EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(true)); EXPECT_CALL(*session, ValidRestoreDataType(_)).WillOnce(Return(true)); @@ -680,7 +653,6 @@ HWTEST_F(ServiceTest, SUB_Service_NoticeClientFinish_0000, TestSize.Level1) service->NoticeClientFinish(bundleName, 0); EXPECT_TRUE(true); - EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::BACKUP)); EXPECT_CALL(*session, GetIsIncrementalBackup()).WillOnce(Return(false)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); @@ -709,7 +681,6 @@ HWTEST_F(ServiceTest, SUB_Service_NoticeClientFinish_0100, TestSize.Level1) GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_NoticeClientFinish_0100"; try { string bundleName; - EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(true)); EXPECT_CALL(*session, ValidRestoreDataType(_)).WillOnce(Return(false)); @@ -719,7 +690,6 @@ HWTEST_F(ServiceTest, SUB_Service_NoticeClientFinish_0100, TestSize.Level1) service->NoticeClientFinish(bundleName, 0); EXPECT_TRUE(true); - EXPECT_CALL(*saUtils, IsSABundleName(_)).WillOnce(Return(true)); EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*param, GetBackupOverrideIncrementalRestore()).WillOnce(Return(false)); EXPECT_CALL(*session, GetServiceReverseProxy()).WillOnce(Return(srProxy)); @@ -749,7 +719,6 @@ HWTEST_F(ServiceTest, SUB_Service_ExtConnectDone_0000, TestSize.Level1) try { EXPECT_CALL(*session, GetClearDataFlag(_)).WillOnce(Return(false)).WillOnce(Return(false)); EXPECT_CALL(*session, GetServiceSchedAction(_)).WillOnce(Return(BConstants::ServiceSchedAction::WAIT)); - EXPECT_CALL(*cdConfig, InsertClearBundleRecord(_)).WillOnce(Return(true)); service->ExtConnectDone(""); EXPECT_TRUE(true); @@ -764,7 +733,6 @@ HWTEST_F(ServiceTest, SUB_Service_ExtConnectDone_0000, TestSize.Level1) EXPECT_CALL(*session, GetServiceSchedAction(_)).WillOnce(Return(BConstants::ServiceSchedAction::START)); EXPECT_CALL(*cdConfig, FindClearBundleRecord(_)).WillOnce(Return(false)); - EXPECT_CALL(*cdConfig, InsertClearBundleRecord(_)).WillOnce(Return(true)); service->ExtConnectDone(""); EXPECT_TRUE(true); } catch (...) { @@ -1140,6 +1108,11 @@ HWTEST_F(ServiceTest, SUB_Service_TryToClearDispose_0000, TestSize.Level1) GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_TryToClearDispose_0000"; try { BundleName bundleName; + EXPECT_CALL(*jdConfig, DeleteFromDisposalConfigFile(_)).WillOnce(Return(true)); + service->TryToClearDispose(bundleName); + EXPECT_TRUE(true); + + bundleName = "100-test"; EXPECT_CALL(*gallery, EndRestore(_, _)).WillOnce(Return(DisposeErr::OK)); EXPECT_CALL(*jdConfig, DeleteFromDisposalConfigFile(_)).WillOnce(Return(true)); service->TryToClearDispose(bundleName); @@ -1180,7 +1153,7 @@ HWTEST_F(ServiceTest, SUB_Service_SendErrAppGalleryNotify_0000, TestSize.Level1) service->SendErrAppGalleryNotify(); EXPECT_TRUE(true); - bundleNameList.emplace_back("bundleName"); + bundleNameList.emplace_back("100-bundleName"); EXPECT_CALL(*session, GetScenario()).WillOnce(Return(IServiceReverseType::Scenario::RESTORE)); EXPECT_CALL(*jdConfig, GetBundleNameFromConfigFile()).WillOnce(Return(bundleNameList)); EXPECT_CALL(*gallery, EndRestore(_, _)).WillOnce(Return(DisposeErr::OK)); @@ -1212,7 +1185,7 @@ HWTEST_F(ServiceTest, SUB_Service_ClearDisposalOnSaStart_0000, TestSize.Level1) service->ClearDisposalOnSaStart(); EXPECT_TRUE(true); - bundleNameList.emplace_back("bundleName"); + bundleNameList.emplace_back("100-bundleName"); EXPECT_CALL(*jdConfig, GetBundleNameFromConfigFile()).WillOnce(Return(bundleNameList)); EXPECT_CALL(*gallery, EndRestore(_, _)).WillOnce(Return(DisposeErr::OK)); EXPECT_CALL(*jdConfig, DeleteFromDisposalConfigFile(_)).WillOnce(Return(true)); @@ -1495,13 +1468,9 @@ HWTEST_F(ServiceTest, SUB_Service_TimeoutRadarReport_0000, TestSize.Level1) GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_TimeoutRadarReport_0000"; try { string bundleName; - EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) - .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); service->TimeoutRadarReport(IServiceReverseType::Scenario::BACKUP, bundleName); EXPECT_TRUE(true); - EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) - .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); service->TimeoutRadarReport(IServiceReverseType::Scenario::RESTORE, bundleName); EXPECT_TRUE(true); @@ -1573,7 +1542,6 @@ HWTEST_F(ServiceTest, SUB_Service_GetBackupDataSize_0000, TestSize.Level1) service->session_ = session_; EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)); EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_NATIVE)); - EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); EXPECT_CALL(*token, VerifyAccessToken(_, _)) .WillOnce(Return(Security::AccessToken::PermissionState::PERMISSION_DENIED)); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) @@ -1581,12 +1549,8 @@ HWTEST_F(ServiceTest, SUB_Service_GetBackupDataSize_0000, TestSize.Level1) ret = service->GetBackupDataSize(isPreciseScan, bundleNameList); EXPECT_EQ(ret, BError(BError::Codes::SA_INVAL_ARG).GetCode()); - EXPECT_CALL(*skeleton, GetCallingTokenID()).WillOnce(Return(0)); EXPECT_CALL(*token, GetTokenType(_)).WillOnce(Return(Security::AccessToken::ATokenTypeEnum::TOKEN_HAP)); EXPECT_CALL(*token, GetHapTokenInfo(_, _)).WillOnce(Return(0)); - EXPECT_CALL(*skeleton, GetCallingUid()).WillOnce(Return(BConstants::SYSTEM_UID)); - EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) - .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); ret = service->GetBackupDataSize(isPreciseScan, bundleNameList); EXPECT_EQ(ret, BError(BError::Codes::SA_INVAL_ARG).GetCode()); } catch (...) { @@ -1813,13 +1777,9 @@ HWTEST_F(ServiceTest, SUB_Service_GetPrecisesSize_0100, TestSize.Level1) dataTwo.bundleName = BUNDLE_NAME; dataTwo.lastIncrementalTime = 1; bundleNameListTwo.push_back(dataTwo); - EXPECT_CALL(*jsonUtil, ParseBundleNameIndexStr(_)).WillOnce(Return(info)) - .WillOnce(Return(info)).WillOnce(Return(info)); - EXPECT_CALL(*sms, GetBundleStatsForIncrease(_, _, _, _, _)).WillOnce(Return(0)) - .WillOnce(Return(0)).WillOnce(Return(0)); + EXPECT_CALL(*jsonUtil, ParseBundleNameIndexStr(_)).WillOnce(Return(info)); + EXPECT_CALL(*sms, GetBundleStatsForIncrease(_, _, _, _, _)).WillOnce(Return(0)); EXPECT_CALL(*param, GetBackupDebugOverrideAccount()) - .WillOnce(Return(make_pair(true, DEBUG_ID + 1))) - .WillOnce(Return(make_pair(true, DEBUG_ID + 1))) .WillOnce(Return(make_pair(true, DEBUG_ID + 1))); service->GetPrecisesSize(bundleNameListTwo, scanning); EXPECT_EQ(service->bundleDataSizeList_.size(), 0); diff --git a/tests/unittests/backup_sa/module_ipc/svc_backup_connection_test.cpp b/tests/unittests/backup_sa/module_ipc/svc_backup_connection_test.cpp index bcc180e3c..9baf66a3a 100644 --- a/tests/unittests/backup_sa/module_ipc/svc_backup_connection_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/svc_backup_connection_test.cpp @@ -130,6 +130,43 @@ HWTEST_F(SvcBackupConnectionTest, SUB_BackupConnection_OnAbilityDisconnectDone_0 GTEST_LOG_(INFO) << "SvcBackupConnectionTest-end SUB_BackupConnection_OnAbilityDisconnectDone_0100"; } +/** + * @tc.number: SUB_BackupConnection_OnAbilityDisconnectDone_0200 + * @tc.name: SUB_BackupConnection_OnAbilityDisconnectDone_0200 + * @tc.desc: 测试 OnAbilityDisconnectDone 链接回调接口调用成功 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SvcBackupConnectionTest, SUB_BackupConnection_OnAbilityDisconnectDone_0200, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SvcBackupConnectionTest-begin SUB_BackupConnection_OnAbilityDisconnectDone_0200"; + try { + AppExecFwk::ElementName element; + string bundleName = "test"; + element.SetBundleName(bundleName); + int resultCode = 1; + + EXPECT_TRUE(backupCon_ != nullptr); + backupCon_->bundleNameIndexInfo_ = "app"; + backupCon_->OnAbilityDisconnectDone(element, resultCode); + bool ret = backupCon_->IsExtAbilityConnected(); + EXPECT_FALSE(ret); + + backupCon_->isConnectCalled_ = true; + backupCon_->isCleanCalled_ = true; + backupCon_->bundleNameIndexInfo_ = "test"; + backupCon_->OnAbilityDisconnectDone(element, resultCode); + ret = backupCon_->IsExtAbilityConnected(); + EXPECT_FALSE(ret); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SvcBackupConnectionTest-an exception occurred by OnAbilityDisconnectDone."; + } + GTEST_LOG_(INFO) << "SvcBackupConnectionTest-end SUB_BackupConnection_OnAbilityDisconnectDone_0200"; +} + /** * @tc.number: SUB_BackupConnection_GetBackupExtProxy_0100 * @tc.name: SUB_BackupConnection_GetBackupExtProxy_0100 @@ -147,4 +184,22 @@ HWTEST_F(SvcBackupConnectionTest, SUB_BackupConnection_GetBackupExtProxy_0100, t EXPECT_EQ(proxy, nullptr); GTEST_LOG_(INFO) << "SvcBackupConnectionTest-end SUB_BackupConnection_GetBackupExtProxy_0100"; } + +/** + * @tc.number: SUB_BackupConnection_WaitDisconnectDone_0100 + * @tc.name: SUB_BackupConnection_WaitDisconnectDone_0100 + * @tc.desc: 测试 WaitDisconnectDone 获取连接状态接口调用成功 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SvcBackupConnectionTest, SUB_BackupConnection_WaitDisconnectDone_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SvcBackupConnectionTest-begin SUB_BackupConnection_WaitDisconnectDone_0100"; + EXPECT_TRUE(backupCon_ != nullptr); + auto res = backupCon_->WaitDisconnectDone(); + EXPECT_TRUE(res); + GTEST_LOG_(INFO) << "SvcBackupConnectionTest-end SUB_BackupConnection_WaitDisconnectDone_0100"; +} } // namespace OHOS::FileManagement::Backup \ No newline at end of file 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 7e7b15bab..bd61dd570 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 @@ -2091,5 +2091,114 @@ HWTEST_F(SvcSessionManagerTest, SUB_backup_sa_session_Exception_0200, testing::e } GTEST_LOG_(INFO) << "SvcSessionManagerTest-end SUB_backup_sa_session_Exception_0200"; } + +/** + * @tc.number: SUB_backup_sa_session_Exception_0300 + * @tc.name: SUB_backup_sa_session_Exception_0300 + * @tc.desc: 测试 Exception + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SvcSessionManagerTest, SUB_backup_sa_session_Exception_0300, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SvcSessionManagerTest-begin SUB_backup_sa_session_Exception_0300"; + try { + EXPECT_TRUE(sessionManagerPtr_ != nullptr); + sessionManagerPtr_->impl_.clientToken = 0; + + sessionManagerPtr_->SetOldBackupVersion(""); + EXPECT_TRUE(true); + + auto result = sessionManagerPtr_->GetOldBackupVersion(); + EXPECT_EQ(result, ""); + + sessionManagerPtr_->SetIsReadyLaunch(BUNDLE_NAME); + EXPECT_TRUE(true); + + sessionManagerPtr_->impl_.clientToken = CLIENT_TOKEN_ID; + sessionManagerPtr_->impl_.backupExtNameMap.clear(); + bool stopFwkTimer = sessionManagerPtr_->StopFwkTimer(BUNDLE_NAME); + EXPECT_EQ(stopFwkTimer, false); + + bool stopExtTimer = sessionManagerPtr_->StopExtTimer(BUNDLE_NAME); + EXPECT_EQ(stopExtTimer, false); + + BIncrementalData incrementalData; + sessionManagerPtr_->SetIncrementalData(incrementalData); + EXPECT_TRUE(true); + + int32_t manifestFd = sessionManagerPtr_->GetIncrementalManifestFd(BUNDLE_NAME); + EXPECT_EQ(manifestFd, BConstants::INVALID_FD_NUM); + + int64_t lastIncrementalTime = sessionManagerPtr_->GetLastIncrementalTime(BUNDLE_NAME); + EXPECT_EQ(lastIncrementalTime, 0); + + uint32_t timeout = sessionManagerPtr_->GetTimeoutValue(BUNDLE_NAME); + EXPECT_EQ(timeout, BConstants::TIMEOUT_INVALID); + + sessionManagerPtr_->SetPublishFlag(BUNDLE_NAME); + EXPECT_TRUE(true); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SvcSessionManagerTest-an exception occurred by Exception."; + } + GTEST_LOG_(INFO) << "SvcSessionManagerTest-end SUB_backup_sa_session_Exception_0300"; +} + +/** + * @tc.number: SUB_backup_sa_session_GetSessionCallerName_0100 + * @tc.name: SUB_backup_sa_session_GetSessionCallerName_0100 + * @tc.desc: 测试 GetSessionCallerName + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SvcSessionManagerTest, SUB_backup_sa_session_GetSessionCallerName_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SvcSessionManagerTest-begin SUB_backup_sa_session_GetSessionCallerName_0100"; + try { + EXPECT_TRUE(sessionManagerPtr_ != nullptr); + sessionManagerPtr_->impl_.clientToken = 0; + auto result = sessionManagerPtr_->GetSessionCallerName(); + EXPECT_EQ(result, ""); + sessionManagerPtr_->impl_.clientToken = CLIENT_TOKEN_ID; + result = sessionManagerPtr_->GetSessionCallerName(); + EXPECT_EQ(result, ""); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SvcSessionManagerTest-an exception occurred by GetSessionCallerName."; + } + GTEST_LOG_(INFO) << "SvcSessionManagerTest-end SUB_backup_sa_session_GetSessionCallerName_0100"; +} + +/** + * @tc.number: SUB_backup_sa_session_GetSessionActiveTime_0100 + * @tc.name: SUB_backup_sa_session_GetSessionActiveTime_0100 + * @tc.desc: 测试 GetSessionActiveTime + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I6F3GV + */ +HWTEST_F(SvcSessionManagerTest, SUB_backup_sa_session_GetSessionActiveTime_0100, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "SvcSessionManagerTest-begin SUB_backup_sa_session_GetSessionActiveTime_0100"; + try { + EXPECT_TRUE(sessionManagerPtr_ != nullptr); + sessionManagerPtr_->impl_.clientToken = 0; + auto result = sessionManagerPtr_->GetSessionActiveTime(); + EXPECT_EQ(result, ""); + sessionManagerPtr_->impl_.clientToken = CLIENT_TOKEN_ID; + result = sessionManagerPtr_->GetSessionActiveTime(); + EXPECT_EQ(result, ""); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "SvcSessionManagerTest-an exception occurred by GetSessionActiveTime."; + } + GTEST_LOG_(INFO) << "SvcSessionManagerTest-end SUB_backup_sa_session_GetSessionActiveTime_0100"; +} #include "svc_session_manager_ex_test.cpp" } // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/tests/unittests/backup_sa/session/BUILD.gn b/tests/unittests/backup_sa/session/BUILD.gn index c5c68c7e0..ffe08a2cd 100644 --- a/tests/unittests/backup_sa/session/BUILD.gn +++ b/tests/unittests/backup_sa/session/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2025 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 @@ -31,6 +31,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 = [ @@ -41,14 +48,16 @@ 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}/tests/mock/utils_mock/src/utils_mock_global_variable.cpp", "b_incremental_session_test.cpp", + "service_client_mock.cpp", "service_proxy_mock.cpp", ] public_configs = [ "${path_backup}/services/backup_sa:public_idl_config" ] deps = [ - "${path_backup}/services/backup_sa:backup_sa_ipc", + "${path_backup}/services/backup_sa:backup_sa_ipc_stub", "${path_backup}/utils:backup_utils", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", 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 3eda5df61..cd176ce50 100644 --- a/tests/unittests/backup_sa/session/b_incremental_session_test.cpp +++ b/tests/unittests/backup_sa/session/b_incremental_session_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -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,14 @@ 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 +104,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 +133,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 +163,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 +192,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 +225,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 +254,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, AppendBundlesRestoreSessionData(_, _, _, _)).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 +286,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 +315,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 +346,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 +354,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 +377,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 +385,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, AppendBundlesRestoreSessionDataByDetail(_, _, _, _, _)).WillOnce(Return(0)); + ServiceClient::serviceProxy_ = proxy; err = restoreSession->AppendBundles(move(remoteCap), bundlesToRestore, detailInfos); EXPECT_EQ(err, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -408,14 +409,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 +442,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 +471,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, AppendBundlesRestoreSessionData(_, _, _, _)).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 +503,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 +534,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 +542,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 +565,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 +573,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, AppendBundlesRestoreSessionDataByDetail(_, _, _, _, _)).WillOnce(Return(0)); + ServiceClient::serviceProxy_ = proxy; err = restoreAsyncSession->AppendBundles(move(remoteCap), bundlesToRestore, detailInfos); EXPECT_EQ(err, BError(BError::Codes::OK).GetCode()); } catch (...) { @@ -596,13 +597,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 +626,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 +657,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 +665,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 +688,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 +718,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 +748,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 +780,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 +814,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 +846,18 @@ 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 +880,18 @@ 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 (...) { @@ -913,12 +916,12 @@ HWTEST_F(IncrementalSessionTest, SUB_b_incremental_session_test_2800, testing::e try { bool isPreciseScan = false; vector bundleNameList; - ServiceProxy::serviceProxy_ = nullptr; + ServiceClient::serviceProxy_ = nullptr; ASSERT_TRUE(backupSession != nullptr); auto err = backupSession->GetBackupDataSize(isPreciseScan, bundleNameList); EXPECT_EQ(err, BError(BError::Codes::SDK_BROKEN_IPC).GetCode()); - ServiceProxy::serviceProxy_ = proxy; + ServiceClient::serviceProxy_ = proxy; EXPECT_CALL(*proxy, GetBackupDataSize(_, _)).WillOnce(Return(BError(BError::Codes::SDK_BROKEN_IPC).GetCode())); err = backupSession->GetBackupDataSize(isPreciseScan, bundleNameList); EXPECT_EQ(err, BError(BError::Codes::SDK_BROKEN_IPC).GetCode()); 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 000000000..2e34c235c --- /dev/null +++ b/tests/unittests/backup_sa/session/service_client_mock.cpp @@ -0,0 +1,38 @@ +/* + * 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) {} +} diff --git a/test/fuzztest/backupservicestubbranch_fuzzer/corpus/init b/tests/unittests/backup_sa/session/service_client_mock.h similarity index 51% rename from test/fuzztest/backupservicestubbranch_fuzzer/corpus/init rename to tests/unittests/backup_sa/session/service_client_mock.h index 6198079a2..0db15eab6 100644 --- a/test/fuzztest/backupservicestubbranch_fuzzer/corpus/init +++ b/tests/unittests/backup_sa/session/service_client_mock.h @@ -13,4 +13,21 @@ * limitations under the License. */ -FUZZ \ No newline at end of file +#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 \ No newline at end of file diff --git a/tests/unittests/backup_sa/session/service_proxy_mock.cpp b/tests/unittests/backup_sa/session/service_proxy_mock.cpp index fa8a2ce24..bfdd210af 100644 --- a/tests/unittests/backup_sa/session/service_proxy_mock.cpp +++ b/tests/unittests/backup_sa/session/service_proxy_mock.cpp @@ -16,229 +16,216 @@ #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) +ErrCode ServiceProxy::AppFileReady(const std::string &fileName, int fd, int32_t appFileReadyErrCode) { - return 0; -} - -int32_t ServiceProxy::InitRestoreSession(sptr remote, std::string &errMsg) -{ - return 0; -} - -int32_t ServiceProxy::InitBackupSession(sptr remote) -{ - return 0; + return BError(BError::Codes::OK); } -int32_t ServiceProxy::InitBackupSession(sptr remote, std::string &errMsg) +ErrCode ServiceProxy::AppDone(int32_t appDoneErrCode) { - return 0; + return BError(BError::Codes::OK); } -ErrCode ServiceProxy::Start() +ErrCode ServiceProxy::RefreshDataSize(int64_t totalDataSize) { return BError(BError::Codes::OK); } -UniqueFd ServiceProxy::GetLocalCapabilities() +ErrCode ServiceProxy::AppIncrementalDone(int32_t appIncrementalDoneErrCode) { - return UniqueFd(-1); + return BError(BError::Codes::OK); } -ErrCode ServiceProxy::PublishFile(const BFileInfo &fileInfo) +ErrCode ServiceProxy::AppIncrementalFileReady(const std::string &fileName, int fd, int manifestFd, int32_t errCode) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppFileReady(const string &fileName, UniqueFd fd, int32_t errCode) +ErrCode ServiceProxy::PublishSAIncrementalFile(const BFileInfo &fileInfo, int fd) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppDone(ErrCode errCode) +ErrCode ServiceProxy::PublishIncrementalFile(const BFileInfo &fileInfo) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::ServiceResultReport(const std::string restoreRetInfo, - BackupRestoreScenario scenario, - ErrCode errCode) +int32_t ServiceProxy::InitRestoreSession(const sptr &remote) { - return BError(BError::Codes::OK); + if (!GetMockInitBackupOrRestoreSession()) { + return 0; + } + return 1; } -ErrCode ServiceProxy::GetFileHandle(const string &bundleName, const string &fileName) +int32_t ServiceProxy::InitRestoreSessionWithErrMsg(const 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) +int32_t ServiceProxy::InitBackupSessionWithErrMsg(const sptr &remote, std::string &errMsg) { - return BError(BError::Codes::OK); + return 0; } -ErrCode ServiceProxy::AppendBundlesRestoreSession(UniqueFd fd, - const vector &bundleNames, - RestoreTypeEnum restoreType, - int32_t userId) +ErrCode ServiceProxy::Start() { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppendBundlesBackupSession(const vector &bundleNames) +ErrCode ServiceProxy::AppendBundlesIncrementalBackupSessionWithBundleInfos( + const std::vector &bundlesToBackup, const std::vector &bundleInfos) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppendBundlesDetailsBackupSession(const std::vector &bundleNames, - const std::vector &detailInfos) +ErrCode ServiceProxy::AppendBundlesIncrementalBackupSession(const std::vector &bundlesToBackup) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::Finish() +ErrCode ServiceProxy::Cancel(const std::string &bundleName, int32_t &cancelResult) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::Release() +ErrCode ServiceProxy::PublishFile(const BFileInfo &fileInfo) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::Cancel(std::string bundleName, int32_t &result) +ErrCode ServiceProxy::ReportAppProcessInfo(const std::string &processInfo, BackupRestoreScenario scenario) { - result = BError(BError::Codes::OK); return BError(BError::Codes::OK); } -UniqueFd ServiceProxy::GetLocalCapabilitiesIncremental(const vector &bundleNames) +int32_t ServiceProxy::InitBackupSession(const sptr &remote) { - return UniqueFd(-1); + if (!GetMockInitBackupOrRestoreSession()) { + return 0; + } + return 1; } -ErrCode ServiceProxy::GetAppLocalListAndDoIncrementalBackup() +ErrCode ServiceProxy::ServiceResultReport(const std::string &restoreRetInfo, BackupRestoreScenario scenario, + int32_t serviceResultReportErrCode) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::InitIncrementalBackupSession(sptr remote) +ErrCode ServiceProxy::GetLocalCapabilities(int &fd) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::InitIncrementalBackupSession(sptr remote, std::string &errMsg) +ErrCode ServiceProxy::GetLocalCapabilitiesIncremental(const std::vector &bundleNames, int &fd) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppendBundlesIncrementalBackupSession(const vector &bundlesToBackup) +ErrCode ServiceProxy::GetFileHandle(const string &bundleName, const string &fileName) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppendBundlesIncrementalBackupSession(const vector &bundlesToBackup, - const std::vector &infos) +ErrCode ServiceProxy::AppendBundlesRestoreSessionDataByDetail(int fd, const std::vector &bundleNames, + const std::vector &detailInfos, + int32_t restoreType, int32_t userId) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::PublishIncrementalFile(const BFileInfo &fileInfo) +ErrCode ServiceProxy::AppendBundlesRestoreSessionData(int fd, + const std::vector &bundleNames, + int32_t restoreType, + int32_t userId) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::PublishSAIncrementalFile(const BFileInfo &fileInfo, UniqueFd fd) +ErrCode ServiceProxy::AppendBundlesBackupSession(const vector &bundleNames) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppIncrementalFileReady(const string &fileName, UniqueFd fd, UniqueFd manifestFd, int32_t errCode) +ErrCode ServiceProxy::AppendBundlesDetailsBackupSession(const std::vector &bundleNames, + const std::vector &detailInfos) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::AppIncrementalDone(ErrCode errCode) +ErrCode ServiceProxy::Finish() { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::GetIncrementalFileHandle(const std::string &bundleName, const std::string &fileName) +ErrCode ServiceProxy::Release() { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::GetBackupInfo(std::string &bundleName, std::string &result) +ErrCode ServiceProxy::GetAppLocalListAndDoIncrementalBackup() { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::UpdateTimer(BundleName &bundleName, uint32_t timeout, bool &result) +ErrCode ServiceProxy::InitIncrementalBackupSession(const sptr &remote) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::StartExtTimer(bool &isExtStart) +ErrCode ServiceProxy::InitIncrementalBackupSessionWithErrMsg(const sptr &remote, std::string &errMsg) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::StartFwkTimer(bool &isFwkStart) +ErrCode ServiceProxy::GetIncrementalFileHandle(const std::string &bundleName, const std::string &fileName) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::StopExtTimer(bool &isExtStop) +ErrCode ServiceProxy::GetBackupInfo(const std::string &bundleName, std::string &result) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::RefreshDataSize(int64_t totalsize) +ErrCode ServiceProxy::UpdateTimer(const BundleName &bundleName, uint32_t timeout, bool &result) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::UpdateSendRate(std::string &bundleName, int32_t sendRate, bool &result) +ErrCode ServiceProxy::StartExtTimer(bool &isExtStart) { return BError(BError::Codes::OK); } -ErrCode ServiceProxy::ReportAppProcessInfo(const std::string processInfo, const BackupRestoreScenario sennario) +ErrCode ServiceProxy::StartFwkTimer(bool &isFwkStart) { return BError(BError::Codes::OK); } -sptr ServiceProxy::GetServiceProxyPointer() +ErrCode ServiceProxy::StopExtTimer(bool &isExtStop) { - return serviceProxy_; + return BError(BError::Codes::OK); } -sptr ServiceProxy::GetInstance() +ErrCode ServiceProxy::UpdateSendRate(const std::string &bundleName, int32_t sendRate, bool &result) { - return serviceProxy_; + return BError(BError::Codes::OK); } -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(int &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 25e4d7373..dfbf9185e 100644 --- a/tests/unittests/backup_sa/session/service_proxy_mock.h +++ b/tests/unittests/backup_sa/session/service_proxy_mock.h @@ -27,53 +27,49 @@ public: ~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(const sptr &remote)); + MOCK_METHOD2(InitRestoreSessionWithErrMsg, ErrCode(const sptr &remote, std::string &errMsg)); + MOCK_METHOD1(InitBackupSession, ErrCode(const sptr &remote)); + MOCK_METHOD2(InitBackupSessionWithErrMsg, ErrCode(const 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, int fd)); + MOCK_METHOD3(AppFileReady, ErrCode(const std::string &fileName, int 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, int &fd)); + MOCK_METHOD1(InitIncrementalBackupSession, ErrCode(const sptr &remote)); + MOCK_METHOD2(InitIncrementalBackupSessionWithErrMsg, + ErrCode(const 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_METHOD2(PublishSAIncrementalFile, ErrCode(const BFileInfo &fileInfo, int fd)); + MOCK_METHOD3(AppIncrementalFileReady, ErrCode(const std::string &fileName, int fd, int manifestFd)); MOCK_METHOD4(AppIncrementalFileReady, - ErrCode(const std::string &fileName, UniqueFd fd, UniqueFd manifestFd, int32_t errCode)); - MOCK_METHOD1(AppIncrementalDone, ErrCode(ErrCode errCode)); + ErrCode(const std::string &fileName, int fd, int manifestFd, int32_t 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_METHOD2(GetBackupInfo, ErrCode(const BundleName &bundleName, std::string &result)); + MOCK_METHOD3(UpdateTimer, ErrCode(const 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( + AppendBundlesRestoreSessionDataByDetail, + ErrCode(int32_t, const std::vector &, const std::vector &, int32_t, int32_t)); + MOCK_METHOD4(AppendBundlesRestoreSessionData, + 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 99bcc90ee..dcbded1ee 100644 --- a/tests/unittests/backup_tools/BUILD.gn +++ b/tests/unittests/backup_tools/BUILD.gn @@ -26,6 +26,7 @@ ohos_unittest("backup_tool_test") { "${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}/tests/mock/backup_kit_inner/b_session_backup_mock.cpp", + "${path_backup}/tests/mock/backup_kit_inner/service_client_mock.cpp", "${path_backup}/tools/backup_tool/src/tools_op.cpp", "${path_backup}/tools/backup_tool/src/tools_op_backup.cpp", "${path_backup}/tools/backup_tool/src/tools_op_check_sa.cpp", @@ -49,7 +50,8 @@ ohos_unittest("backup_tool_test") { include_dirs += backup_mock_utils_include deps = [ - "${path_backup}/services/backup_sa:backup_sa_ipc", + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", + "${path_backup}/services/backup_sa:backup_sa_ipc_stub", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", @@ -111,7 +113,8 @@ ohos_unittest("backup_tool_restore_test") { include_dirs += backup_mock_utils_include deps = [ - "${path_backup}/services/backup_sa:backup_sa_ipc", + "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", + "${path_backup}/services/backup_sa:backup_sa_ipc_stub", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", @@ -148,7 +151,7 @@ ohos_unittest("backup_tool_restore_test") { use_exceptions = true } -group("backup_test") { +group("backup_tools_test") { testonly = true deps = [ diff --git a/tests/unittests/backup_utils/BUILD.gn b/tests/unittests/backup_utils/BUILD.gn index 4a16ef68c..9825597ba 100644 --- a/tests/unittests/backup_utils/BUILD.gn +++ b/tests/unittests/backup_utils/BUILD.gn @@ -395,7 +395,7 @@ ohos_unittest("b_json_clear_data_test") { use_exceptions = true } -group("backup_test") { +group("backup_utils_test") { testonly = true deps = [ diff --git a/tests/unittests/backup_utils/b_anony/b_anony_test.cpp b/tests/unittests/backup_utils/b_anony/b_anony_test.cpp index fbe16d220..382eebb6d 100644 --- a/tests/unittests/backup_utils/b_anony/b_anony_test.cpp +++ b/tests/unittests/backup_utils/b_anony/b_anony_test.cpp @@ -36,7 +36,7 @@ public: * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BAnonyTest, b_anony_GetAnonyPath_0100, testing::ext::TestSize.Level0) +HWTEST_F(BAnonyTest, b_anony_GetAnonyPath_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BAnonyTest-begin b_anony_GetAnonyPath_0100"; try { diff --git a/tests/unittests/backup_utils/b_error/b_error_test.cpp b/tests/unittests/backup_utils/b_error/b_error_test.cpp index 861f6440a..2466b8b49 100644 --- a/tests/unittests/backup_utils/b_error/b_error_test.cpp +++ b/tests/unittests/backup_utils/b_error/b_error_test.cpp @@ -36,7 +36,7 @@ public: * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_construction_0100, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_construction_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_construction_0100"; try { @@ -57,7 +57,7 @@ HWTEST_F(BErrorTest, b_error_construction_0100, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_construction_0300, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_construction_0300, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_construction_0300"; try { @@ -79,7 +79,7 @@ HWTEST_F(BErrorTest, b_error_construction_0300, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_construction_0500, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_construction_0500, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_construction_0500"; try { @@ -102,7 +102,7 @@ HWTEST_F(BErrorTest, b_error_construction_0500, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_construction_0700, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_construction_0700, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_construction_0700"; try { @@ -125,7 +125,7 @@ HWTEST_F(BErrorTest, b_error_construction_0700, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_construction_0900, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_construction_0900, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_construction_0900"; try { @@ -148,7 +148,7 @@ HWTEST_F(BErrorTest, b_error_construction_0900, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_construction_0200, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_construction_0200, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_construction_0200"; try { @@ -171,7 +171,7 @@ HWTEST_F(BErrorTest, b_error_construction_0200, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_construction_0400, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_construction_0400, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_construction_0400"; try { @@ -194,7 +194,7 @@ HWTEST_F(BErrorTest, b_error_construction_0400, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetCode_0100, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetCode_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetCode_0100"; BError be(BError::Codes::OK); @@ -212,7 +212,7 @@ HWTEST_F(BErrorTest, b_error_GetCode_0100, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetCode_0200, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetCode_0200, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetCode_0200"; BError be(BError::Codes::UTILS_INVAL_JSON_ENTITY); @@ -230,7 +230,7 @@ HWTEST_F(BErrorTest, b_error_GetCode_0200, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetCode_0300, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetCode_0300, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetCode_0300"; BError be(BError::Codes::UTILS_INVAL_FILE_HANDLE); @@ -248,7 +248,7 @@ HWTEST_F(BErrorTest, b_error_GetCode_0300, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetCode_0400, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetCode_0400, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetCode_0400"; BError be(BError::Codes::UTILS_INVAL_TARBALL_ARG); @@ -266,7 +266,7 @@ HWTEST_F(BErrorTest, b_error_GetCode_0400, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetCode_0500, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetCode_0500, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetCode_0500"; BError be(BError::Codes::UTILS_INVAL_PROCESS_ARG); @@ -284,7 +284,7 @@ HWTEST_F(BErrorTest, b_error_GetCode_0500, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetCode_0600, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetCode_0600, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetCode_0600"; BError be(BError::Codes::UTILS_INTERRUPTED_PROCESS); @@ -302,7 +302,7 @@ HWTEST_F(BErrorTest, b_error_GetCode_0600, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetRawCode_0100, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetRawCode_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetRawCode_0100"; BError be(BError::Codes::OK); @@ -320,7 +320,7 @@ HWTEST_F(BErrorTest, b_error_GetRawCode_0100, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetRawCode_0200, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetRawCode_0200, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetRawCode_0200"; BError be(BError::Codes::UTILS_INVAL_JSON_ENTITY); @@ -338,7 +338,7 @@ HWTEST_F(BErrorTest, b_error_GetRawCode_0200, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetRawCode_0300, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetRawCode_0300, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetRawCode_0300"; BError be(BError::Codes::UTILS_INVAL_FILE_HANDLE); @@ -356,7 +356,7 @@ HWTEST_F(BErrorTest, b_error_GetRawCode_0300, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetRawCode_0400, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetRawCode_0400, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetRawCode_0400"; BError be(BError::Codes::UTILS_INVAL_TARBALL_ARG); @@ -374,7 +374,7 @@ HWTEST_F(BErrorTest, b_error_GetRawCode_0400, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetRawCode_0500, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetRawCode_0500, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetRawCode_0500"; BError be(BError::Codes::UTILS_INVAL_PROCESS_ARG); @@ -392,7 +392,7 @@ HWTEST_F(BErrorTest, b_error_GetRawCode_0500, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetRawCode_0600, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetRawCode_0600, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetRawCode_0600"; BError be(BError::Codes::UTILS_INTERRUPTED_PROCESS); @@ -410,7 +410,7 @@ HWTEST_F(BErrorTest, b_error_GetRawCode_0600, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_what_0100, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_what_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_what_0100"; BError be(BError::Codes::OK); @@ -428,7 +428,7 @@ HWTEST_F(BErrorTest, b_error_what_0100, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_bool_0100, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_bool_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_bool_0100"; bool result = BError(); @@ -445,7 +445,7 @@ HWTEST_F(BErrorTest, b_error_bool_0100, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_int_0100, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_int_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_int_0100"; int result = BError(); @@ -462,7 +462,7 @@ HWTEST_F(BErrorTest, b_error_int_0100, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetCodeByErrno_0100, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetCodeByErrno_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetCodeByErrno_0100"; int32_t errnoSys = 0; @@ -480,7 +480,7 @@ HWTEST_F(BErrorTest, b_error_GetCodeByErrno_0100, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetCodeByErrno_0200, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetCodeByErrno_0200, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetCodeByErrno_0200"; int32_t errnoSys = EPERM; @@ -498,7 +498,7 @@ HWTEST_F(BErrorTest, b_error_GetCodeByErrno_0200, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetCodeByErrno_0300, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetCodeByErrno_0300, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetCodeByErrno_0300"; int32_t errnoSys = -EPERM; @@ -516,7 +516,7 @@ HWTEST_F(BErrorTest, b_error_GetCodeByErrno_0300, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetBackupCodeByErrno_0100, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetBackupCodeByErrno_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetBackupCodeByErrno_0100"; int err = ERR_OK; @@ -534,7 +534,7 @@ HWTEST_F(BErrorTest, b_error_GetBackupCodeByErrno_0100, testing::ext::TestSize.L * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetBackupCodeByErrno_0200, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetBackupCodeByErrno_0200, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetBackupCodeByErrno_0200"; int err = BError(BError::Codes::SA_INVAL_ARG).GetCode(); @@ -555,7 +555,7 @@ HWTEST_F(BErrorTest, b_error_GetBackupCodeByErrno_0200, testing::ext::TestSize.L * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetBackupCodeByErrno_0300, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetBackupCodeByErrno_0300, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetBackupCodeByErrno_0300"; int err = -EPERM; @@ -573,7 +573,7 @@ HWTEST_F(BErrorTest, b_error_GetBackupCodeByErrno_0300, testing::ext::TestSize.L * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetBackupMsgByErrno_0100, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetBackupMsgByErrno_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetBackupMsgByErrno_0100"; int err = BError(BError::BackupErrorCode::E_PERM).GetCode(); @@ -594,7 +594,7 @@ HWTEST_F(BErrorTest, b_error_GetBackupMsgByErrno_0100, testing::ext::TestSize.Le * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BErrorTest, b_error_GetBackupMsgByErrno_0200, testing::ext::TestSize.Level0) +HWTEST_F(BErrorTest, b_error_GetBackupMsgByErrno_0200, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BErrorTest-begin b_error_GetBackupMsgByErrno_0200"; int err = -EPERM; diff --git a/tests/unittests/backup_utils/b_filesystem/b_dir_test.cpp b/tests/unittests/backup_utils/b_filesystem/b_dir_test.cpp index a893b8164..6cd5d7f4f 100644 --- a/tests/unittests/backup_utils/b_filesystem/b_dir_test.cpp +++ b/tests/unittests/backup_utils/b_filesystem/b_dir_test.cpp @@ -48,7 +48,7 @@ public: * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BDirTest, b_dir_GetDirFiles_0100, testing::ext::TestSize.Level0) +HWTEST_F(BDirTest, b_dir_GetDirFiles_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BDirTest-begin b_dir_GetDirFiles_0100"; try { @@ -86,7 +86,7 @@ HWTEST_F(BDirTest, b_dir_GetDirFiles_0100, testing::ext::TestSize.Level0) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BDirTest, b_dir_GetDirFiles_0104, testing::ext::TestSize.Level0) +HWTEST_F(BDirTest, b_dir_GetDirFiles_0104, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BDirTest-begin b_dir_GetDirFiles_0104"; try { diff --git a/tests/unittests/backup_utils/b_filesystem/b_file_hash_test.cpp b/tests/unittests/backup_utils/b_filesystem/b_file_hash_test.cpp index bedfa2e60..e745dedf4 100644 --- a/tests/unittests/backup_utils/b_filesystem/b_file_hash_test.cpp +++ b/tests/unittests/backup_utils/b_filesystem/b_file_hash_test.cpp @@ -58,7 +58,7 @@ static tuple GetTestFile(const TestManager &tm) * @tc.type: FUNC * @tc.level Level 1 */ -HWTEST_F(BFileHashTest, b_file_hash_HashWithSHA256_0100, testing::ext::TestSize.Level0) +HWTEST_F(BFileHashTest, b_file_hash_HashWithSHA256_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BFileHashTest-begin b_file_hash_HashWithSHA256_0100"; try { @@ -83,7 +83,7 @@ HWTEST_F(BFileHashTest, b_file_hash_HashWithSHA256_0100, testing::ext::TestSize. * @tc.type: FUNC * @tc.level Level 1 */ -HWTEST_F(BFileHashTest, b_file_hash_HashWithSHA256_0101, testing::ext::TestSize.Level0) +HWTEST_F(BFileHashTest, b_file_hash_HashWithSHA256_0101, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BFileHashTest-begin b_file_hash_HashWithSHA256_0101"; try { diff --git a/tests/unittests/backup_utils/b_json/b_json_cached_entity_test.cpp b/tests/unittests/backup_utils/b_json/b_json_cached_entity_test.cpp index 2cebb5ad9..61868d40f 100644 --- a/tests/unittests/backup_utils/b_json/b_json_cached_entity_test.cpp +++ b/tests/unittests/backup_utils/b_json/b_json_cached_entity_test.cpp @@ -43,7 +43,7 @@ public: * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonCachedEntityTest, b_json_construction_0100, testing::ext::TestSize.Level0) +HWTEST_F(BJsonCachedEntityTest, b_json_construction_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonCachedEntityTest-begin b_json_construction_0100"; try { @@ -68,7 +68,7 @@ HWTEST_F(BJsonCachedEntityTest, b_json_construction_0100, testing::ext::TestSize * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonCachedEntityTest, b_json_construction_0101, testing::ext::TestSize.Level0) +HWTEST_F(BJsonCachedEntityTest, b_json_construction_0101, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonCachedEntityTest-begin b_json_construction_0101"; try { @@ -93,7 +93,7 @@ HWTEST_F(BJsonCachedEntityTest, b_json_construction_0101, testing::ext::TestSize * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonCachedEntityTest, b_json_construction_0102, testing::ext::TestSize.Level0) +HWTEST_F(BJsonCachedEntityTest, b_json_construction_0102, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonCachedEntityTest-begin b_json_construction_0102"; try { @@ -118,7 +118,7 @@ HWTEST_F(BJsonCachedEntityTest, b_json_construction_0102, testing::ext::TestSize * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonCachedEntityTest, b_json_construction_0104, testing::ext::TestSize.Level0) +HWTEST_F(BJsonCachedEntityTest, b_json_construction_0104, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonCachedEntityTest-begin b_json_construction_0104"; try { @@ -143,7 +143,7 @@ HWTEST_F(BJsonCachedEntityTest, b_json_construction_0104, testing::ext::TestSize * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonCachedEntityTest, b_json_construction_0105, testing::ext::TestSize.Level0) +HWTEST_F(BJsonCachedEntityTest, b_json_construction_0105, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonCachedEntityTest-begin b_json_construction_0105"; try { @@ -168,7 +168,7 @@ HWTEST_F(BJsonCachedEntityTest, b_json_construction_0105, testing::ext::TestSize * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonCachedEntityTest, b_json_construction_0106, testing::ext::TestSize.Level0) +HWTEST_F(BJsonCachedEntityTest, b_json_construction_0106, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonCachedEntityTest-begin b_json_construction_0106"; try { @@ -193,7 +193,7 @@ HWTEST_F(BJsonCachedEntityTest, b_json_construction_0106, testing::ext::TestSize * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonCachedEntityTest, b_json_construction_0107, testing::ext::TestSize.Level0) +HWTEST_F(BJsonCachedEntityTest, b_json_construction_0107, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonCachedEntityTest-begin b_json_construction_0107"; try { @@ -218,7 +218,7 @@ HWTEST_F(BJsonCachedEntityTest, b_json_construction_0107, testing::ext::TestSize * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonCachedEntityTest, b_json_Structuralize_0100, testing::ext::TestSize.Level0) +HWTEST_F(BJsonCachedEntityTest, b_json_Structuralize_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonCachedEntityTest-begin b_json_Structuralize_0100"; try { @@ -244,7 +244,7 @@ HWTEST_F(BJsonCachedEntityTest, b_json_Structuralize_0100, testing::ext::TestSiz * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonCachedEntityTest, b_json_GetFd_0100, testing::ext::TestSize.Level0) +HWTEST_F(BJsonCachedEntityTest, b_json_GetFd_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonCachedEntityTest-begin b_json_GetFd_0100"; try { @@ -270,7 +270,7 @@ HWTEST_F(BJsonCachedEntityTest, b_json_GetFd_0100, testing::ext::TestSize.Level0 * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonCachedEntityTest, b_json_Persist_0100, testing::ext::TestSize.Level0) +HWTEST_F(BJsonCachedEntityTest, b_json_Persist_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonCachedEntityTest-begin b_json_Persist_0100"; try { @@ -296,7 +296,7 @@ HWTEST_F(BJsonCachedEntityTest, b_json_Persist_0100, testing::ext::TestSize.Leve * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonCachedEntityTest, b_json_ReloadFromFile_0100, testing::ext::TestSize.Level0) +HWTEST_F(BJsonCachedEntityTest, b_json_ReloadFromFile_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonCachedEntityTest-begin b_json_ReloadFromFile_0100"; try { @@ -323,7 +323,7 @@ HWTEST_F(BJsonCachedEntityTest, b_json_ReloadFromFile_0100, testing::ext::TestSi * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonCachedEntityTest, b_json_ReloadFromString_0100, testing::ext::TestSize.Level0) +HWTEST_F(BJsonCachedEntityTest, b_json_ReloadFromString_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonCachedEntityTest-begin b_json_ReloadFromString_0100"; try { diff --git a/tests/unittests/backup_utils/b_json/b_json_clear_data_config_test.cpp b/tests/unittests/backup_utils/b_json/b_json_clear_data_config_test.cpp index f18f1c1df..357ff2ada 100644 --- a/tests/unittests/backup_utils/b_json/b_json_clear_data_config_test.cpp +++ b/tests/unittests/backup_utils/b_json/b_json_clear_data_config_test.cpp @@ -436,12 +436,16 @@ HWTEST_F(BJsonClearDataConfigTest, Clear_Data_Config_Test_0700, testing::ext::Te BJsonClearDataConfig config; EXPECT_EQ(access(filePath.c_str(), F_OK), 0); - EXPECT_CALL(*cJsonMock, cJSON_Parse(_)).WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_Parse(_)).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_GetObjectItem(_, _)).WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); auto ret = config.InsertClearBundleRecord(bundleName); EXPECT_FALSE(ret); EXPECT_CALL(*cJsonMock, cJSON_Parse(_)).WillOnce(Return(reinterpret_cast(&cjson))); - EXPECT_CALL(*cJsonMock, cJSON_GetObjectItem(_, _)).WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_GetObjectItem(_, _)).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_GetArraySize(_)).WillOnce(Return(0)); + EXPECT_CALL(*cJsonMock, cJSON_Parse(_)).WillOnce(Return(nullptr)); EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); ret = config.InsertClearBundleRecord(bundleName); EXPECT_FALSE(ret); @@ -476,19 +480,116 @@ HWTEST_F(BJsonClearDataConfigTest, Clear_Data_Config_Test_0800, testing::ext::Te BJsonClearDataConfig config; EXPECT_EQ(access(filePath.c_str(), F_OK), 0); - EXPECT_CALL(*cJsonMock, cJSON_Parse(_)).WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_Parse(_)).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_GetObjectItem(_, _)).WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); auto ret = config.GetAllClearBundleRecords(); - EXPECT_EQ(ret.size(), 0); + EXPECT_TRUE(ret.empty()); EXPECT_CALL(*cJsonMock, cJSON_Parse(_)).WillOnce(Return(reinterpret_cast(&cjson))); - EXPECT_CALL(*cJsonMock, cJSON_GetObjectItem(_, _)).WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_GetObjectItem(_, _)).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_GetArraySize(_)).WillOnce(Return(0)); EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); ret = config.GetAllClearBundleRecords(); - EXPECT_EQ(ret.size(), 0); + EXPECT_TRUE(ret.empty()); } catch (...) { EXPECT_TRUE(false); GTEST_LOG_(INFO) << "BJsonClearDataConfigTest-an exception occurred by construction."; } GTEST_LOG_(INFO) << "BJsonClearDataConfigTest-end Clear_Data_Config_Test_0800"; } + +/** + * @tc.number: SUB_Clear_Data_Config_Test_0900 + * @tc.name: Clear_Data_Config_Test_0900 + * @tc.desc: 测试 InsertClearBundleRecord 接口 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: IAAMIK + */ +HWTEST_F(BJsonClearDataConfigTest, Clear_Data_Config_Test_0900, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "BJsonClearDataConfigTest-begin Clear_Data_Config_Test_0900"; + try { + string bundleName = "test1"; + string filePath = PATH + CONFIG_NAME; + int cjson = 0; + EXPECT_CALL(*cJsonMock, cJSON_CreateObject()).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_AddItemToObject(_, _, _)).WillOnce(Return(true)); + EXPECT_CALL(*cJsonMock, cJSON_Print(_)).WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); + BJsonClearDataConfig config; + EXPECT_EQ(access(filePath.c_str(), F_OK), 0); + + EXPECT_CALL(*cJsonMock, cJSON_Parse(_)).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_GetObjectItem(_, _)).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_GetArraySize(_)).WillOnce(Return(1)).WillOnce(Return(0)); + EXPECT_CALL(*cJsonMock, cJSON_GetArrayItem(_, _)).WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_GetObjectItem(_, _)).WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); + auto ret = config.InsertClearBundleRecord(bundleName); + EXPECT_FALSE(ret); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "BJsonClearDataConfigTest-an exception occurred by construction."; + } + GTEST_LOG_(INFO) << "BJsonClearDataConfigTest-end Clear_Data_Config_Test_0900"; +} + +/** + * @tc.number: SUB_Clear_Data_Config_Test_1000 + * @tc.name: Clear_Data_Config_Test_1000 + * @tc.desc: 测试 InsertClearBundleRecord 接口 + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: IAAMIK + */ +HWTEST_F(BJsonClearDataConfigTest, Clear_Data_Config_Test_1000, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "BJsonClearDataConfigTest-begin Clear_Data_Config_Test_1000"; + try { + string bundleName = "test1"; + string filePath = PATH + CONFIG_NAME; + int cjson = 0; + EXPECT_CALL(*cJsonMock, cJSON_CreateObject()).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_AddItemToObject(_, _, _)).WillOnce(Return(true)); + EXPECT_CALL(*cJsonMock, cJSON_Print(_)).WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); + BJsonClearDataConfig config; + EXPECT_EQ(access(filePath.c_str(), F_OK), 0); + + EXPECT_CALL(*cJsonMock, cJSON_Parse(_)) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_GetObjectItem(_, _)).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_GetArraySize(_)).WillOnce(Return(1)).WillOnce(Return(0)); + EXPECT_CALL(*cJsonMock, cJSON_GetArrayItem(_, _)).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_GetObjectItem(_, _)).WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); + auto ret = config.InsertClearBundleRecord(bundleName); + EXPECT_FALSE(ret); + + EXPECT_CALL(*cJsonMock, cJSON_Parse(_)) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_GetObjectItem(_, _)).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_GetArraySize(_)).WillOnce(Return(1)).WillOnce(Return(0)); + EXPECT_CALL(*cJsonMock, cJSON_GetArrayItem(_, _)).WillOnce(Return(reinterpret_cast(&cjson))); + EXPECT_CALL(*cJsonMock, cJSON_GetObjectItem(_, _)) + .WillOnce(Return(reinterpret_cast(&cjson))) + .WillOnce(Return(nullptr)) + .WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()).WillOnce(Return()); + ret = config.InsertClearBundleRecord(bundleName); + EXPECT_FALSE(ret); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "BJsonClearDataConfigTest-an exception occurred by construction."; + } + GTEST_LOG_(INFO) << "BJsonClearDataConfigTest-end Clear_Data_Config_Test_1000"; +} } // namespace OHOS::FileManagement::Backup \ No newline at end of file diff --git a/tests/unittests/backup_utils/b_json/b_json_entity_ext_manage_test.cpp b/tests/unittests/backup_utils/b_json/b_json_entity_ext_manage_test.cpp index 239a274bd..f13dd9d0b 100644 --- a/tests/unittests/backup_utils/b_json/b_json_entity_ext_manage_test.cpp +++ b/tests/unittests/backup_utils/b_json/b_json_entity_ext_manage_test.cpp @@ -132,7 +132,7 @@ struct stat GetFileStat(const string &pathTestFile) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0100, testing::ext::TestSize.Level0) +HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonEntityExtManageTest-begin b_json_entity_ext_manage_0100"; try { @@ -175,7 +175,7 @@ HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0100, testing::ext:: * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0200, testing::ext::TestSize.Level0) +HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0200, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonEntityExtManageTest-begin b_json_entity_ext_manage_0200"; try { @@ -228,7 +228,7 @@ HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0200, testing::ext:: * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0300, testing::ext::TestSize.Level0) +HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0300, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonEntityExtManageTest-begin b_json_entity_ext_manage_0300"; try { @@ -291,7 +291,7 @@ HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0300, testing::ext:: * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0400, testing::ext::TestSize.Level0) +HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0400, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonEntityExtManageTest-begin b_json_entity_ext_manage_0400"; try { @@ -355,7 +355,7 @@ HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0400, testing::ext:: * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0500, testing::ext::TestSize.Level0) +HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0500, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonEntityExtManageTest-begin b_json_entity_ext_manage_0500"; try { @@ -410,7 +410,7 @@ HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0500, testing::ext:: * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0700, testing::ext::TestSize.Level0) +HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0700, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonEntityExtManageTest-begin b_json_entity_ext_manage_0700"; try { @@ -435,7 +435,7 @@ HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0700, testing::ext:: * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0800, testing::ext::TestSize.Level0) +HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0800, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonEntityExtManageTest-begin b_json_entity_ext_manage_0800"; try { @@ -460,7 +460,7 @@ HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0800, testing::ext:: * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0801, testing::ext::TestSize.Level0) +HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0801, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonEntityExtManageTest-begin b_json_entity_ext_manage_0801"; try { @@ -485,7 +485,7 @@ HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0801, testing::ext:: * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0802, testing::ext::TestSize.Level0) +HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0802, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonEntityExtManageTest-begin b_json_entity_ext_manage_0802"; try { @@ -510,7 +510,7 @@ HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0802, testing::ext:: * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0803, testing::ext::TestSize.Level0) +HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0803, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonEntityExtManageTest-begin b_json_entity_ext_manage_0803"; try { @@ -535,7 +535,7 @@ HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0803, testing::ext:: * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0804, testing::ext::TestSize.Level0) +HWTEST_F(BJsonEntityExtManageTest, b_json_entity_ext_manage_0804, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonEntityExtManageTest-begin b_json_entity_ext_manage_0804"; try { diff --git a/tests/unittests/backup_utils/b_json/b_json_entity_extension_config_test.cpp b/tests/unittests/backup_utils/b_json/b_json_entity_extension_config_test.cpp index 937245c1a..3da3ab4c1 100644 --- a/tests/unittests/backup_utils/b_json/b_json_entity_extension_config_test.cpp +++ b/tests/unittests/backup_utils/b_json/b_json_entity_extension_config_test.cpp @@ -70,7 +70,7 @@ static vector DEFAULT_EXCLUDE_DIR = {}; * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonEntityExtensionConfigTest, b_json_entity_extension_config_0100, testing::ext::TestSize.Level0) +HWTEST_F(BJsonEntityExtensionConfigTest, b_json_entity_extension_config_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonEntityExtensionConfigTest-begin b_json_entity_extension_config_0100"; try { @@ -102,7 +102,7 @@ HWTEST_F(BJsonEntityExtensionConfigTest, b_json_entity_extension_config_0100, te * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonEntityExtensionConfigTest, b_json_entity_extension_config_0200, testing::ext::TestSize.Level0) +HWTEST_F(BJsonEntityExtensionConfigTest, b_json_entity_extension_config_0200, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonEntityExtensionConfigTest-begin b_json_entity_extension_config_0200"; try { @@ -133,7 +133,7 @@ HWTEST_F(BJsonEntityExtensionConfigTest, b_json_entity_extension_config_0200, te * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonEntityExtensionConfigTest, b_json_entity_extension_config_0300, testing::ext::TestSize.Level0) +HWTEST_F(BJsonEntityExtensionConfigTest, b_json_entity_extension_config_0300, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonEntityExtensionConfigTest-begin b_json_entity_extension_config_0300"; try { @@ -164,7 +164,7 @@ HWTEST_F(BJsonEntityExtensionConfigTest, b_json_entity_extension_config_0300, te * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonEntityExtensionConfigTest, b_json_entity_extension_config_0400, testing::ext::TestSize.Level0) +HWTEST_F(BJsonEntityExtensionConfigTest, b_json_entity_extension_config_0400, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonEntityExtensionConfigTest-begin b_json_entity_extension_config_0400"; try { diff --git a/tests/unittests/backup_utils/b_json/b_report_entity_test.cpp b/tests/unittests/backup_utils/b_json/b_report_entity_test.cpp index 5bc9fd747..6624bba1a 100644 --- a/tests/unittests/backup_utils/b_json/b_report_entity_test.cpp +++ b/tests/unittests/backup_utils/b_json/b_report_entity_test.cpp @@ -63,7 +63,7 @@ static tuple GetTestFile(const TestManager &tm, const string con * @tc.type: FUNC * @tc.level Level 1 */ -HWTEST_F(BReportEntityTest, b_report_entity_GetReportInfos_0100, testing::ext::TestSize.Level0) +HWTEST_F(BReportEntityTest, b_report_entity_GetReportInfos_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BReportEntityTest-begin b_report_entity_GetReportInfos_0100"; try { diff --git a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp index 397424299..7cac718a4 100644 --- a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp +++ b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_other_test.cpp @@ -69,7 +69,7 @@ void BJsonUtilTest::TearDownTestCase() * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildExtensionErrInfo_0101, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildExtensionErrInfo_0101, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildExtensionErrInfo_0101"; try { @@ -104,7 +104,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildExtensionErrInfo_0101, testing::ext::Tes * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildExtensionErrInfo_0201, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildExtensionErrInfo_0201, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildExtensionErrInfo_0201"; try { @@ -137,7 +137,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildExtensionErrInfo_0201, testing::ext::Tes * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildOnProcessRetInfo_0301, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildOnProcessRetInfo_0301, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildOnProcessRetInfo_0301"; try { @@ -183,7 +183,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildOnProcessRetInfo_0301, testing::ext::Tes * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfoJson_0401, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfoJson_0401, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildBundleInfoJson_0401"; try { @@ -227,7 +227,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfoJson_0401, testing::ext::TestS * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildOnProcessErrInfo_0501, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildOnProcessErrInfo_0501, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildOnProcessErrInfo_0501"; try { @@ -283,7 +283,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildOnProcessErrInfo_0501, testing::ext::Tes * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleNameIndexInfo_0601, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleNameIndexInfo_0601, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildBundleNameIndexInfo_0601"; try { @@ -311,7 +311,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleNameIndexInfo_0601, testing::ext:: * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildInitSessionErrInfo_0701, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildInitSessionErrInfo_0701, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildInitSessionErrInfo_0701"; try { @@ -324,30 +324,21 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildInitSessionErrInfo_0701, testing::ext::T EXPECT_EQ(result, ""); EXPECT_CALL(*cJsonMock, cJSON_CreateObject()).WillOnce(Return(reinterpret_cast(&cjson))); - EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(nullptr)); - EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); - result = BJsonUtil::BuildInitSessionErrInfo(userId, callerName, activeTime); - EXPECT_EQ(result, ""); - - EXPECT_CALL(*cJsonMock, cJSON_CreateObject()).WillOnce(Return(reinterpret_cast(&cjson))); - EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(reinterpret_cast(&cjson))); - EXPECT_CALL(*cJsonMock, cJSON_AddItemToObject(_, _, _)).WillOnce(Return(true)); EXPECT_CALL(*cJsonMock, cJSON_CreateObject()).WillOnce(Return(nullptr)); EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); result = BJsonUtil::BuildInitSessionErrInfo(userId, callerName, activeTime); EXPECT_EQ(result, ""); EXPECT_CALL(*cJsonMock, cJSON_CreateObject()).WillOnce(Return(reinterpret_cast(&cjson))); - EXPECT_CALL(*cJsonMock, cJSON_CreateArray()).WillOnce(Return(reinterpret_cast(&cjson))); - EXPECT_CALL(*cJsonMock, cJSON_AddItemToObject(_, _, _)).WillOnce(Return(true)); EXPECT_CALL(*cJsonMock, cJSON_CreateObject()) .WillOnce(Return(reinterpret_cast(&cjson))) .WillOnce(Return(nullptr)); - EXPECT_CALL(*cJsonMock, cJSON_AddItemToArray(_, _)).WillOnce(Return(true)); EXPECT_CALL(*cJsonMock, cJSON_AddStringToObject(_, _, _)) + .WillOnce(Return(nullptr)) .WillOnce(Return(nullptr)) .WillOnce(Return(nullptr)) .WillOnce(Return(nullptr)); + EXPECT_CALL(*cJsonMock, cJSON_AddItemToObject(_, _, _)).WillOnce(Return(true)); EXPECT_CALL(*cJsonMock, cJSON_Print(_)).WillOnce(Return(nullptr)); EXPECT_CALL(*cJsonMock, cJSON_Delete(_)).WillOnce(Return()); result = BJsonUtil::BuildInitSessionErrInfo(userId, callerName, activeTime); @@ -368,7 +359,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildInitSessionErrInfo_0701, testing::ext::T * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_WriteToStr_0801, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_WriteToStr_0801, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin WriteToStr_0801"; try { diff --git a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_test.cpp b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_test.cpp index 11bd5ee79..44a5f6da5 100644 --- a/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_test.cpp +++ b/tests/unittests/backup_utils/b_jsonutil/b_jsonutil_test.cpp @@ -51,7 +51,7 @@ public: * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_ParseBundleNameIndexStr_0100, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_ParseBundleNameIndexStr_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin b_dir_GetDirFiles_0100"; try { @@ -74,7 +74,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_ParseBundleNameIndexStr_0100, testing::ext::T * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_ParseBundleNameIndexStr_0200, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_ParseBundleNameIndexStr_0200, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin ParseBundleNameIndexStr_0200"; try { @@ -97,7 +97,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_ParseBundleNameIndexStr_0200, testing::ext::T * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0100, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildBundleInfos_0100"; try { @@ -131,7 +131,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0100, testing::ext::TestSize * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0200, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0200, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildBundleInfos_0200"; try { @@ -163,7 +163,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0200, testing::ext::TestSize * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0300, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0300, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildBundleInfos_0300"; try { @@ -195,7 +195,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0300, testing::ext::TestSize * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0301, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0301, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildBundleInfos_0301"; try { @@ -227,7 +227,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0301, testing::ext::TestSize * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0400, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0400, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildBundleInfos_0400"; try { @@ -262,7 +262,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0400, testing::ext::TestSize * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0500, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0500, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildBundleInfos_0500"; try { @@ -296,7 +296,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0500, testing::ext::TestSize * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0600, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0600, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildBundleInfos_0600"; try { @@ -330,7 +330,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0600, testing::ext::TestSize * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0700, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0700, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildBundleInfos_0700"; try { @@ -363,7 +363,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0700, testing::ext::TestSize * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0800, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0800, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildBundleInfos_0800"; try { @@ -396,7 +396,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0800, testing::ext::TestSize * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0900, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0900, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildBundleInfos_0900"; try { @@ -429,7 +429,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_0900, testing::ext::TestSize * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_1000, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_1000, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildBundleInfos_1000"; try { @@ -462,7 +462,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildBundleInfos_1000, testing::ext::TestSize * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_FindBundleInfoByName_0100, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_FindBundleInfoByName_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin FindBundleInfoByName_0100"; try { @@ -489,7 +489,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_FindBundleInfoByName_0100, testing::ext::Test * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_FindBundleInfoByName_0200, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_FindBundleInfoByName_0200, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin FindBundleInfoByName_0200"; try { @@ -521,7 +521,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_FindBundleInfoByName_0200, testing::ext::Test * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_FindBundleInfoByName_0300, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_FindBundleInfoByName_0300, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin FindBundleInfoByName_0300"; try { @@ -553,7 +553,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_FindBundleInfoByName_0300, testing::ext::Test * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildOnProcessRetInfo_0100, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildOnProcessRetInfo_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildOnProcessRetInfo_0100"; try { @@ -580,7 +580,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildOnProcessRetInfo_0100, testing::ext::Tes * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildExtensionErrInfo_0100, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildExtensionErrInfo_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildExtensionErrInfo_0100"; try { @@ -609,7 +609,7 @@ HWTEST_F(BJsonUtilTest, b_jsonutil_BuildExtensionErrInfo_0100, testing::ext::Tes * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BJsonUtilTest, b_jsonutil_BuildExtensionErrInfo_0200, testing::ext::TestSize.Level0) +HWTEST_F(BJsonUtilTest, b_jsonutil_BuildExtensionErrInfo_0200, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BJsonUtilTest-begin BuildExtensionErrInfo_0200"; try { diff --git a/tests/unittests/backup_utils/b_process/b_process_test.cpp b/tests/unittests/backup_utils/b_process/b_process_test.cpp index 1c8534d99..fc8171422 100644 --- a/tests/unittests/backup_utils/b_process/b_process_test.cpp +++ b/tests/unittests/backup_utils/b_process/b_process_test.cpp @@ -51,7 +51,7 @@ static bool DetectFatalLog(string_view output) * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0100, testing::ext::TestSize.Level0) +HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0100, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BProcessTest-begin SUB_backup_tool_BProcess_0100"; try { @@ -86,7 +86,7 @@ HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0100, testing::ext::TestSize.Lev * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0200, testing::ext::TestSize.Level0) +HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0200, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BProcessTest-begin SUB_backup_tool_BProcess_0200"; try { @@ -114,7 +114,7 @@ HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0200, testing::ext::TestSize.Lev * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0300, testing::ext::TestSize.Level0) +HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0300, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BProcessTest-begin SUB_backup_tool_BProcess_0300"; try { @@ -141,7 +141,7 @@ HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0300, testing::ext::TestSize.Lev * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0400, testing::ext::TestSize.Level0) +HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0400, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BProcessTest-begin SUB_backup_tool_BProcess_0400"; try { @@ -168,7 +168,7 @@ HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0400, testing::ext::TestSize.Lev * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0500, testing::ext::TestSize.Level0) +HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0500, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BProcessTest-begin SUB_backup_tool_BProcess_0500"; try { @@ -195,7 +195,7 @@ HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0500, testing::ext::TestSize.Lev * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0600, testing::ext::TestSize.Level0) +HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0600, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BProcessTest-begin SUB_backup_tool_BProcess_0600"; try { @@ -222,7 +222,7 @@ HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0600, testing::ext::TestSize.Lev * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0700, testing::ext::TestSize.Level0) +HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0700, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BProcessTest-begin SUB_backup_tool_BProcess_0700"; try { @@ -249,7 +249,7 @@ HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0700, testing::ext::TestSize.Lev * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0800, testing::ext::TestSize.Level0) +HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0800, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BProcessTest-begin SUB_backup_tool_BProcess_0800"; try { @@ -276,7 +276,7 @@ HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0800, testing::ext::TestSize.Lev * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0900, testing::ext::TestSize.Level0) +HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0900, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BProcessTest-begin SUB_backup_tool_BProcess_0900"; try { @@ -301,7 +301,7 @@ HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_0900, testing::ext::TestSize.Lev * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_1000, testing::ext::TestSize.Level0) +HWTEST_F(BProcessTest, SUB_backup_tool_BProcess_1000, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "BProcessTest-begin SUB_backup_tool_BProcess_1000"; try { diff --git a/tools/backup_tool/src/tools_op_backup.cpp b/tools/backup_tool/src/tools_op_backup.cpp index 745fe725e..f11c1c08b 100644 --- a/tools/backup_tool/src/tools_op_backup.cpp +++ b/tools/backup_tool/src/tools_op_backup.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 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 @@ -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->GetLocalCapabilities(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 5e781f316..a2173be23 100644 --- a/tools/backup_tool/src/tools_op_check_sa.cpp +++ b/tools/backup_tool/src/tools_op_check_sa.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2023 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 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 @@ -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 41a97190c..b62616d02 100644 --- a/tools/backup_tool/src/tools_op_incremental_backup.cpp +++ b/tools/backup_tool/src/tools_op_incremental_backup.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 @@ -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); + int fdVal = -1; + proxy->GetLocalCapabilitiesIncremental(ctx->lastIncrementalData, fdVal); + UniqueFd fd(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 844b164cd..6a6928383 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -113,7 +113,7 @@ ohos_shared_library("backup_utils") { deps = [ ":backup_cxx_cppdeps", "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", - "${path_backup}/services/backup_sa:backup_sa_ipc", + "${path_backup}/services/backup_sa:backup_sa_ipc_type", "${path_jsoncpp}:jsoncpp", "//third_party/openssl:libcrypto_shared", ] diff --git a/utils/include/b_error/b_error.h b/utils/include/b_error/b_error.h index 87616036e..de3b502c3 100644 --- a/utils/include/b_error/b_error.h +++ b/utils/include/b_error/b_error.h @@ -93,6 +93,7 @@ public: EXT_THROW_EXCEPTION = 0x5009, EXT_BACKUP_UNPACKET_ERROR = 0x5010, EXT_TIMER_ERROR = 0x5011, + EXT_CREATE_DIR_ERROR = 0x5012, // 0x6000~0x6999 sa_ext错误 SA_EXT_ERR_CALL = 0x6000, diff --git a/utils/include/b_radar/b_radar.h b/utils/include/b_radar/b_radar.h index ff097be94..0e367736c 100644 --- a/utils/include/b_radar/b_radar.h +++ b/utils/include/b_radar/b_radar.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 diff --git a/utils/src/b_jsonutil/b_jsonutil.cpp b/utils/src/b_jsonutil/b_jsonutil.cpp index bc3bebd9b..cdd7a085d 100644 --- a/utils/src/b_jsonutil/b_jsonutil.cpp +++ b/utils/src/b_jsonutil/b_jsonutil.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 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 @@ -468,23 +468,17 @@ std::string BJsonUtil::BuildInitSessionErrInfo(int32_t userId, std::string calle HILOGE("Failed to create cJSON object info, update errMsg failed"); return ""; } - cJSON *sessionInfoArray = cJSON_CreateArray(); - if (sessionInfoArray == nullptr) { - HILOGE("Failed to create cJSON array sessionInfoArray, update errMsg failed"); - cJSON_Delete(info); - return ""; - } - cJSON_AddItemToObject(info, "sessionInfo", sessionInfoArray); cJSON *sessionInfoObject = cJSON_CreateObject(); if (sessionInfoObject == nullptr) { HILOGE("Failed to create cJSON object sessionInfoObject, update errMsg failed"); cJSON_Delete(info); return ""; } - cJSON_AddItemToArray(sessionInfoArray, sessionInfoObject); + cJSON_AddStringToObject(sessionInfoObject, "error", "Session Conflict"); cJSON_AddStringToObject(sessionInfoObject, "userId", to_string(userId).c_str()); cJSON_AddStringToObject(sessionInfoObject, "name", callerName.c_str()); cJSON_AddStringToObject(sessionInfoObject, "activeTime", activeTime.c_str()); + cJSON_AddItemToObject(info, "sessionInfo", sessionInfoObject); char *jsonStr = cJSON_Print(info); if (jsonStr == nullptr) { HILOGE("update errMsg failed"); diff --git a/utils/src/b_radar/b_radar.cpp b/utils/src/b_radar/b_radar.cpp index 7783339f4..09f853776 100644 --- a/utils/src/b_radar/b_radar.cpp +++ b/utils/src/b_radar/b_radar.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2025 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 -- Gitee From 8fd43df5e56e7555d35362f93280276069b7669a Mon Sep 17 00:00:00 2001 From: BrainL Date: Wed, 2 Apr 2025 17:19:34 +0800 Subject: [PATCH 10/15] merge fixed. Signed-off-by: BrainL --- bundle.json | 3 +-- tests/unittests/backup_sa/module_ipc/BUILD.gn | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bundle.json b/bundle.json index d38886f3e..3e2a6a941 100644 --- a/bundle.json +++ b/bundle.json @@ -144,8 +144,7 @@ "impl/b_session_restore_async.h", "impl/b_file_info.h", "impl/service_client.h", - "impl/b_session_backup.h", - "impl/iservice_reverse.h" + "impl/b_session_backup.h" ] } }, diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn index 1433c3ff4..c72b3814f 100644 --- a/tests/unittests/backup_sa/module_ipc/BUILD.gn +++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn @@ -456,7 +456,6 @@ ohos_unittest("backup_service_incremental_test") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", - "${path_backup}/services/backup_sa:backup_sa_ipc", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils:backup_utils", "${path_googletest}:gmock_main", -- Gitee From 05799baaae480002fcc6e6a1ec18fc58fb1d97ec Mon Sep 17 00:00:00 2001 From: BrainL Date: Fri, 11 Apr 2025 13:49:38 +0800 Subject: [PATCH 11/15] =?UTF-8?q?ipc=20=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E5=8F=82=E6=95=B0=E5=AF=B9=E5=BA=94=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: BrainL --- services/backup_sa/src/module_ipc/service_incremental.cpp | 7 +++++-- services/backup_sa/src/module_ipc/sub_service.cpp | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/services/backup_sa/src/module_ipc/service_incremental.cpp b/services/backup_sa/src/module_ipc/service_incremental.cpp index 0d7c62127..4eb82331a 100644 --- a/services/backup_sa/src/module_ipc/service_incremental.cpp +++ b/services/backup_sa/src/module_ipc/service_incremental.cpp @@ -743,8 +743,11 @@ ErrCode Service::SendIncrementalFileHandle(const std::string &bundleName, const 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); + UniqueFdGroup fdGroup; + proxy->GetIncrementalFileHandle(fileName, fdGroup); + UniqueFd fd(fdGroup.fd); + UniqueFd reportFd(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()); diff --git a/services/backup_sa/src/module_ipc/sub_service.cpp b/services/backup_sa/src/module_ipc/sub_service.cpp index e34df05bb..1b83bbfa4 100644 --- a/services/backup_sa/src/module_ipc/sub_service.cpp +++ b/services/backup_sa/src/module_ipc/sub_service.cpp @@ -265,7 +265,9 @@ ErrCode Service::SendFileHandle(const std::string &bundleName, const std::string return BError(BError::Codes::SA_INVAL_ARG); } int32_t errCode = 0; - UniqueFd fd = proxy->GetFileHandle(fileName, errCode); + int32_t fdCode = 0; + proxy->GetFileHandleWithUniqueFd(fileName, errCode, fdCode); + UniqueFd fd(fdCode); if (errCode != ERR_OK) { AppRadar::Info info(bundleName, "", ""); AppRadar::GetInstance().RecordRestoreFuncRes(info, "Service::GetFileHandle", GetUserIdDefault(), -- Gitee From 75aa5560e36471e9438b47a4ee8601e2cb639a46 Mon Sep 17 00:00:00 2001 From: BrainL Date: Fri, 11 Apr 2025 17:24:32 +0800 Subject: [PATCH 12/15] Increamental backup sa modify. Signed-off-by: BrainL --- .../backup_kit_inner/include/service_reverse.h | 2 ++ .../src/service_incremental_reverse.cpp | 12 ++++++++++++ services/backup_sa/IServiceReverse.idl | 5 ++++- services/backup_sa/src/module_ipc/service.cpp | 3 +-- .../module_ipc/include/service_reverse_proxy_mock.h | 1 + .../backup_impl/include/service_reverse_mock.h | 8 ++++++++ 6 files changed, 28 insertions(+), 3 deletions(-) diff --git a/frameworks/native/backup_kit_inner/include/service_reverse.h b/frameworks/native/backup_kit_inner/include/service_reverse.h index 2a0b486c5..90b51874e 100644 --- a/frameworks/native/backup_kit_inner/include/service_reverse.h +++ b/frameworks/native/backup_kit_inner/include/service_reverse.h @@ -56,6 +56,8 @@ public: int fd, int manifestFd, int32_t errCode) override; + ErrCode IncrementalSaBackupOnFileReady(const std::string &bundleName, const std::string &fileName, + int fd, 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; 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 26f9054c2..7cc645857 100644 --- a/frameworks/native/backup_kit_inner/src/service_incremental_reverse.cpp +++ b/frameworks/native/backup_kit_inner/src/service_incremental_reverse.cpp @@ -37,6 +37,18 @@ ErrCode ServiceReverse::IncrementalBackupOnFileReady(const std::string &bundleNa return BError(BError::Codes::OK); } +ErrCode ServiceReverse::IncrementalSaBackupOnFileReady(const std::string &bundleName, const std::string &fileName, + int fd, int32_t errCode) +{ + if (scenario_ != Scenario::BACKUP || !callbacksIncrementalBackup_.onFileReady) { + HILOGE("Error scenario or callback is nullptr, scenario = %{public}d", scenario_); + return BError(BError::Codes::OK); + } + BFileInfo bFileInfo(bundleName, fileName, 0); + callbacksIncrementalBackup_.onFileReady(bFileInfo, UniqueFd(fd), UniqueFd(INVALID_FD), errCode); + return BError(BError::Codes::OK); +} + ErrCode ServiceReverse::IncrementalBackupOnBundleStarted(int32_t errCode, const std::string &bundleName) { if (scenario_ != Scenario::BACKUP || !callbacksIncrementalBackup_.onBundleStarted) { diff --git a/services/backup_sa/IServiceReverse.idl b/services/backup_sa/IServiceReverse.idl index 04a2eb480..307910914 100644 --- a/services/backup_sa/IServiceReverse.idl +++ b/services/backup_sa/IServiceReverse.idl @@ -39,6 +39,9 @@ interface OHOS.FileManagement.Backup.IServiceReverse{ [ipccode 14] void IncrementalBackupOnFileReady([in] String bundleName, [in] String fileName, [in] FileDescriptor fd, [in] FileDescriptor manifestFd, [in] int incrementalBackupOnFileReadyErrCode); + [ipccode 26] void IncrementalSaBackupOnFileReady([in] String bundleName, + [in] String fileName, [in] FileDescriptor fd, + [in] int incrementalBackupOnFileReadyErrCode); [ipccode 15] void IncrementalBackupOnResultReport([in] String myResult, [in] String bundleName); [ipccode 16] void IncrementalBackupOnBundleFinished([in] int incrementalBackupOnBundleFinishedErrCode, [in] String bundleName); @@ -59,4 +62,4 @@ interface OHOS.FileManagement.Backup.IServiceReverse{ [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/services/backup_sa/src/module_ipc/service.cpp b/services/backup_sa/src/module_ipc/service.cpp index 6809e9fca..dc39257cf 100644 --- a/services/backup_sa/src/module_ipc/service.cpp +++ b/services/backup_sa/src/module_ipc/service.cpp @@ -1840,8 +1840,7 @@ void Service::OnSABackup(const std::string &bundleName, const int &fd, const std BackupRestoreScenario scenario = BackupRestoreScenario::FULL_BACKUP; if (session_->GetIsIncrementalBackup()) { scenario = BackupRestoreScenario::INCREMENTAL_BACKUP; - session_->GetServiceReverseProxy()->IncrementalBackupOnFileReady(bundleName, "", move(fd), INVALID_FD, - errCode); + session_->GetServiceReverseProxy()->IncrementalSaBackupOnFileReady(bundleName, "", move(fd), errCode); } else { scenario = BackupRestoreScenario::FULL_BACKUP; session_->GetServiceReverseProxy()->BackupOnFileReady(bundleName, "", move(fd), errCode); 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 06afe23f5..8e6b6b17f 100644 --- a/tests/mock/module_ipc/include/service_reverse_proxy_mock.h +++ b/tests/mock/module_ipc/include/service_reverse_proxy_mock.h @@ -42,6 +42,7 @@ public: 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, IncrementalSaBackupOnFileReady, (const std::string &, const std::string &, 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 &)); 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 cf41dc966..3a0474f0c 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 @@ -116,6 +116,14 @@ public: return BError(BError::Codes::OK); } + ErrCode IncrementalSaBackupOnFileReady(const std::string &bundleName, + const std::string &fileName, + int fd, + int32_t errCode) override + { + return BError(BError::Codes::OK); + } + ErrCode IncrementalBackupOnBundleStarted(int32_t errCode, const std::string &bundleName) override { return BError(BError::Codes::OK); -- Gitee From a1c0d0164d14cccfbc701ac00f3363fe2be09b67 Mon Sep 17 00:00:00 2001 From: BrainL Date: Mon, 14 Apr 2025 09:40:44 +0800 Subject: [PATCH 13/15] Fixed fuzz test. Signed-off-by: BrainL --- test/fuzztest/backupext_fuzzer/BUILD.gn | 1 - test/fuzztest/backupsa_fuzzer/BUILD.gn | 2 -- test/fuzztest/backupsaanother_fuzzer/BUILD.gn | 1 - test/fuzztest/backupsaappend_fuzzer/BUILD.gn | 1 - test/fuzztest/backupservicestub_fuzzer/BUILD.gn | 1 - 5 files changed, 6 deletions(-) diff --git a/test/fuzztest/backupext_fuzzer/BUILD.gn b/test/fuzztest/backupext_fuzzer/BUILD.gn index a3c9b7ca6..319f0ebd5 100644 --- a/test/fuzztest/backupext_fuzzer/BUILD.gn +++ b/test/fuzztest/backupext_fuzzer/BUILD.gn @@ -51,7 +51,6 @@ ohos_fuzztest("BackupExtFuzzTest") { deps = [ "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", - "${path_backup}/services/backup_sa:backup_sa_ipc_stub", "${path_backup}/utils:backup_utils", ] diff --git a/test/fuzztest/backupsa_fuzzer/BUILD.gn b/test/fuzztest/backupsa_fuzzer/BUILD.gn index b69182931..0dde0ed7d 100644 --- a/test/fuzztest/backupsa_fuzzer/BUILD.gn +++ b/test/fuzztest/backupsa_fuzzer/BUILD.gn @@ -36,8 +36,6 @@ ohos_fuzztest("BackupSaFuzzTest") { deps = [ "${app_file_service_path}/services/backup_sa:backup_sa", - "${app_file_service_path}/services/backup_sa:backup_sa_ipc_stub", - "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils:backup_utils", ] diff --git a/test/fuzztest/backupsaanother_fuzzer/BUILD.gn b/test/fuzztest/backupsaanother_fuzzer/BUILD.gn index 8ce297233..764660d8d 100644 --- a/test/fuzztest/backupsaanother_fuzzer/BUILD.gn +++ b/test/fuzztest/backupsaanother_fuzzer/BUILD.gn @@ -38,7 +38,6 @@ ohos_fuzztest("BackupSaAnotherFuzzTest") { deps = [ "${app_file_service_path}/services/backup_sa:backup_sa", - "${app_file_service_path}/services/backup_sa:backup_sa_ipc_stub", "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils:backup_utils", ] diff --git a/test/fuzztest/backupsaappend_fuzzer/BUILD.gn b/test/fuzztest/backupsaappend_fuzzer/BUILD.gn index f70c7b404..410ead2a2 100644 --- a/test/fuzztest/backupsaappend_fuzzer/BUILD.gn +++ b/test/fuzztest/backupsaappend_fuzzer/BUILD.gn @@ -38,7 +38,6 @@ ohos_fuzztest("BackupSaAppendFuzzTest") { deps = [ "${app_file_service_path}/services/backup_sa:backup_sa", - "${app_file_service_path}/services/backup_sa:backup_sa_ipc_stub", "${path_backup}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${path_backup}/utils:backup_utils", ] diff --git a/test/fuzztest/backupservicestub_fuzzer/BUILD.gn b/test/fuzztest/backupservicestub_fuzzer/BUILD.gn index 28dad30b4..c4d813425 100644 --- a/test/fuzztest/backupservicestub_fuzzer/BUILD.gn +++ b/test/fuzztest/backupservicestub_fuzzer/BUILD.gn @@ -43,7 +43,6 @@ ohos_fuzztest("BackupServiceStubFuzzTest") { deps = [ "${app_file_service_path}/interfaces/inner_api/native/backup_kit_inner:backup_kit_inner", "${app_file_service_path}/services/backup_sa:backup_sa", - "${app_file_service_path}/services/backup_sa:backup_sa_ipc_stub", "${app_file_service_path}/utils:backup_utils", ] -- Gitee From 4ba577887f4957274129be1a93623aa55b7b7f48 Mon Sep 17 00:00:00 2001 From: BrainL Date: Mon, 21 Apr 2025 16:27:00 +0800 Subject: [PATCH 14/15] Merge master into R_extension_250313 Signed-off-by: BrainL --- .../src/b_incremental_backup_session.cpp | 13 +- .../src/b_incremental_restore_session.cpp | 13 +- .../b_incremental_session_restore_async.cpp | 13 +- .../backup_kit_inner/src/b_session_backup.cpp | 13 +- .../src/b_session_restore.cpp | 13 +- .../src/b_session_restore_async.cpp | 13 +- interfaces/common/include/sandbox_helper.h | 2 + interfaces/common/src/common_func.cpp | 4 + interfaces/common/src/sandbox_helper.cpp | 62 +++++- .../native/file_share/src/file_share.cpp | 35 ++-- .../native/file_uri/src/file_uri.cpp | 11 +- .../src/remote_file_share.cpp | 160 +++++++++++----- .../js/backup/session_backup_n_exporter.cpp | 15 +- .../session_incremental_backup_n_exporter.cpp | 15 +- .../js/backup/session_restore_n_exporter.cpp | 17 +- services/backup_sa/src/module_ipc/service.cpp | 2 +- .../backupsa_fuzzer/backupsa_fuzzer.cpp | 19 +- .../backupsaanother_fuzzer.cpp | 34 ++-- .../backupsaappend_fuzzer.cpp | 2 +- .../backupservicestub_fuzzer.cpp | 23 ++- .../servicereverse_fuzzer.cpp | 18 +- .../file_share_native/file_share_test.cpp | 178 ++++++++++++++++++ .../file_uri_native/file_uri_test.cpp | 104 ++++++++++ .../remote_file_share_test.cpp | 59 +++++- tests/unittests/backup_utils/BUILD.gn | 1 + utils/src/b_filesystem/b_dir.cpp | 23 +-- 26 files changed, 632 insertions(+), 230 deletions(-) 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 2413f9de2..731e23cdf 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 @@ -26,18 +26,7 @@ using namespace std; BIncrementalBackupSession::~BIncrementalBackupSession() { - if (!deathRecipient_) { - HILOGI("Death Recipient is nullptr"); - return; - } - auto proxy = ServiceClient::GetServiceProxyPointer(); - if (proxy == nullptr) { - return; - } - auto remoteObject = proxy->AsObject(); - if (remoteObject != nullptr) { - remoteObject->RemoveDeathRecipient(deathRecipient_); - } + HILOGE("BIncrementalBackupSession Destory"); deathRecipient_ = nullptr; } 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 461763e15..b0f8179ce 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 @@ -26,18 +26,7 @@ using namespace std; BIncrementalRestoreSession::~BIncrementalRestoreSession() { - if (!deathRecipient_) { - HILOGI("Death Recipient is nullptr"); - return; - } - auto proxy = ServiceClient::GetServiceProxyPointer(); - if (proxy == nullptr) { - return; - } - auto remoteObject = proxy->AsObject(); - if (remoteObject != nullptr) { - remoteObject->RemoveDeathRecipient(deathRecipient_); - } + HILOGE("BIncrementalRestoreSession Destory"); deathRecipient_ = nullptr; } 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 fa1eb7624..d5925422f 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 @@ -27,18 +27,7 @@ using namespace std; BIncrementalSessionRestoreAsync::~BIncrementalSessionRestoreAsync() { - if (!deathRecipient_) { - HILOGE("Death Recipient is nullptr"); - return; - } - auto proxy = ServiceClient::GetServiceProxyPointer(); - if (proxy == nullptr) { - return; - } - auto remoteObject = proxy->AsObject(); - if (remoteObject != nullptr) { - remoteObject->RemoveDeathRecipient(deathRecipient_); - } + HILOGE("BIncrementalSessionRestoreAsync Destory"); callbacks_ = {}; deathRecipient_ = nullptr; } diff --git a/frameworks/native/backup_kit_inner/src/b_session_backup.cpp b/frameworks/native/backup_kit_inner/src/b_session_backup.cpp index cbecc9896..863d696d5 100644 --- a/frameworks/native/backup_kit_inner/src/b_session_backup.cpp +++ b/frameworks/native/backup_kit_inner/src/b_session_backup.cpp @@ -26,18 +26,7 @@ using namespace std; BSessionBackup::~BSessionBackup() { - if (!deathRecipient_) { - HILOGI("Death Recipient is nullptr"); - return; - } - auto proxy = ServiceClient::GetServiceProxyPointer(); - if (proxy == nullptr) { - return; - } - auto remoteObject = proxy->AsObject(); - if (remoteObject != nullptr) { - remoteObject->RemoveDeathRecipient(deathRecipient_); - } + HILOGE("BSessionBackup Destory"); deathRecipient_ = nullptr; } 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 d0a9d1644..501b054ba 100644 --- a/frameworks/native/backup_kit_inner/src/b_session_restore.cpp +++ b/frameworks/native/backup_kit_inner/src/b_session_restore.cpp @@ -26,18 +26,7 @@ using namespace std; BSessionRestore::~BSessionRestore() { - if (!deathRecipient_) { - HILOGI("Death Recipient is nullptr"); - return; - } - auto proxy = ServiceClient::GetServiceProxyPointer(); - if (proxy == nullptr) { - return; - } - auto remoteObject = proxy->AsObject(); - if (remoteObject != nullptr) { - remoteObject->RemoveDeathRecipient(deathRecipient_); - } + HILOGE("BSessionRestore Destory"); deathRecipient_ = nullptr; } 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 f3f5276bd..8cc600b95 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 @@ -29,18 +29,7 @@ using namespace std; BSessionRestoreAsync::~BSessionRestoreAsync() { - if (!deathRecipient_) { - HILOGI("Death Recipient is nullptr"); - return; - } - auto proxy = ServiceClient::GetServiceProxyPointer(); - if (proxy == nullptr) { - return; - } - auto remoteObject = proxy->AsObject(); - if (remoteObject != nullptr) { - remoteObject->RemoveDeathRecipient(deathRecipient_); - } + HILOGE("BSessionRestoreAsync Destory"); callbacks_ = {}; deathRecipient_ = nullptr; } diff --git a/interfaces/common/include/sandbox_helper.h b/interfaces/common/include/sandbox_helper.h index c0fa99864..ac94fc32c 100644 --- a/interfaces/common/include/sandbox_helper.h +++ b/interfaces/common/include/sandbox_helper.h @@ -29,10 +29,12 @@ private: static std::unordered_map backupSandboxPathMap_; static bool GetSandboxPathMap(); static bool GetBackupSandboxPathMap(); + static void* libMediaHandle_; public: static std::string Encode(const std::string &uri); static std::string Decode(const std::string &uri); static bool CheckValidPath(const std::string &filePath); + static int32_t GetMediaSharePath(const std::vector &fileUris, std::vector &physicalPaths); static int32_t GetPhysicalPath(const std::string &fileUri, const std::string &userId, std::string &physicalPath); static int32_t GetBackupPhysicalPath(const std::string &fileUri, const std::string &userId, diff --git a/interfaces/common/src/common_func.cpp b/interfaces/common/src/common_func.cpp index 01307b9ca..8850178f6 100644 --- a/interfaces/common/src/common_func.cpp +++ b/interfaces/common/src/common_func.cpp @@ -110,6 +110,10 @@ static void NormalizePath(string &path) string CommonFunc::GetUriFromPath(const string &path) { + if (!SandboxHelper::IsValidPath(path)) { + LOGE("path is ValidPath, The path contains '/./' or '../'characters"); + return ""; + } if (path.find(FILE_SCHEME_PREFIX) == 0) { return path; } diff --git a/interfaces/common/src/sandbox_helper.cpp b/interfaces/common/src/sandbox_helper.cpp index 863884aa0..2dac229ae 100644 --- a/interfaces/common/src/sandbox_helper.cpp +++ b/interfaces/common/src/sandbox_helper.cpp @@ -15,11 +15,11 @@ #include "sandbox_helper.h" +#include #include #include #include #include - #include "log.h" #include "json_utils.h" #include "uri.h" @@ -28,6 +28,8 @@ using namespace std; namespace OHOS { namespace AppFileService { +typedef void (*ConvertFileUriToMntPath)(const std::vector &fileUris, + std::vector &physicalPaths); namespace { const string PACKAGE_NAME_FLAG = ""; const string CURRENT_USER_ID_FLAG = ""; @@ -42,13 +44,16 @@ namespace { const string FILE_MANAGER_AUTHORITY = "docs"; const string DLP_MANAGER_BUNDLE_NAME = "com.ohos.dlpmanager"; const string FUSE_URI_HEAD = "/mnt/data/fuse"; - const string BACKFLASH = "/"; + const char BACKSLASH = '/'; const string MEDIA = "media"; const string NETWORK_ID_FLAG = ""; const string LOCAL = "local"; const int ASSET_IN_BUCKET_NUM_MAX = 1000; const int ASSET_DIR_START_NUM = 16; const int DECODE_FORMAT_NUM = 16; + const std::string PATH_INVALID_FLAG1 = "../"; + const std::string PATH_INVALID_FLAG2 = "/.."; + const uint32_t PATH_INVALID_FLAG_LEN = 3; } struct MediaUriInfo { @@ -61,6 +66,7 @@ struct MediaUriInfo { std::unordered_map SandboxHelper::sandboxPathMap_; std::unordered_map SandboxHelper::backupSandboxPathMap_; std::mutex SandboxHelper::mapMutex_; +void* SandboxHelper::libMediaHandle_; string SandboxHelper::Encode(const string &uri) { @@ -302,7 +308,31 @@ static int32_t GetMediaPhysicalPath(const std::string &sandboxPath, const std::s } physicalPath = SHAER_PATH_HEAD + userId + SHAER_PATH_MID + mediaUriInfo.mediaType + - BACKFLASH + to_string(bucketNum) + BACKFLASH + mediaUriInfo.realName + mediaSuffix; + BACKSLASH + to_string(bucketNum) + BACKSLASH + mediaUriInfo.realName + mediaSuffix; + return 0; +} + +int32_t SandboxHelper::GetMediaSharePath(const std::vector &fileUris, + std::vector &physicalPaths) +{ + if (libMediaHandle_ == nullptr) { + libMediaHandle_ = dlopen("libmedia_library_handler.z.so", RTLD_LAZY | RTLD_GLOBAL); + } + if (libMediaHandle_ == nullptr) { + LOGE("dlopen libmedia_library_handler.z.so failed, errno = %{public}s", dlerror()); + return -EINVAL; + } + ConvertFileUriToMntPath convertFileUriToMntPath = + (ConvertFileUriToMntPath)dlsym(libMediaHandle_, "ConvertFileUriToMntPath"); + if (convertFileUriToMntPath == nullptr) { + LOGE("GetMediaSharePath dlsym failed, errno %{public}s", dlerror()); + return -EINVAL; + } + convertFileUriToMntPath(fileUris, physicalPaths); + if (fileUris.size() != physicalPaths.size()) { + LOGE("GetMediaSharePath returns fewer results than the output parameters"); + return -EINVAL; + } return 0; } @@ -342,6 +372,10 @@ static void DoGetPhysicalPath(string &lowerPathTail, string &lowerPathHead, cons int32_t SandboxHelper::GetPhysicalPath(const std::string &fileUri, const std::string &userId, std::string &physicalPath) { + if (!IsValidPath(fileUri)) { + LOGE("fileUri is ValidUri, The fileUri contains '/./' or '../'characters"); + return -EINVAL; + } Uri uri(fileUri); string bundleName = uri.GetAuthority(); if (bundleName == MEDIA) { @@ -378,6 +412,10 @@ int32_t SandboxHelper::GetPhysicalPath(const std::string &fileUri, const std::st int32_t SandboxHelper::GetBackupPhysicalPath(const std::string &fileUri, const std::string &userId, std::string &physicalPath) { + if (!IsValidPath(fileUri)) { + LOGE("fileUri is ValidUri, The fileUri contains '/./' or '../'characters"); + return -EINVAL; + } Uri uri(fileUri); string bundleName = uri.GetAuthority(); if (bundleName == MEDIA) { @@ -411,10 +449,22 @@ int32_t SandboxHelper::GetBackupPhysicalPath(const std::string &fileUri, const s return 0; } -bool SandboxHelper::IsValidPath(const std::string &path) +bool SandboxHelper::IsValidPath(const std::string &filePath) { - if (path.find("/./") != std::string::npos || - path.find("/../") != std::string::npos) { + if (filePath.find("/./") != std::string::npos) { + return false; + } + size_t pos = filePath.find(PATH_INVALID_FLAG1); + while (pos != string::npos) { + if (pos == 0 || filePath[pos - 1] == BACKSLASH) { + LOGE("Relative path is not allowed, path contain ../"); + return false; + } + pos = filePath.find(PATH_INVALID_FLAG1, pos + PATH_INVALID_FLAG_LEN); + } + pos = filePath.rfind(PATH_INVALID_FLAG2); + if ((pos != string::npos) && (filePath.size() - pos == PATH_INVALID_FLAG_LEN)) { + LOGE("Relative path is not allowed, path tail is /.."); return false; } return true; diff --git a/interfaces/innerkits/native/file_share/src/file_share.cpp b/interfaces/innerkits/native/file_share/src/file_share.cpp index 0c954afab..ddaa5ea9f 100644 --- a/interfaces/innerkits/native/file_share/src/file_share.cpp +++ b/interfaces/innerkits/native/file_share/src/file_share.cpp @@ -139,6 +139,23 @@ static bool CheckIfNeedShare(const string &uriStr, ShareFileType type, FileShare return true; } +static void DelSharePath(const string &delPath) +{ + if (!SandboxHelper::CheckValidPath(delPath)) { + LOGE("DelSharePath, umount path is invalid"); + return; + } + + if (access(delPath.c_str(), F_OK) == 0) { + if (umount2(delPath.c_str(), MNT_DETACH) != 0) { + LOGE("DelSharePath, umount failed with %{public}d", errno); + } + if (remove(delPath.c_str()) != 0) { + LOGE("DelSharePath, remove failed with %{public}d", errno); + } + } +} + static int32_t GetSharePath(const string &uri, FileShareInfo &info, uint32_t flag) { string shareRPath = DATA_APP_EL2_PATH + info.currentUid_ + SHARE_PATH + info.targetBundleName_ + @@ -153,6 +170,7 @@ static int32_t GetSharePath(const string &uri, FileShareInfo &info, uint32_t fla if (CheckIfNeedShare(uri, info.type_, info, shareRPath)) { info.sharePath_.push_back(shareRPath); + DelSharePath(shareRWPath); } if ((flag & WRITE_URI_PERMISSION) == WRITE_URI_PERMISSION && @@ -244,23 +262,6 @@ static bool DeleteExistShareFile(const string &path) return true; } -static void DelSharePath(const string &delPath) -{ - if (!SandboxHelper::CheckValidPath(delPath)) { - LOGE("DelSharePath, umount path is invalid"); - return; - } - - if (access(delPath.c_str(), F_OK) == 0) { - if (umount2(delPath.c_str(), MNT_DETACH) != 0) { - LOGE("DelSharePath, umount failed with %{public}d", errno); - } - if (remove(delPath.c_str()) != 0) { - LOGE("DelSharePath, remove failed with %{public}d", errno); - } - } -} - static void UmountDelUris(vector sharePathList, string currentUid, string bundleNameSelf) { string delPathPrefix = DATA_APP_EL2_PATH + currentUid + SHARE_PATH + bundleNameSelf; diff --git a/interfaces/innerkits/native/file_uri/src/file_uri.cpp b/interfaces/innerkits/native/file_uri/src/file_uri.cpp index f2af06226..5e58b6000 100644 --- a/interfaces/innerkits/native/file_uri/src/file_uri.cpp +++ b/interfaces/innerkits/native/file_uri/src/file_uri.cpp @@ -143,7 +143,8 @@ string FileUri::GetRealPath() string FileUri::GetRealPathBySA(const std::string &targetBundleName) { string sandboxPath = DecodeBySA(uri_.GetPath()); - if (sandboxPath.empty()) { + if (sandboxPath.empty() || !SandboxHelper::IsValidPath(sandboxPath)) { + LOGE("path is ValidPath, The path contains '/./' or '../'characters"); return ""; } string realPath = sandboxPath; @@ -165,6 +166,10 @@ string FileUri::ToString() string FileUri::GetFullDirectoryUri() { string uri = uri_.ToString(); + if (!SandboxHelper::IsValidPath(uri)) { + LOGE("uri is ValidUri, The uri contains '/./' or '../'characters"); + return ""; + } struct stat fileInfo; if (stat(GetRealPath().c_str(), &fileInfo) != 0) { LOGE("fileInfo is error,%{public}s", strerror(errno)); @@ -200,6 +205,10 @@ bool FileUri::CheckUriFormat(const std::string &uri) LOGE("URI is missing file://"); return false; } + if (!SandboxHelper::IsValidPath(uri)) { + LOGE("uri is ValidPath, The uri contains '/./' or '../'characters"); + return false; + } return true; } diff --git a/interfaces/innerkits/native/remote_file_share/src/remote_file_share.cpp b/interfaces/innerkits/native/remote_file_share/src/remote_file_share.cpp index 568d8a573..28dfc1a78 100644 --- a/interfaces/innerkits/native/remote_file_share/src/remote_file_share.cpp +++ b/interfaces/innerkits/native/remote_file_share/src/remote_file_share.cpp @@ -40,10 +40,12 @@ namespace ModuleRemoteFileShare { using namespace OHOS::DistributedHardware; #endif namespace { +const int E_OK = 0; const int HMDFS_CID_SIZE = 64; const int USER_ID_INIT = 100; const unsigned HMDFS_IOC = 0xf2; const std::string FILE_SCHEME = "file"; +const std::string BACKSLASH = "/"; const std::string DISTRIBUTED_DIR_PATH = "/data/storage/el2/distributedfiles"; const std::string DST_PATH_HEAD = "/data/service/el2/"; const std::string DST_PATH_MID = "/hmdfs/account/data/"; @@ -93,7 +95,7 @@ static std::string GetProcessName() { char pthreadName[PATH_MAX]; int ret = pthread_getname_np(pthread_self(), pthreadName, sizeof(pthreadName)); - if (ret != 0) { + if (ret != E_OK) { LOGE("RemoteFileShare::GetProcessName, pthread_getname_np failed with %{public}d", errno); return ""; } @@ -133,12 +135,12 @@ static int CreateShareDir(const std::string &path) { if (access(path.c_str(), F_OK) != 0) { int ret = mkdir(path.c_str(), S_IRWXU); - if (ret != 0) { + if (ret != E_OK) { LOGE("RemoteFileShare::CreateShareDir, make dir failed with %{public}d", errno); return errno; } } - return 0; + return E_OK; } static std::string GetSharePath(const int &userId, const std::string &packageName) @@ -154,18 +156,18 @@ static std::string GetLowerSharePath(const int &userId, const std::string &packa static bool DeleteShareDir(const std::string &PACKAGE_PATH, const std::string &SHARE_PATH) { bool result = true; - if (access(SHARE_PATH.c_str(), F_OK) == 0) { + if (access(SHARE_PATH.c_str(), F_OK) == E_OK) { int ret = rmdir(SHARE_PATH.c_str()); - if (ret != 0) { + if (ret != E_OK) { LOGE("RemoteFileShare::DeleteShareDir, delete dir failed with %{public}d", errno); result = false; } else { LOGI("RemoteFileShare::DeleteShareDir, delete path successfully"); } } - if (access(PACKAGE_PATH.c_str(), F_OK) == 0) { + if (access(PACKAGE_PATH.c_str(), F_OK) == E_OK) { int ret = rmdir(PACKAGE_PATH.c_str()); - if (ret != 0) { + if (ret != E_OK) { LOGE("RemoteFileShare::DeleteShareDir, delete dir failed with %{public}d", errno); result = false; } else { @@ -194,7 +196,7 @@ static int CreateShareFile(struct HmdfsShareControl &shareControl, const char *f LOGE("RemoteFileShare::CreateShareFile, ioctl failed with %{public}d", errno); } close(dirFd); - return 0; + return E_OK; } static int CheckInputValidity(const int &fd, const int &userId, const std::string &deviceId) @@ -210,7 +212,7 @@ int RemoteFileShare::CreateSharePath(const int &fd, struct HmdfsShareControl shareControl; shareControl.fd = fd; - if (CheckInputValidity(fd, userId, deviceId) != 0) { + if (CheckInputValidity(fd, userId, deviceId) != E_OK) { LOGE("RemoteFileShare::CreateSharePath, invalid argument with %{public}d", EINVAL); return EINVAL; } @@ -228,9 +230,9 @@ int RemoteFileShare::CreateSharePath(const int &fd, } const std::string LOWER_SHARE_PATH = PACKAGE_PATH + SHARE_PATH_DIR; - if (CreateShareDir(PACKAGE_PATH) != 0) + if (CreateShareDir(PACKAGE_PATH) != E_OK) return errno; - if (CreateShareDir(LOWER_SHARE_PATH) != 0) { + if (CreateShareDir(LOWER_SHARE_PATH) != E_OK) { DeleteShareDir(PACKAGE_PATH, LOWER_SHARE_PATH); return errno; } @@ -251,32 +253,34 @@ int RemoteFileShare::CreateSharePath(const int &fd, } sharePath = SHARE_PATH + "/" + file_name; - if (CreateShareFile(shareControl, realPath, deviceId) != 0) { + if (CreateShareFile(shareControl, realPath, deviceId) != E_OK) { LOGE("RemoteFileShare::CreateSharePath, create share file failed with %{public}d", errno); /* When the file is exist, we should not delete the dictionary */ if (errno == EEXIST) { - return 0; + return E_OK; } sharePath = ""; DeleteShareDir(PACKAGE_PATH, LOWER_SHARE_PATH); return errno; } LOGI("RemoteFileShare::CreateSharePath, create successfully"); - return 0; + return E_OK; } static int GetDistributedPath(Uri &uri, const int &userId, std::string &distributedPath, - const std::string &bundleName) + const std::string &bundleName, + const std::string &networkId) { - distributedPath = DST_PATH_HEAD + std::to_string(userId) + DST_PATH_MID + bundleName + - REMOTE_SHARE_PATH_DIR + SandboxHelper::Decode(uri.GetPath()); + distributedPath = DST_PATH_HEAD + std::to_string(userId) + DST_PATH_MID + bundleName + REMOTE_SHARE_PATH_DIR + + BACKSLASH + networkId + SandboxHelper::Decode(uri.GetPath()); if (distributedPath.size() >= PATH_MAX) { + LOGE("Path is too long with %{public}zu", distributedPath.size()); return -EINVAL; } - return 0; + return E_OK; } static std::string GetPhysicalPath(Uri &uri, const std::string &userId) @@ -289,7 +293,7 @@ static std::string GetPhysicalPath(Uri &uri, const std::string &userId) std::string physicalPath = ""; int ret = SandboxHelper::GetPhysicalPath(uri.ToString(), userId, physicalPath); - if (ret != 0) { + if (ret != E_OK) { LOGE("Get physical path failed with %{public}d", ret); return ""; } @@ -341,8 +345,8 @@ static void SetHmdfsUriInfo(struct HmdfsUriInfo &hui, const std::string &networkId, const std::string &bundleName) { - hui.uriStr = FILE_SCHEME + "://" + bundleName + DISTRIBUTED_DIR_PATH + REMOTE_SHARE_PATH_DIR + - uri.GetPath() + networkId; + hui.uriStr = FILE_SCHEME + "://" + bundleName + DISTRIBUTED_DIR_PATH + REMOTE_SHARE_PATH_DIR + BACKSLASH + + networkId + uri.GetPath() + NETWORK_PARA + networkId; hui.fileSize = fileSize; return; @@ -351,14 +355,14 @@ static void SetHmdfsUriInfo(struct HmdfsUriInfo &hui, static int32_t SetPublicDirHmdfsInfo(const std::string &physicalPath, const std::string &uriStr, struct HmdfsUriInfo &hui, const std::string &networkId) { - hui.uriStr = uriStr + networkId; + hui.uriStr = uriStr + NETWORK_PARA + networkId; struct stat buf = {}; - if (stat(physicalPath.c_str(), &buf) != 0) { + if (stat(physicalPath.c_str(), &buf) != E_OK) { LOGE("Failed to get physical path stat with %{public}d", -errno); return -errno; } hui.fileSize = static_cast(buf.st_size); - return 0; + return E_OK; } static int32_t GetMergePathFd(HmdfsDstInfo &hdi, UniqueFd &dirFd, const int32_t &userId) @@ -371,12 +375,12 @@ static int32_t GetMergePathFd(HmdfsDstInfo &hdi, UniqueFd &dirFd, const int32_t return errno; } int32_t ret = ioctl(dirMergeFd, HMDFS_IOC_GET_DST_PATH, &hdi); - if (ret != 0) { + if (ret != E_OK) { LOGE("Ioctl merge failed with %{public}d", errno); return -errno; } dirFd = std::move(dirMergeFd); - return 0; + return E_OK; } int32_t RemoteFileShare::GetDfsUriFromLocal(const std::string &uriStr, const int32_t &userId, struct HmdfsUriInfo &hui) @@ -393,17 +397,16 @@ int32_t RemoteFileShare::GetDfsUriFromLocal(const std::string &uriStr, const int bundleName = MEDIA_BUNDLE_NAME; } - std::string networkId = NETWORK_PARA + GetLocalNetworkId(); + std::string networkId = GetLocalNetworkId(); if (bundleName == FILE_MANAGER_AUTHORITY) { (void)SetPublicDirHmdfsInfo(physicalPath, uriStr, hui, networkId); LOGD("GetDfsUriFromLocal successfully"); - return 0; + return E_OK; } std::string distributedPath; - int ret = GetDistributedPath(uri, userId, distributedPath, bundleName); - if (ret != 0) { - LOGE("Path is too long with %{public}d", ret); + int ret = GetDistributedPath(uri, userId, distributedPath, bundleName, networkId); + if (ret != E_OK) { return ret; } @@ -418,28 +421,96 @@ int32_t RemoteFileShare::GetDfsUriFromLocal(const std::string &uriStr, const int } ret = ioctl(dirFd, HMDFS_IOC_GET_DST_PATH, &hdi); - if (ret != 0 && GetMergePathFd(hdi, dirFd, userId) != 0) { + if (ret != E_OK && GetMergePathFd(hdi, dirFd, userId) != E_OK) { return errno; } SetHmdfsUriInfo(hui, uri, hdi.size, networkId, bundleName); LOGI("GetDfsUriFromLocal successfully"); - return 0; + return E_OK; +} + +static int32_t UriCategoryByType(const std::vector &uriList, + std::vector &mediaUriList, + std::vector &otherUriList) +{ + LOGI("GetDfsUrisFromLocal UriCategoryByType start"); + if (uriList.size() == 0) { + LOGE("Parameter uriList is NULL"); + return -EINVAL; + } + for (auto &uriStr : uriList) { + Uri uri(uriStr); + std::string bundleName = uri.GetAuthority(); + if (bundleName == MEDIA_AUTHORITY) { + mediaUriList.push_back(uriStr); + } else { + otherUriList.push_back(uriStr); + } + } + return E_OK; +} + +static int32_t GetMediaDfsUrisFromLocal(const std::vector &uriList, + const int32_t &userId, + std::unordered_map &uriToDfsUriMaps) +{ + LOGI("GetMediaDfsUrisFromLocal start"); + std::string ioctlDir = SHAER_PATH_HEAD + std::to_string(userId) + LOWER_SHARE_PATH_MID; + UniqueFd dirFd(open(ioctlDir.c_str(), O_RDONLY)); + if (dirFd < 0) { + LOGE("Open share path failed with %{public}d", errno); + return errno; + } + std::vector physicalPaths; + int getPhysicalPathRet = SandboxHelper::GetMediaSharePath(uriList, physicalPaths); + if (getPhysicalPathRet != E_OK) { + return -EINVAL; + } + std::string networkId = GetLocalNetworkId(); + std::string bundleName = MEDIA_BUNDLE_NAME; + for (size_t i = 0; i < uriList.size(); i++) { + Uri uri(uriList[i]); + LOGD("GetDfsUriFromLocal begin, uri: %{private}s", uriList[i].c_str()); + std::string distributedPath; + int ret = GetDistributedPath(uri, userId, distributedPath, bundleName, networkId); + if (ret != E_OK) { + return ret; + } + struct HmdfsDstInfo hdi; + InitHmdfsInfo(hdi, physicalPaths[i], distributedPath, bundleName); + ret = ioctl(dirFd, HMDFS_IOC_GET_DST_PATH, &hdi); + if (ret != E_OK && GetMergePathFd(hdi, dirFd, userId) != E_OK) { + return errno; + } + HmdfsUriInfo dfsUriInfo; + SetHmdfsUriInfo(dfsUriInfo, uri, hdi.size, networkId, bundleName); + uriToDfsUriMaps.insert({uriList[i], dfsUriInfo}); + } + LOGI("GetDfsUrisFromLocal successfully"); + return E_OK; } int32_t RemoteFileShare::GetDfsUrisFromLocal(const std::vector &uriList, const int32_t &userId, std::unordered_map &uriToDfsUriMaps) { - LOGI("GetDfsUrisFromLocal start"); + std::vector otherUriList; + std::vector mediaUriList; + int ret = UriCategoryByType(uriList, mediaUriList, otherUriList); + if (ret == E_OK && mediaUriList.size() != E_OK) { + ret = GetMediaDfsUrisFromLocal(mediaUriList, userId, uriToDfsUriMaps); + } + if (ret != E_OK) { + return ret; + } std::string ioctlDir = SHAER_PATH_HEAD + std::to_string(userId) + LOWER_SHARE_PATH_MID; UniqueFd dirFd(open(ioctlDir.c_str(), O_RDONLY)); if (dirFd < 0) { LOGE("Open share path failed with %{public}d", errno); return errno; } - LOGI("open ioctlDir end"); - std::string networkId = NETWORK_PARA + GetLocalNetworkId(); - for (auto &uriStr : uriList) { + std::string networkId = GetLocalNetworkId(); + for (const auto &uriStr : otherUriList) { Uri uri(uriStr); std::string bundleName = uri.GetAuthority(); LOGD("GetDfsUriFromLocal begin, uri: %{private}s", uriStr.c_str()); @@ -448,27 +519,22 @@ int32_t RemoteFileShare::GetDfsUrisFromLocal(const std::vector &uri LOGE("Failed to get physical path"); return -EINVAL; } - if (bundleName == MEDIA_AUTHORITY) { - bundleName = MEDIA_BUNDLE_NAME; - } if (bundleName == FILE_MANAGER_AUTHORITY) { HmdfsUriInfo dfsUriInfo; (void)SetPublicDirHmdfsInfo(physicalPath, uriStr, dfsUriInfo, networkId); uriToDfsUriMaps.insert({uriStr, dfsUriInfo}); - LOGD("GetDfsUriFromLocal successfully"); continue; } std::string distributedPath; - int ret = GetDistributedPath(uri, userId, distributedPath, bundleName); - if (ret != 0) { - LOGE("Path is too long with %{public}d", ret); + ret = GetDistributedPath(uri, userId, distributedPath, bundleName, networkId); + if (ret != E_OK) { return ret; } struct HmdfsDstInfo hdi; InitHmdfsInfo(hdi, physicalPath, distributedPath, bundleName); ret = ioctl(dirFd, HMDFS_IOC_GET_DST_PATH, &hdi); - if (ret != 0 && GetMergePathFd(hdi, dirFd, userId) != 0) { + if (ret != E_OK && GetMergePathFd(hdi, dirFd, userId) != E_OK) { return errno; } HmdfsUriInfo dfsUriInfo; @@ -476,7 +542,7 @@ int32_t RemoteFileShare::GetDfsUrisFromLocal(const std::vector &uri uriToDfsUriMaps.insert({uriStr, dfsUriInfo}); } LOGI("GetDfsUrisFromLocal successfully"); - return 0; + return E_OK; } int32_t RemoteFileShare::TransRemoteUriToLocal(const std::vector &uriList, @@ -529,7 +595,7 @@ int32_t RemoteFileShare::TransRemoteUriToLocal(const std::vector &u return -EINVAL; } resultList = tmpResultList; - return 0; + return E_OK; } } // namespace ModuleRemoteFileShare } // namespace AppFileService diff --git a/interfaces/kits/js/backup/session_backup_n_exporter.cpp b/interfaces/kits/js/backup/session_backup_n_exporter.cpp index f331a15f3..c04ef6664 100644 --- a/interfaces/kits/js/backup/session_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_backup_n_exporter.cpp @@ -418,19 +418,18 @@ napi_value SessionBackupNExporter::GetLocalCapabilities(napi_env env, napi_callb NError(BError(BError::Codes::SDK_INVAL_ARG, "Failed to get backupSession entity.").GetCode()).ThrowErr(env); return nullptr; } - UniqueFd fd; - auto cbExec = [session {backupEntity->session.get()}, &fd]() -> NError { + auto fd = make_shared(); + auto cbExec = [session {backupEntity->session.get()}, fd]() -> NError { if (!session) { return NError(BError(BError::Codes::SDK_INVAL_ARG, "backup session is nullptr").GetCode()); } - fd = session->GetLocalCapabilities(); - return fd < 0 ? NError(BError(BError::Codes::SA_INVAL_ARG, "Failed to get local capabilities.").GetCode()) : - NError(BError(BError::Codes::OK, "Success to get local capabilities.").GetCode()); + *fd = session->GetLocalCapabilities(); + return NError(ERRNO_NOERR); }; - auto cbCompl = [&fd](napi_env env, NError err) -> NVal { + auto cbCompl = [fd](napi_env env, NError err) -> NVal { NVal obj = NVal::CreateObject(env); - obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd.Release()).val_)}); - return err ? NVal {env, err.GetNapiErr(env)} : obj; + obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd->Release()).val_)}); + return {obj}; }; NVal thisVar(env, funcArg.GetThisVar()); return NAsyncWorkPromise(env, thisVar).Schedule(className, cbExec, cbCompl).val_; 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 5d61b6db4..05912440e 100644 --- a/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp @@ -421,19 +421,18 @@ napi_value SessionIncrementalBackupNExporter::GetLocalCapabilities(napi_env env, NError(BError(BError::Codes::SDK_INVAL_ARG, "Failed to get backupSession entity.").GetCode()).ThrowErr(env); return nullptr; } - UniqueFd fd; - auto cbExec = [session {backupEntity->session.get()}, &fd]() -> NError { + auto fd = make_shared(); + auto cbExec = [session {backupEntity->session.get()}, fd]() -> NError { if (!session) { return NError(BError(BError::Codes::SDK_INVAL_ARG, "backup session is nullptr").GetCode()); } - fd = session->GetLocalCapabilities(); - return fd < 0 ? NError(BError(BError::Codes::SA_INVAL_ARG, "Failed to get local capabilities.").GetCode()) : - NError(BError(BError::Codes::OK, "Success to get local capabilities.").GetCode()); + *fd = session->GetLocalCapabilities(); + return NError(ERRNO_NOERR); }; - auto cbCompl = [&fd](napi_env env, NError err) -> NVal { + auto cbCompl = [fd](napi_env env, NError err) -> NVal { NVal obj = NVal::CreateObject(env); - obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd.Release()).val_)}); - return err ? NVal {env, err.GetNapiErr(env)} : obj; + obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd->Release()).val_)}); + return {obj}; }; NVal thisVar(env, funcArg.GetThisVar()); return NAsyncWorkPromise(env, thisVar).Schedule(className, cbExec, cbCompl).val_; diff --git a/interfaces/kits/js/backup/session_restore_n_exporter.cpp b/interfaces/kits/js/backup/session_restore_n_exporter.cpp index bb507b410..ef6ddf6df 100644 --- a/interfaces/kits/js/backup/session_restore_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_restore_n_exporter.cpp @@ -508,23 +508,22 @@ napi_value SessionRestoreNExporter::GetLocalCapabilities(napi_env env, napi_call NError(BError(BError::Codes::SDK_INVAL_ARG, "Failed to get restoreSession entity.").GetCode()).ThrowErr(env); return nullptr; } - UniqueFd fd; - auto cbExec = [session {restoreEntity}, &fd]() -> NError { + auto fd = make_shared(); + auto cbExec = [session {restoreEntity}, fd]() -> NError { if (!session && (session->sessionWhole || session->sessionSheet)) { return NError(BError(BError::Codes::SDK_INVAL_ARG, "backup session is nullptr").GetCode()); } if (session->sessionWhole) { - fd = session->sessionWhole->GetLocalCapabilities(); + *fd = session->sessionWhole->GetLocalCapabilities(); } else if (session->sessionSheet) { - fd = session->sessionSheet->GetLocalCapabilities(); + *fd = session->sessionSheet->GetLocalCapabilities(); } - return fd < 0 ? NError(BError(BError::Codes::SA_INVAL_ARG, "Failed to get local capabilities.").GetCode()) : - NError(BError(BError::Codes::OK, "Success to get local capabilities.").GetCode()); + return NError(ERRNO_NOERR); }; - auto cbCompl = [&fd](napi_env env, NError err) -> NVal { + auto cbCompl = [fd](napi_env env, NError err) -> NVal { NVal obj = NVal::CreateObject(env); - obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd.Release()).val_)}); - return err ? NVal {env, err.GetNapiErr(env)} : obj; + obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd->Release()).val_)}); + return {obj}; }; NVal thisVar(env, funcArg.GetThisVar()); return NAsyncWorkPromise(env, thisVar).Schedule(className, cbExec, cbCompl).val_; diff --git a/services/backup_sa/src/module_ipc/service.cpp b/services/backup_sa/src/module_ipc/service.cpp index dc39257cf..ba1779f2c 100644 --- a/services/backup_sa/src/module_ipc/service.cpp +++ b/services/backup_sa/src/module_ipc/service.cpp @@ -1655,7 +1655,7 @@ ErrCode Service::GetBackupInfo(const BundleName &bundleName, std::string &result return BError(BError::Codes::SA_INVAL_ARG); } if (session_->GetImpl().clientToken) { - return BError(BError::Codes::SA_REFUSED_ACT, "Already have an active session"); + HILOGI("Already have an active session, bundleName:%{public}s", bundleName.c_str()); } session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); auto ret = GetBackupInfoCmdHandle(bundleName, result); diff --git a/test/fuzztest/backupsa_fuzzer/backupsa_fuzzer.cpp b/test/fuzztest/backupsa_fuzzer/backupsa_fuzzer.cpp index a811dcc08..2f4141076 100644 --- a/test/fuzztest/backupsa_fuzzer/backupsa_fuzzer.cpp +++ b/test/fuzztest/backupsa_fuzzer/backupsa_fuzzer.cpp @@ -15,25 +15,14 @@ #include "backupsa_fuzzer.h" -#include -#include -#include - -#include #include "message_parcel.h" -#include "service_stub.h" #include "service.h" -#include "securec.h" -#include "system_ability.h" - -#include "filemgmt_libhilog.h" - -using namespace OHOS::FileManagement::Backup; +#include "service_client.h" namespace OHOS { +using namespace OHOS::FileManagement::Backup; constexpr size_t U32_AT_SIZE = 4; -constexpr uint8_t MAX_CALL_TRANSACTION = 24; -constexpr int32_t SERVICE_ID = 5203; +constexpr uint8_t MAX_CALL_TRANSACTION = 40; uint32_t GetU32Data(const char* ptr) { @@ -47,7 +36,7 @@ bool BackupSaFuzzTest(const uint8_t *data, size_t size) return true; } - sptr service = sptr(new Service(SERVICE_ID)); + Service* service = static_cast(ServiceClient::GetInstance()->AsObject().GetRefPtr()); uint32_t code = GetU32Data(reinterpret_cast(data)); if (code == 0) { return true; diff --git a/test/fuzztest/backupsaanother_fuzzer/backupsaanother_fuzzer.cpp b/test/fuzztest/backupsaanother_fuzzer/backupsaanother_fuzzer.cpp index 2b1f339e3..a202ce4b6 100644 --- a/test/fuzztest/backupsaanother_fuzzer/backupsaanother_fuzzer.cpp +++ b/test/fuzztest/backupsaanother_fuzzer/backupsaanother_fuzzer.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include "message_parcel.h" @@ -103,19 +104,24 @@ bool CmdReleaseFuzzTest(const uint8_t *data, size_t size) void GetBundleNamesData(const uint8_t *data, size_t size, vector &bundleNames) { - for (size_t i = 0; i < size; i++) { - string param(reinterpret_cast(data), size); - string name = param + to_string(i); - if (size < sizeof(int64_t)) { - BIncrementalData data(name, 0); - bundleNames.push_back(data); - continue; - } - - int64_t nTime = *(reinterpret_cast(data)); - int fd = *(reinterpret_cast(data)); - int32_t priority = *(reinterpret_cast(data + sizeof(int32_t))); - string parameters = string(reinterpret_cast(data), size) + to_string(size - i); + int minLen = sizeof(int64_t) + sizeof(int) + sizeof(int32_t); + if (size < minLen + 1) { + return; + } + FuzzedDataProvider fdp(data, size); + uint8_t loop = fdp.ConsumeIntegral(); + size--; + if (loop == 0 || (minLen * loop) > size) { + return; + } + int blob = (size / loop); + int len = (blob - minLen) >> 1; + for (size_t i = 0, pos = 1; i < loop; i++, pos += blob) { + int64_t nTime = fdp.ConsumeIntegral(); + int fd = fdp.ConsumeIntegral(); + int32_t priority = fdp.ConsumeIntegral(); + string name(reinterpret_cast(data + pos + minLen), len); + string parameters(reinterpret_cast(data + pos + len + minLen), len); BIncrementalData incrementaData(name, nTime, fd, parameters, priority); bundleNames.push_back(incrementaData); } @@ -202,7 +208,7 @@ bool CmdPublishIncrementalFileFuzzTest(const uint8_t *data, size_t size) if (size > 0) { int pos = (size + 1) >> 1; std::string fileName(reinterpret_cast(data), pos); - std::string bundleName(reinterpret_cast(data) + pos, size - pos); + std::string bundleName(reinterpret_cast(data + pos), size - pos); uint32_t sn = 0; if (size > sizeof(uint32_t)) { sn = *(reinterpret_cast(data)); diff --git a/test/fuzztest/backupsaappend_fuzzer/backupsaappend_fuzzer.cpp b/test/fuzztest/backupsaappend_fuzzer/backupsaappend_fuzzer.cpp index 73826f873..9a6e46113 100644 --- a/test/fuzztest/backupsaappend_fuzzer/backupsaappend_fuzzer.cpp +++ b/test/fuzztest/backupsaappend_fuzzer/backupsaappend_fuzzer.cpp @@ -74,7 +74,7 @@ bool CmdPublishFileFuzzTest(const uint8_t *data, size_t size) if (size > 0) { int pos = (size + 1) >> 1; std::string fileName(reinterpret_cast(data), pos); - std::string bundleName(reinterpret_cast(data) + pos, size - pos); + std::string bundleName(reinterpret_cast(data + pos), size - pos); uint32_t sn = 0; if (size > sizeof(uint32_t)) { sn = *(reinterpret_cast(data)); diff --git a/test/fuzztest/backupservicestub_fuzzer/backupservicestub_fuzzer.cpp b/test/fuzztest/backupservicestub_fuzzer/backupservicestub_fuzzer.cpp index 6172e19b2..94f3c897a 100644 --- a/test/fuzztest/backupservicestub_fuzzer/backupservicestub_fuzzer.cpp +++ b/test/fuzztest/backupservicestub_fuzzer/backupservicestub_fuzzer.cpp @@ -526,7 +526,7 @@ bool CmdPublishIncrementalFileFuzzTest(sptr service, const uint8_t *dat int pos = 0; BFileInfo info; int fd = TypeCast(data, &pos); - info.sn = TypeCast(data, &pos); + info.sn = TypeCast(data + pos, &pos); int len = (size - pos) >> 1; info.owner = string(reinterpret_cast(data + pos), len); info.fileName = string(reinterpret_cast(data + pos + len), len); @@ -670,6 +670,26 @@ bool CmdUpdateSendRateFuzzTest(sptr service, const uint8_t *data, size_ } return true; } + +bool CmdGetBackupDataSizeFuzzTest(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; + MessageOption option; + uint32_t code = static_cast(IServiceIpcCode::COMMAND_GET_BACKUP_DATA_SIZE); + + try { + msg.WriteBuffer(data, size); + service->OnRemoteRequest(code, msg, reply, option); + } catch (OHOS::FileManagement::Backup::BError &err) { + // Only filter BError errors, Other results are not expected. + } + return true; +} } // namespace OHOS /* Fuzzer entry point */ @@ -708,6 +728,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) CmdGetBackupInfoFuzzTest(service, data, size); CmdUpdateTimerFuzzTest(service, data, size); CmdUpdateSendRateFuzzTest(service, data, size); + CmdGetBackupDataSizeFuzzTest(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/servicereverse_fuzzer.cpp b/test/fuzztest/servicereverse_fuzzer/servicereverse_fuzzer.cpp index 6c3b2fe0c..fe1d613a2 100644 --- a/test/fuzztest/servicereverse_fuzzer/servicereverse_fuzzer.cpp +++ b/test/fuzztest/servicereverse_fuzzer/servicereverse_fuzzer.cpp @@ -53,7 +53,7 @@ bool BackupOnFileReadyFuzzTest(sptr service, const uint8_t *data try { int pos = 0; int fd = TypeCast(data, &pos); - bool fdFlag = TypeCast(data, &pos); + bool fdFlag = TypeCast(data + pos, &pos); int len = ((size - pos) >> 1); msg.WriteString(string(reinterpret_cast(data + pos), len)); msg.WriteString(string(reinterpret_cast(data + pos + len), size - pos - len)); @@ -280,8 +280,8 @@ bool RestoreOnFileReadyFuzzTest(sptr service, const uint8_t *dat try { int pos = 0; int fd = TypeCast(data, &pos); - bool fdFlag = TypeCast(data, &pos); - int32_t errCode = TypeCast(data, &pos); + bool fdFlag = TypeCast(data + pos, &pos); + int32_t errCode = TypeCast(data + pos, &pos); int len = ((size - pos) >> 1); msg.WriteString(string(reinterpret_cast(data + pos), len)); msg.WriteString(string(reinterpret_cast(data + pos + len), size - pos - len)); @@ -358,9 +358,9 @@ bool IncrementalBackupOnFileReadyFuzzTest(sptr service, const ui try { int pos = 0; int fd = TypeCast(data, &pos); - int manifestFd = TypeCast(data, &pos); - bool fdFlag = TypeCast(data, &pos); - int32_t errCode = TypeCast(data, &pos); + int manifestFd = TypeCast(data + pos, &pos); + bool fdFlag = TypeCast(data + pos, &pos); + int32_t errCode = TypeCast(data + pos, &pos); int len = ((size - pos) >> 1); msg.WriteString(string(reinterpret_cast(data + pos), len)); msg.WriteString(string(reinterpret_cast(data + pos + len), size - pos - len)); @@ -589,9 +589,9 @@ bool IncrementalRestoreOnFileReadyFuzzTest(sptr service, const u try { int pos = 0; int fd = TypeCast(data, &pos); - int manifestFd = TypeCast(data, &pos); - bool fdFlag = TypeCast(data, &pos); - int32_t errCode = TypeCast(data, &pos); + int manifestFd = TypeCast(data + pos, &pos); + bool fdFlag = TypeCast(data + pos, &pos); + int32_t errCode = TypeCast(data + pos, &pos); int len = ((size - pos) >> 1); msg.WriteString(string(reinterpret_cast(data + pos), len)); msg.WriteString(string(reinterpret_cast(data + pos + len), size - pos - len)); diff --git a/test/unittest/file_share_native/file_share_test.cpp b/test/unittest/file_share_native/file_share_test.cpp index 2a0b3c279..22d26eb86 100644 --- a/test/unittest/file_share_native/file_share_test.cpp +++ b/test/unittest/file_share_native/file_share_test.cpp @@ -421,6 +421,107 @@ HWTEST_F(FileShareTest, File_share_GetPhysicalPath_0006, testing::ext::TestSize. GTEST_LOG_(INFO) << "FileShareTest-end File_share_GetPhysicalPath_0006"; } +/** + * @tc.name: File_share_GetPhysicalPath_0007 + * @tc.desc: Test function of GetPhysicalPath() interface for SUCCESS. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I7PDZL + */ +HWTEST_F(FileShareTest, File_share_GetPhysicalPath_0007, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileShareTest-begin File_share_GetPhysicalPath_0007"; + std::string fileUri0 = "file://docs/storage/Users/currentUser/../test../test1"; + std::string fileUri1 = "file://docs/storage/Users/currentUser/test../../test"; + std::string fileUri2 = "file://docs/storage/Users/currentUser/test../../"; + std::string fileUri3 = "file://docs/storage/Users/currentUser/test../test../.."; + std::string fileUri4 = "file://docs/storage/Users/currentUser/test/..test/.."; + std::string fileUri5 = "file://docs/storage/Users/currentUser/test/test../test"; + std::string fileUri6 = "file://docs/storage/Users/currentUser/test../test../test"; + std::string fileUri7 = "file://docs/storage/Users/currentUser/test../test../test../..test"; + std::string physicalPath; + int32_t ret = SandboxHelper::GetPhysicalPath(fileUri0, "100", physicalPath); + EXPECT_EQ(ret, -EINVAL); + ret = SandboxHelper::GetPhysicalPath(fileUri1, "100", physicalPath); + EXPECT_EQ(ret, -EINVAL); + ret = SandboxHelper::GetPhysicalPath(fileUri2, "100", physicalPath); + EXPECT_EQ(ret, -EINVAL); + ret = SandboxHelper::GetPhysicalPath(fileUri3, "100", physicalPath); + EXPECT_EQ(ret, -EINVAL); + ret = SandboxHelper::GetPhysicalPath(fileUri4, "100", physicalPath); + EXPECT_EQ(ret, -EINVAL); + ret = SandboxHelper::GetPhysicalPath(fileUri5, "100", physicalPath); + EXPECT_EQ(ret, E_OK); + ret = SandboxHelper::GetPhysicalPath(fileUri6, "100", physicalPath); + EXPECT_EQ(ret, E_OK); + ret = SandboxHelper::GetPhysicalPath(fileUri7, "100", physicalPath); + EXPECT_EQ(ret, E_OK); + GTEST_LOG_(INFO) << "FileShareTest-end File_share_GetPhysicalPath_0007"; +} + +/** + * @tc.name: File_share_GetMediaSharePath_0001 + * @tc.desc: Test function of GetMediaSharePath() interface for SUCCESS. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I7PDZL + */ +HWTEST_F(FileShareTest, File_share_GetMediaSharePath_0001, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileShareTest-begin File_share_GetMediaSharePath_0001"; + std::string fileUri = "file://media/Photo/test/IMG_12345_999999/test.jpg"; + vector uriList; + vector physicalPathList; + uriList.push_back(fileUri); + int32_t ret = SandboxHelper::GetMediaSharePath(uriList, physicalPathList); + EXPECT_EQ(ret, -EINVAL); + GTEST_LOG_(INFO) << "FileShareTest-end File_share_GetMediaSharePath_0001"; +} + +/** + * @tc.name: File_share_GetMediaSharePath_0002 + * @tc.desc: Test function of GetMediaSharePath() interface for SUCCESS. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I7PDZL + */ +HWTEST_F(FileShareTest, File_share_GetMediaSharePath_0002, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileShareTest-begin File_share_GetMediaSharePath_0002"; + std::string fileUri = "file://media/Photo"; + vector uriList; + vector physicalPathList; + uriList.push_back(fileUri); + int32_t ret = SandboxHelper::GetMediaSharePath(uriList, physicalPathList); + EXPECT_EQ(ret, -EINVAL); + GTEST_LOG_(INFO) << "FileShareTest-end File_share_GetMediaSharePath_0002"; +} + +/** + * @tc.name: File_share_GetMediaSharePath_0003 + * @tc.desc: Test function of GetMediaSharePath() interface for SUCCESS. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I7PDZL + */ +HWTEST_F(FileShareTest, File_share_GetMediaSharePath_0003, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileShareTest-begin File_share_GetMediaSharePath_0003"; + std::string fileUri = "file://media/Photo/test/IMG_12345_/test.JPG"; + std::string fileUri1 = "file://media/Photo/test/IMG_12345_/test.JPG"; + vector uriList; + vector physicalPathList; + uriList.push_back(fileUri); + uriList.push_back(fileUri1); + int32_t ret = SandboxHelper::GetMediaSharePath(uriList, physicalPathList); + EXPECT_EQ(ret, -EINVAL); + GTEST_LOG_(INFO) << "FileShareTest-end File_share_GetMediaSharePath_0003"; +} + /** * @tc.name: File_share_CheckValidPath_0001 * @tc.desc: Test function of CheckValidPath() interface for FAILURE. @@ -442,6 +543,43 @@ HWTEST_F(FileShareTest, File_share_CheckValidPath_0001, testing::ext::TestSize.L GTEST_LOG_(INFO) << "FileShareTest-end File_share_CheckValidPath_0001"; } +/** + * @tc.name: File_share_IsValidPath_0002 + * @tc.desc: Test function of CheckValidPath() interface for FAILURE. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I7PDZL + */ +HWTEST_F(FileShareTest, File_share_IsValidPath_0002, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileShareTest-begin File_share_IsValidPath_0002"; + bool result = SandboxHelper::IsValidPath("../test../test1"); + EXPECT_FALSE(result); + result = SandboxHelper::IsValidPath("/../test../test1"); + EXPECT_FALSE(result); + result = SandboxHelper::IsValidPath("test../../test"); + EXPECT_FALSE(result); + result = SandboxHelper::IsValidPath("test../../"); + EXPECT_FALSE(result); + result = SandboxHelper::IsValidPath("test../test../.."); + EXPECT_FALSE(result); + result = SandboxHelper::IsValidPath("/test/..test/.."); + EXPECT_FALSE(result); + + result = SandboxHelper::IsValidPath("test"); + EXPECT_TRUE(result); + result = SandboxHelper::IsValidPath("/test/test../test"); + EXPECT_TRUE(result); + result = SandboxHelper::IsValidPath("/test../test../test"); + EXPECT_TRUE(result); + result = SandboxHelper::IsValidPath("/test../test../test../"); + EXPECT_TRUE(result); + result = SandboxHelper::IsValidPath("/test../test../test../..test"); + EXPECT_TRUE(result); + GTEST_LOG_(INFO) << "FileShareTest-end File_share_IsValidPath_0002"; +} + /** * @tc.name: File_share_GetBackupPhysicalPath_0001 * @tc.desc: Test function of GetBackupPhysicalPath() interface for SUCCESS. @@ -558,4 +696,44 @@ HWTEST_F(FileShareTest, File_share_GetBackupPhysicalPath_0006, testing::ext::Tes EXPECT_EQ(ret, -EINVAL); GTEST_LOG_(INFO) << "FileShareTest-end File_share_GetBackupPhysicalPath_0006"; } + +/** + * @tc.name: File_share_GetBackupPhysicalPath_0007 + * @tc.desc: Test function of GetBackupPhysicalPath() interface for FAILURE. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I7PDZL + */ +HWTEST_F(FileShareTest, File_share_GetBackupPhysicalPath_0007, testing::ext::TestSize.Level1) +{ + GTEST_LOG_(INFO) << "FileShareTest-begin File_share_GetPhysicalPath_0007"; + std::string fileUri0 = "file://docs/storage/Users/currentUser/../test../test1"; + std::string fileUri1 = "file://docs/storage/Users/currentUser/test../../test"; + std::string fileUri2 = "file://docs/storage/Users/currentUser/test../../"; + std::string fileUri3 = "file://docs/storage/Users/currentUser/test../test../.."; + std::string fileUri4 = "file://docs/storage/Users/currentUser/test/..test/.."; + std::string fileUri5 = "file://docs/storage/Users/currentUser/test/test../test"; + std::string fileUri6 = "file://docs/storage/Users/currentUser/test../test../test"; + std::string fileUri7 = "file://docs/storage/Users/currentUser/test../test../test../..test"; + std::string physicalPath; + int32_t ret = SandboxHelper::GetBackupPhysicalPath(fileUri0, "100", physicalPath); + EXPECT_EQ(ret, -EINVAL); + ret = SandboxHelper::GetBackupPhysicalPath(fileUri1, "100", physicalPath); + EXPECT_EQ(ret, -EINVAL); + ret = SandboxHelper::GetBackupPhysicalPath(fileUri2, "100", physicalPath); + EXPECT_EQ(ret, -EINVAL); + ret = SandboxHelper::GetBackupPhysicalPath(fileUri3, "100", physicalPath); + EXPECT_EQ(ret, -EINVAL); + ret = SandboxHelper::GetBackupPhysicalPath(fileUri4, "100", physicalPath); + EXPECT_EQ(ret, -EINVAL); + ret = SandboxHelper::GetBackupPhysicalPath(fileUri5, "100", physicalPath); + EXPECT_EQ(ret, E_OK); + ret = SandboxHelper::GetBackupPhysicalPath(fileUri6, "100", physicalPath); + EXPECT_EQ(ret, E_OK); + ret = SandboxHelper::GetBackupPhysicalPath(fileUri7, "100", physicalPath); + EXPECT_EQ(ret, E_OK); + GTEST_LOG_(INFO) << "FileShareTest-end File_share_GetBackupPhysicalPath_0007"; +} + } // namespace \ No newline at end of file diff --git a/test/unittest/file_uri_native/file_uri_test.cpp b/test/unittest/file_uri_native/file_uri_test.cpp index bb5fce798..468865cb2 100644 --- a/test/unittest/file_uri_native/file_uri_test.cpp +++ b/test/unittest/file_uri_native/file_uri_test.cpp @@ -368,6 +368,110 @@ namespace OHOS::AppFileService::ModuleFileUri { GTEST_LOG_(INFO) << "FileUriTest-end File_uri_GetPath_0000"; } + /** + * @tc.name: file_uri_test_0008 + * @tc.desc: Test function of GetFullDirectoryUri() interface for SUCCESS. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: + */ + HWTEST_F(FileUriTest, File_uri_GetFullDirectoryUri_0001, testing::ext::TestSize.Level1) + { + GTEST_LOG_(INFO) << "FileUriTest-begin File_uri_GetFullDirectoryUri_0001"; + std::string fileUri0 = "file://docs/storage/Users/currentUser/../test../test1"; + std::string fileUri1 = "file://docs/storage/Users/currentUser/test../../test"; + std::string fileUri2 = "file://docs/storage/Users/currentUser/test../../"; + std::string fileUri3 = "file://docs/storage/Users/currentUser/test../test../.."; + std::string fileUri4 = "file://docs/storage/Users/currentUser/test/..test/.."; + FileUri fileUriObject0(fileUri0); + EXPECT_EQ(fileUriObject0.GetFullDirectoryUri(), ""); + FileUri fileUriObject1(fileUri1); + EXPECT_EQ(fileUriObject1.GetFullDirectoryUri(), ""); + FileUri fileUriObject2(fileUri2); + EXPECT_EQ(fileUriObject2.GetFullDirectoryUri(), ""); + FileUri fileUriObject3(fileUri3); + EXPECT_EQ(fileUriObject3.GetFullDirectoryUri(), ""); + FileUri fileUriObject4(fileUri4); + EXPECT_EQ(fileUriObject4.GetFullDirectoryUri(), ""); + GTEST_LOG_(INFO) << "FileUriTest-end File_uri_GetPath_0001"; + } + + /** + * @tc.name: file_uri_test_0009 + * @tc.desc: Test function of CheckUriFormat() interface for SUCCESS. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: + */ + HWTEST_F(FileUriTest, File_uri_CheckUriFormat_0000, testing::ext::TestSize.Level1) + { + GTEST_LOG_(INFO) << "FileUriTest-begin File_uri_CheckUriFormat_0000"; + std::string fileUri0 = "file://docs/storage/Users/currentUser/../test../test1"; + std::string fileUri1 = "file://docs/storage/Users/currentUser/test../../test"; + std::string fileUri2 = "file://docs/storage/Users/currentUser/test../../"; + std::string fileUri3 = "file://docs/storage/Users/currentUser/test../test../.."; + std::string fileUri4 = "file://docs/storage/Users/currentUser/test/..test/.."; + std::string fileUri5 = "file://docs/storage/Users/currentUser/test/test../test"; + std::string fileUri6 = "file://docs/storage/Users/currentUser/test../test../test"; + std::string fileUri7 = "file://docs/storage/Users/currentUser/test../test../test../..test"; + FileUri fileUriObject0(fileUri0); + EXPECT_FALSE(fileUriObject0.CheckUriFormat(fileUri0)); + FileUri fileUriObject1(fileUri1); + EXPECT_FALSE(fileUriObject1.CheckUriFormat(fileUri1)); + FileUri fileUriObject2(fileUri2); + EXPECT_FALSE(fileUriObject2.CheckUriFormat(fileUri2)); + FileUri fileUriObject3(fileUri3); + EXPECT_FALSE(fileUriObject3.CheckUriFormat(fileUri3)); + FileUri fileUriObject4(fileUri4); + EXPECT_FALSE(fileUriObject4.CheckUriFormat(fileUri4)); + FileUri fileUriObject5(fileUri5); + EXPECT_TRUE(fileUriObject5.CheckUriFormat(fileUri5)); + FileUri fileUriObject6(fileUri6); + EXPECT_TRUE(fileUriObject6.CheckUriFormat(fileUri6)); + FileUri fileUriObject7(fileUri7); + EXPECT_TRUE(fileUriObject7.CheckUriFormat(fileUri7)); + GTEST_LOG_(INFO) << "FileUriTest-end File_uri_CheckUriFormat_0000"; + } + + /** + * @tc.name: file_uri_test_0010 + * @tc.desc: Test function of GetUriFromPath() interface for SUCCESS. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: + */ + HWTEST_F(FileUriTest, File_uri_GetUriFromPath_0010, testing::ext::TestSize.Level1) + { + GTEST_LOG_(INFO) << "FileUriTest-begin File_uri_GetUriFromPath_0010"; + std::string fileUri0 = "/storage/Users/currentUser/../test../test1"; + std::string fileUri1 = "/storage/Users/currentUser/test../../test"; + std::string fileUri2 = "/storage/Users/currentUser/test../../"; + std::string fileUri3 = "/storage/Users/currentUser/test../test../.."; + std::string fileUri4 = "/storage/Users/currentUser/test/..test/.."; + std::string fileUri5 = "/storage/Users/currentUser/test/test../test"; + std::string fileUri6 = "/storage/Users/currentUser/test../test../test"; + std::string fileUri7 = "/storage/Users/currentUser/test../test../test../..test"; + FileUri fileUriObject0(fileUri0); + EXPECT_EQ(fileUriObject0.ToString(), ""); + FileUri fileUriObject1(fileUri1); + EXPECT_EQ(fileUriObject1.ToString(), ""); + FileUri fileUriObject2(fileUri2); + EXPECT_EQ(fileUriObject2.ToString(), ""); + FileUri fileUriObject3(fileUri3); + EXPECT_EQ(fileUriObject3.ToString(), ""); + FileUri fileUriObject4(fileUri4); + EXPECT_EQ(fileUriObject4.ToString(), ""); + FileUri fileUriObject5(fileUri5); + EXPECT_EQ(fileUriObject5.ToString(), "file://docs/storage/Users/currentUser/test/test../test"); + FileUri fileUriObject6(fileUri6); + EXPECT_EQ(fileUriObject6.ToString(), "file://docs/storage/Users/currentUser/test../test../test"); + FileUri fileUriObject7(fileUri7); + EXPECT_EQ(fileUriObject7.ToString(), "file://docs/storage/Users/currentUser/test../test../test../..test"); + GTEST_LOG_(INFO) << "FileUriTest-end File_uri_GetUriFromPath_0010"; + } /** * @tc.name: File_uri_IsRemoteUri_0000 * @tc.desc: Test function of IsRemoteUri() interface for SUCCESS. diff --git a/test/unittest/remote_file_share/remote_file_share_test.cpp b/test/unittest/remote_file_share/remote_file_share_test.cpp index 7b97212c5..5df49b322 100644 --- a/test/unittest/remote_file_share/remote_file_share_test.cpp +++ b/test/unittest/remote_file_share/remote_file_share_test.cpp @@ -477,7 +477,7 @@ namespace { HWTEST_F(RemoteFileShareTest, Remote_file_share_GetDfsUriFromLocal_0015, testing::ext::TestSize.Level1) { GTEST_LOG_(INFO) << "RemoteFileShareTest-begin Remote_file_share_GetDfsUriFromLocal_0015"; - const string uriStr = "file://media/Photo/12/IMG_12345_0011/test.jpg"; + const string uriStr = "file://media/Photo/test/IMG_12345_0011/test.jpg"; const int userId = USER_ID; HmdfsUriInfo hui; int ret = RemoteFileShare::GetDfsUriFromLocal(uriStr, userId, hui); @@ -522,6 +522,63 @@ namespace { GTEST_LOG_(INFO) << "RemoteFileShareTest-end Remote_file_share_GetDfsUriFromLocal_0016"; } + /** + * @tc.name: remote_file_share_GetDfsUriFromLocal_0017 + * @tc.desc: Test function of GetDfsUrisFromLocal() interface. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I7KDF7 + */ + HWTEST_F(RemoteFileShareTest, Remote_file_share_GetDfsUriFromLocal_0017, testing::ext::TestSize.Level1) + { + GTEST_LOG_(INFO) << "RemoteFileShareTest-begin Remote_file_share_GetDfsUriFromLocal_0017"; + const string uriStr = "file://docs/storage/Users/currentUser/Documents/1.txt"; + const string uriStr1 = "file://media/Photo/test/IMG_12345_0011/test.jpg"; + const int userId = USER_ID; + HmdfsUriInfo hui; + int ret = RemoteFileShare::GetDfsUriFromLocal(uriStr, userId, hui); + EXPECT_EQ(ret, E_OK); + + vector uriList; + unordered_map uriToDfsUriMaps; + uriList.push_back(uriStr); + uriList.push_back(uriStr1); + ret = RemoteFileShare::GetDfsUrisFromLocal(uriList, userId, uriToDfsUriMaps); + EXPECT_EQ(ret, -EINVAL); + + GTEST_LOG_(INFO) << "RemoteFileShareTest uri is " << hui.uriStr; + GTEST_LOG_(INFO) << "RemoteFileShareTest file size is " << hui.fileSize; + GTEST_LOG_(INFO) << "RemoteFileShareTest-end Remote_file_share_GetDfsUriFromLocal_0017"; + } + + /** + * @tc.name: remote_file_share_GetDfsUriFromLocal_0018 + * @tc.desc: Test function of GetDfsUrisFromLocal() interface. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 1 + * @tc.require: I7KDF7 + */ + HWTEST_F(RemoteFileShareTest, Remote_file_share_GetDfsUriFromLocal_0018, testing::ext::TestSize.Level1) + { + GTEST_LOG_(INFO) << "RemoteFileShareTest-begin Remote_file_share_GetDfsUriFromLocal_0018"; + const string uriStr = "file://media/Photo/test/IMG_12345_0011/test.jpg"; + const string uriStr1 = "file://media/Photo/test/IMG_12345_0012/test1.jpg"; + const string uriStr2 = "file://media/Photo/test/IMG_12345_0013/test1.jpg"; + const int userId = USER_ID; + + vector uriList; + unordered_map uriToDfsUriMaps; + uriList.push_back(uriStr); + uriList.push_back(uriStr1); + uriList.push_back(uriStr2); + int ret = RemoteFileShare::GetDfsUrisFromLocal(uriList, userId, uriToDfsUriMaps); + EXPECT_EQ(ret, -EINVAL); + + GTEST_LOG_(INFO) << "RemoteFileShareTest-end Remote_file_share_GetDfsUriFromLocal_0018"; + } + /** * @tc.name: remote_file_share_test_0012 * @tc.desc: Test function of TransRemoteUriToLocal() interface for SUCCESS. diff --git a/tests/unittests/backup_utils/BUILD.gn b/tests/unittests/backup_utils/BUILD.gn index f982532bc..79370309e 100644 --- a/tests/unittests/backup_utils/BUILD.gn +++ b/tests/unittests/backup_utils/BUILD.gn @@ -84,6 +84,7 @@ ohos_unittest("b_file_test") { include_dirs = [ "${path_backup}/utils/src/b_filesystem" ] deps = [ + "${path_backup}/interfaces/innerkits/native:sandbox_helper_native", "${path_backup}/tests/utils:backup_test_utils", "${path_backup}/utils/:backup_utils", ] diff --git a/utils/src/b_filesystem/b_dir.cpp b/utils/src/b_filesystem/b_dir.cpp index 2845338e4..286e5e3ba 100644 --- a/utils/src/b_filesystem/b_dir.cpp +++ b/utils/src/b_filesystem/b_dir.cpp @@ -34,6 +34,7 @@ #include "directory_ex.h" #include "errors.h" #include "filemgmt_libhilog.h" +#include "sandbox_helper.h" namespace OHOS::FileManagement::Backup { using namespace std; @@ -41,9 +42,6 @@ const int32_t PATH_MAX_LEN = 4096; const size_t TOP_ELE = 0; const std::string APP_DATA_DIR = BConstants::PATH_PUBLIC_HOME + BConstants::PATH_APP_DATA + BConstants::FILE_SEPARATOR_CHAR; -const std::string PATH_INVALID_FLAG1 = "../"; -const std::string PATH_INVALID_FLAG2 = "/.."; -const uint32_t PATH_INVALID_FLAG_LEN = 3; static bool IsEmptyDirectory(const string &path) { @@ -296,8 +294,8 @@ tuple, map> BDir::GetBigFiles( HILOGW("GetBigFiles, path = %{public}s", item.c_str()); auto [errCode, files, smallFiles] = GetDirFilesDetail(item, true, BConstants::BIG_FILE_BOUNDARY); if (errCode == 0) { - incFiles.merge(move(files)); HILOGW("big files: %{public}zu; small files: %{public}zu", files.size(), smallFiles.size()); + incFiles.merge(move(files)); incSmallFiles.merge(move(smallFiles)); } } @@ -516,22 +514,7 @@ vector BDir::GetDirs(const vector &paths) bool BDir::IsFilePathValid(const std::string &filePath) { - size_t pos = filePath.find(PATH_INVALID_FLAG1); - while (pos != string::npos) { - if (pos == 0 || filePath[pos - 1] == BConstants::FILE_SEPARATOR_CHAR) { - HILOGE("Relative path is not allowed, path contain ../, path = %{private}s", - GetAnonyString(filePath).c_str()); - return false; - } - pos = filePath.find(PATH_INVALID_FLAG1, pos + PATH_INVALID_FLAG_LEN); - } - pos = filePath.rfind(PATH_INVALID_FLAG2); - if ((pos != string::npos) && (filePath.size() - pos == PATH_INVALID_FLAG_LEN)) { - HILOGE("Relative path is not allowed, path tail is /.., path = %{private}s", - GetAnonyString(filePath).c_str()); - return false; - } - return true; + return AppFileService::SandboxHelper::IsValidPath(filePath); } bool BDir::CheckAndRmSoftLink(const std::string &filePath) -- Gitee From 05301034c87308c7b8cae5bedb50b03b0372e9d0 Mon Sep 17 00:00:00 2001 From: BrainL Date: Mon, 21 Apr 2025 17:08:33 +0800 Subject: [PATCH 15/15] fixed gn of fuzz. Signed-off-by: BrainL --- test/fuzztest/backupsa_fuzzer/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/test/fuzztest/backupsa_fuzzer/BUILD.gn b/test/fuzztest/backupsa_fuzzer/BUILD.gn index 0dde0ed7d..be88b3013 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", "${path_backup}/utils:backup_utils", ] -- Gitee