From 878ebeee2c0d999d5a9ab2a3e8b7f7cfbf45d701 Mon Sep 17 00:00:00 2001
From: guochao <guochao76@h-partners.com>
Date: Tue, 2 Sep 2025 16:22:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=94=A8=E4=BE=8Bcrash=20Signed-of?=
 =?UTF-8?q?f-by:=20guochao=20<guochao76@h-partners.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 services/distributeddataservice/app/test/BUILD.gn             | 3 ---
 .../test/unittest/kvstore_meta_manager_update_key_test.cpp    | 1 -
 .../app/test/unittest/session_manager_test.cpp                | 2 --
 .../service/test/rdb_service_impl_token_test.cpp              | 4 ----
 4 files changed, 10 deletions(-)

diff --git a/services/distributeddataservice/app/test/BUILD.gn b/services/distributeddataservice/app/test/BUILD.gn
index d79c567b8..f6f95a304 100644
--- a/services/distributeddataservice/app/test/BUILD.gn
+++ b/services/distributeddataservice/app/test/BUILD.gn
@@ -264,7 +264,6 @@ ohos_unittest("SessionManagerTest") {
     "kv_store:distributeddb",
     "kv_store:kvdb_inner_lite",
     "safwk:system_ability_fwk",
-    "samgr:samgr_proxy",
   ]
 
   if (datamgr_service_power) {
@@ -402,7 +401,6 @@ ohos_unittest("FeatureStubImplTest") {
     "kv_store:distributeddata_mgr",
     "kv_store:distributeddb",
     "safwk:system_ability_fwk",
-    "samgr:samgr_proxy",
   ]
 
   cflags = [
@@ -528,7 +526,6 @@ ohos_unittest("RouteHeadHandlerImplTest") {
     "kv_store:distributeddata_mgr",
     "kv_store:distributeddb",
     "safwk:system_ability_fwk",
-    "samgr:samgr_proxy",
   ]
 
   if (datamgr_service_power) {
diff --git a/services/distributeddataservice/app/test/unittest/kvstore_meta_manager_update_key_test.cpp b/services/distributeddataservice/app/test/unittest/kvstore_meta_manager_update_key_test.cpp
index a520cfb6e..21321aa01 100644
--- a/services/distributeddataservice/app/test/unittest/kvstore_meta_manager_update_key_test.cpp
+++ b/services/distributeddataservice/app/test/unittest/kvstore_meta_manager_update_key_test.cpp
@@ -50,7 +50,6 @@ public:
         auto executors = std::make_shared<OHOS::ExecutorPool>(1, 0);
         Bootstrap::GetInstance().LoadComponents();
         Bootstrap::GetInstance().LoadDirectory();
-        DeviceManagerAdapter::GetInstance().Init(executors);
         KvStoreMetaManager::GetInstance().BindExecutor(executors);
         KvStoreMetaManager::GetInstance().InitMetaParameter();
     }
diff --git a/services/distributeddataservice/app/test/unittest/session_manager_test.cpp b/services/distributeddataservice/app/test/unittest/session_manager_test.cpp
index f08136914..3aa3c020e 100644
--- a/services/distributeddataservice/app/test/unittest/session_manager_test.cpp
+++ b/services/distributeddataservice/app/test/unittest/session_manager_test.cpp
@@ -115,11 +115,9 @@ public:
     static void SetUpTestCase()
     {
         MetaDataManager::GetInstance().Initialize(dbStoreMock_, nullptr, "");
-        auto executors = std::make_shared<ExecutorPool>(12, 5);
         Bootstrap::GetInstance().LoadComponents();
         Bootstrap::GetInstance().LoadDirectory();
         Bootstrap::GetInstance().LoadCheckers();
-        DeviceManagerAdapter::GetInstance().Init(executors);
 
         // init peer device
         UserMetaData userMetaData;
diff --git a/services/distributeddataservice/service/test/rdb_service_impl_token_test.cpp b/services/distributeddataservice/service/test/rdb_service_impl_token_test.cpp
index 4a49356a4..b66319166 100644
--- a/services/distributeddataservice/service/test/rdb_service_impl_token_test.cpp
+++ b/services/distributeddataservice/service/test/rdb_service_impl_token_test.cpp
@@ -93,10 +93,6 @@ void RdbServiceImplTokenTest::SetUpTestCase()
 {
     accTokenMock = std::make_shared<AccessTokenKitMock>();
     BAccessTokenKit::accessTokenkit = accTokenMock;
-    size_t max = 12;
-    size_t min = 5;
-    auto dmExecutor = std::make_shared<ExecutorPool>(max, min);
-    DeviceManagerAdapter::GetInstance().Init(dmExecutor);
     InitMetaData();
     Bootstrap::GetInstance().LoadCheckers();
     CryptoManager::GetInstance().GenerateRootKey();
-- 
Gitee