From 970314742f82092feefc01703af167beac0f3efe Mon Sep 17 00:00:00 2001
From: xujintong <xujintong@huawei.com>
Date: Tue, 19 Dec 2023 21:39:26 +0800
Subject: [PATCH] Fix the remaining unavailable TDD

Signed-off-by: xujintong <xujintong@huawei.com>
---
 .../src/module_ipc/svc_backup_connection.cpp  |  2 +-
 .../module_ipc/svc_backup_connection_mock.cpp |  2 +-
 .../backup_impl/service_proxy_test.cpp        |  2 +-
 tests/unittests/backup_sa/module_ipc/BUILD.gn | 20 +++++++++++++++++++
 4 files changed, 23 insertions(+), 3 deletions(-)

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 4da0013a6..c11b00efb 100644
--- a/services/backup_sa/src/module_ipc/svc_backup_connection.cpp
+++ b/services/backup_sa/src/module_ipc/svc_backup_connection.cpp
@@ -33,7 +33,7 @@ void SvcBackupConnection::OnAbilityConnectDone(const AppExecFwk::ElementName &el
         HILOGE("Failed to ability connect done, remote is nullptr");
         return;
     }
-    backupProxy_ = iface_cast<SvcExtensionProxy>(remoteObject);
+    backupProxy_ = iface_cast<IExtension>(remoteObject);
     if (backupProxy_ == nullptr) {
         HILOGE("Failed to ability connect done, backupProxy_ is nullptr");
         return;
diff --git a/tests/mock/module_ipc/svc_backup_connection_mock.cpp b/tests/mock/module_ipc/svc_backup_connection_mock.cpp
index ead43d40d..68cbd81b8 100644
--- a/tests/mock/module_ipc/svc_backup_connection_mock.cpp
+++ b/tests/mock/module_ipc/svc_backup_connection_mock.cpp
@@ -32,7 +32,7 @@ void SvcBackupConnection::OnAbilityConnectDone(const AppExecFwk::ElementName &el
                                                int resultCode)
 {
     isConnected_.store(true);
-    backupProxy_ = iface_cast<SvcExtensionProxy>(remoteObject);
+    backupProxy_ = iface_cast<IExtension>(remoteObject);
     string bundleName = "";
     callConnDone_(move(bundleName));
 }
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 ecc24d04a..8cf4350a9 100644
--- a/tests/unittests/backup_api/backup_impl/service_proxy_test.cpp
+++ b/tests/unittests/backup_api/backup_impl/service_proxy_test.cpp
@@ -77,7 +77,7 @@ HWTEST_F(ServiceProxyTest, SUB_Service_proxy_InitRestoreSession_0100, testing::e
     EXPECT_CALL(*mock_, SendRequest(_, _, _, _))
         .Times(1)
         .WillOnce(Invoke(mock_.GetRefPtr(), &IServiceMock::InvokeSendRequest));
-    int32_t result = proxy_->InitRestoreSession(remote_);
+    int32_t result = proxy_->InitRestoreSession(static_cast<sptr<IServiceReverse>>(remote_));
     EXPECT_EQ(result, BError(BError::Codes::OK));
 
     result = proxy_->InitRestoreSession(nullptr);
diff --git a/tests/unittests/backup_sa/module_ipc/BUILD.gn b/tests/unittests/backup_sa/module_ipc/BUILD.gn
index 849e366f5..4829e895b 100644
--- a/tests/unittests/backup_sa/module_ipc/BUILD.gn
+++ b/tests/unittests/backup_sa/module_ipc/BUILD.gn
@@ -22,6 +22,7 @@ ohos_unittest("module_ipc_test") {
     "service_stub_test.cpp",
     "svc_backup_connection_test.cpp",
     "svc_extension_proxy_test.cpp",
+    "${path_backup_mock}/timer/timer_mock.cpp",
   ]
 
   include_dirs = [
@@ -50,6 +51,12 @@ ohos_unittest("module_ipc_test") {
     "storage_service:storage_manager_sa_proxy",
   ]
 
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
+
   use_exceptions = true
 }
 
@@ -57,6 +64,7 @@ ohos_unittest("backup_service_test") {
   module_out_path = path_module_out_tests
 
   sources = [
+    "${path_backup_mock}/timer/timer_mock.cpp",
     "${path_backup_mock}/accesstoken/accesstoken_kit_mock.cpp",
     "${path_backup}/services/backup_sa/src/module_app_gallery/app_gallery_dispose_proxy.cpp",
     "${path_backup}/services/backup_sa/src/module_ipc/service.cpp",
@@ -96,6 +104,12 @@ ohos_unittest("backup_service_test") {
     "storage_service:storage_manager_sa_proxy",
   ]
 
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
+  
   use_exceptions = true
 }
 
@@ -238,6 +252,12 @@ ohos_unittest("backup_restore_deps_manager_test") {
     "storage_service:storage_manager_sa_proxy",
   ]
 
+  sanitize = {
+    cfi = true
+    cfi_cross_dso = true
+    debug = false
+  }
+
   use_exceptions = true
 }
 
-- 
Gitee