diff --git a/distributedhardwarefwk.gni b/distributedhardwarefwk.gni
index 1d1ada75bf49400dc0720e2b3658495341c69512..3727b4cf947591a184530f9a3f36dab5d9628b0c 100644
--- a/distributedhardwarefwk.gni
+++ b/distributedhardwarefwk.gni
@@ -11,7 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-distributedhardwarefwk_path = "//foundation/distributedhardware/distributedhardwarefwk"
+distributedhardwarefwk_path =
+    "//foundation/distributedhardware/distributedhardwarefwk"
 
 common_path = "${distributedhardwarefwk_path}/common"
 
diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn
index 3fd69ff76613a5a557aa346f3a77c435df0478b8..c9d4ba6001344563c7ab2c1ea8e1e32d5ee33e36 100644
--- a/services/distributedhardwarefwkservice/BUILD.gn
+++ b/services/distributedhardwarefwkservice/BUILD.gn
@@ -41,8 +41,8 @@ ohos_shared_library("distributedhardwarefwksvr") {
   deps = [
     "${services_path}/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl",
     "${utils_path}:distributedhardwareutils",
-    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
-    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
+    "//foundation/ability/ability_runtime/interfaces/innerkits/ability_manager:ability_manager",
+    "//foundation/ability/ability_runtime/services/abilitymgr:abilityms",
     "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk",
     "//utils/native/base:utils",
   ]
diff --git a/services/distributedhardwarefwkservice/test/unittest/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/BUILD.gn
index bdee75a090671759eaff5f5bb7fa0c80c6ee1ddc..def0e61e6ed2f35d37c6b2cdb39e3e2bbb18126b 100644
--- a/services/distributedhardwarefwkservice/test/unittest/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/BUILD.gn
@@ -14,5 +14,5 @@
 group("test") {
   testonly = true
 
-  deps = [ "common/accessmanager:AccessManagerTest", ]
+  deps = [ "common/accessmanager:AccessManagerTest" ]
 }
diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn
index 5fc00a80c409c9b5d70c20c3c6187aa3839fed7a..74c8c30e69fc95cc712b0a8da4ea37851e091b9b 100644
--- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn
+++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn
@@ -12,7 +12,8 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni")
+import(
+    "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni")
 
 module_out_path = "distributed_hardware_fwk/access_manager_test"
 
@@ -35,20 +36,20 @@ ohos_unittest("AccessManagerTest") {
   module_out_path = module_out_path
 
   sources = [
-    "${services_path}/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp",
     "${services_path}/distributedhardwarefwkservice/src/accessmanager/access_manager.cpp",
+    "${services_path}/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp",
   ]
 
-  sources += ["access_manager_test.cpp"]
+  sources += [ "access_manager_test.cpp" ]
 
-  configs = [":module_private_config"]
+  configs = [ ":module_private_config" ]
 
   deps = [
-    "//third_party/googletest:gtest_main",
     "${utils_path}:distributedhardwareutils",
+    "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk",
     "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkservice:distributedhardwarefwksvr",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
-    "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk",
+    "//third_party/googletest:gtest_main",
   ]
   defines = [
     "HI_LOG_ENABLE",
diff --git a/services/distributedhardwarefwkserviceimpl/BUILD.gn b/services/distributedhardwarefwkserviceimpl/BUILD.gn
index 6e3b3a20217fd08611be789314fcc1bdbe12138d..59a0695e9394668bb093e026bbb1433ea2e90d72 100644
--- a/services/distributedhardwarefwkserviceimpl/BUILD.gn
+++ b/services/distributedhardwarefwkserviceimpl/BUILD.gn
@@ -66,8 +66,8 @@ ohos_shared_library("distributedhardwarefwksvr_impl") {
 
   deps = [
     "${utils_path}:distributedhardwareutils",
-    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
-    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
+    "//foundation/ability/ability_runtime/interfaces/innerkits/ability_manager:ability_manager",
+    "//foundation/ability/ability_runtime/services/abilitymgr:abilityms",
     "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
     "//utils/native/base:utils",
   ]
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/unittest/BUILD.gn
index 58d73d37175bec18109670091e98bb2925b0a44d..81f9d266baf2d70b6561f80ef80c763cd9bde775 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/BUILD.gn
+++ b/services/distributedhardwarefwkserviceimpl/test/unittest/BUILD.gn
@@ -14,11 +14,11 @@
 group("svrimpl_test") {
   testonly = true
   deps = [
-    "common/task:dh_task_test",
-    "common/componentmanager:component_manager_test",
-    "common/versionmanager:version_manager_test",
+    "common:distributed_hardware_manager_test",
     "common/componentloader:component_loader_test",
+    "common/componentmanager:component_manager_test",
     "common/resourcemanager:resource_manager_test",
-    "common:distributed_hardware_manager_test",
+    "common/task:dh_task_test",
+    "common/versionmanager:version_manager_test",
   ]
-}
\ No newline at end of file
+}
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/unittest/common/BUILD.gn
index be5ddaf0fb815bf70a403ac25e2d3b7e0a9adfe8..1c07a3a238566041b4c9afae212c2dc17733adc5 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/BUILD.gn
+++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/BUILD.gn
@@ -12,7 +12,9 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni")
+import(
+    "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni")
+
 module_out_path = "distributed_hardware_fwk/dh_manager_test"
 
 config("module_private_config") {
@@ -34,17 +36,15 @@ config("module_private_config") {
 ohos_unittest("DistributedHardwareManagerTest") {
   module_out_path = module_out_path
 
-  sources = [
-    "distributed_hardware_manager_test.cpp"
-  ]
+  sources = [ "distributed_hardware_manager_test.cpp" ]
 
   configs = [ ":module_private_config" ]
 
   deps = [
-    "//third_party/googletest:gtest_main",
-    "//third_party/googletest:gmock_main",
+    "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl",
     "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils",
-    "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl"
+    "//third_party/googletest:gmock_main",
+    "//third_party/googletest:gtest_main",
   ]
 
   defines = [
@@ -56,9 +56,9 @@ ohos_unittest("DistributedHardwareManagerTest") {
   external_deps = [
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "dsoftbus_standard:softbus_client",
     "eventhandler:libeventhandler",
     "hiviewdfx_hilog_native:libhilog",
-    "dsoftbus_standard:softbus_client",
   ]
 }
 
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/BUILD.gn
index e7a4ecf751633f1f8c860d2d4df0e53eb6ac3ef0..c94546ee99a3991382845c48656c5c6e9061954e 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/BUILD.gn
+++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentloader/BUILD.gn
@@ -12,7 +12,9 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni")
+import(
+    "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni")
+
 module_out_path = "distributed_hardware_fwk/component_loader_test"
 
 config("module_private_config") {
@@ -33,15 +35,13 @@ config("module_private_config") {
 ohos_unittest("ComponentLoaderTest") {
   module_out_path = module_out_path
 
-  sources = [
-    "src/component_loader_test.cpp"
-  ]
+  sources = [ "src/component_loader_test.cpp" ]
 
   configs = [ ":module_private_config" ]
 
   deps = [
+    "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl",
     "//third_party/googletest:gtest_main",
-    "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl"
   ]
 
   defines = [
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/BUILD.gn
index 5b83af89f7d433d6103299fc77313932be62c9bd..82f4f3ce8b43c57332ecdf3627eebef3a6d05547 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/BUILD.gn
+++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/componentmanager/BUILD.gn
@@ -12,7 +12,9 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni")
+import(
+    "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni")
+
 module_out_path = "distributed_hardware_fwk/component_manager_test"
 
 config("module_private_config") {
@@ -33,17 +35,15 @@ config("module_private_config") {
 ohos_unittest("ComponentManagerTest") {
   module_out_path = module_out_path
 
-  sources = [
-    "src/component_manager_test.cpp"
-  ]
+  sources = [ "src/component_manager_test.cpp" ]
 
   configs = [ ":module_private_config" ]
 
   deps = [
-    "//third_party/googletest:gtest_main",
-    "//third_party/googletest:gmock_main",
+    "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl",
     "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils",
-    "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl"
+    "//third_party/googletest:gmock_main",
+    "//third_party/googletest:gtest_main",
   ]
 
   defines = [
@@ -52,9 +52,7 @@ ohos_unittest("ComponentManagerTest") {
     "LOG_DOMAIN=0xD004100",
   ]
 
-  external_deps = [
-    "ipc:ipc_core",
-  ]
+  external_deps = [ "ipc:ipc_core" ]
 }
 
 group("component_manager_test") {
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/BUILD.gn
index 05ce090eb526ec5fab7e9bf520580992a7c25ad7..bcf729a8182966735fd1d5501fccf2afe6364b4a 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/BUILD.gn
+++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/resourcemanager/BUILD.gn
@@ -12,7 +12,9 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni")
+import(
+    "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni")
+
 module_out_path = "distributed_hardware_fwk/resource_manager_test"
 
 config("module_private_config") {
@@ -30,7 +32,7 @@ config("module_private_config") {
     "//utils/native/base/include",
     "//third_party/json/include",
     "//utils/native/base/include",
-    "//utils/system/safwk/native/include"
+    "//utils/system/safwk/native/include",
   ]
 }
 
@@ -38,25 +40,23 @@ config("module_private_config") {
 ohos_unittest("ResourceManagerTest") {
   module_out_path = module_out_path
 
-  sources = [
-    "src/resource_manager_test.cpp"
-  ]
+  sources = [ "src/resource_manager_test.cpp" ]
 
   configs = [ ":module_private_config" ]
 
   deps = [
+    "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl",
+    "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils",
     "//third_party/googletest:gtest_main",
     "//utils/native/base:utils",
-    "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils",
-    "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl"
   ]
 
   external_deps = [
     "bundle_framework:appexecfwk_base",
     "bundle_framework:appexecfwk_core",
+    "distributeddatamgr:distributeddata_inner",
     "eventhandler:libeventhandler",
     "hiviewdfx_hilog_native:libhilog",
-    "distributeddatamgr:distributeddata_inner"
   ]
 }
 
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/BUILD.gn
index aae4510615849d29fd89f49efe5b90ee99500616..d4b88904a6bd36eeb3711d1d4462abb1cfc1b31d 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/BUILD.gn
+++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/task/BUILD.gn
@@ -12,7 +12,9 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni")
+import(
+    "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni")
+
 module_out_path = "distributed_hardware_fwk/dh_task_test"
 
 config("module_private_config") {
@@ -40,15 +42,15 @@ ohos_unittest("DHTaskTest") {
     "src/mock_offline_task.cpp",
     "src/mock_online_task.cpp",
     "src/mock_task_factory.cpp",
-    "src/task_test.cpp"
+    "src/task_test.cpp",
   ]
 
   configs = [ ":module_private_config" ]
 
   deps = [
-    "//third_party/googletest:gtest_main",
+    "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl",
     "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils",
-    "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl"
+    "//third_party/googletest:gtest_main",
   ]
 
   defines = [
diff --git a/services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/BUILD.gn b/services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/BUILD.gn
index 094574fbc5abccd775c6f2ea5c11abc454e0fba2..b9d63e31ceafd826bc0cd2ea2296d31386a6b142 100644
--- a/services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/BUILD.gn
+++ b/services/distributedhardwarefwkserviceimpl/test/unittest/common/versionmanager/BUILD.gn
@@ -12,7 +12,9 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni")
+import(
+    "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni")
+
 module_out_path = "distributed_hardware_fwk/version_manager_test"
 
 config("module_private_config") {
@@ -34,15 +36,13 @@ config("module_private_config") {
 ohos_unittest("VersionManagerTest") {
   module_out_path = module_out_path
 
-  sources = [
-    "src/version_manager_test.cpp"
-  ]
+  sources = [ "src/version_manager_test.cpp" ]
 
   configs = [ ":module_private_config" ]
 
   deps = [
+    "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl",
     "//third_party/googletest:gtest_main",
-    "//foundation/distributedhardware/distributedhardwarefwk/services/distributedhardwarefwkserviceimpl:distributedhardwarefwksvr_impl"
   ]
 
   defines = [
diff --git a/utils/test/unittest/BUILD.gn b/utils/test/unittest/BUILD.gn
index 705c81df6acac1f218389414079320ac9eaeba9d..1ff1b02e22c02518865cbfe7f399e1e3c9c75d92 100644
--- a/utils/test/unittest/BUILD.gn
+++ b/utils/test/unittest/BUILD.gn
@@ -15,6 +15,6 @@ group("utils_test") {
   testonly = true
   deps = [
     "common/eventbus:event_bus_test",
-    "common/utilstool:utils_tool_test"
+    "common/utilstool:utils_tool_test",
   ]
-}
\ No newline at end of file
+}
diff --git a/utils/test/unittest/common/utilstool/BUILD.gn b/utils/test/unittest/common/utilstool/BUILD.gn
index 4e67c6e97acf9e43ddfc7607eff5611be8aa8af9..1bf17c0484cfc8231999d475879faf941420767e 100644
--- a/utils/test/unittest/common/utilstool/BUILD.gn
+++ b/utils/test/unittest/common/utilstool/BUILD.gn
@@ -12,7 +12,9 @@
 # limitations under the License.
 
 import("//build/test.gni")
-import("//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni")
+import(
+    "//foundation/distributedhardware/distributedhardwarefwk/distributedhardwarefwk.gni")
+
 module_out_path = "distributed_hardware_fwk/utils_tool_test"
 
 config("module_private_config") {
@@ -30,13 +32,14 @@ config("module_private_config") {
 ohos_unittest("UtilsToolTest") {
   module_out_path = module_out_path
 
-  sources = [ "${utils_path}/test/unittest/common/utilstool/utils_tool_test.cpp" ]
+  sources =
+      [ "${utils_path}/test/unittest/common/utilstool/utils_tool_test.cpp" ]
 
   configs = [ ":module_private_config" ]
 
   deps = [
+    "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils",
     "//third_party/googletest:gtest_main",
-    "//foundation/distributedhardware/distributedhardwarefwk/utils:distributedhardwareutils"
   ]
 }