diff --git a/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn b/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn
index 54392bffff00f494340fe1a7013c090819c3d76a..b3c1e72797f90adad5c737f907a0601ae34be7a2 100644
--- a/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn
+++ b/services/distributeddataservice/adapter/communicator/test/fuzztest/softbusadapter_fuzzer/BUILD.gn
@@ -35,7 +35,17 @@ ohos_fuzztest("SoftBusAdapterFuzzTest") {
     "-fno-omit-frame-pointer",
   ]
 
-  sources = [ "softbusadapter_fuzzer.cpp" ]
+  sources = [
+    "${data_service_path}/adapter/communicator/src/communicator_context.cpp",
+    "${data_service_path}/adapter/communicator/src/device_manager_adapter.cpp",
+    "${data_service_path}/adapter/communicator/src/softbus_client.cpp",
+    "softbusadapter_fuzzer.cpp",
+  ]
+
+  deps = [
+    "${data_service_path}/adapter/utils:distributeddata_utils",
+    "${data_service_path}/framework:distributeddatasvcfwk",
+  ]
 
   external_deps = [
     "access_token:libaccesstoken_sdk",
diff --git a/services/distributeddataservice/adapter/screenlock/test/screen_lock_test.cpp b/services/distributeddataservice/adapter/screenlock/test/screen_lock_test.cpp
index 9374568e57385ac1ca1fa5a348bfa796271fd8a5..5384155bcb5dc94b87ca1164aa6286e4ddb4fe07 100644
--- a/services/distributeddataservice/adapter/screenlock/test/screen_lock_test.cpp
+++ b/services/distributeddataservice/adapter/screenlock/test/screen_lock_test.cpp
@@ -53,6 +53,8 @@ public:
     void TearDown()
     {
     }
+protected:
+    static constexpr int32_t MAX_RETRY_TIME = 300;
 };
 
 /**
@@ -125,4 +127,57 @@ HWTEST_F(ScreenLockTest, SubscribeScreenEvent001, TestSize.Level0)
     screenLock->UnsubscribeScreenEvent();
     screenLock->executors_ = nullptr;
 }
+
+/**
+* @tc.name: SubscribeScreenEvent002
+* @tc.desc: subscribe ScreenEvent
+* @tc.type: FUNC
+* @tc.author:
+*/
+HWTEST_F(ScreenLockTest, SubscribeScreenEvent002, TestSize.Level0)
+{
+    auto screenLock = std::make_shared<ScreenLock>();
+    EXPECT_EQ(screenLock->executors_, nullptr);
+    EXPECT_EQ(screenLock->eventSubscriber_, nullptr);
+    screenLock->SubscribeScreenEvent();
+    EXPECT_NE(screenLock->eventSubscriber_, nullptr);
+    screenLock->UnsubscribeScreenEvent();
+}
+
+/**
+* @tc.name: GetTask001
+* @tc.desc: subscribe ScreenEvent
+* @tc.type: FUNC
+* @tc.author:
+*/
+HWTEST_F(ScreenLockTest, GetTask001, TestSize.Level0)
+{
+    auto screenLock = std::make_shared<ScreenLock>();
+    EXPECT_EQ(screenLock->executors_, nullptr);
+    EXPECT_EQ(screenLock->eventSubscriber_, nullptr);
+    auto Task = screenLock->GetTask(0);
+    Task();
+    auto executor = std::make_shared<OHOS::ExecutorPool>(12, 5);
+    screenLock->BindExecutor(executor);
+    ASSERT_NE(screenLock->executors_, nullptr);
+    Task = screenLock->GetTask(MAX_RETRY_TIME - 1);
+    Task();
+}
+
+/**
+* @tc.name: GetTask002
+* @tc.desc: subscribe ScreenEvent
+* @tc.type: FUNC
+* @tc.author:
+*/
+HWTEST_F(ScreenLockTest, GetTask002, TestSize.Level0)
+{
+    auto screenLock = std::make_shared<ScreenLock>();
+    EXPECT_EQ(screenLock->executors_, nullptr);
+    EXPECT_EQ(screenLock->eventSubscriber_, nullptr);
+    screenLock->SubscribeScreenEvent();
+    EXPECT_NE(screenLock->eventSubscriber_, nullptr);
+    auto Task = screenLock->GetTask(0);
+    Task();
+}
 } // namespace
\ No newline at end of file
diff --git a/services/distributeddataservice/service/test/kvdb_general_store_test.cpp b/services/distributeddataservice/service/test/kvdb_general_store_test.cpp
index c34db72a617fcc3173e4615191b60aef0798a614..3566bb00790b96cd89b6509dd990ffe276c6cc99 100644
--- a/services/distributeddataservice/service/test/kvdb_general_store_test.cpp
+++ b/services/distributeddataservice/service/test/kvdb_general_store_test.cpp
@@ -59,10 +59,9 @@ public:
     static void TearDownTestCase(void);
     void SetUp();
     void TearDown();
-
 protected:
-    static constexpr const char *bundleName = "test_distributeddata";
-    static constexpr const char *storeName = "test_service_meta";
+    static constexpr const char *BUNDLE_NAME = "test_distributeddata";
+    static constexpr const char *STORE_NAME = "test_service_meta";
 
     void InitMetaData();
     static std::vector<uint8_t> Random(uint32_t len);
@@ -76,15 +75,15 @@ static const uint32_t KEY_LENGTH = 32;
 
 void KVDBGeneralStoreTest::InitMetaData()
 {
-    metaData_.bundleName = bundleName;
-    metaData_.appId = bundleName;
+    metaData_.bundleName  = BUNDLE_NAME;
+    metaData_.appId = BUNDLE_NAME;
     metaData_.user = "0";
     metaData_.area = OHOS::DistributedKv::EL1;
     metaData_.instanceId = 0;
     metaData_.isAutoSync = true;
     metaData_.storeType = DistributedKv::KvStoreType::SINGLE_VERSION;
-    metaData_.storeId = storeName;
-    metaData_.dataDir = "/data/service/el1/public/database/" + std::string(bundleName) + "/kvdb";
+    metaData_.storeId = STORE_NAME;
+    metaData_.dataDir = "/data/service/el1/public/database/" + std::string(BUNDLE_NAME) + "/kvdb";
     metaData_.securityLevel = SecurityLevel::S2;
 }
 
@@ -404,7 +403,7 @@ HWTEST_F(KVDBGeneralStoreTest, BusyClose, TestSize.Level0)
 HWTEST_F(KVDBGeneralStoreTest, SyncTest, TestSize.Level0)
 {
     ZLOGI("SyncTest start");
-    mkdir(("/data/service/el1/public/database/" + std::string(bundleName)).c_str(),
+    mkdir(("/data/service/el1/public/database/" + std::string(BUNDLE_NAME)).c_str(),
         (S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH));
     auto store = new (std::nothrow) KVDBGeneralStore(metaData_);
     ASSERT_NE(store, nullptr);
@@ -540,14 +539,14 @@ HWTEST_F(KVDBGeneralStoreTest, CloudSync001, TestSize.Level0)
 {
     auto store = new (std::nothrow) KVDBGeneralStore(metaData_);
     ASSERT_NE(store, nullptr);
-    store->SetEqualIdentifier(bundleName, storeName);
+    store->SetEqualIdentifier(BUNDLE_NAME, STORE_NAME);
     KvStoreNbDelegateMock mockDelegate;
     store->delegate_ = &mockDelegate;
     std::vector<std::string> devices = { "device1", "device2" };
     auto asyncs = [](const GenDetails &result) {};
     store->storeInfo_.user = 0;
     auto cloudSyncMode = DistributedDB::SyncMode::SYNC_MODE_PUSH_ONLY;
-    store->SetEqualIdentifier(bundleName, storeName);
+    store->SetEqualIdentifier(BUNDLE_NAME, STORE_NAME);
     std::string prepareTraceId;
     std::vector<int> users;
     EXPECT_CALL(*accountDelegateMock, QueryUsers(_)).Times(1).WillOnce(DoAll(SetArgReferee<0>(users), Return(false)));
@@ -568,20 +567,22 @@ HWTEST_F(KVDBGeneralStoreTest, CloudSync002, TestSize.Level0)
 {
     auto store = new (std::nothrow) KVDBGeneralStore(metaData_);
     ASSERT_NE(store, nullptr);
-    store->SetEqualIdentifier(bundleName, storeName);
+    store->SetEqualIdentifier(BUNDLE_NAME, STORE_NAME);
     KvStoreNbDelegateMock mockDelegate;
     store->delegate_ = &mockDelegate;
     std::vector<std::string> devices = { "device1", "device2" };
     auto asyncs = [](const GenDetails &result) {};
     store->storeInfo_.user = 0;
     auto cloudSyncMode = DistributedDB::SyncMode::SYNC_MODE_PUSH_ONLY;
-    store->SetEqualIdentifier(bundleName, storeName);
+    store->SetEqualIdentifier(BUNDLE_NAME, STORE_NAME);
     std::string prepareTraceId;
     std::vector<int> users;
     EXPECT_CALL(*accountDelegateMock, QueryUsers(_))
         .Times(1)
-        .WillOnce(
-            DoAll(SetArgReferee<0>(users), Invoke([](std::vector<int> &users) { users.clear(); }), Return(true)));
+        .WillOnce(DoAll(
+            SetArgReferee<0>(users),
+            Invoke([](std::vector<int>& users) { users.clear(); }),
+            Return(true)));
     auto ret = store->CloudSync(devices, cloudSyncMode, asyncs, 0, prepareTraceId);
     EXPECT_EQ(ret, DBStatus::DB_ERROR);
 
@@ -604,14 +605,14 @@ HWTEST_F(KVDBGeneralStoreTest, CloudSync003, TestSize.Level0)
 {
     auto store = new (std::nothrow) KVDBGeneralStore(metaData_);
     ASSERT_NE(store, nullptr);
-    store->SetEqualIdentifier(bundleName, storeName);
+    store->SetEqualIdentifier(BUNDLE_NAME, STORE_NAME);
     KvStoreNbDelegateMock mockDelegate;
     store->delegate_ = &mockDelegate;
     std::vector<std::string> devices = { "device1", "device2" };
     auto asyncs = [](const GenDetails &result) {};
     store->storeInfo_.user = 0;
     auto cloudSyncMode = DistributedDB::SyncMode::SYNC_MODE_PUSH_ONLY;
-    store->SetEqualIdentifier(bundleName, storeName);
+    store->SetEqualIdentifier(BUNDLE_NAME, STORE_NAME);
     std::string prepareTraceId;
     std::vector<int> users = {0, 1};
     EXPECT_CALL(*accountDelegateMock, QueryUsers(_))
@@ -654,7 +655,7 @@ HWTEST_F(KVDBGeneralStoreTest, GetIdentifierParams, TestSize.Level0)
 */
 HWTEST_F(KVDBGeneralStoreTest, Sync002, TestSize.Level0)
 {
-    mkdir(("/data/service/el1/public/database/" + std::string(bundleName)).c_str(),
+    mkdir(("/data/service/el1/public/database/" + std::string(BUNDLE_NAME)).c_str(),
         (S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH));
     auto store = new (std::nothrow) KVDBGeneralStore(metaData_);
     ASSERT_NE(store, nullptr);
@@ -689,7 +690,7 @@ HWTEST_F(KVDBGeneralStoreTest, Sync002, TestSize.Level0)
 */
 HWTEST_F(KVDBGeneralStoreTest, Sync003, TestSize.Level0)
 {
-    mkdir(("/data/service/el1/public/database/" + std::string(bundleName)).c_str(),
+    mkdir(("/data/service/el1/public/database/" + std::string(BUNDLE_NAME)).c_str(),
         (S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH));
     auto store = new (std::nothrow) KVDBGeneralStore(metaData_);
     ASSERT_NE(store, nullptr);
@@ -974,7 +975,7 @@ HWTEST_F(KVDBGeneralStoreTest, GetDBOption001, TestSize.Level0)
 */
 HWTEST_F(KVDBGeneralStoreTest, Sync001, TestSize.Level0)
 {
-    mkdir(("/data/service/el1/public/database/" + std::string(bundleName)).c_str(),
+    mkdir(("/data/service/el1/public/database/" + std::string(BUNDLE_NAME)).c_str(),
         (S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH));
     auto store = new (std::nothrow) KVDBGeneralStore(metaData_);
     ASSERT_NE(store, nullptr);
@@ -1209,7 +1210,7 @@ HWTEST_F(KVDBGeneralStoreTest, ConstructorTest, TestSize.Level0)
     delete store3;
 
     // Test observer registration
-    metaData_.storeId = storeName;
+    metaData_.storeId = STORE_NAME;
     metaData_.storeType = DistributedKv::KvStoreType::SINGLE_VERSION;
     auto store4 = new (std::nothrow) KVDBGeneralStore(metaData_);
     ASSERT_NE(store4, nullptr);