From e0e781e607a7e26a8726cd6fbc4acd2cf14ea663 Mon Sep 17 00:00:00 2001 From: shiqichang Date: Sat, 28 May 2022 15:25:34 +0800 Subject: [PATCH] =?UTF-8?q?aafwk=E7=9B=AE=E5=BD=95=E5=88=87=E6=8D=A2abilit?= =?UTF-8?q?y=5Fability=5Fruntime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shiqichang Change-Id: Ie6182ffa7df71ba63e9de94193ba87d9d6e74842 --- distributedhardwarefwk.gni | 3 ++- .../distributedhardwarefwkservice/BUILD.gn | 4 ++-- .../test/unittest/BUILD.gn | 2 +- .../unittest/common/accessmanager/BUILD.gn | 13 +++++++------ .../distributedhardwarefwkserviceimpl/BUILD.gn | 4 ++-- .../test/unittest/BUILD.gn | 10 +++++----- .../test/unittest/common/BUILD.gn | 16 ++++++++-------- .../unittest/common/componentloader/BUILD.gn | 10 +++++----- .../unittest/common/componentmanager/BUILD.gn | 18 ++++++++---------- .../unittest/common/resourcemanager/BUILD.gn | 16 ++++++++-------- .../test/unittest/common/task/BUILD.gn | 10 ++++++---- .../unittest/common/versionmanager/BUILD.gn | 10 +++++----- utils/test/unittest/BUILD.gn | 4 ++-- utils/test/unittest/common/utilstool/BUILD.gn | 9 ++++++--- 14 files changed, 67 insertions(+), 62 deletions(-) diff --git a/distributedhardwarefwk.gni b/distributedhardwarefwk.gni index 1d1ada75..3727b4cf 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 3fd69ff7..c9d4ba60 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 bdee75a0..def0e61e 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 5fc00a80..74c8c30e 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 6e3b3a20..59a0695e 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 58d73d37..81f9d266 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 be5ddaf0..1c07a3a2 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 e7a4ecf7..c94546ee 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 5b83af89..82f4f3ce 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 05ce090e..bcf729a8 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 aae45106..d4b88904 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 094574fb..b9d63e31 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 705c81df..1ff1b02e 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 4e67c6e9..1bf17c04 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" ] } -- Gitee