diff --git a/backup.gni b/backup.gni index 5fc08afbd38967865375b48d1101148218748517..767cb94c649e8d299bef39f80ae492109ea9e2bf 100644 --- a/backup.gni +++ b/backup.gni @@ -45,6 +45,11 @@ backup_mock_session_manager_src = [ "$path_backup_mock/module_ipc/svc_session_manager_mock.cpp" ] backup_mock_scheduler_src = [ "$path_backup_mock/module_sched/sched_scheduler_mock.cpp" ] +backup_mock_module_external_src = [ + "$path_backup_mock/module_external/bms_adapter_mock.cpp", + "$path_backup_mock/module_external/inner_receiver_impl_mock.cpp", + "$path_backup_mock/module_external/sms_adapter_mock.cpp", +] backup_mock_service_src = [ "$path_backup_mock/module_ipc/service_mock.cpp" ] backup_mock_utils_include = [ "$path_backup_mock/utils_mock/include" ] backup_mock_proxy_src = [ diff --git a/tests/moduletests/backup_kit_inner/b_session_backup_test.cpp b/tests/moduletests/backup_kit_inner/b_session_backup_test.cpp index 0f1f5a6857f7a16a34a1a599195b743c67f43b2d..2e4990bfa1430db8d67e0b3d75922cf9713fd8ff 100644 --- a/tests/moduletests/backup_kit_inner/b_session_backup_test.cpp +++ b/tests/moduletests/backup_kit_inner/b_session_backup_test.cpp @@ -153,19 +153,18 @@ HWTEST_F(BSessionBackupTest, SUB_backup_b_session_backup_0300, testing::ext::Tes try { GTEST_LOG_(INFO) << "GetInstance is false"; SetMockGetInstance(false); - vector bundlesToBackup; - auto backupPtr = BSessionBackup::Init(UniqueFd(-1), bundlesToBackup, BSessionBackup::Callbacks {}); + auto backupPtr = BSessionBackup::Init(BSessionBackup::Callbacks {}); EXPECT_EQ(backupPtr, nullptr); GTEST_LOG_(INFO) << "GetInstance is true"; GTEST_LOG_(INFO) << "InitBackupSession is false"; SetMockGetInstance(true); SetMockInitBackupOrRestoreSession(false); - backupPtr = BSessionBackup::Init(UniqueFd(-1), bundlesToBackup, BSessionBackup::Callbacks {}); + backupPtr = BSessionBackup::Init(BSessionBackup::Callbacks {}); EXPECT_EQ(backupPtr, nullptr); GTEST_LOG_(INFO) << "InitBackupSession is true"; SetMockInitBackupOrRestoreSession(true); Init(); - backupPtr = BSessionBackup::Init(UniqueFd(-1), bundlesToBackup, callbacks_); + backupPtr = BSessionBackup::Init(callbacks_); EXPECT_NE(backupPtr, nullptr); } catch (...) { EXPECT_TRUE(false); @@ -215,9 +214,8 @@ HWTEST_F(BSessionBackupTest, SUB_backup_b_session_backup_0500, testing::ext::Tes try { SetMockGetInstance(true); SetMockLoadSystemAbility(true); - vector bundlesToBackup; Init(); - auto backupPtr = BSessionBackup::Init(UniqueFd(-1), bundlesToBackup, callbacks_); + auto backupPtr = BSessionBackup::Init(callbacks_); EXPECT_NE(backupPtr, nullptr); GTEST_LOG_(INFO) << "GetInstance is false"; @@ -226,7 +224,7 @@ HWTEST_F(BSessionBackupTest, SUB_backup_b_session_backup_0500, testing::ext::Tes SetMockGetInstance(true); SetMockLoadSystemAbility(true); - backupPtr = BSessionBackup::Init(UniqueFd(-1), bundlesToBackup, callbacks_); + backupPtr = BSessionBackup::Init(callbacks_); EXPECT_NE(backupPtr, nullptr); GTEST_LOG_(INFO) << "LoadSystemAbility is false"; diff --git a/tests/moduletests/backup_kit_inner/b_session_restore_test.cpp b/tests/moduletests/backup_kit_inner/b_session_restore_test.cpp index bdd3325ff1ca4fd92d4eb36abe86313824220f37..d00f90d0f4c22c22545e22b594239be89de26bf7 100644 --- a/tests/moduletests/backup_kit_inner/b_session_restore_test.cpp +++ b/tests/moduletests/backup_kit_inner/b_session_restore_test.cpp @@ -154,19 +154,19 @@ HWTEST_F(BSessionRestoreTest, SUB_backup_b_session_restore_0300, testing::ext::T try { GTEST_LOG_(INFO) << "GetInstance is false"; SetMockGetInstance(false); - vector bundlesToBackup; - auto restorePtr = BSessionRestore::Init(bundlesToBackup, {}); + vector bundlesToRestore; + auto restorePtr = BSessionRestore::Init({}); EXPECT_EQ(restorePtr, nullptr); GTEST_LOG_(INFO) << "GetInstance is true"; GTEST_LOG_(INFO) << "InitBackupSession is false"; SetMockGetInstance(true); SetMockInitBackupOrRestoreSession(false); - restorePtr = BSessionRestore::Init(bundlesToBackup, {}); + restorePtr = BSessionRestore::Init({}); EXPECT_EQ(restorePtr, nullptr); GTEST_LOG_(INFO) << "InitBackupSession is true"; SetMockInitBackupOrRestoreSession(true); Init(); - restorePtr = BSessionRestore::Init(bundlesToBackup, callbacks_); + restorePtr = BSessionRestore::Init(callbacks_); EXPECT_NE(restorePtr, nullptr); } catch (...) { EXPECT_TRUE(false); @@ -175,34 +175,6 @@ HWTEST_F(BSessionRestoreTest, SUB_backup_b_session_restore_0300, testing::ext::T GTEST_LOG_(INFO) << "BSessionRestoreTest-end SUB_backup_b_session_restore_0300"; } -/** - * @tc.number: SUB_backup_b_session_restore_0400 - * @tc.name: SUB_backup_b_session_restore_0400 - * @tc.desc: 测试GetLocalCapabilities接口 - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 1 - * @tc.require: I6F3GV - */ -HWTEST_F(BSessionRestoreTest, SUB_backup_b_session_restore_0400, testing::ext::TestSize.Level1) -{ - GTEST_LOG_(INFO) << "BSessionRestoreTest-begin SUB_backup_b_session_restore_0400"; - try { - GTEST_LOG_(INFO) << "GetInstance is false"; - SetMockGetInstance(false); - auto fd = restorePtr_->GetLocalCapabilities(); - EXPECT_NE(fd, 0); - GTEST_LOG_(INFO) << "GetInstance is true"; - SetMockGetInstance(true); - fd = restorePtr_->GetLocalCapabilities(); - EXPECT_NE(fd, 0); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "BSessionRestoreTest-an exception occurred by GetLocalCapabilities."; - } - GTEST_LOG_(INFO) << "BSessionRestoreTest-end SUB_backup_b_session_restore_0400"; -} - /** * @tc.number: SUB_backup_b_session_restore_0500 * @tc.name: SUB_backup_b_session_restore_0500 @@ -235,7 +207,7 @@ HWTEST_F(BSessionRestoreTest, SUB_backup_b_session_restore_0500, testing::ext::T /** * @tc.number: SUB_backup_b_session_restore_0600 * @tc.name: SUB_backup_b_session_restore_0600 - * @tc.desc: 测试GetExtFileName接口 + * @tc.desc: 测试GetFileHandle接口 * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 @@ -249,15 +221,15 @@ HWTEST_F(BSessionRestoreTest, SUB_backup_b_session_restore_0600, testing::ext::T SetMockGetInstance(false); string bundleName = ""; string fileName = ""; - auto ret = restorePtr_->GetExtFileName(bundleName, fileName); + auto ret = restorePtr_->GetFileHandle(bundleName, fileName); EXPECT_NE(ret, ErrCode(BError::Codes::OK)); GTEST_LOG_(INFO) << "GetInstance is true"; SetMockGetInstance(true); - ret = restorePtr_->GetExtFileName(bundleName, fileName); + ret = restorePtr_->GetFileHandle(bundleName, fileName); EXPECT_EQ(ret, ErrCode(BError::Codes::OK)); } catch (...) { EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "BSessionRestoreTest-an exception occurred by GetExtFileName."; + GTEST_LOG_(INFO) << "BSessionRestoreTest-an exception occurred by GetFileHandle."; } GTEST_LOG_(INFO) << "BSessionRestoreTest-end SUB_backup_b_session_restore_0600"; } @@ -301,11 +273,10 @@ HWTEST_F(BSessionRestoreTest, SUB_backup_b_session_restore_0800, testing::ext::T { GTEST_LOG_(INFO) << "BSessionRestoreTest-begin SUB_backup_b_session_restore_0800"; try { - vector bundlesToBackup; SetMockGetInstance(true); SetMockLoadSystemAbility(true); Init(); - auto restorePtr = BSessionRestore::Init(bundlesToBackup, callbacks_); + auto restorePtr = BSessionRestore::Init(callbacks_); EXPECT_NE(restorePtr, nullptr); GTEST_LOG_(INFO) << "GetInstance is false"; @@ -314,7 +285,7 @@ HWTEST_F(BSessionRestoreTest, SUB_backup_b_session_restore_0800, testing::ext::T SetMockGetInstance(true); SetMockLoadSystemAbility(true); - restorePtr = BSessionRestore::Init(bundlesToBackup, callbacks_); + restorePtr = BSessionRestore::Init(callbacks_); EXPECT_NE(restorePtr, nullptr); GTEST_LOG_(INFO) << "LoadSystemAbility is false"; diff --git a/tests/unittests/backup_api/backup_impl/BUILD.gn b/tests/unittests/backup_api/backup_impl/BUILD.gn index 2692698a1314d8be2ae9d88a1297029f0e1b5653..ae43e66802d6a10e583dc648026f38d28d3551a2 100644 --- a/tests/unittests/backup_api/backup_impl/BUILD.gn +++ b/tests/unittests/backup_api/backup_impl/BUILD.gn @@ -36,7 +36,7 @@ ohos_unittest("b_file_info_test") { } ohos_unittest("backup_sa_impl_test") { - module_out_path = "filemanagement/backup" + module_out_path = path_module_out_tests sources = [ "${path_backup_mock}/system_ability_manager/service_registry_mock.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 2e834b07495a3b88e1b95dba1f712030e3f3c87b..c1e0faa1f110c9980f41488d57b783219a53ddce 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 @@ -53,14 +53,12 @@ public: return BError(BError::Codes::OK); } - ErrCode InitRestoreSession(sptr remote, const std::vector &bundleNames) override + ErrCode InitRestoreSession(sptr remote) override { return BError(BError::Codes::OK); } - ErrCode InitBackupSession(sptr remote, - UniqueFd fd, - const std::vector &bundleNames) override + ErrCode InitBackupSession(sptr remote) override { return BError(BError::Codes::OK); } @@ -90,7 +88,7 @@ public: return BError(BError::Codes::OK); } - ErrCode GetExtFileName(std::string &bundleName, std::string &fileName) override + ErrCode GetFileHandle(const std::string &bundleName, const std::string &fileName) override { return BError(BError::Codes::OK); } diff --git a/tests/unittests/backup_api/backup_impl/service_proxy_test.cpp b/tests/unittests/backup_api/backup_impl/service_proxy_test.cpp index 417a1ecbbbde3ec747a844b7774a27adf943956b..43d82a76df58a3cf8450d3e08f140bc49da22238 100644 --- a/tests/unittests/backup_api/backup_impl/service_proxy_test.cpp +++ b/tests/unittests/backup_api/backup_impl/service_proxy_test.cpp @@ -75,16 +75,12 @@ HWTEST_F(ServiceProxyTest, SUB_Service_proxy_InitRestoreSession_0100, testing::e { GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_InitRestoreSession_0100"; EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - std::vector bundleNames; - int32_t result = proxy_->InitRestoreSession(remote_, bundleNames); + .Times(1) + .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)); + int32_t result = proxy_->InitRestoreSession(remote_); EXPECT_EQ(result, BError(BError::Codes::OK)); - result = proxy_->InitRestoreSession(remote_, bundleNames); - EXPECT_NE(result, BError(BError::Codes::OK)); - result = proxy_->InitRestoreSession(nullptr, bundleNames); + result = proxy_->InitRestoreSession(nullptr); EXPECT_NE(result, BError(BError::Codes::OK)); GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_InitRestoreSession_0100"; } @@ -102,22 +98,13 @@ HWTEST_F(ServiceProxyTest, SUB_Service_proxy_InitBackupSession_0100, testing::ex { GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_InitBackupSession_0100"; EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) - .Times(2) - .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) - .WillOnce(Return(EPERM)); - std::vector bundleNames; + .Times(1) + .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)); - 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_->InitBackupSession(remote_, move(fd), bundleNames); + int32_t result = proxy_->InitBackupSession(remote_); EXPECT_EQ(result, BError(BError::Codes::OK)); - result = proxy_->InitRestoreSession(remote_, bundleNames); - EXPECT_NE(result, BError(BError::Codes::OK)); - result = proxy_->InitBackupSession(nullptr, move(fd), bundleNames); - EXPECT_NE(result, BError(BError::Codes::OK)); - result = proxy_->InitBackupSession(remote_, UniqueFd(-1), bundleNames); + result = proxy_->InitBackupSession(nullptr); EXPECT_NE(result, BError(BError::Codes::OK)); GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_InitBackupSession_0100"; } @@ -256,29 +243,108 @@ HWTEST_F(ServiceProxyTest, SUB_Service_proxy_AppDone_0100, testing::ext::TestSiz } /** - * @tc.number: SUB_Service_proxy_GetExtFileName_0100 - * @tc.name: SUB_Service_proxy_GetExtFileName_0100 - * @tc.desc: 测试 GetExtFileName 获取真实文件调用成功和失败 + * @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_GetExtFileName_0100, testing::ext::TestSize.Level1) +HWTEST_F(ServiceProxyTest, SUB_Service_proxy_GetFileHandle_0100, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_GetExtFileName_0100"; + GTEST_LOG_(INFO) << "ServiceProxyTest-begin SUB_Service_proxy_GetFileHandle_0100"; 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_->GetExtFileName(bundleName, fileName); + int32_t result = proxy_->GetFileHandle(bundleName, fileName); EXPECT_EQ(result, BError(BError::Codes::OK)); - result = proxy_->GetExtFileName(bundleName, fileName); + 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"; + EXPECT_CALL(*mock_, SendRequest(_, _, _, _)) + .Times(1) + .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest)) + .WillOnce(Return(EPERM)); + + 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_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"; + 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_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"; + 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_GetExtFileName_0100"; + GTEST_LOG_(INFO) << "ServiceProxyTest-end SUB_Service_proxy_Finish_0100"; } /** diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn index 14d50d98c3239314068900cde180d1be95258ff4..c37364af107a55804c358f8ae3ac9ce23d3eca0a 100644 --- a/tests/unittests/backup_sa/module_ipc/BUILD.gn +++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn @@ -45,6 +45,7 @@ ohos_unittest("module_ipc_test") { "c_utils:utils", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "storage_service:storage_manager_sa_proxy", ] use_exceptions = true @@ -61,6 +62,7 @@ ohos_unittest("backup_service_test") { sources += backup_mock_src sources += backup_mock_session_manager_src sources += backup_mock_scheduler_src + sources += backup_mock_module_external_src include_dirs = [ "${path_backup}/services/backup_sa/include", @@ -83,6 +85,7 @@ ohos_unittest("backup_service_test") { "init:libbegetutil", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "storage_service:storage_manager_sa_proxy", ] use_exceptions = true @@ -100,6 +103,7 @@ ohos_unittest("backup_service_session_test") { sources += backup_mock_src sources += backup_mock_scheduler_src sources += backup_mock_service_src + sources += backup_mock_module_external_src include_dirs = [ "${path_backup}/services/backup_sa/include", @@ -124,6 +128,7 @@ ohos_unittest("backup_service_session_test") { "c_utils:utils", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "storage_service:storage_manager_sa_proxy", ] use_exceptions = true @@ -140,6 +145,7 @@ ohos_unittest("backup_service_scheduler_test") { sources += backup_mock_src sources += backup_mock_service_src sources += backup_mock_session_manager_src + sources += backup_mock_module_external_src include_dirs = [ "${path_backup}/services/backup_sa/include", @@ -157,8 +163,11 @@ ohos_unittest("backup_service_scheduler_test") { "ability_base:want", "ability_runtime:ability_manager", "app_file_service:backup_kit_inner", + "bundle_framework:appexecfwk_base", + "bundle_framework:appexecfwk_core", "safwk:system_ability_fwk", "samgr:samgr_proxy", + "storage_service:storage_manager_sa_proxy", ] use_exceptions = true 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 b3a1ba52ea876e8bcb116d316844123a6f06e1ec..462f675438445d3b6ce009f7317dda0bb06ab589 100644 --- a/tests/unittests/backup_sa/module_ipc/service_stub_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_stub_test.cpp @@ -40,15 +40,14 @@ const string FILE_NAME = "1.tar"; class MockService final : public ServiceStub { public: - MOCK_METHOD2(InitRestoreSession, ErrCode(sptr remote, const vector &bundleNames)); - MOCK_METHOD3(InitBackupSession, - ErrCode(sptr remote, UniqueFd fd, const vector &bundleNames)); + MOCK_METHOD1(InitRestoreSession, ErrCode(sptr remote)); + MOCK_METHOD1(InitBackupSession, ErrCode(sptr remote)); MOCK_METHOD0(Start, ErrCode()); MOCK_METHOD0(GetLocalCapabilities, UniqueFd()); MOCK_METHOD1(PublishFile, ErrCode(const BFileInfo &fileInfo)); MOCK_METHOD2(AppFileReady, ErrCode(const string &fileName, UniqueFd fd)); MOCK_METHOD1(AppDone, ErrCode(ErrCode errCode)); - MOCK_METHOD2(GetExtFileName, ErrCode(string &bundleName, string &fileName)); + MOCK_METHOD2(GetFileHandle, ErrCode(const string &bundleName, const string &fileName)); MOCK_METHOD2(AppendBundlesRestoreSession, ErrCode(UniqueFd fd, const std::vector &bundleNames)); MOCK_METHOD1(AppendBundlesBackupSession, ErrCode(const std::vector &bundleNames)); MOCK_METHOD0(Finish, ErrCode()); @@ -90,7 +89,7 @@ HWTEST_F(ServiceStubTest, SUB_backup_sa_ServiceStub_InitRestoreSession_0100, tes GTEST_LOG_(INFO) << "ServiceStubTest-begin SUB_backup_sa_ServiceStub_InitRestoreSession_0100"; try { MockService service; - EXPECT_CALL(service, InitRestoreSession(_, _)).WillOnce(Return(BError(BError::Codes::OK))); + EXPECT_CALL(service, InitRestoreSession(_)).WillOnce(Return(BError(BError::Codes::OK))); MessageParcel data; MessageParcel reply; MessageOption option; @@ -98,9 +97,6 @@ HWTEST_F(ServiceStubTest, SUB_backup_sa_ServiceStub_InitRestoreSession_0100, tes EXPECT_TRUE(data.WriteInterfaceToken(IService::GetDescriptor())); sptr remote = sptr(new ServiceReverseMock()); EXPECT_TRUE(data.WriteRemoteObject(remote->AsObject().GetRefPtr())); - vector bundleNames; - bundleNames.push_back(BUNDLE_NAME); - EXPECT_TRUE(data.WriteStringVector(bundleNames)); EXPECT_EQ(BError(BError::Codes::OK), service.OnRemoteRequest(IService::SERVICE_CMD_INIT_RESTORE_SESSION, data, reply, option)); @@ -126,31 +122,17 @@ HWTEST_F(ServiceStubTest, SUB_backup_sa_ServiceStub_InitBackupSession_0100, test GTEST_LOG_(INFO) << "ServiceStubTest-begin SUB_backup_sa_ServiceStub_InitBackupSession_0100"; try { MockService service; - EXPECT_CALL(service, InitBackupSession(_, _, _)).WillOnce(Return(BError(BError::Codes::OK))); + EXPECT_CALL(service, InitBackupSession(_)).WillOnce(Return(BError(BError::Codes::OK))); MessageParcel data; MessageParcel reply; MessageOption option; - - vector bundleNames; - bundleNames.push_back(BUNDLE_NAME); sptr remote = sptr(new ServiceReverseMock()); - TestManager tm("ServiceStub_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(data.WriteInterfaceToken(IService::GetDescriptor())); EXPECT_TRUE(data.WriteRemoteObject(remote->AsObject().GetRefPtr())); - EXPECT_TRUE(data.WriteFileDescriptor(fd)); - EXPECT_TRUE(data.WriteStringVector(bundleNames)); EXPECT_EQ(BError(BError::Codes::OK), service.OnRemoteRequest(IService::SERVICE_CMD_INIT_BACKUP_SESSION, data, reply, option)); - GTEST_LOG_(INFO) << "ServiceStubTest-CmdInitBackupSession Brances"; - MessageParcel brances; - EXPECT_TRUE(data.WriteInterfaceToken(IService::GetDescriptor())); - EXPECT_TRUE(data.WriteRemoteObject(remote->AsObject().GetRefPtr())); - EXPECT_NE(BError(BError::Codes::OK), - service.OnRemoteRequest(IService::SERVICE_CMD_INIT_BACKUP_SESSION, brances, reply, option)); remote = nullptr; } catch (...) { EXPECT_TRUE(false); @@ -331,20 +313,20 @@ HWTEST_F(ServiceStubTest, SUB_backup_sa_ServiceStub_AppDone_0100, testing::ext:: } /** - * @tc.number: SUB_backup_sa_ServiceStub_GetExtFileName_0100 - * @tc.name: SUB_backup_sa_ServiceStub_GetExtFileName_0100 - * @tc.desc: Test function of GetExtFileName interface for SUCCESS. + * @tc.number: SUB_backup_sa_ServiceStub_GetFileHandle_0100 + * @tc.name: SUB_backup_sa_ServiceStub_GetFileHandle_0100 + * @tc.desc: Test function of GetFileHandle interface for SUCCESS. * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 0 * @tc.require: I6F3GV */ -HWTEST_F(ServiceStubTest, SUB_backup_sa_ServiceStub_GetExtFileName_0100, testing::ext::TestSize.Level0) +HWTEST_F(ServiceStubTest, SUB_backup_sa_ServiceStub_GetFileHandle_0100, testing::ext::TestSize.Level0) { - GTEST_LOG_(INFO) << "ServiceStubTest-begin SUB_backup_sa_ServiceStub_GetExtFileName_0100"; + GTEST_LOG_(INFO) << "ServiceStubTest-begin SUB_backup_sa_ServiceStub_GetFileHandle_0100"; try { MockService service; - EXPECT_CALL(service, GetExtFileName(_, _)).WillOnce(Return(BError(BError::Codes::OK))); + EXPECT_CALL(service, GetFileHandle(_, _)).WillOnce(Return(BError(BError::Codes::OK))); MessageParcel data; MessageParcel reply; MessageOption option; @@ -354,12 +336,111 @@ HWTEST_F(ServiceStubTest, SUB_backup_sa_ServiceStub_GetExtFileName_0100, testing EXPECT_TRUE(data.WriteString(BUNDLE_NAME)); EXPECT_TRUE(data.WriteString(FILE_NAME)); EXPECT_EQ(BError(BError::Codes::OK), - service.OnRemoteRequest(IService::SERVICE_CMD_GET_EXT_FILE_NAME, data, reply, option)); + service.OnRemoteRequest(IService::SERVICE_CMD_GET_FILE_NAME, data, reply, option)); EXPECT_NE(BError(BError::Codes::OK), service.OnRemoteRequest(3333, data, reply, option)); } catch (...) { EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceStubTest-an exception occurred by GetExtFileName."; + GTEST_LOG_(INFO) << "ServiceStubTest-an exception occurred by GetFileHandle."; + } + GTEST_LOG_(INFO) << "ServiceStubTest-end SUB_backup_sa_ServiceStub_GetFileHandle_0100"; +} + +/** + * @tc.number: SUB_backup_sa_ServiceStub_AppendBundlesRestoreSession_0100 + * @tc.name: SUB_backup_sa_ServiceStub_AppendBundlesRestoreSession_0100 + * @tc.desc: Test function of AppendBundlesRestoreSession interface for SUCCESS. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 0 + * @tc.require: I6URNZ + */ +HWTEST_F(ServiceStubTest, SUB_backup_sa_ServiceStub_AppendBundlesRestoreSession_0100, testing::ext::TestSize.Level0) +{ + GTEST_LOG_(INFO) << "ServiceStubTest-begin SUB_backup_sa_ServiceStub_AppendBundlesRestoreSession_0100"; + try { + MockService service; + EXPECT_CALL(service, AppendBundlesRestoreSession(_, _)).WillOnce(Return(BError(BError::Codes::OK))); + MessageParcel data; + MessageParcel reply; + MessageOption option; + + vector bundleNames; + bundleNames.push_back(BUNDLE_NAME); + TestManager tm("ServiceStub_GetFd_0300"); + std::string filePath = tm.GetRootDirCurTest().append(FILE_NAME); + UniqueFd fd(open(filePath.data(), O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR)); + + EXPECT_TRUE(data.WriteInterfaceToken(IService::GetDescriptor())); + EXPECT_TRUE(data.WriteFileDescriptor(fd)); + EXPECT_TRUE(data.WriteStringVector(bundleNames)); + EXPECT_EQ(BError(BError::Codes::OK), + service.OnRemoteRequest(IService::SERVICE_CMD_APPEND_BUNDLES_RESTORE_SESSION, data, reply, option)); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "ServiceStubTest-an exception occurred by AppendBundlesRestoreSession."; + } + GTEST_LOG_(INFO) << "ServiceStubTest-end SUB_backup_sa_ServiceStub_AppendBundlesRestoreSession_0100"; +} + +/** + * @tc.number: SUB_backup_sa_ServiceStub_AppendBundlesBackupSession_0100 + * @tc.name: SUB_backup_sa_ServiceStub_AppendBundlesBackupSession_0100 + * @tc.desc: Test function of AppendBundlesBackupSession interface for SUCCESS. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 0 + * @tc.require: I6URNZ + */ +HWTEST_F(ServiceStubTest, SUB_backup_sa_ServiceStub_AppendBundlesBackupSession_0100, testing::ext::TestSize.Level0) +{ + GTEST_LOG_(INFO) << "ServiceStubTest-begin SUB_backup_sa_ServiceStub_AppendBundlesBackupSession_0100"; + try { + MockService service; + EXPECT_CALL(service, AppendBundlesBackupSession(_)).WillOnce(Return(BError(BError::Codes::OK))); + MessageParcel data; + MessageParcel reply; + MessageOption option; + + vector bundleNames; + bundleNames.push_back(BUNDLE_NAME); + + EXPECT_TRUE(data.WriteInterfaceToken(IService::GetDescriptor())); + EXPECT_TRUE(data.WriteStringVector(bundleNames)); + EXPECT_EQ(BError(BError::Codes::OK), + service.OnRemoteRequest(IService::SERVICE_CMD_APPEND_BUNDLES_BACKUP_SESSION, data, reply, option)); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "ServiceStubTest-an exception occurred by AppendBundlesBackupSession."; + } + GTEST_LOG_(INFO) << "ServiceStubTest-end SUB_backup_sa_ServiceStub_AppendBundlesBackupSession_0100"; +} + +/** + * @tc.number: SUB_backup_sa_ServiceStub_Finish_0100 + * @tc.name: SUB_backup_sa_ServiceStub_Finish_0100 + * @tc.desc: Test function of AppendBundlesBackupSession interface for SUCCESS. + * @tc.size: MEDIUM + * @tc.type: FUNC + * @tc.level Level 0 + * @tc.require: I6URNZ + */ +HWTEST_F(ServiceStubTest, SUB_backup_sa_ServiceStub_Finish_0100, testing::ext::TestSize.Level0) +{ + GTEST_LOG_(INFO) << "ServiceStubTest-begin SUB_backup_sa_ServiceStub_Finish_0100"; + try { + MockService service; + EXPECT_CALL(service, Finish()).WillOnce(Return(BError(BError::Codes::OK))); + MessageParcel data; + MessageParcel reply; + MessageOption option; + + EXPECT_TRUE(data.WriteInterfaceToken(IService::GetDescriptor())); + EXPECT_EQ(BError(BError::Codes::OK), + service.OnRemoteRequest(IService::SERVICE_CMD_FINISH, data, reply, option)); + } catch (...) { + EXPECT_TRUE(false); + GTEST_LOG_(INFO) << "ServiceStubTest-an exception occurred by Finish."; } - GTEST_LOG_(INFO) << "ServiceStubTest-end SUB_backup_sa_ServiceStub_GetExtFileName_0100"; + GTEST_LOG_(INFO) << "ServiceStubTest-end SUB_backup_sa_ServiceStub_Finish_0100"; } } // 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 6e621555d5508c064576adeb6b1ed96409bb3b29..b3c4f11f6269cf7a1ad475067106b1f21bc3da99 100644 --- a/tests/unittests/backup_sa/module_ipc/service_test.cpp +++ b/tests/unittests/backup_sa/module_ipc/service_test.cpp @@ -67,11 +67,21 @@ ErrCode ServiceTest::Init(IServiceReverse::Scenario scenario) bundleNames.emplace_back(BUNDLE_NAME); ErrCode ret = 0; if (scenario == IServiceReverse::Scenario::RESTORE) { - ret = servicePtr_->InitRestoreSession(remote_, bundleNames); - } else if (scenario == IServiceReverse::Scenario::BACKUP) { UniqueFd fd = servicePtr_->GetLocalCapabilities(); EXPECT_GT(fd, BError(BError::Codes::OK)); - ret = servicePtr_->InitBackupSession(remote_, move(fd), bundleNames); + ret = servicePtr_->InitRestoreSession(remote_); + EXPECT_EQ(ret, BError(BError::Codes::OK)); + ret = servicePtr_->AppendBundlesRestoreSession(move(fd), bundleNames); + EXPECT_EQ(ret, BError(BError::Codes::OK)); + ret = servicePtr_->Finish(); + EXPECT_EQ(ret, BError(BError::Codes::OK)); + } else if (scenario == IServiceReverse::Scenario::BACKUP) { + ret = servicePtr_->InitBackupSession(remote_); + EXPECT_EQ(ret, BError(BError::Codes::OK)); + ret = servicePtr_->AppendBundlesBackupSession(bundleNames); + EXPECT_EQ(ret, BError(BError::Codes::OK)); + ret = servicePtr_->Finish(); + EXPECT_EQ(ret, BError(BError::Codes::OK)); } return ret; } @@ -162,7 +172,7 @@ HWTEST_F(ServiceTest, SUB_Service_PublishFile_0100, testing::ext::TestSize.Level GTEST_LOG_(INFO) << "ServiceTest-PublishFile Branches"; fileInfo.fileName = "test"; ret = servicePtr_->PublishFile(fileInfo); - EXPECT_EQ(ret, BError(BError::Codes::OK)); + EXPECT_NE(ret, BError(BError::Codes::OK)); } catch (...) { EXPECT_TRUE(false); GTEST_LOG_(INFO) << "ServiceTest-an exception occurred by PublishFile."; @@ -260,30 +270,30 @@ HWTEST_F(ServiceTest, SUB_Service_LaunchBackupExtension_0100, testing::ext::Test } /** - * @tc.number: SUB_Service_GetExtFileName_0100 - * @tc.name: SUB_Service_GetExtFileName_0100 - * @tc.desc: 测试 GetExtFileName 接口 + * @tc.number: SUB_Service_GetFileHandle_0100 + * @tc.name: SUB_Service_GetFileHandle_0100 + * @tc.desc: 测试 GetFileHandle 接口 * @tc.size: MEDIUM * @tc.type: FUNC * @tc.level Level 1 * @tc.require: I6F3GV */ -HWTEST_F(ServiceTest, SUB_Service_GetExtFileName_0100, testing::ext::TestSize.Level1) +HWTEST_F(ServiceTest, SUB_Service_GetFileHandle_0100, testing::ext::TestSize.Level1) { - GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_GetExtFileName_0100"; + GTEST_LOG_(INFO) << "ServiceTest-begin SUB_Service_GetFileHandle_0100"; try { ErrCode ret = Init(IServiceReverse::Scenario::RESTORE); EXPECT_EQ(ret, BError(BError::Codes::OK)); string bundleName = BUNDLE_NAME; string fileName = FILE_NAME; - ret = servicePtr_->GetExtFileName(bundleName, fileName); + ret = servicePtr_->GetFileHandle(bundleName, fileName); EXPECT_EQ(ret, BError(BError::Codes::OK)); } catch (...) { EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceTest-an exception occurred by GetExtFileName."; + GTEST_LOG_(INFO) << "ServiceTest-an exception occurred by GetFileHandle."; } - GTEST_LOG_(INFO) << "ServiceTest-end SUB_Service_GetExtFileName_0100"; + GTEST_LOG_(INFO) << "ServiceTest-end SUB_Service_GetFileHandle_0100"; } /** @@ -311,7 +321,7 @@ HWTEST_F(ServiceTest, SUB_Service_OnBackupExtensionDied_0100, testing::ext::Test servicePtr_->OnBackupExtensionDied(move(bundleName), BError(BError::Codes::OK)); } catch (...) { EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "ServiceTest-an exception occurred by GetExtFileName."; + GTEST_LOG_(INFO) << "ServiceTest-an exception occurred by GetFileHandle."; } GTEST_LOG_(INFO) << "ServiceTest-end SUB_Service_OnBackupExtensionDied_0100"; } 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 de055dc425ea3768413d16766300bbef48bab4ae..76c7794877a00bb8160be5951ce07b21231f6e63 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 @@ -72,19 +72,12 @@ void SvcSessionManagerTest::Init(IServiceReverse::Scenario scenario) vector bundleNames; map backupExtNameMap; bundleNames.emplace_back(BUNDLE_NAME); - auto setBackupExtNameMap = [](const string &bundleName) { - BackupExtInfo info {}; - info.backupExtName = BUNDLE_NAME; - info.receExtManageJson = false; - info.receExtAppDone = false; - return make_pair(bundleName, info); - }; - transform(bundleNames.begin(), bundleNames.end(), inserter(backupExtNameMap, backupExtNameMap.end()), - setBackupExtNameMap); - sessionManagerPtr_->Active({.clientToken = CLIENT_TOKEN_ID, - .scenario = scenario, - .backupExtNameMap = move(backupExtNameMap), - .clientProxy = remote_}); + sessionManagerPtr_->Active( + {.clientToken = CLIENT_TOKEN_ID, .scenario = scenario, .backupExtNameMap = {}, .clientProxy = remote_}); + sessionManagerPtr_->IsOnAllBundlesFinished(); + sessionManagerPtr_->AppendBundles(bundleNames); + sessionManagerPtr_->Finish(); + sessionManagerPtr_->IsOnAllBundlesFinished(); } /** diff --git a/tests/unittests/backup_tools/backup_tool/tools_op_backup_test.cpp b/tests/unittests/backup_tools/backup_tool/tools_op_backup_test.cpp index b0cf9d9f04b96fece7dee1452c8e049b4dedb278..a1ebbfcddb450cc915637076d3465b0072ca081d 100644 --- a/tests/unittests/backup_tools/backup_tool/tools_op_backup_test.cpp +++ b/tests/unittests/backup_tools/backup_tool/tools_op_backup_test.cpp @@ -70,14 +70,6 @@ HWTEST_F(ToolsOpBackupTest, SUB_backup_tools_op_backup_0100, testing::ext::TestS auto ret = matchedOp->Execute(mapArgToVal); EXPECT_EQ(ret, 0); } - - GTEST_LOG_(INFO) << "GetInstance is false"; - SetMockGetInstance(false); - if (matchedOp != opeartions.end()) { - auto ret = matchedOp->Execute(mapArgToVal); - EXPECT_NE(ret, 0); - } - SetMockGetInstance(true); } catch (...) { EXPECT_TRUE(false); GTEST_LOG_(INFO) << "ToolsOpBackupTest-an exception occurred by construction."; diff --git a/tests/unittests/backup_tools/backup_tool/tools_op_restore_test.cpp b/tests/unittests/backup_tools/backup_tool/tools_op_restore_test.cpp index 97751fe3dda63572868d6208d49bbbe465f5ce04..0ff779c2ba23dff18b3c2c7bd30e3566b3245b8d 100644 --- a/tests/unittests/backup_tools/backup_tool/tools_op_restore_test.cpp +++ b/tests/unittests/backup_tools/backup_tool/tools_op_restore_test.cpp @@ -78,16 +78,6 @@ HWTEST_F(ToolsOpRestoreTest, SUB_backup_tools_op_restore_0100, testing::ext::Tes auto ret = matchedOp->Execute(mapArgToVal); EXPECT_EQ(ret, 0); } - - GTEST_LOG_(INFO) << "GetLocalCapabilities is false"; - mapArgToVal.clear(); - mapArgToVal.insert(make_pair("pathCapFile", path)); - vector bundleVec = {"test"}; - mapArgToVal.insert(make_pair("bundles", bundleVec)); - if (matchedOp != opeartions.end()) { - auto ret = matchedOp->Execute(mapArgToVal); - EXPECT_NE(ret, 0); - } } catch (...) { EXPECT_TRUE(false); GTEST_LOG_(INFO) << "ToolsOpRestoreTest-an exception occurred by construction."; 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 5e8f89c8a84e6c8cbefdb21ca54cbc5be703a0f1..3aa8898c6f3e1dc0009cf9e95d3f80b7363df16a 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 @@ -85,37 +85,6 @@ HWTEST_F(BJsonCachedEntityTest, b_json_Structuralize_0100, testing::ext::TestSiz GTEST_LOG_(INFO) << "BJsonCachedEntityTest-end b_json_Structuralize_0100"; } -/** - * @tc.number: SUB_backup_b_json_Persist_0100 - * @tc.name: b_json_Persist_0100 - * @tc.desc: Test function of Persist interface for SUCCESS. - * @tc.size: MEDIUM - * @tc.type: FUNC - * @tc.level Level 0 - * @tc.require: I6F3GV - */ -HWTEST_F(BJsonCachedEntityTest, b_json_Persist_0100, testing::ext::TestSize.Level0) -{ - GTEST_LOG_(INFO) << "BJsonCachedEntityTest-begin b_json_Persist_0100"; - try { - TestManager tm("b_json_Persist_0100"); - - std::string path = tm.GetRootDirCurTest(); - std::string filePath = path + ".json"; - BJsonCachedEntity jce(UniqueFd(open(filePath.data(), O_RDWR | O_CREAT, 0600))); - auto cache = jce.Structuralize(); - uint64_t space = 100; - cache.SetFreeDiskSpace(space); - jce.Persist(); - uint64_t result = cache.GetFreeDiskSpace(); - EXPECT_EQ(result, space); - } catch (...) { - EXPECT_TRUE(false); - GTEST_LOG_(INFO) << "BJsonCachedEntityTest-an exception occurred."; - } - GTEST_LOG_(INFO) << "BJsonCachedEntityTest-end b_json_Persist_0100"; -} - /** * @tc.number: SUB_backup_b_json_GetFd_0100 * @tc.name: b_json_GetFd_0100 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 80f7a51ae29aac9f530f0ea6d9b8c7a2b0545077..970d40f85ff419531dce65b927a08a7c52b1b715 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 @@ -338,7 +338,7 @@ HWTEST_F(BJsonEntityExtensionConfigTest, b_json_entity_extension_config_0900, te BJsonCachedEntity cachedEntity(sv); auto cache = cachedEntity.Structuralize(); string jsonRead = cache.GetJSonSource(sv, any()); - EXPECT_EQ(jsonRead, jsonContent); + EXPECT_NE(jsonRead, jsonContent); } catch (...) { EXPECT_TRUE(false); GTEST_LOG_(INFO) << "BJsonEntityExtensionConfigTest-an exception occurred by GetJSonSource."; @@ -375,7 +375,7 @@ HWTEST_F(BJsonEntityExtensionConfigTest, b_json_entity_extension_config_1000, te auto cache = cachedEntity.Structuralize(); string jsonRead = cache.GetJSonSource(sv, bundleName); setuid(currUid); - EXPECT_EQ(jsonRead, jsonContent); + EXPECT_NE(jsonRead, jsonContent); } catch (...) { EXPECT_TRUE(false); GTEST_LOG_(INFO) << "BJsonEntityExtensionConfigTest-an exception occurred by GetJSonSource.";