diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn
index 62d8ffc17ebad29e49b1001aa17ae5b1e5e92085..307ba0d388c5486169ff3dfc97b41c7b435fd6fe 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn
@@ -62,7 +62,10 @@ ohos_unittest("AccessManagerTest") {
     "LOG_DOMAIN=0xD004100",
   ]
 
-  external_deps = [ "init:libbegetutil" ]
+  external_deps = [
+    "c_utils:utils",
+    "init:libbegetutil",
+  ]
 }
 
 group("unittest") {
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp
index 49e18d06c57663990a400b1a8e74fc6c178098eb..299db1e347d9de9e5118ef72e5f284765672010d 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp
+++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/access_manager_test.cpp
@@ -15,12 +15,16 @@
 
 #include <algorithm>
 #include <chrono>
+#include <securec.h>
 #include <thread>
 #include <vector>
 
 #include "gtest/gtest.h"
 
+#define private public
 #include "access_manager.h"
+#undef private
+#include "dm_device_info.h"
 #include "distributed_hardware_errno.h"
 #include "distributed_hardware_manager_factory.h"
 using namespace testing::ext;
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp
index 7838556d0c6294349c6a13ea90677f705f28f816..875f6b8325e821832562ed1f88b1ad8bfc763948 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp
+++ b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/src/component_loader_test.cpp
@@ -160,5 +160,70 @@ HWTEST_F(ComponentLoaderTest, component_loader_test_008, TestSize.Level0)
     auto vec = ComponentLoader::GetInstance().GetAllCompTypes();
     EXPECT_EQ(vec.size(), ComponentLoader::GetInstance().compHandlerMap_.size());
 }
+
+/**
+ * @tc.name: component_loader_test_009
+ * @tc.desc: Verify the GetHandler function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSK3
+ */
+HWTEST_F(ComponentLoaderTest, component_loader_test_009, TestSize.Level0)
+{
+    std::string soNameEmpty = "";
+    auto handler = ComponentLoader::GetInstance().GetHandler(soNameEmpty);
+    EXPECT_EQ(nullptr, handler);
+}
+
+/**
+ * @tc.name: component_loader_test_010
+ * @tc.desc: Verify the GetHandler function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSK3
+ */
+HWTEST_F(ComponentLoaderTest, component_loader_test_010, TestSize.Level0)
+{
+    std::string soName = "NON_EXISTENT_SO";
+    auto handler = ComponentLoader::GetInstance().GetHandler(soName);
+    EXPECT_EQ(nullptr, handler);
+}
+
+/**
+ * @tc.name: component_loader_test_011
+ * @tc.desc: Verify the GetCompPathAndVersion function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSK3
+ */
+HWTEST_F(ComponentLoaderTest, component_loader_test_011, TestSize.Level0)
+{
+    std::string jsonStr = "";
+    std::map<DHType, CompConfig> dhtypeMap;
+    int32_t ret = ComponentLoader::GetInstance().GetCompPathAndVersion(jsonStr, dhtypeMap);
+    EXPECT_EQ(ERR_DH_FWK_JSON_PARSE_FAILED, ret);
+}
+
+/**
+ * @tc.name: component_loader_test_012
+ * @tc.desc: Verify the IsDHTypeExist function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSK3
+ */
+HWTEST_F(ComponentLoaderTest, component_loader_test_012, TestSize.Level0)
+{
+    bool ret = ComponentLoader::GetInstance().IsDHTypeExist(DHType::CAMERA);
+    EXPECT_EQ(true, ret);
+}
+
+/**
+ * @tc.name: component_loader_test_013
+ * @tc.desc: Verify the GetSourceSaId function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSK3
+ */
+HWTEST_F(ComponentLoaderTest, component_loader_test_013, TestSize.Level0)
+{
+    const int32_t INVALID_SA_ID = -1;
+    int32_t ret = ComponentLoader::GetInstance().GetSourceSaId(DHType::UNKNOWN);
+    EXPECT_EQ(INVALID_SA_ID, ret);
+}
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/src/component_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/src/component_manager_test.cpp
index a09736fa7048bfe2009a2d9814c98ff9b5d12ae5..021ca2236c730de383859429172d6a6d9d8368d2 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/src/component_manager_test.cpp
+++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/src/component_manager_test.cpp
@@ -309,6 +309,22 @@ HWTEST_F(ComponentManagerTest, enable_test_004, TestSize.Level0)
     thread6.join();
 }
 
+/**
+ * @tc.name: enable_test_005
+ * @tc.desc: Verify the Enable for Multi-thread
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSK7
+ */
+HWTEST_F(ComponentManagerTest, Enable_test_005, TestSize.Level0)
+{
+    std::string networkId = "";
+    std::string uuid = "";
+    std::string dhId = "";
+    ComponentManager::GetInstance().compSource_.clear();
+    auto ret = ComponentManager::GetInstance().Enable(networkId, uuid, dhId, DHType::CAMERA);
+    EXPECT_EQ(ERR_DH_FWK_PARA_INVALID, ret);
+}
+
 /**
  * @tc.name: disable_test_001
  * @tc.desc: Verify the Disable success
@@ -376,6 +392,22 @@ HWTEST_F(ComponentManagerTest, disable_test_004, TestSize.Level0)
     thread6.join();
 }
 
+/**
+ * @tc.name: disable_test_005
+ * @tc.desc: Verify the Disable for Multi-thread
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSK9
+ */
+HWTEST_F(ComponentManagerTest, Disable_test_005, TestSize.Level0)
+{
+    std::string networkId = "";
+    std::string uuid = "";
+    std::string dhId = "";
+    ComponentManager::GetInstance().compSource_.clear();
+    auto ret = ComponentManager::GetInstance().Disable(networkId, uuid, dhId, DHType::CAMERA);
+    EXPECT_EQ(ERR_DH_FWK_PARA_INVALID, ret);
+}
+
 /**
  * @tc.name: init_compSource_test_001
  * @tc.desc: Verify the InitCompSource
@@ -436,7 +468,7 @@ HWTEST_F(ComponentManagerTest, get_enableparam_test_001, TestSize.Level0)
     EnableParam param;
     auto ret = ComponentManager::GetInstance().GetEnableParam(NETWORK_TEST, UUID_TEST,
         DH_ID_1, DHType::CAMERA, param);
-    EXPECT_EQ(ret, DH_FWK_SUCCESS);
+    EXPECT_EQ(DH_FWK_SUCCESS, ret);
 }
 
 /**
@@ -462,7 +494,21 @@ HWTEST_F(ComponentManagerTest, get_sinkversion_fromvermgr_test_001, TestSize.Lev
     VersionManager::GetInstance().AddDHVersion(UUID_TEST, dhVersion);
     std::string sinkVersion;
     auto ret = ComponentManager::GetInstance().GetSinkVersionFromVerMgr(UUID_TEST, DHType::CAMERA, sinkVersion);
-    EXPECT_EQ(ret, DH_FWK_SUCCESS);
+    EXPECT_EQ(DH_FWK_SUCCESS, ret);
+}
+
+/**
+ * @tc.name: GetDHType_test_001
+ * @tc.desc: Verify the GetDHType
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSK9
+ */
+HWTEST_F(ComponentManagerTest, GetDHType_test_001, TestSize.Level0)
+{
+    std::string uuid = "distribueted_111222333";
+    std::string dhId = "camera_1234567489";
+    auto ret = ComponentManager::GetInstance().GetDHType(uuid, dhId);
+    EXPECT_EQ(DHType::UNKNOWN, ret);
 }
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp
index 17387888d32bd87cd7012827e3d0aa0c16e99a95..c7932d019e9a9c7597a35c964507da4206c0feaf 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp
+++ b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/src/db_adapter_test.cpp
@@ -40,6 +40,7 @@ namespace DistributedHardware {
 
 namespace {
 const string DATABASE_DIR = "/data/service/el1/public/database/dtbhardware_manager_service/";
+const std::string DEV_NETWORK_ID_1 = "nt36a637105409e904d4da83790a4a9";
 const string TEST_DEV_ID_0 = "bb536a637105409e904d4da83791aa11";
 const string TEST_DEV_ID_1 = "bb536a637105409e904d4da83791bb22";
 const string TEST_DEV_ID_2 = "bb536a637105409e904d4da83791bb33";
@@ -122,7 +123,7 @@ void DbAdapterTest::TearDown()
  */
 HWTEST_F(DbAdapterTest, db_adapter_test_000, TestSize.Level0)
 {
-    EXPECT_EQ(g_dbAdapterPtr->Init(), DH_FWK_SUCCESS);
+    EXPECT_EQ(DH_FWK_SUCCESS, g_dbAdapterPtr->Init());
 }
 
 /**
@@ -144,7 +145,7 @@ HWTEST_F(DbAdapterTest, db_adapter_test_001, TestSize.Level0)
         keys.push_back(key);
         values.push_back(resInfo->ToJsonString());
     }
-    EXPECT_EQ(g_dbAdapterPtr->PutDataBatch(keys, values), DH_FWK_SUCCESS);
+    EXPECT_EQ(DH_FWK_SUCCESS, g_dbAdapterPtr->PutDataBatch(keys, values));
     for (auto &resInfo : resInfos) {
         g_dbAdapterPtr->RemoveDataByKey(resInfo->GetKey());
     }
@@ -161,7 +162,7 @@ HWTEST_F(DbAdapterTest, db_adapter_test_002, TestSize.Level0)
     std::vector<std::string> keys { std::string(TEST_DEV_ID_2 + TEST_DH_ID_0) };
     std::vector<std::string> values { TEST_DH_ATTR_0 };
 
-    EXPECT_EQ(g_dbAdapterPtr->PutDataBatch(keys, values), DH_FWK_SUCCESS);
+    EXPECT_EQ(DH_FWK_SUCCESS, g_dbAdapterPtr->PutDataBatch(keys, values));
     g_dbAdapterPtr->RemoveDataByKey(keys[0]);
 }
 
@@ -176,7 +177,7 @@ HWTEST_F(DbAdapterTest, db_adapter_test_003, TestSize.Level0)
     std::vector<std::string> keys { std::string(TEST_DEV_ID_2 + TEST_DH_ID_0) };
     std::vector<std::string> valuesEmpty;
 
-    EXPECT_EQ(g_dbAdapterPtr->PutDataBatch(keys, valuesEmpty), ERR_DH_FWK_PARA_INVALID);
+    EXPECT_EQ(ERR_DH_FWK_PARA_INVALID, g_dbAdapterPtr->PutDataBatch(keys, valuesEmpty));
 }
 
 /**
@@ -190,7 +191,7 @@ HWTEST_F(DbAdapterTest, db_adapter_test_004, TestSize.Level0)
     std::vector<std::string> keysEmpty;
     std::vector<std::string> values { TEST_DH_ATTR_0 };
 
-    EXPECT_EQ(g_dbAdapterPtr->PutDataBatch(keysEmpty, values), ERR_DH_FWK_PARA_INVALID);
+    EXPECT_EQ(ERR_DH_FWK_PARA_INVALID, g_dbAdapterPtr->PutDataBatch(keysEmpty, values));
 }
 
 /**
@@ -204,7 +205,7 @@ HWTEST_F(DbAdapterTest, db_adapter_test_005, TestSize.Level0)
     std::vector<std::string> keysEmpty;
     std::vector<std::string> valuesEmpty;
 
-    EXPECT_EQ(g_dbAdapterPtr->PutDataBatch(keysEmpty, valuesEmpty), ERR_DH_FWK_PARA_INVALID);
+    EXPECT_EQ(ERR_DH_FWK_PARA_INVALID, g_dbAdapterPtr->PutDataBatch(keysEmpty, valuesEmpty));
 }
 
 /**
@@ -218,7 +219,7 @@ HWTEST_F(DbAdapterTest, db_adapter_test_006, TestSize.Level0)
     std::vector<std::string> keys { std::string(TEST_DEV_ID_2 + TEST_DH_ID_0) };
     std::vector<std::string> values { TEST_DH_ATTR_0, TEST_DH_ATTR_1 };
 
-    EXPECT_EQ(g_dbAdapterPtr->PutDataBatch(keys, values), ERR_DH_FWK_PARA_INVALID);
+    EXPECT_EQ(ERR_DH_FWK_PARA_INVALID, g_dbAdapterPtr->PutDataBatch(keys, values));
 }
 
 /**
@@ -233,7 +234,107 @@ HWTEST_F(DbAdapterTest, db_adapter_test_007, TestSize.Level0)
     std::vector<std::string> keys { std::string(TEST_DEV_ID_2 + TEST_DH_ID_0) };
     std::vector<std::string> values { TEST_DH_ATTR_0 };
 
-    EXPECT_EQ(g_dbAdapterPtr->PutDataBatch(keys, values), ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL);
+    EXPECT_EQ(ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL, g_dbAdapterPtr->PutDataBatch(keys, values));
+}
+
+/**
+ * @tc.name: db_adapter_test_008
+ * @tc.desc: Verify the ReInit function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSCV
+ */
+HWTEST_F(DbAdapterTest, db_adapter_test_008, TestSize.Level0)
+{
+    g_dbAdapterPtr->kvStoragePtr_ = nullptr;
+    EXPECT_EQ(ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL, g_dbAdapterPtr->ReInit());
+}
+
+/**
+ * @tc.name: db_adapter_test_009
+ * @tc.desc: Verify the RemoveDeviceData function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSCV
+ */
+HWTEST_F(DbAdapterTest, db_adapter_test_009, TestSize.Level0)
+{
+    g_dbAdapterPtr->kvStoragePtr_ = nullptr;
+    EXPECT_EQ(ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL, g_dbAdapterPtr->RemoveDeviceData(TEST_DEV_ID_0));
+}
+
+/**
+ * @tc.name: db_adapter_test_010
+ * @tc.desc: Verify the RemoveDataByKey function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSCV
+ */
+HWTEST_F(DbAdapterTest, db_adapter_test_010, TestSize.Level0)
+{
+    g_dbAdapterPtr->kvStoragePtr_ = nullptr;
+    EXPECT_EQ(ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL, g_dbAdapterPtr->RemoveDataByKey("key"));
+}
+
+/**
+ * @tc.name: db_adapter_test_011
+ * @tc.desc: Verify the ManualSync function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSCV
+ */
+HWTEST_F(DbAdapterTest, db_adapter_test_011, TestSize.Level0)
+{
+    std::string networkId = DEV_NETWORK_ID_1;
+    g_dbAdapterPtr->kvStoragePtr_ = nullptr;
+    EXPECT_EQ(ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL, g_dbAdapterPtr->ManualSync(DEV_NETWORK_ID_1));
+}
+
+/**
+ * @tc.name: db_adapter_test_012
+ * @tc.desc: Verify the UnRegisterChangeListener function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSCV
+ */
+HWTEST_F(DbAdapterTest, db_adapter_test_012, TestSize.Level0)
+{
+    g_dbAdapterPtr->kvStoragePtr_ = nullptr;
+    EXPECT_EQ(ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL, g_dbAdapterPtr->UnRegisterChangeListener());
+}
+
+/**
+ * @tc.name: db_adapter_test_013
+ * @tc.desc: Verify the PutData function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSCV
+ */
+HWTEST_F(DbAdapterTest, db_adapter_test_013, TestSize.Level0)
+{
+    std::string key = std::string(TEST_DEV_ID_1 + TEST_DH_ID_1);
+    std::string value = TEST_DH_ATTR_0;
+    g_dbAdapterPtr->kvStoragePtr_ = nullptr;
+    EXPECT_EQ(ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL, g_dbAdapterPtr->PutData(key, value));
+}
+
+/**
+ * @tc.name: db_adapter_test_014
+ * @tc.desc: Verify the RegisterChangeListener function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSCV
+ */
+HWTEST_F(DbAdapterTest, db_adapter_test_014, TestSize.Level0)
+{
+    std::string networkId = DEV_NETWORK_ID_1;
+    g_dbAdapterPtr->kvStoragePtr_ = nullptr;
+    EXPECT_EQ(ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL, g_dbAdapterPtr->RegisterChangeListener());
+}
+
+/**
+ * @tc.name: db_adapter_test_015
+ * @tc.desc: Verify the UnRegisterChangeListener function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSCV
+ */
+HWTEST_F(DbAdapterTest, db_adapter_test_015, TestSize.Level0)
+{
+    g_dbAdapterPtr->kvStoragePtr_ = nullptr;
+    EXPECT_EQ(ERR_DH_FWK_RESOURCE_KV_STORAGE_POINTER_NULL, g_dbAdapterPtr->UnRegisterChangeListener());
 }
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/src/distributed_hardware_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/src/distributed_hardware_manager_test.cpp
index dcf836cc134cded7f0fa736ab6cdedefea1e0ac3..5c66fe4fe750893f2dc789deeb772e065ec39467 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/src/distributed_hardware_manager_test.cpp
+++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/src/distributed_hardware_manager_test.cpp
@@ -168,5 +168,28 @@ HWTEST_F(DistributedHardwareManagerTest, sendOffLineEvent_test_003, TestSize.Lev
     ASSERT_EQ(DH_FWK_SUCCESS, TaskBoard::GetInstance().WaitForALLTaskFinish());
     ASSERT_TRUE(TaskBoard::GetInstance().IsAllTaskFinish());
 }
+
+/**
+ * @tc.name: Release_001
+ * @tc.desc: Verify the Release function
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSJM
+ */
+HWTEST_F(DistributedHardwareManagerTest, Release_001, TestSize.Level0)
+{
+    EXPECT_EQ(DH_FWK_SUCCESS, DistributedHardwareManager::GetInstance().Release());
+}
+
+/**
+ * @tc.name: GetComponentVersion_001
+ * @tc.desc: Verify the GetComponentVersion function
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSJM
+ */
+HWTEST_F(DistributedHardwareManagerTest, RGetComponentVersion_001, TestSize.Level0)
+{
+    std::unordered_map<DHType, std::string> versionMap;
+    EXPECT_NE(DH_FWK_SUCCESS, DistributedHardwareManager::GetInstance().GetComponentVersion(versionMap));
+}
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/src/distributed_hardware_service_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/src/distributed_hardware_service_test.cpp
index 2e6e5fe95a7b5b57ef20d6d45faef12d91485147..5b4419142f0464b2484b5358e3cedc8fb4c01e56 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/src/distributed_hardware_service_test.cpp
+++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/src/distributed_hardware_service_test.cpp
@@ -136,5 +136,34 @@ HWTEST_F(DistributedHardwareServiceTest, dump_test_001, TestSize.Level0)
     ret = service.Dump(fd, std::vector<std::u16string> { ARGS_C });
     EXPECT_EQ(ret, DH_FWK_SUCCESS);
 }
+
+/**
+ * @tc.name: OnStart_001
+ * @tc.desc: Verify the OnStart function
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSJM
+ */
+HWTEST_F(DistributedHardwareServiceTest, OnStart_001, TestSize.Level0)
+{
+    DistributedHardwareService service(ASID, true);
+    service.state_ = ServiceRunningState::STATE_RUNNING;
+    service.OnStart();
+    service.OnStop();
+    EXPECT_EQ(ServiceRunningState::STATE_NOT_START, service.state_);
+}
+
+/**
+ * @tc.name: Init_001
+ * @tc.desc: Verify the Init function
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSJM
+ */
+HWTEST_F(DistributedHardwareServiceTest, Init_001, TestSize.Level0)
+{
+    DistributedHardwareService service(ASID, true);
+    service.registerToService_ = false;
+
+    EXPECT_EQ(false, service.Init());
+}
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp
index c37786b31762904316ecd17e61b008ec538c6a71..6d6513b478ff5d471093348a13a24088f8e27f7f 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp
+++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp
@@ -372,5 +372,99 @@ HWTEST_F(ResourceManagerTest, resource_manager_test_013, TestSize.Level0)
         DH_FWK_SUCCESS);
     EXPECT_EQ(capMap.size(), TEST_SIZE_10);
 }
+
+/**
+ * @tc.name: resource_manager_test_014
+ * @tc.desc: Verify the RemoveCapabilityInfoInDB function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSJE
+ */
+HWTEST_F(ResourceManagerTest, resource_manager_test_014, TestSize.Level0)
+{
+    std::string deviceIdEmpty = "";
+    int32_t ret = CapabilityInfoManager::GetInstance()->RemoveCapabilityInfoInDB(deviceIdEmpty);
+    EXPECT_EQ(ERR_DH_FWK_PARA_INVALID, ret);
+}
+
+/**
+ * @tc.name: resource_manager_test_015
+ * @tc.desc: Verify the GetCapabilityByValue function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSJE
+ */
+HWTEST_F(ResourceManagerTest, resource_manager_test_015, TestSize.Level0)
+{
+    std::string value = "";
+    std::shared_ptr<CapabilityInfo> capPtr = nullptr;
+    int32_t ret = CapabilityUtils::GetCapabilityByValue(value, capPtr);
+    EXPECT_EQ(ERR_DH_FWK_JSON_PARSE_FAILED, ret);
+}
+
+/**
+ * @tc.name: resource_manager_test_016
+ * @tc.desc: Verify the GetCapabilityKey function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSJE
+ */
+HWTEST_F(ResourceManagerTest, resource_manager_test_016, TestSize.Level0)
+{
+    std::string deviceId = "deviceIdtest";
+    std::string dhId = "dhIdtest";
+    std::string str = CapabilityUtils::GetCapabilityKey(deviceId, dhId);
+    EXPECT_EQ("deviceIdtest###dhIdtest", str);
+}
+
+/**
+ * @tc.name: resource_manager_test_017
+ * @tc.desc: Verify the IsCapKeyMatchDeviceId function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSJE
+ */
+HWTEST_F(ResourceManagerTest, resource_manager_test_017, TestSize.Level0)
+{
+    std::string key = "keytest";
+    bool ret = CapabilityUtils::IsCapKeyMatchDeviceId(key, DEV_ID_0);
+    EXPECT_EQ(false, ret);
+}
+
+/**
+ * @tc.name: resource_manager_test_018
+ * @tc.desc: Verify the IsCapKeyMatchDeviceId function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSJE
+ */
+HWTEST_F(ResourceManagerTest, resource_manager_test_018, TestSize.Level0)
+{
+    std::string key = "bb536a637105409e904d4da83790a4a7###keytest";
+    bool ret = CapabilityUtils::IsCapKeyMatchDeviceId(key, DEV_ID_0);
+    EXPECT_EQ(true, ret);
+}
+
+/**
+ * @tc.name: resource_manager_test_019
+ * @tc.desc: Verify the FromJsonString function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSJE
+ */
+HWTEST_F(ResourceManagerTest, resource_manager_test_019, TestSize.Level0)
+{
+    CapabilityInfo capaInfo;
+    std::string jsonStr = "";
+    int32_t ret = capaInfo.FromJsonString(jsonStr);
+    EXPECT_EQ(ERR_DH_FWK_JSON_PARSE_FAILED, ret);
+}
+
+/**
+ * @tc.name: resource_manager_test_020
+ * @tc.desc: Verify the Compare function.
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSJE
+ */
+HWTEST_F(ResourceManagerTest, resource_manager_test_020, TestSize.Level0)
+{
+    CapabilityInfo capaInfo(DH_ID_0, DEV_ID_0, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::CAMERA, DH_ATTR_0);
+    bool ret = CAP_INFO_1->Compare(capaInfo);
+    EXPECT_EQ(false, ret);
+}
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/src/version_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/src/version_manager_test.cpp
index 4193cc1bd7bf96163bee2b6848965430fbcff0a1..e7a82bda295fd0fa6fad1ef3b6801fa3475a5f48 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/src/version_manager_test.cpp
+++ b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/src/version_manager_test.cpp
@@ -154,5 +154,26 @@ HWTEST_F(VersionManagerTest, version_manager_test_005, TestSize.Level0)
     ret = VersionManager::GetInstance().RemoveDHVersion(TEST_DEVICE_ID_1);
     EXPECT_EQ(DH_FWK_SUCCESS, ret);
 }
+
+/**
+ * @tc.name: version_manager_test_006
+ * @tc.desc: Verify GetCompVersion function
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSKN
+ */
+HWTEST_F(VersionManagerTest, version_manager_test_006, TestSize.Level0)
+{
+    DHVersion dhVersion;
+    CompVersion cVs1;
+    CompVersionGetValue(cVs1, TEST_COMPONENT_NAME_1, DHType::CAMERA, TEST_HANDLER_VERSION_1, TEST_SOURCE_VERSION_1,
+        TEST_SINK_VERSION_1);
+    dhVersion.uuid = TEST_DEVICE_ID_1;
+    dhVersion.dhVersion = TEST_DH_VERSION;
+    dhVersion.compVersions.insert(std::make_pair(cVs1.dhType, cVs1));
+    int32_t ret = VersionManager::GetInstance().AddDHVersion(dhVersion.uuid, dhVersion);
+    EXPECT_EQ(DH_FWK_SUCCESS, ret);
+    ret = VersionManager::GetInstance().GetCompVersion(TEST_DEVICE_ID_1, DHType::CAMERA, cVs1);
+    EXPECT_EQ(DH_FWK_SUCCESS, ret);
+}
 } // namespace DistributedHardware
 } // namespace OHOS
diff --git a/utils/include/eventbus/event_bus.h b/utils/include/eventbus/event_bus.h
index 9e4f013e0ffe691bcbf444899a8742d7ab620bc3..9989f194ad820f7ed1763ce7534651e62209b992 100644
--- a/utils/include/eventbus/event_bus.h
+++ b/utils/include/eventbus/event_bus.h
@@ -57,7 +57,7 @@ public:
         }
     }
 
-    EventBus(const std::string &threadName)
+    explicit EventBus(const std::string &threadName)
     {
         ULOGI("ctor EventBus threadName: %s", threadName.c_str());
         if (eventbusHandler_ == nullptr) {
diff --git a/utils/test/unittest/common/utilstool/utils_tool_test.cpp b/utils/test/unittest/common/utilstool/utils_tool_test.cpp
index b8981972b12e9b0bb773b8b36cd2d6321d97730a..e43067bf0cc72186ebe9492fc97eeae8c31bd66e 100644
--- a/utils/test/unittest/common/utilstool/utils_tool_test.cpp
+++ b/utils/test/unittest/common/utilstool/utils_tool_test.cpp
@@ -120,5 +120,44 @@ HWTEST_F(UtilsToolTest, utils_tool_test_004, TestSize.Level0)
     ASSERT_STRNE(std::to_string(i4).c_str(), GetAnonyInt32(i4).c_str());
     ASSERT_STRNE(std::to_string(i5).c_str(), GetAnonyInt32(i5).c_str());
 }
+
+/**
+ * @tc.name: utils_tool_test_005
+ * @tc.desc: Verify the GetUUIDBySoftBus function
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSK0
+ */
+HWTEST_F(UtilsToolTest, utils_tool_test_005, TestSize.Level0)
+{
+    std::string networkId = "";
+    std::string ret = GetUUIDBySoftBus(networkId);
+    EXPECT_EQ(0, ret.size());
+}
+
+/**
+ * @tc.name: utils_tool_test_006
+ * @tc.desc: Verify the GetDeviceIdByUUID function
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSK0
+ */
+HWTEST_F(UtilsToolTest, utils_tool_test_006, TestSize.Level0)
+{
+    std::string uuidEmpty = "";
+    std::string ret = GetDeviceIdByUUID(uuidEmpty);
+    ASSERT_EQ(0, ret.size());
+}
+
+/**
+ * @tc.name: utils_tool_test_007
+ * @tc.desc: Verify the GetDeviceIdByUUID function
+ * @tc.type: FUNC
+ * @tc.require: AR000GHSK0
+ */
+HWTEST_F(UtilsToolTest, utils_tool_test_007, TestSize.Level0)
+{
+    std::string uuid = "bb536a637105409e904d4da78290ab1";
+    std::string ret = GetDeviceIdByUUID(uuid);
+    ASSERT_NE(0, ret.size());
+}
 } // namespace DistributedHardware
 } // namespace OHOS