diff --git a/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_import_and_export_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_import_and_export_test.cpp
index e8532315dc04f8f0c08732d2f2d74bf14da6a88f..7347837fd3aad5f9a13af16992b3e8d739a68675 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_import_and_export_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_import_and_export_test.cpp
@@ -12,8 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 #ifndef OMIT_ENCRYPT
 #include <gtest/gtest.h>
 #include <fcntl.h>
@@ -94,8 +92,10 @@ public:
 
 void DistributedDBInterfacesImportAndExportTest::SetUpTestCase(void)
 {
+#ifdef USE_DISTRIBUTEDDB_DEVICE
     g_mgr.SetProcessLabel("6666", "8888");
     g_mgr.SetProcessCommunicator(std::make_shared<ProcessCommunicatorTestStub>());
+#endif
     DistributedDBToolsUnitTest::TestDirInit(g_testDir);
     g_config.dataDir = g_testDir;
     g_mgr.SetKvStoreConfig(g_config);
@@ -1482,5 +1482,4 @@ HWTEST_F(DistributedDBInterfacesImportAndExportTest, CheckSecurityLabel002, Test
     RuntimeContext::GetInstance()->SetProcessSystemApiAdapter(nullptr);
     g_junkFilesList.push_back(singleFileName);
 }
-#endif // OMIT_ENCRYPT
-#endif
\ No newline at end of file
+#endif // OMIT_ENCRYPT
\ No newline at end of file
diff --git a/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_extend_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_extend_test.cpp
index d7cb7121bf2289e28b9afb89c2701e254294a2b9..a66251897e5ccd847583675ba884b8d70e80a958 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_extend_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_extend_test.cpp
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 #include <gtest/gtest.h>
 #include <thread>
 
@@ -62,8 +61,10 @@ namespace {
 #endif // OMIT_MULTI_VER
     const std::string DEVICE_B = "deviceB";
     VirtualCommunicatorAggregator* g_communicatorAggregator = nullptr;
+#ifdef USE_DISTRIBUTEDDB_DEVICE
     KvVirtualDevice *g_deviceB = nullptr;
     VirtualSingleVerSyncDBInterface *g_syncInterfaceB = nullptr;
+#endif
 
     // the type of g_kvNbDelegateCallback is function<void(DBStatus, KvStoreDelegate*)>
     auto g_kvNbDelegateCallback = bind(&DistributedDBToolsUnitTest::KvStoreNbDelegateCallback, placeholders::_1,
@@ -379,6 +380,7 @@ HWTEST_F(DistributedDBInterfacesNBDelegateExtendTest, ResultSetLimitTest001, Tes
     g_kvNbDelegatePtr = nullptr;
 }
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
   * @tc.name: LocalStore001
   * @tc.desc: Test get kv store with localOnly
@@ -426,6 +428,7 @@ HWTEST_F(DistributedDBInterfacesNBDelegateExtendTest, LocalStore001, TestSize.Le
     EXPECT_EQ(mgr.DeleteKvStore(STORE_ID_1), OK);
     openDelegate = nullptr;
 }
+#endif
 
 /**
   * @tc.name: LocalStore002
@@ -892,6 +895,7 @@ HWTEST_F(DistributedDBInterfacesNBDelegateExtendTest, InvalidQueryTest002, TestS
     g_kvNbDelegatePtr = nullptr;
 }
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
   * @tc.name: SyncRangeQuery001
   * @tc.desc: test sync query with range
@@ -926,6 +930,7 @@ HWTEST_F(DistributedDBInterfacesNBDelegateExtendTest, SyncRangeQuery001, TestSiz
     EXPECT_EQ(mgr.DeleteKvStore(STORE_ID_1), OK);
     FreeVirtualDevice(g_deviceB);
 }
+#endif
 
 /**
   * @tc.name: OptionValidCheck001
@@ -967,6 +972,7 @@ HWTEST_F(DistributedDBInterfacesNBDelegateExtendTest, OptionModeValidCheck001, T
     observer = nullptr;
 }
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
   * @tc.name: AbnormalKvStoreTest001
   * @tc.desc: Test KvStoreNbDelegateImpl interface while conn is nullptr.
@@ -1026,6 +1032,7 @@ HWTEST_F(DistributedDBInterfacesNBDelegateExtendTest, AbnormalKvStoreTest001, Te
     g_kvNbDelegatePtr = nullptr;
 }
 
+#ifdef USE_DISTRIBUTEDDB_CLOUD
 /**
   * @tc.name: AbnormalKvStoreTest002
   * @tc.desc: Test KvStoreNbDelegateImpl interface while conn is nullptr.
@@ -1080,6 +1087,8 @@ HWTEST_F(DistributedDBInterfacesNBDelegateExtendTest, AbnormalKvStoreTest002, Te
     EXPECT_EQ(g_mgr.DeleteKvStore("AbnormalKvStoreTest002"), OK);
     g_kvNbDelegatePtr = nullptr;
 }
+#endif
+#endif
 
 /**
   * @tc.name: AbnormalKvStoreResultSetTest
@@ -1184,4 +1193,3 @@ HWTEST_F(DistributedDBInterfacesNBDelegateExtendTest, AbnormalKvStoreTest003, Te
 }
 #endif
 }
-#endif
diff --git a/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_rd_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_rd_test.cpp
index 47a0cb915c001cdf16ec39a89b57967888349a15..be5c61bd689787be11e75575f4555510468c2205 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_rd_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_rd_test.cpp
@@ -178,7 +178,7 @@ void DistributedDBInterfacesNBDelegateRdTest::TearDown(void)
     RuntimeContext::GetInstance()->SetProcessSystemApiAdapter(nullptr);
 }
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
+#ifdef USE_DISTRIBUTEDDB_CLOUD
 /**
   * @tc.name:
   * @tc.desc:
diff --git a/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_test.cpp
index e1a0b1ca69ea41bc57f5be9728a590c966837952..7d684f3ddbb5c87bccb90afbf309cad14d59f182 100755
--- a/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_delegate_test.cpp
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 #include <gtest/gtest.h>
 #include <thread>
 
@@ -1064,7 +1063,6 @@ static void PreparePutBatch004(vector<Entry> &entrys1, vector<Entry> &entrys2, v
     }
 }
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
   * @tc.name: SingleVerPutBatch004
   * @tc.desc: Check interface data insertion and update functions.
@@ -1154,7 +1152,6 @@ HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerPutBatch004, TestSize.L
     EXPECT_EQ(g_mgr.DeleteKvStore("distributed_SingleVerPutBatch_004"), OK);
     g_kvNbDelegatePtr = nullptr;
 }
-#endif
 
 static void CreatEntrys(int recordSize, vector<Key> &keys, vector<Value> &values, vector<Entry> &entries)
 {
@@ -1360,7 +1357,6 @@ HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerPutBatch008, TestSize.L
     g_kvNbDelegatePtr = nullptr;
 }
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
   * @tc.name: SingleVerPutBatch009
   * @tc.desc: Check for illegal parameters
@@ -1434,7 +1430,6 @@ HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerPutBatch009, TestSize.L
     EXPECT_EQ(g_mgr.DeleteKvStore("distributed_SingleVerPutBatch_001"), OK);
     g_kvNbDelegatePtr = nullptr;
 }
-#endif
 #endif // LOW_LEVEL_MEM_DEV
 
 /**
@@ -1862,7 +1857,6 @@ HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerPutBatchObserver001, Te
     g_kvNbDelegatePtr = nullptr;
 }
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
   * @tc.name: SingleVerPutBatchObserver002
   * @tc.desc: Test the observer function of PutBatch() for invalid input.
@@ -1936,7 +1930,6 @@ HWTEST_F(DistributedDBInterfacesNBDelegateTest, SingleVerPutBatchObserver002, Te
     EXPECT_EQ(g_mgr.DeleteKvStore("distributed_SingleVerPutBatchObserver_002"), OK);
     g_kvNbDelegatePtr = nullptr;
 }
-#endif
 
 /**
   * @tc.name: SingleVerPutBatchObserver003
@@ -2470,6 +2463,7 @@ HWTEST_F(DistributedDBInterfacesNBDelegateTest, MaxLogSize001, TestSize.Level2)
     EXPECT_TRUE(g_mgr.DeleteKvStore("MaxLogSize001") == OK);
 }
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
  * @tc.name: ForceCheckpoint002
  * @tc.desc: Test the checkpoint of the database.
@@ -2552,6 +2546,7 @@ HWTEST_F(DistributedDBInterfacesNBDelegateTest, MaxLogSize002, TestSize.Level2)
     EXPECT_EQ(g_mgr.DeleteKvStore("MaxLogSize002"), OK);
     g_kvNbDelegatePtr = nullptr;
 }
+#endif
 
 /**
  * @tc.name: MaxLogCheckPoint001
@@ -3006,4 +3001,3 @@ HWTEST_F(DistributedDBInterfacesNBDelegateTest, SetAndGetHandleTest002, TestSize
     }
 }
 }
-#endif
diff --git a/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_transaction_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_transaction_test.cpp
index a355dfafda85cada1836e07d789e57275f461451..56f2f6da218948bb71eac93aa0d0553dddb925f1 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_transaction_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_nb_transaction_test.cpp
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 #include <gtest/gtest.h>
 
 #include "db_common.h"
@@ -288,6 +287,7 @@ HWTEST_F(DistributedDBInterfacesNBTransactionTest, start003, TestSize.Level1)
     g_kvNbDelegatePtr = nullptr;
 }
 
+#ifdef USE_DISTRIBUTEDDB_CLOUD
 /**
   * @tc.name: start004
   * @tc.desc: Test the nb operations return BUSY after transaction started.
@@ -340,6 +340,7 @@ HWTEST_F(DistributedDBInterfacesNBTransactionTest, start004, TestSize.Level4)
     EXPECT_EQ(g_mgr.DeleteKvStore("distributed_nb_transaction_start004"), OK);
     g_kvNbDelegatePtr = nullptr;
 }
+#endif
 
 /**
   * @tc.name: commit001
@@ -1097,5 +1098,4 @@ HWTEST_F(DistributedDBInterfacesNBTransactionTest, rollback008, TestSize.Level1)
     EXPECT_EQ(g_mgr.CloseKvStore(g_kvNbDelegatePtr), OK);
     EXPECT_EQ(g_mgr.DeleteKvStore("distributed_nb_transaction_rollback008"), OK);
     g_kvNbDelegatePtr = nullptr;
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_sync_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_sync_test.cpp
index ccba926fd22330be9bc3e298e34a39a357de27b4..66617e03d94d3b05a136997399d7c32da7292b2c 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_sync_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_sync_test.cpp
@@ -413,7 +413,6 @@ HWTEST_F(DistributedDBInterfacesRelationalSyncTest, RelationalSyncTest008, TestS
     EXPECT_EQ(errCode, OK);
 }
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
   * @tc.name: RelationalSyncTest009
   * @tc.desc: Test sync with invalid query
@@ -452,7 +451,6 @@ HWTEST_F(DistributedDBInterfacesRelationalSyncTest, RelationalSyncTest009, TestS
 
     EXPECT_EQ(status, OK);
 }
-#endif
 
 /**
   * @tc.name: RelationalSyncTest010
@@ -487,7 +485,6 @@ HWTEST_F(DistributedDBInterfacesRelationalSyncTest, RelationalSyncTest010, TestS
     EXPECT_EQ(errCode, DISTRIBUTED_SCHEMA_CHANGED);
 }
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
   * @tc.name: UpdatePrimaryKeyTest001
   * @tc.desc: Test update data's primary key
@@ -513,7 +510,6 @@ HWTEST_F(DistributedDBInterfacesRelationalSyncTest, UpdatePrimaryKeyTest001, Tes
         "_log");
     EXPECT_EQ(cnt, 2);
 }
-#endif
 
 /**
   * @tc.name: UpgradeTriggerTest001
@@ -613,7 +609,6 @@ void CheckSyncData(sqlite3 *db, const std::string &checkSql, const std::vector<V
 }
 }
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
   * @tc.name: SyncLimitTest001
   * @tc.desc: Sync device with limit query
@@ -638,7 +633,6 @@ HWTEST_F(DistributedDBInterfacesRelationalSyncTest, SyncLimitTest001, TestSize.L
     std::string checkSql = "select * from sync_data limit 4500 offset 100;";
     CheckSyncData(db, checkSql, data);
 }
-#endif
 
 /**
   * @tc.name: SyncLimitTest002
@@ -1145,6 +1139,7 @@ HWTEST_F(DistributedDBInterfacesRelationalSyncTest, RelationalSyncRangeTest001,
     EXPECT_EQ(errCode, NOT_SUPPORT);
 }
 
+#ifdef USE_DISTRIBUTEDDB_CLOUD
 /**
   * @tc.name: RelationalSyncTest011
   * @tc.desc: Test sync with invalid parm
@@ -1205,3 +1200,4 @@ HWTEST_F(DistributedDBInterfacesRelationalSyncTest, RelationalSyncTest011, TestS
     delete observer;
 }
 #endif
+#endif
\ No newline at end of file
diff --git a/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_test.cpp
index c40403055211516f1b669db2d0841a39f8d73f65..88a3a0f69a071ff0d1d496a4e5062dcce5f577b4 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_test.cpp
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 #include <gtest/gtest.h>
 #include <queue>
 #include <random>
@@ -393,8 +392,8 @@ void CreateDistributedTableOverLimitTest(TableSyncType tableSyncTpe)
     EXPECT_EQ(status, OK);
 }
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 #ifdef USE_DISTRIBUTEDDB_CLOUD
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
   * @tc.name: RelationalStoreTest004
   * @tc.desc: Test create distributed table with over limit for DEVICE_COOPERATION type
@@ -2197,5 +2196,4 @@ HWTEST_F(DistributedDBInterfacesRelationalTest, GetDbHandleConcurrentlyTest001,
     status = g_mgr.CloseStore(delegate);
     EXPECT_EQ(status, OK);
 }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_tracker_table_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_tracker_table_test.cpp
index 99c8924ef896dca10f96ddf4f55c3bb89c34a50a..ac85bd7c2f67e8daf207f86cdbca1124cecc6807 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_tracker_table_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/interfaces/distributeddb_interfaces_relational_tracker_table_test.cpp
@@ -13,8 +13,6 @@
  * limitations under the License.
  */
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
-#ifdef USE_DISTRIBUTEDDB_CLOUD
 #include <gtest/gtest.h>
 #include <queue>
 #include <random>
@@ -702,6 +700,8 @@ HWTEST_F(DistributedDBInterfacesRelationalTrackerTableTest, TrackerTableTest010,
     CloseStore();
 }
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
+#ifdef USE_DISTRIBUTEDDB_CLOUD
 /**
   * @tc.name: TrackerTableTest011
   * @tc.desc: Test CreateDistributedTable after set tracker table
@@ -3048,6 +3048,6 @@ HWTEST_F(DistributedDBInterfacesRelationalTrackerTableTest, TrackerTableTest041,
     SQLiteUtils::ResetStatement(stmt, true, errCode);
     CloseStore();
 }
-}
 #endif
-#endif
\ No newline at end of file
+#endif
+}
diff --git a/frameworks/libs/distributeddb/test/unittest/common/storage/distributeddb_rdb_collaboration_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/storage/distributeddb_rdb_collaboration_test.cpp
index 2d10f23c7aceef2f0a50130385c409774afaf216..773245ee27faa76ba86350d03a8d7e51be2936d8 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/storage/distributeddb_rdb_collaboration_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/storage/distributeddb_rdb_collaboration_test.cpp
@@ -12,8 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifdef USE_DISTRIBUTEDDB_CLOUD
-#ifdef USE_DISTRIBUTEDDB_CLOUD
 #include <gtest/gtest.h>
 #include <variant>
 
@@ -189,6 +187,8 @@ void DistributedDBRDBCollaborationTest::CloseDb()
     }
 }
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
+#ifdef USE_DISTRIBUTEDDB_CLOUD
 /**
  * @tc.name: SetSchema001
  * @tc.desc: Test set distributed schema.
@@ -2896,6 +2896,6 @@ HWTEST_F(DistributedDBRDBCollaborationTest, InvalidSync006, TestSize.Level0)
         EXPECT_EQ(callStatus, NOT_SUPPORT);
     }
 }
-}
 #endif
-#endif
\ No newline at end of file
+#endif
+}
\ No newline at end of file
diff --git a/frameworks/libs/distributeddb/test/unittest/common/storage/distributeddb_relational_syncable_storage_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/storage/distributeddb_relational_syncable_storage_test.cpp
index 1584579a6288d21471368194f3793d3b335afcc3..af934d17bcd8641e9d650bc2abb12d4e190e10a6 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/storage/distributeddb_relational_syncable_storage_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/storage/distributeddb_relational_syncable_storage_test.cpp
@@ -123,6 +123,7 @@ HWTEST_F(DistributedDBRelationalSyncableStorageTest, SchemaRefTest001, TestSize.
     EXPECT_EQ(sqlite3_close_v2(db), SQLITE_OK);
 }
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
  * @tc.name: FuncExceptionTest001
  * @tc.desc: Test the interception expection of the delegate interface when the store is empty.
@@ -177,8 +178,8 @@ HWTEST_F(DistributedDBRelationalSyncableStorageTest, FuncExceptionTest001, TestS
     EXPECT_EQ(conn->OperateDataStatus(0u), -E_INVALID_CONNECTION);
     conn = nullptr;
 }
+#endif
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
  * @tc.name: FuncExceptionTest002
  * @tc.desc: Test the interception expection of the delegate interface when the store is empty.
@@ -223,5 +224,4 @@ HWTEST_F(DistributedDBRelationalSyncableStorageTest, FuncExceptionTest002, TestS
     int32_t localCount = 0;
     EXPECT_EQ(executor->GetFlagIsLocalCount("tableName", localCount), -E_INVALID_DB);
 }
-#endif
 #endif // RELATIONAL_STORE
diff --git a/frameworks/libs/distributeddb/test/unittest/common/store_test/kv/distributeddb_basic_kv_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/store_test/kv/distributeddb_basic_kv_test.cpp
index 4856835bd39d26b1ad6a809c788742b930349f73..b64b716abc4a4c32b90643b6e258f0058129522b 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/store_test/kv/distributeddb_basic_kv_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/store_test/kv/distributeddb_basic_kv_test.cpp
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 #include "kv_general_ut.h"
 #include "distributeddb_tools_unit_test.h"
 
@@ -36,6 +35,7 @@ void DistributedDBBasicKVTest::SetUp()
     ASSERT_EQ(BasicUnitTest::InitDelegate(storeInfo3, "dev3"), E_OK);
 }
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
  * @tc.name: ExampleSync001
  * @tc.desc: Test sync from dev1 to dev2.
@@ -108,6 +108,7 @@ HWTEST_F(DistributedDBBasicKVTest, ExampleSync002, TestSize.Level0)
     SetMtu("dev1", 1);
     BlockPush(storeInfo1, storeInfo2);
 }
+#endif
 
 /**
  * @tc.name: WhitelistKvGet001
@@ -578,6 +579,7 @@ HWTEST_F(DistributedDBBasicKVTest, GetKvStore005, TestSize.Level0)
     EXPECT_NE(store2->Get(k1, actualValue), OK);
 }
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
  * @tc.name: GetKvStore006
  * @tc.desc: Test enable when open db with different paths
@@ -633,5 +635,5 @@ HWTEST_F(DistributedDBBasicKVTest, GetKvStore006, TestSize.Level0)
         autoLaunchOption, notifer), ALREADY_SET);
     EXPECT_EQ(manager1.DisableKvStoreAutoLaunch(storeInfo1.userId, storeInfo1.appId, storeInfo1.storeId), OK);
 }
-} // namespace DistributedDB
-#endif
\ No newline at end of file
+#endif
+} // namespace DistributedDB
\ No newline at end of file
diff --git a/frameworks/libs/distributeddb/test/unittest/common/store_test/kv/distributeddb_kv_data_status_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/store_test/kv/distributeddb_kv_data_status_test.cpp
index 554bcd8d7486fb6bfd04b892e7944dd163e3cffa..af44311e451888bfdf08407a1dc30a51db3c98a4 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/store_test/kv/distributeddb_kv_data_status_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/store_test/kv/distributeddb_kv_data_status_test.cpp
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 #include "kv_general_ut.h"
 
 namespace DistributedDB {
@@ -40,6 +39,7 @@ void DistributedDBKVDataStatusTest::SetUp()
     ASSERT_EQ(BasicUnitTest::InitDelegate(storeInfo2, DEVICE_B), E_OK);
 }
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
  * @tc.name: OperateDataStatus001
  * @tc.desc: Test sync from dev1 to dev2 after operate valid data status.
@@ -218,6 +218,7 @@ HWTEST_F(DistributedDBKVDataStatusTest, OperateDataStatus004, TestSize.Level0)
     EXPECT_EQ(KVGeneralUt::GetDeviceEntries(store2, std::string(DEVICE_C), false, entries), NOT_FOUND);
     EXPECT_EQ(entries.size(), 0u); // 0 record
 }
+#endif
 
 /**
  * @tc.name: OperateDataStatus005
@@ -276,6 +277,7 @@ HWTEST_F(DistributedDBKVDataStatusTest, OperateDataStatus007, TestSize.Level0)
     EXPECT_EQ(sqlite3_close_v2(db), SQLITE_OK);
 }
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
  * @tc.name: OperateDataStatus008
  * @tc.desc: Test operate data status when db was error.
@@ -440,5 +442,5 @@ HWTEST_F(DistributedDBKVDataStatusTest, CloudOperateDataStatus003, TestSize.Leve
     EXPECT_EQ(actualValue, expectValue);
 }
 #endif // USE_DISTRIBUTEDDB_CLOUD
+#endif
 } // namespace DistributedDB
-#endif
\ No newline at end of file
diff --git a/frameworks/libs/distributeddb/test/unittest/common/store_test/rdb/distributeddb_rdb_compress_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/store_test/rdb/distributeddb_rdb_compress_test.cpp
index 29d68f28c3bfcc355d8dd2e1870894e00703d627..98caadcc4e765716d86b290c864f76d0cf2a6479 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/store_test/rdb/distributeddb_rdb_compress_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/store_test/rdb/distributeddb_rdb_compress_test.cpp
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 #include "rdb_general_ut.h"
 #include "relational_store_delegate_impl.h"
 #include "single_ver_relational_syncer.h"
@@ -182,6 +181,7 @@ void DistributedDBRDBCompressTest::CompressTest(bool store1Compress, bool store2
     EXPECT_LE(size2 - size1, size4 - size3);
 }
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
  * @tc.name: RDBCompressSync001
  * @tc.desc: Test collaboration table push sync with compress.
@@ -249,6 +249,7 @@ HWTEST_F(DistributedDBRDBCompressTest, RDBCompressSync006, TestSize.Level1)
 {
     ASSERT_NO_FATAL_FAILURE(CompressTest(true, false, 100, 100, SyncMode::SYNC_MODE_PULL_ONLY));
 }
+#endif
 
 /**
  * @tc.name: RDBInvalidCompress001
@@ -318,6 +319,7 @@ HWTEST_F(DistributedDBRDBCompressTest, RDBInvalidCompress002, TestSize.Level0)
     mgr.CloseStore(delegate);
 }
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
  * @tc.name: RDBGetDevTaskCount001
  * @tc.desc: Test get dev task count when sync.
@@ -399,5 +401,5 @@ HWTEST_F(DistributedDBRDBCompressTest, VerifyInvalidGetDeviceSyncTaskCount001, T
     SingleVerRelationalSyncer syncer;
     EXPECT_EQ(syncer.GetTaskCount(), 0);
 }
-}
-#endif
\ No newline at end of file
+#endif
+}
\ No newline at end of file
diff --git a/frameworks/libs/distributeddb/test/unittest/common/store_test/rdb/distributeddb_rdb_data_status_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/store_test/rdb/distributeddb_rdb_data_status_test.cpp
index 3af4ce7cd5b6f1f7fcc07a077bcdf16519143737..45711f980699e424114c865dbc261013dd5a4e6f 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/store_test/rdb/distributeddb_rdb_data_status_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/store_test/rdb/distributeddb_rdb_data_status_test.cpp
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 #include "rdb_general_ut.h"
 
 namespace DistributedDB {
@@ -183,7 +182,7 @@ HWTEST_F(DistributedDBRDBDataStatusTest, SplitTable001, TestSize.Level0)
     BlockPush(info1_, info2_, DEVICE_SYNC_TABLE);
 }
 
-
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
  * @tc.name: SplitTable002
  * @tc.desc: Test split table sync with diff dev after update time.
@@ -331,6 +330,7 @@ HWTEST_F(DistributedDBRDBDataStatusTest, CollaborationTable006, TestSize.Level1)
     BlockPush(info1_, info2_, DEVICE_SYNC_TABLE, SCHEMA_MISMATCH);
 }
 
+#ifdef USE_DISTRIBUTEDDB_CLOUD
 /**
  * @tc.name: CollaborationTable007
  * @tc.desc: Test device collaboration search table and search table sync.
@@ -528,6 +528,7 @@ HWTEST_F(DistributedDBRDBDataStatusTest, CollaborationTable013, TestSize.Level1)
     DBStatus callStatus = store->Sync({toDevice}, SYNC_MODE_PUSH_ONLY, query, nullptr, true);
     EXPECT_EQ(callStatus, NOT_SUPPORT);
 }
+#endif
 
 /**
  * @tc.name: CreateDistributedTableTest001
@@ -603,5 +604,5 @@ HWTEST_F(DistributedDBRDBDataStatusTest, TimeCheck001, TestSize.Level0)
     EXPECT_EQ(ret, E_OK);
     EXPECT_GE(t2, t1);
 }
-}
-#endif
\ No newline at end of file
+#endif
+}
\ No newline at end of file
diff --git a/frameworks/libs/distributeddb/test/unittest/common/store_test/rdb/distributeddb_rdb_knowledge_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/store_test/rdb/distributeddb_rdb_knowledge_test.cpp
index f595e13dd1ede91258221a57f53486e11b250084..fd6ff9c04f120eb97fb3bacf7e579ca7d9f30ae2 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/store_test/rdb/distributeddb_rdb_knowledge_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/store_test/rdb/distributeddb_rdb_knowledge_test.cpp
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 #include "rdb_general_ut.h"
 #include "relational_store_client.h"
 
@@ -145,6 +144,7 @@ HWTEST_F(DistributedDBRDBKnowledgeTest, SetKnowledge002, TestSize.Level0)
     EXPECT_EQ(CleanDeletedData(db, schema.tableName, 0u), OK);
 }
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
  * @tc.name: SetKnowledge003
  * @tc.desc: Test set knowledge schema after create distributed table.
@@ -172,6 +172,7 @@ HWTEST_F(DistributedDBRDBKnowledgeTest, SetKnowledge003, TestSize.Level0)
     ASSERT_NE(db, nullptr);
     EXPECT_EQ(SetKnowledgeSourceSchema(db, GetKnowledgeSchema()), INVALID_ARGS);
 }
+#endif
 
 /**
  * @tc.name: SetKnowledge004
@@ -248,5 +249,4 @@ HWTEST_F(DistributedDBRDBKnowledgeTest, SetKnowledge005, TestSize.Level0)
     sql = "SELECT count(*) FROM " + inverted + ";";
     EXPECT_EQ(RelationalTestUtils::ExecSql(db, sql), SQLITE_ERROR);
 }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/frameworks/libs/distributeddb/test/unittest/common/syncer/cloud/distributeddb_cloud_kv_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/syncer/cloud/distributeddb_cloud_kv_test.cpp
index 301c305fdd400aba96601338fa7e9b2fa2efaabb..9e07e760e88121c264e1d8299fdfd669cd362e5d 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/syncer/cloud/distributeddb_cloud_kv_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/syncer/cloud/distributeddb_cloud_kv_test.cpp
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 #ifdef USE_DISTRIBUTEDDB_CLOUD
 #include <gtest/gtest.h>
 
@@ -770,6 +769,7 @@ HWTEST_F(DistributedDBCloudKvTest, NormalSync013, TestSize.Level1)
     CloseKvStore(kvDelegatePtrS3_, STORE_ID_3);
 }
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
  * @tc.name: NormalSync014
  * @tc.desc: Test sync after user change.
@@ -813,6 +813,7 @@ HWTEST_F(DistributedDBCloudKvTest, NormalSync014, TestSize.Level1)
     CloseKvStore(kvDelegatePtrS3_, STORE_ID_3);
     g_mgr.SetSyncActivationCheckCallback(nullptr);
 }
+#endif
 
 /**
  * @tc.name: NormalSync015
@@ -2683,5 +2684,4 @@ HWTEST_F(DistributedDBCloudKvTest, KvSupportEncryptTest004, TestSize.Level1)
     RuntimeContext::GetInstance()->SetProcessSystemApiAdapter(nullptr);
 }
 }
-#endif // USE_DISTRIBUTEDDB_CLOUD
-#endif
\ No newline at end of file
+#endif // USE_DISTRIBUTEDDB_CLOUD
\ No newline at end of file
diff --git a/frameworks/libs/distributeddb/test/unittest/common/syncer/cloud/distributeddb_cloud_kvstore_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/syncer/cloud/distributeddb_cloud_kvstore_test.cpp
index 305acebea35fe2d4296239a800483ca8458dccba..030a9715fb3cba9bd31b0d3b643c1c3c0056b8c8 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/syncer/cloud/distributeddb_cloud_kvstore_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/syncer/cloud/distributeddb_cloud_kvstore_test.cpp
@@ -1261,6 +1261,7 @@ HWTEST_F(DistributedDBCloudKvStoreTest, RemoveDeviceTest007, TestSize.Level0)
     EXPECT_EQ(kvDelegatePtrS1_->RemoveDeviceData(deviceId, "user1", ClearMode::CLEAR_SHARED_TABLE), NOT_SUPPORT);
 }
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
  * @tc.name: RemoveDeviceTest008
  * @tc.desc: remove record without mode.
@@ -1312,6 +1313,7 @@ HWTEST_F(DistributedDBCloudKvStoreTest, RemoveDeviceTest008, TestSize.Level0)
         EXPECT_EQ(kvDelegatePtrS1_->Get(key, actualValue), NOT_FOUND);
     }
 }
+#endif
 
 /**
  * @tc.name: RemoveDeviceTest009
@@ -1641,6 +1643,7 @@ HWTEST_F(DistributedDBCloudKvStoreTest, NormalSyncInvalid004, TestSize.Level0)
     EXPECT_EQ(g_mgr.CloseKvStore(kvDelegateInvalidPtrS2_), OK);
 }
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
  * @tc.name: NormalSyncInvalid005
  * @tc.desc: Test normal sync with invalid parm.
@@ -1665,6 +1668,7 @@ HWTEST_F(DistributedDBCloudKvStoreTest, NormalSyncInvalid005, TestSize.Level0)
     EXPECT_EQ(kvDelegatePtrS1_->Sync(devices, mode, nullptr), DB_ERROR);
     EXPECT_EQ(kvDelegatePtrS1_->Sync(devices, mode, nullptr, query, true), DB_ERROR);
 }
+#endif
 
 /**
  * @tc.name: NormalSyncInvalid006
diff --git a/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_dlp_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_dlp_test.cpp
index b36437e5a6a0d43e12a0edae08e1d70c3208d077..071e33f1e8070803d671b68728a7fd5934adc34e 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_dlp_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_dlp_test.cpp
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 #include <condition_variable>
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -181,11 +180,13 @@ void DistributedDBSingleVerDLPTest::TearDown(void)
         delete g_deviceC;
         g_deviceC = nullptr;
     }
+#ifdef USE_DISTRIBUTEDDB_DEVICE
     PermissionCheckCallbackV3 nullCallback = nullptr;
     RuntimeConfig::SetPermissionCheckCallback(nullCallback);
     SyncActivationCheckCallbackV2 activeCallBack = nullptr;
     RuntimeConfig::SetSyncActivationCheckCallback(activeCallBack);
     RuntimeConfig::SetPermissionConditionCallback(nullptr);
+#endif
 }
 
 /**
@@ -283,6 +284,7 @@ HWTEST_F(DistributedDBSingleVerDLPTest, DlpDelegateCRUDTest001, TestSize.Level1)
     CloseDelegate(delegatePtr1, mgr1, STORE_ID_1);
 }
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
  * @tc.name: SandboxDelegateSync001
  * @tc.desc: Test dlp delegate sync function.
@@ -312,7 +314,6 @@ HWTEST_F(DistributedDBSingleVerDLPTest, SandboxDelegateSync001, TestSize.Level1)
         res.emplace(KEY_INSTANCE_ID, std::to_string(INSTANCE_ID_1));
         return res;
     });
-
     KvStoreNbDelegate *delegatePtr1 = nullptr;
     EXPECT_EQ(OpenDelegate("/dlp1", delegatePtr1, mgr1), OK);
     ASSERT_NE(delegatePtr1, nullptr);
@@ -346,7 +347,6 @@ HWTEST_F(DistributedDBSingleVerDLPTest, SandboxDelegateSync002, TestSize.Level1)
         }
         return false;
     });
-
     KvStoreNbDelegate *delegatePtr1 = nullptr;
     EXPECT_EQ(OpenDelegate("/dlp1", delegatePtr1, mgr1, true), OK);
     ASSERT_NE(delegatePtr1, nullptr);
@@ -358,6 +358,7 @@ HWTEST_F(DistributedDBSingleVerDLPTest, SandboxDelegateSync002, TestSize.Level1)
 
     CloseDelegate(delegatePtr1, mgr1, STORE_ID_1);
 }
+#endif
 
 /**
  * @tc.name: SingleVerUtilsTest001
@@ -457,5 +458,4 @@ HWTEST_F(DistributedDBSingleVerDLPTest, SingleVerUtilsTest002, TestSize.Level0)
     kvEnv->SetEntryData(std::move(dataItem));
     SingleVerDataSyncUtils::GetQuerySyncDataTimeRange(inData, 100, 100, isUpdate);
     delete kvEnv;
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_multi_sub_user_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_multi_sub_user_test.cpp
index c2449e7e2bf2cd348226b4660fc9da21e201f7fe..9c961d1ef278e2795ac7a3f97b7dafcd4c0218b1 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_multi_sub_user_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_multi_sub_user_test.cpp
@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-#ifdef USE_DISTRIBUTEDDB_DEVICE
 #include <condition_variable>
 #include <gtest/gtest.h>
 #include <thread>
@@ -263,10 +262,12 @@ void DistributedDBSingleVerMultiSubUserTest::TearDown(void)
         g_deviceB = nullptr;
     }
     PermissionCheckCallbackV3 nullCallback = nullptr;
+#ifdef USE_DISTRIBUTEDDB_DEVICE
     RuntimeConfig::SetPermissionCheckCallback(nullCallback);
     SyncActivationCheckCallbackV2 activeCallBack = nullptr;
     RuntimeConfig::SetSyncActivationCheckCallback(activeCallBack);
     RuntimeConfig::SetPermissionConditionCallback(nullptr);
+#endif
     if (DistributedDBToolsUnitTest::RemoveTestDbFiles(*g_testDir) != 0) {
         LOGE("rm test db files error.");
     }
@@ -434,6 +435,7 @@ HWTEST_F(DistributedDBSingleVerMultiSubUserTest, KvDelegateInvalidParamTest001,
     CloseDelegate(delegatePtr3, mgr3, STORE_ID_1);
 }
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
  * @tc.name: SubUserPermissionCheck
  * @tc.desc: permission check subuser
@@ -459,7 +461,6 @@ HWTEST_F(DistributedDBSingleVerMultiSubUserTest, SubUserPermissionCheck, TestSiz
         }
     };
     EXPECT_EQ(mgr1.SetPermissionCheckCallback(permissionCheckCallback), OK);
-
     /**
      * @tc.steps: step2. deviceB put {1,1}
      * @tc.expected: step2. put success
@@ -498,6 +499,7 @@ HWTEST_F(DistributedDBSingleVerMultiSubUserTest, SubUserPermissionCheck, TestSiz
     EXPECT_EQ(mgr1.SetPermissionCheckCallback(nullCallback), OK);
     CloseDelegate(delegatePtr1, mgr1, STORE_ID_1);
 }
+#endif
 
 /**
  * @tc.name: RDBDelegateInvalidParamTest001
@@ -769,6 +771,7 @@ HWTEST_F(DistributedDBSingleVerMultiSubUserTest, SubUserDelegateCloudSyncTest002
 }
 #endif
 
+#ifdef USE_DISTRIBUTEDDB_DEVICE
 /**
  * @tc.name: MultiSubUserDelegateSync001
  * @tc.desc: Test subUser delegate sync function.
@@ -855,6 +858,5 @@ HWTEST_F(DistributedDBSingleVerMultiSubUserTest, MultiSubUserDelegateSync002, Te
 
     CloseDelegate(delegatePtr1, mgr1, STORE_ID_1);
 }
-
-} // namespace
-#endif
\ No newline at end of file
+#endif
+} // namespace
\ No newline at end of file
diff --git a/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_multi_user_test.cpp b/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_multi_user_test.cpp
index 7cfb59e8ec93c25f10fdcf4e1ad72e92e0b4e86c..f56d482bca5c7730f1f3dc385fccdc65db7c45c2 100644
--- a/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_multi_user_test.cpp
+++ b/frameworks/libs/distributeddb/test/unittest/common/syncer/distributeddb_single_ver_multi_user_test.cpp
@@ -455,7 +455,6 @@ HWTEST_F(DistributedDBSingleVerMultiUserTest, MultiUser003, TestSize.Level3)
      * @tc.steps: step1. set SyncActivationCheckCallback and only userId2 can active
      */
     g_mgr1.SetSyncActivationCheckCallback(g_syncActivationCheckCallback1);
-
     std::shared_ptr<KvStoreObserverUnitTest> observer = std::make_shared<KvStoreObserverUnitTest>();
     EXPECT_TRUE(observer != nullptr);
     /**
@@ -464,7 +463,6 @@ HWTEST_F(DistributedDBSingleVerMultiUserTest, MultiUser003, TestSize.Level3)
      */
     g_mgr1.SetAutoLaunchRequestCallback(
         std::bind(AutoLaunchCallBack, std::placeholders::_1, std::placeholders::_2, observer, true));
-
     /**
      * @tc.steps: step2. RunCommunicatorLackCallback
      * @tc.expected: step2. success.
@@ -499,7 +497,6 @@ HWTEST_F(DistributedDBSingleVerMultiUserTest, MultiUser003, TestSize.Level3)
     Value actualValue;
     g_kvDelegatePtr2->Get(key, actualValue);
     EXPECT_EQ(actualValue, value);
-
     RuntimeConfig::SetAutoLaunchRequestCallback(nullptr, DBType::DB_KV);
     RuntimeConfig::ReleaseAutoLaunch(USER_ID_2, APP_ID, STORE_ID, DBType::DB_KV);
     CloseStore();
@@ -538,7 +535,6 @@ HWTEST_F(DistributedDBSingleVerMultiUserTest, MultiUser004, TestSize.Level1)
     EXPECT_TRUE(g_mgr1.EnableKvStoreAutoLaunch(USER_ID_2, APP_ID, STORE_ID, option, notifier) == OK);
     EXPECT_TRUE(g_mgr1.EnableKvStoreAutoLaunch(USER_ID_1, APP_ID, STORE_ID, option, notifier) == OK);
     DistributedDBToolsUnitTest::Dump();
-
     /**
      * @tc.steps: step3. RunCommunicatorLackCallback
      * @tc.expected: step3. userId2 open db successfully.