From cdee4c4e443d38b48b57699d0c45f5deb57647f8 Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Mon, 12 May 2025 17:17:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96so=20rom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-tiangang4 --- .../test/unittest/BUILD.gn | 3 +- .../av_trans_engine/av_receiver/BUILD.gn | 7 - .../test/unittest/av_receiver_engine/BUILD.gn | 6 +- .../av_receiver_engine_provider/BUILD.gn | 6 +- .../av_trans_engine/av_sender/BUILD.gn | 6 - .../test/unittest/av_sender_engine/BUILD.gn | 6 +- .../av_sender_engine_provider/BUILD.gn | 6 +- av_transport/framework/BUILD.gn | 4 - bundle.json | 2 - common/utils/include/constants.h | 68 +-- interfaces/inner_kits/BUILD.gn | 1 - .../distributedhardwarefwkkit_fuzzer/BUILD.gn | 3 +- .../BUILD.gn | 3 +- .../common/distributedhardwarefwkkit/BUILD.gn | 1 - .../common/ipc/dhfwk_sa_manager/BUILD.gn | 1 - .../ipc/distributed_hardware_proxy/BUILD.gn | 1 - .../hardware_status_listener_stub/BUILD.gn | 1 - .../ipc/publisher_listener_stub/BUILD.gn | 1 - interfaces/kits/napi/BUILD.gn | 9 - .../native_distributedhardwarefwk_js.h | 3 +- .../src/native_distributedhardwarefwk_js.cpp | 6 +- .../distributedhardwarefwkservice/BUILD.gn | 3 - .../resourcemanager/meta_info_manager.h | 1 - .../src/componentloader/component_loader.cpp | 138 +---- .../componentmanager/component_disable.cpp | 6 +- .../src/componentmanager/component_enable.cpp | 6 +- .../src/hidumphelper/enabled_comps_dump.cpp | 5 +- .../src/hidumphelper/hidump_helper.cpp | 1 + .../plugin_listener_impl.cpp | 3 +- .../src/lowlatency/low_latency_listener.cpp | 6 +- .../src/resourcemanager/capability_info.cpp | 30 +- .../resourcemanager/meta_capability_info.cpp | 40 +- .../src/resourcemanager/meta_info_manager.cpp | 20 - .../src/resourcemanager/version_info.cpp | 40 +- .../src/task/disable_task.cpp | 5 +- .../src/task/enable_task.cpp | 5 +- .../src/task/meta_disable_task.cpp | 4 + .../src/task/meta_enable_task.cpp | 3 + .../src/task/offline_task.cpp | 2 +- .../src/task/task.cpp | 7 +- .../src/task/task_board.cpp | 2 - .../src/task/task_executor.cpp | 4 +- .../src/transport/dh_transport.cpp | 1 + .../src/utils/dh_context.cpp | 9 +- .../src/utils/dh_timer.cpp | 6 +- .../fuzztest/accessmanager_fuzzer/BUILD.gn | 1 - .../accessmanageroffline_fuzzer/BUILD.gn | 1 - .../capabilityinfomanager_fuzzer/BUILD.gn | 2 - .../capabilityinfomanager_fuzzer.cpp | 18 +- .../fuzztest/componentdisable_fuzzer/BUILD.gn | 2 - .../fuzztest/componentenable_fuzzer/BUILD.gn | 2 - .../fuzztest/componentloader_fuzzer/BUILD.gn | 2 - .../fuzztest/componentmanager_fuzzer/BUILD.gn | 1 - .../test/fuzztest/dhcommtool_fuzzer/BUILD.gn | 1 - .../fuzztest/dhmanagerfactory_fuzzer/BUILD.gn | 1 - .../test/fuzztest/dhtransport_fuzzer/BUILD.gn | 1 - .../distributedfwkservices_fuzzer/BUILD.gn | 1 - .../fuzztest/enabledcompsdump_fuzzer/BUILD.gn | 1 - .../test/fuzztest/metainfomgr_fuzzer/BUILD.gn | 2 - .../metainfomgr_fuzzer/metainfomgr_fuzzer.cpp | 12 +- .../test/fuzztest/publisher_fuzzer/BUILD.gn | 1 - .../fuzztest/publisheritem_fuzzer/BUILD.gn | 1 - .../fuzztest/resourcemanager_fuzzer/BUILD.gn | 2 - .../test/fuzztest/task_fuzzer/BUILD.gn | 1 - .../versioninfomanager_fuzzer/BUILD.gn | 2 - .../unittest/common/accessmanager/BUILD.gn | 2 - .../unittest/common/componentloader/BUILD.gn | 2 - .../src/component_loader_test.cpp | 495 +----------------- .../component_manager/BUILD.gn | 2 - .../component_monitior/BUILD.gn | 2 - .../component_privacy/BUILD.gn | 2 - .../test/unittest/common/dbadapter/BUILD.gn | 2 - .../distributedhardwaremanager/BUILD.gn | 1 - .../distributedhardwareservice/BUILD.gn | 2 - .../common/distributedhardwarestub/BUILD.gn | 2 - .../common/hidumphelper/hidumphelper/BUILD.gn | 2 - .../localhardwaremanager/BUILD.gn | 2 - .../pluginlistenerimpl/BUILD.gn | 2 - .../unittest/common/resourcemanager/BUILD.gn | 2 - .../resourcemanager/capability_info_test.cpp | 70 +-- .../resourcemanager/meta_cap_info_test.cpp | 110 ++-- .../meta_info_manager_test.cpp | 48 +- .../resourcemanager/resource_manager_test.cpp | 12 +- .../resourcemanager/version_info_test.cpp | 30 +- .../test/unittest/common/task/BUILD.gn | 1 - .../test/unittest/common/transport/BUILD.gn | 1 - .../unittest/common/utils/dh_context_test.cpp | 12 +- .../common/versioninfomanager/BUILD.gn | 2 - .../src/version_info_manager_test.cpp | 8 +- .../unittest/common/versionmanager/BUILD.gn | 2 - utils/BUILD.gn | 2 - utils/include/log/dh_log.h | 41 -- utils/test/fuzztest/utils_fuzzer/BUILD.gn | 1 - .../common/histreamer_ability_parser/BUILD.gn | 1 - utils/test/unittest/common/utilstool/BUILD.gn | 1 - 95 files changed, 289 insertions(+), 1119 deletions(-) delete mode 100644 utils/include/log/dh_log.h diff --git a/av_transport/av_trans_control_center/test/unittest/BUILD.gn b/av_transport/av_trans_control_center/test/unittest/BUILD.gn index 6ae39c15..42b720d8 100644 --- a/av_transport/av_trans_control_center/test/unittest/BUILD.gn +++ b/av_transport/av_trans_control_center/test/unittest/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023-2024 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -29,7 +29,6 @@ config("module_private_config") { "${engine_path}/av_receiver/include", "${engine_path}/av_sender/include", "${engine_path}/filters/av_transport_input", - "${distributedhardwarefwk_path}/utils/include/eventbus", "${control_center_path}/inner_kits/include", "${control_center_path}/services/include", "${control_center_path}/services/include/ipc", diff --git a/av_transport/av_trans_engine/av_receiver/BUILD.gn b/av_transport/av_trans_engine/av_receiver/BUILD.gn index 09e2050b..5a083660 100644 --- a/av_transport/av_trans_engine/av_receiver/BUILD.gn +++ b/av_transport/av_trans_engine/av_receiver/BUILD.gn @@ -47,7 +47,6 @@ ohos_shared_library("distributed_av_receiver") { "${engine_path}/av_receiver/include", "${interface_path}", "${dh_fwk_utils_path}/include", - "${dh_fwk_utils_path}/include", "${control_center_path}/inner_kits/include", "${control_center_path}/inner_kits/include/ipc", "${filters_path}/av_transport_input", @@ -109,14 +108,8 @@ ohos_shared_library("distributed_av_receiver") { "cJSON:cjson", "c_utils:utils", "dsoftbus:softbus_client", - "graphic_2d:libgraphic_utils", - "graphic_surface:surface", "hilog:libhilog", - "hisysevent:libhisysevent", - "hitrace:hitrace_meter", "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] remove_configs = [ diff --git a/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine/BUILD.gn b/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine/BUILD.gn index b1b6ca17..4e31909f 100644 --- a/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine/BUILD.gn +++ b/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -86,8 +86,6 @@ ohos_unittest("AvReceiverEngineTest") { "c_utils:utils", "dsoftbus:softbus_client", "googletest:gtest", - "graphic_2d:libgraphic_utils", - "graphic_surface:surface", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", @@ -167,8 +165,6 @@ ohos_unittest("AvAudioReceiverEngineTest") { "c_utils:utils", "dsoftbus:softbus_client", "googletest:gtest", - "graphic_2d:libgraphic_utils", - "graphic_surface:surface", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", diff --git a/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine_provider/BUILD.gn b/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine_provider/BUILD.gn index 92af9458..c93f8bd3 100644 --- a/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine_provider/BUILD.gn +++ b/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine_provider/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -85,8 +85,6 @@ ohos_unittest("AvReceiverEngineProviderTest") { "c_utils:utils", "dsoftbus:softbus_client", "googletest:gtest", - "graphic_2d:libgraphic_utils", - "graphic_surface:surface", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", @@ -169,8 +167,6 @@ ohos_unittest("AvAudioReceiverEngineProviderTest") { "c_utils:utils", "dsoftbus:softbus_client", "googletest:gtest", - "graphic_2d:libgraphic_utils", - "graphic_surface:surface", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", diff --git a/av_transport/av_trans_engine/av_sender/BUILD.gn b/av_transport/av_trans_engine/av_sender/BUILD.gn index 6f074dc6..ac2dd8a5 100644 --- a/av_transport/av_trans_engine/av_sender/BUILD.gn +++ b/av_transport/av_trans_engine/av_sender/BUILD.gn @@ -103,14 +103,8 @@ ohos_shared_library("distributed_av_sender") { "cJSON:cjson", "c_utils:utils", "dsoftbus:softbus_client", - "graphic_2d:libgraphic_utils", - "graphic_surface:surface", "hilog:libhilog", - "hisysevent:libhisysevent", - "hitrace:hitrace_meter", "ipc:ipc_core", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] remove_configs = [ diff --git a/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/BUILD.gn b/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/BUILD.gn index 4f42a4a3..d44da2b5 100644 --- a/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/BUILD.gn +++ b/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -87,8 +87,6 @@ ohos_unittest("AvSenderEngineTest") { "c_utils:utils", "dsoftbus:softbus_client", "googletest:gtest", - "graphic_2d:libgraphic_utils", - "graphic_surface:surface", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", @@ -171,8 +169,6 @@ ohos_unittest("AvAudioSenderEngineTest") { "c_utils:utils", "dsoftbus:softbus_client", "googletest:gtest", - "graphic_2d:libgraphic_utils", - "graphic_surface:surface", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", diff --git a/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine_provider/BUILD.gn b/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine_provider/BUILD.gn index a1ddf1f7..b2c42b5c 100644 --- a/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine_provider/BUILD.gn +++ b/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine_provider/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Huawei Device Co., Ltd. +# Copyright (c) 2023-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -87,8 +87,6 @@ ohos_unittest("AvSenderEngineProviderTest") { "c_utils:utils", "dsoftbus:softbus_client", "googletest:gtest", - "graphic_2d:libgraphic_utils", - "graphic_surface:surface", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", @@ -173,8 +171,6 @@ ohos_unittest("AvAudioSenderEngineProviderTest") { "c_utils:utils", "dsoftbus:softbus_client", "googletest:gtest", - "graphic_2d:libgraphic_utils", - "graphic_surface:surface", "hilog:libhilog", "hisysevent:libhisysevent", "hitrace:hitrace_meter", diff --git a/av_transport/framework/BUILD.gn b/av_transport/framework/BUILD.gn index 2e0e6990..fd187f12 100644 --- a/av_transport/framework/BUILD.gn +++ b/av_transport/framework/BUILD.gn @@ -76,13 +76,9 @@ ohos_shared_library("distributed_av_pipeline_fwk") { "c_utils:utils", "dsoftbus:softbus_client", "hilog:libhilog", - "hisysevent:libhisysevent", - "hitrace:hitrace_meter", "ipc:ipc_core", "media_foundation:media_foundation", "media_foundation:native_media_core", - "safwk:system_ability_fwk", - "samgr:samgr_proxy", ] if (histreamer_compile_part) { diff --git a/bundle.json b/bundle.json index edb2210a..5b6bfe3d 100644 --- a/bundle.json +++ b/bundle.json @@ -51,8 +51,6 @@ "init", "kv_store", "resource_schedule_service", - "graphic_2d", - "graphic_surface", "media_foundation", "bounds_checking_function", "openssl", diff --git a/common/utils/include/constants.h b/common/utils/include/constants.h index 2da0b285..a0fd24b8 100644 --- a/common/utils/include/constants.h +++ b/common/utils/include/constants.h @@ -22,8 +22,6 @@ namespace OHOS { namespace DistributedHardware { constexpr int32_t LOG_MAX_LEN = 4096; - constexpr int32_t ENABLE_TIMEOUT_MS = 1000; - constexpr int32_t DISABLE_TIMEOUT_MS = 500; constexpr uint32_t MAX_MESSAGE_LEN = 40 * 1024 * 1024; constexpr uint32_t MIN_MESSAGE_LEN = 0; constexpr uint32_t MAX_ID_LEN = 256; @@ -41,62 +39,42 @@ namespace DistributedHardware { constexpr uint32_t MAX_HASH_SIZE = 64; constexpr uint32_t MAX_KEY_SIZE = 256; constexpr uint32_t MAX_DH_DESCRIPTOR_ARRAY_SIZE = 4096; + const uint32_t EVENT_VERSION_INFO_DB_RECOVER = 101; + const uint32_t EVENT_CAPABILITY_INFO_DB_RECOVER = 201; + const uint32_t EVENT_DATA_SYNC_MANUAL = 301; + const uint32_t EVENT_META_INFO_DB_RECOVER = 401; const std::string LOW_LATENCY_KEY = "identity"; - const std::u16string DHMS_STUB_INTERFACE_TOKEN = u"ohos.distributedhardware.accessToken"; const std::string APP_ID = "dtbhardware_manager_service"; const std::string GLOBAL_CAPABILITY_ID = "global_capability_info"; const std::string GLOBAL_VERSION_ID = "global_version_info"; const std::string LOCAL_CAPABILITY_ID = "local_capability_info"; const std::string GLOBAL_META_INFO = "global_meta_info"; const std::string RESOURCE_SEPARATOR = "###"; - const std::string DH_ID = "dh_id"; - const std::string DEV_ID = "dev_id"; - const std::string DEV_NAME = "dev_name"; - const std::string DEV_TYPE = "dev_type"; - const std::string DH_TYPE = "dh_type"; - const std::string DH_ATTRS = "dh_attrs"; - const std::string DH_SUBTYPE = "dh_subtype"; - const std::string DEV_UDID_HASH = "udid_hash"; - const std::string DH_LOG_TITLE_TAG = "DHFWK"; - const std::string DH_VER = "dh_ver"; - const std::string COMP_VER = "comp_ver"; - const std::string NAME = "name"; - const std::string TYPE = "type"; - const std::string HANDLER = "handler"; - const std::string SOURCE_VER = "source_ver"; - const std::string SINK_VER = "sink_ver"; - const std::string SOURCE_FEATURE_FILTER = "source_feature_filter"; - const std::string SINK_SUPPORTED_FEATURE = "sink_supported_feature"; - const std::string DH_TASK_NAME_PREFIX = "Task_"; const std::string DH_FWK_PKG_NAME = "ohos.dhardware"; - const std::string DH_FWK_SESSION_NAME = "ohos.dhardware.session_"; - const std::string DH_COMPONENT_VERSIONS = "componentVersions"; - const std::string DH_COMPONENT_TYPE = "dhType"; - const std::string DH_COMPONENT_SINK_VER = "version"; - const std::string DH_COMPONENT_DEFAULT_VERSION = "1.0"; - const std::string LOW_LATENCY_ENABLE = "low_latency_enable"; + + constexpr const char *DH_ID = "dh_id"; + constexpr const char *DEV_ID = "dev_id"; + constexpr const char *DEV_NAME = "dev_name"; + constexpr const char *DEV_TYPE = "dev_type"; + constexpr const char *DH_TYPE = "dh_type"; + constexpr const char *DH_ATTRS = "dh_attrs"; + constexpr const char *DH_SUBTYPE = "dh_subtype"; + constexpr const char *DEV_UDID_HASH = "udid_hash"; + constexpr const char *DH_VER = "dh_ver"; + constexpr const char *COMP_VER = "comp_ver"; + constexpr const char *NAME = "name"; + constexpr const char *TYPE = "type"; + constexpr const char *HANDLER = "handler"; + constexpr const char *SOURCE_VER = "source_ver"; + constexpr const char *SINK_VER = "sink_ver"; + constexpr const char *SOURCE_FEATURE_FILTER = "source_feature_filter"; + constexpr const char *SINK_SUPPORTED_FEATURE = "sink_supported_feature"; + constexpr const char *LOW_LATENCY_ENABLE = "low_latency_enable"; constexpr const char *DO_RECOVER = "DoRecover"; constexpr const char *SEND_ONLINE = "SendOnLine"; - constexpr const char *DISABLE_TASK_INNER = "DisableTask"; - constexpr const char *ENABLE_TASK_INNER = "EnableTask"; - constexpr const char *META_DISABLE_TASK_INNER = "MetaDisableTask"; - constexpr const char *META_ENABLE_TASK_INNER = "MetaEnableTask"; - constexpr const char *OFFLINE_TASK_INNER = "OffLineTask"; - constexpr const char *TRIGGER_TASK = "TriggerTask"; - constexpr const char *EVENT_RUN = "EventRun"; - constexpr const char *START_EVENT = "StartEvent"; constexpr const char *COMPONENTSLOAD_PROFILE_PATH = "etc/distributedhardware/distributed_hardware_components_cfg.json"; - - const uint32_t EVENT_VERSION_INFO_DB_RECOVER = 101; - const uint32_t EVENT_CAPABILITY_INFO_DB_RECOVER = 201; - const uint32_t EVENT_DATA_SYNC_MANUAL = 301; - const uint32_t EVENT_META_INFO_DB_RECOVER = 401; - - const std::string ISOMERISM_EVENT_KEY = "isomerism_event"; - const std::string ISOMERISM_EVENT_CONNECT_VAL = "isomerism_connect"; - const std::string ISOMERISM_EVENT_DISCONNECT_VAL = "isomerism_disconnect"; } // namespace DistributedHardware } // namespace OHOS #endif diff --git a/interfaces/inner_kits/BUILD.gn b/interfaces/inner_kits/BUILD.gn index 0b9a495e..0d6f0583 100644 --- a/interfaces/inner_kits/BUILD.gn +++ b/interfaces/inner_kits/BUILD.gn @@ -43,7 +43,6 @@ ohos_shared_library("libdhfwk_sdk") { "${common_path}/log/include", "${common_path}/utils/include", "${utils_path}/include", - "${utils_path}/include/log", "${services_path}/distributedhardwarefwkservice/include", ] diff --git a/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn b/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn index 6cd9d1f7..f2d874b4 100644 --- a/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkkit_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2022-2023 Huawei Device Co., Ltd. +# Copyright (c) 2022-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -27,7 +27,6 @@ ohos_fuzztest("DistributedHardwareFwkKitFuzzTest") { "${av_trans_path}/common/include", "include", "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", "${common_path}/log/include", "${services_path}/distributedhardwarefwkservice/include", diff --git a/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkstub_fuzzer/BUILD.gn b/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkstub_fuzzer/BUILD.gn index 531c7e53..a344a08b 100644 --- a/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkstub_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/test/fuzztest/distributedhardwarefwkstub_fuzzer/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2024 Huawei Device Co., Ltd. +# Copyright (c) 2024-2025 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -26,7 +26,6 @@ ohos_fuzztest("DistributedHardwareFwkStubFuzzTest") { "${av_trans_path}/common/include", "include", "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", "${common_path}/log/include", "${services_path}/distributedhardwarefwkservice/include", diff --git a/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn b/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn index 347ad53e..913a5577 100644 --- a/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn +++ b/interfaces/inner_kits/test/unittest/common/distributedhardwarefwkkit/BUILD.gn @@ -23,7 +23,6 @@ config("module_private_config") { "${av_trans_path}/common/include", "include", "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", "${common_path}/log/include", "${innerkits_path}/include", diff --git a/interfaces/inner_kits/test/unittest/common/ipc/dhfwk_sa_manager/BUILD.gn b/interfaces/inner_kits/test/unittest/common/ipc/dhfwk_sa_manager/BUILD.gn index 7fa2025f..2b65e96b 100644 --- a/interfaces/inner_kits/test/unittest/common/ipc/dhfwk_sa_manager/BUILD.gn +++ b/interfaces/inner_kits/test/unittest/common/ipc/dhfwk_sa_manager/BUILD.gn @@ -23,7 +23,6 @@ config("module_private_config") { "${av_trans_path}/common/include", "include", "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", "${common_path}/log/include", "${innerkits_path}/include", diff --git a/interfaces/inner_kits/test/unittest/common/ipc/distributed_hardware_proxy/BUILD.gn b/interfaces/inner_kits/test/unittest/common/ipc/distributed_hardware_proxy/BUILD.gn index 241f428d..c9bdd2c4 100644 --- a/interfaces/inner_kits/test/unittest/common/ipc/distributed_hardware_proxy/BUILD.gn +++ b/interfaces/inner_kits/test/unittest/common/ipc/distributed_hardware_proxy/BUILD.gn @@ -23,7 +23,6 @@ config("module_private_config") { "${av_trans_path}/common/include", "include", "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", "${common_path}/log/include", "${innerkits_path}/include", diff --git a/interfaces/inner_kits/test/unittest/common/ipc/hardware_status_listener_stub/BUILD.gn b/interfaces/inner_kits/test/unittest/common/ipc/hardware_status_listener_stub/BUILD.gn index 62773a0e..a6fd17dc 100644 --- a/interfaces/inner_kits/test/unittest/common/ipc/hardware_status_listener_stub/BUILD.gn +++ b/interfaces/inner_kits/test/unittest/common/ipc/hardware_status_listener_stub/BUILD.gn @@ -22,7 +22,6 @@ config("module_private_config") { "${av_trans_path}/common/include", "include", "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", "${common_path}/log/include", "${innerkits_path}/include", diff --git a/interfaces/inner_kits/test/unittest/common/ipc/publisher_listener_stub/BUILD.gn b/interfaces/inner_kits/test/unittest/common/ipc/publisher_listener_stub/BUILD.gn index 1a0f5f25..3da38ba0 100644 --- a/interfaces/inner_kits/test/unittest/common/ipc/publisher_listener_stub/BUILD.gn +++ b/interfaces/inner_kits/test/unittest/common/ipc/publisher_listener_stub/BUILD.gn @@ -23,7 +23,6 @@ config("module_private_config") { "${av_trans_path}/common/include", "include", "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", "${common_path}/log/include", "${innerkits_path}/include", diff --git a/interfaces/kits/napi/BUILD.gn b/interfaces/kits/napi/BUILD.gn index e5ad6f8d..b57cb752 100644 --- a/interfaces/kits/napi/BUILD.gn +++ b/interfaces/kits/napi/BUILD.gn @@ -28,21 +28,13 @@ ohos_shared_library("hardwaremanager") { "${common_path}/utils/include", "${innerkits_path}/include", "${innerkits_path}/include/ipc", - "${services_path}/distributedhardwarefwkservice/include/componentmanager", - "${services_path}/distributedhardwarefwkservice/include/lowlatency", - "${services_path}/distributedhardwarefwkservice/include/utils", - "${services_path}/distributedhardwarefwkservice/include/task", - "${services_path}/distributedhardwarefwkservice/include/resourcemanager", "${av_trans_path}/common/include", - "${utils_path}/include/log", ] sources = [ "src/native_distributedhardwarefwk_js.cpp" ] deps = [ "${distributedhardwarefwk_path}/interfaces/inner_kits:libdhfwk_sdk", - "${services_path}/distributedhardwarefwkservice:distributedhardwarefwksvr", - "${utils_path}:distributedhardwareutils", ] defines = [ @@ -68,7 +60,6 @@ ohos_shared_library("hardwaremanager") { external_deps = [ "access_token:libtokenid_sdk", "bundle_framework:appexecfwk_base", - "cJSON:cjson", "hilog:libhilog", "ipc:ipc_core", "napi:ace_napi", diff --git a/interfaces/kits/napi/include/native_distributedhardwarefwk_js.h b/interfaces/kits/napi/include/native_distributedhardwarefwk_js.h index bf6a0052..0be3038e 100644 --- a/interfaces/kits/napi/include/native_distributedhardwarefwk_js.h +++ b/interfaces/kits/napi/include/native_distributedhardwarefwk_js.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -20,7 +20,6 @@ #include "napi/native_api.h" #include "napi/native_node_api.h" -#include "cJSON.h" constexpr int32_t ALL = 0; constexpr int32_t CAMERA = 1; diff --git a/interfaces/kits/napi/src/native_distributedhardwarefwk_js.cpp b/interfaces/kits/napi/src/native_distributedhardwarefwk_js.cpp index 41e892ab..16872f13 100644 --- a/interfaces/kits/napi/src/native_distributedhardwarefwk_js.cpp +++ b/interfaces/kits/napi/src/native_distributedhardwarefwk_js.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023-2024 Huawei Device Co., Ltd. + * Copyright (c) 2023-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,11 +15,11 @@ #include "native_distributedhardwarefwk_js.h" -#include "device_type.h" #include "ipc_skeleton.h" #include "js_native_api.h" #include "tokenid_kit.h" -#include "cJSON.h" + +#include "device_type.h" #include "distributed_hardware_log.h" #include "distributed_hardware_fwk_kit.h" diff --git a/services/distributedhardwarefwkservice/BUILD.gn b/services/distributedhardwarefwkservice/BUILD.gn index fc1776f9..a5ffe399 100644 --- a/services/distributedhardwarefwkservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/BUILD.gn @@ -37,7 +37,6 @@ ohos_shared_library("distributedhardwarefwksvr") { "${innerkits_path}/include/ipc", "${common_path}/log/include", "${common_path}/utils/include", - "${utils_path}/include/log", "${utils_path}/include", "include/componentloader", "include/versionmanager", @@ -50,7 +49,6 @@ ohos_shared_library("distributedhardwarefwksvr") { "include/resourcemanager", "include/hidumphelper", "include/ipc", - "${utils_path}/include/eventbus", "include/lowlatency", ] @@ -59,7 +57,6 @@ ohos_shared_library("distributedhardwarefwksvr") { "${av_center_svc_path}/src/av_trans_control_center.cpp", "${av_center_svc_path}/src/ipc/av_trans_control_center_callback_proxy.cpp", "${av_trans_path}/common/src/av_sync_utils.cpp", - "${av_trans_path}/common/src/av_trans_log.cpp", "${av_trans_path}/common/src/av_trans_message.cpp", "${av_trans_path}/common/src/softbus_channel_adapter.cpp", "src/accessmanager/access_manager.cpp", diff --git a/services/distributedhardwarefwkservice/include/resourcemanager/meta_info_manager.h b/services/distributedhardwarefwkservice/include/resourcemanager/meta_info_manager.h index 3fa19cb8..cf872134 100644 --- a/services/distributedhardwarefwkservice/include/resourcemanager/meta_info_manager.h +++ b/services/distributedhardwarefwkservice/include/resourcemanager/meta_info_manager.h @@ -44,7 +44,6 @@ public: int32_t SyncMetaInfoFromDB(const std::string &udidHash); int32_t SyncRemoteMetaInfos(); int32_t GetDataByKeyPrefix(const std::string &keyPrefix, MetaCapInfoMap &metaCapMap); - int32_t RemoveMetaInfoByKey(const std::string &key); int32_t RemoveMetaInfoInMemByUdid(const std::string &peerudid); int32_t GetMetaCapInfo(const std::string &udidHash, const std::string &dhId, std::shared_ptr &metaCapPtr); diff --git a/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp b/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp index 63225e94..7e21a229 100644 --- a/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp +++ b/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp @@ -108,140 +108,6 @@ std::vector ComponentLoader::GetAllCompTypes() return DHTypeALL; } -int32_t ParseComponent(const cJSON *json, CompConfig &cfg) -{ - cJSON *nameJson = cJSON_GetObjectItem(json, COMP_NAME.c_str()); - if (!IsString(nameJson)) { - DHLOGE("COMP_NAME is invalid!"); - return ERR_DH_FWK_JSON_PARSE_FAILED; - } - cfg.name = nameJson->valuestring; - - cJSON *typeJson = cJSON_GetObjectItem(json, COMP_TYPE.c_str()); - if (!IsString(typeJson)) { - DHLOGE("COMP_TYPE is invalid!"); - return ERR_DH_FWK_JSON_PARSE_FAILED; - } - cfg.type = g_mapDhTypeName[typeJson->valuestring]; - - cJSON *handlerLocJson = cJSON_GetObjectItem(json, COMP_HANDLER_LOC.c_str()); - if (!IsString(handlerLocJson)) { - DHLOGE("COMP_HANDLER_LOC is invalid!"); - return ERR_DH_FWK_JSON_PARSE_FAILED; - } - cfg.compHandlerLoc = handlerLocJson->valuestring; - - cJSON *handlerVerJson = cJSON_GetObjectItem(json, COMP_HANDLER_VERSION.c_str()); - if (!IsString(handlerVerJson)) { - DHLOGE("COMP_HANDLER_VERSION is invalid!"); - return ERR_DH_FWK_JSON_PARSE_FAILED; - } - cfg.compHandlerVersion = handlerVerJson->valuestring; - return DH_FWK_SUCCESS; -} - -int32_t ParseSource(const cJSON *json, CompConfig &cfg) -{ - cJSON *sourceLocJson = cJSON_GetObjectItem(json, COMP_SOURCE_LOC.c_str()); - if (!IsString(sourceLocJson)) { - DHLOGE("COMP_SOURCE_LOC is invalid!"); - return ERR_DH_FWK_JSON_PARSE_FAILED; - } - cfg.compSourceLoc = sourceLocJson->valuestring; - - cJSON *sourceVerJson = cJSON_GetObjectItem(json, COMP_SOURCE_VERSION.c_str()); - if (!IsString(sourceVerJson)) { - DHLOGE("COMP_SOURCE_VERSION is invalid!"); - return ERR_DH_FWK_JSON_PARSE_FAILED; - } - cfg.compSourceVersion = sourceVerJson->valuestring; - - cJSON *sourceSaIdJson = cJSON_GetObjectItem(json, COMP_SOURCE_SA_ID.c_str()); - if (!IsInt32(sourceSaIdJson)) { - DHLOGE("COMP_SOURCE_SA_ID is invalid!"); - return ERR_DH_FWK_JSON_PARSE_FAILED; - } - cfg.compSourceSaId = static_cast(sourceSaIdJson->valueint); - return DH_FWK_SUCCESS; -} - -int32_t ParseSink(const cJSON *json, CompConfig &cfg) -{ - cJSON *sinkLocJson = cJSON_GetObjectItem(json, COMP_SINK_LOC.c_str()); - if (!IsString(sinkLocJson)) { - DHLOGE("COMP_SINK_LOC is invalid!"); - return ERR_DH_FWK_JSON_PARSE_FAILED; - } - cfg.compSinkLoc = sinkLocJson->valuestring; - - cJSON *sinkVerJson = cJSON_GetObjectItem(json, COMP_SINK_VERSION.c_str()); - if (!IsString(sinkVerJson)) { - DHLOGE("COMP_SINK_VERSION is invalid!"); - return ERR_DH_FWK_JSON_PARSE_FAILED; - } - cfg.compSinkVersion = sinkVerJson->valuestring; - - cJSON *sinkSaIdJson = cJSON_GetObjectItem(json, COMP_SINK_SA_ID.c_str()); - if (!IsInt32(sinkSaIdJson)) { - DHLOGE("COMP_SINK_SA_ID is invalid!"); - return ERR_DH_FWK_JSON_PARSE_FAILED; - } - cfg.compSinkSaId = static_cast(sinkSaIdJson->valueint); - return DH_FWK_SUCCESS; -} - -int32_t ParseResourceDesc(const cJSON *json, CompConfig &cfg) -{ - cJSON *resouceDescJson = cJSON_GetObjectItem(json, COMP_RESOURCE_DESC.c_str()); - if (!IsArray(resouceDescJson)) { - DHLOGE("COMP_RESOURCE_DESC is invalid!"); - return ERR_DH_FWK_JSON_PARSE_FAILED; - } - cJSON *element = nullptr; - cJSON_ArrayForEach(element, resouceDescJson) { - ResourceDesc desc; - cJSON *subtypeJson = cJSON_GetObjectItem(element, COMP_SUBTYPE.c_str()); - if (!IsString(subtypeJson)) { - DHLOGE("COMP_SUBTYPE is invalid!"); - return ERR_DH_FWK_JSON_PARSE_FAILED; - } - desc.subtype = subtypeJson->valuestring; - - cJSON *sensitive = cJSON_GetObjectItem(element, COMP_SENSITIVE.c_str()); - if (!IsBool(sensitive)) { - DHLOGE("COMP_SENSITIVE is invalid!"); - return ERR_DH_FWK_JSON_PARSE_FAILED; - } - if (cJSON_IsTrue(sensitive)) { - desc.sensitiveValue = true; - } else { - desc.sensitiveValue = false; - } - cfg.compResourceDesc.push_back(desc); - } - return DH_FWK_SUCCESS; -} - -void from_json(const cJSON *json, CompConfig &cfg) -{ - if (ParseComponent(json, cfg) != DH_FWK_SUCCESS) { - DHLOGE("ParseComponent is failed"); - return; - } - if (ParseSource(json, cfg) != DH_FWK_SUCCESS) { - DHLOGE("ParseSource is failed"); - return; - } - if (ParseSink(json, cfg) != DH_FWK_SUCCESS) { - DHLOGE("ParseSink is failed"); - return; - } - if (ParseResourceDesc(json, cfg) != DH_FWK_SUCCESS) { - DHLOGE("ParseResourceDesc is failed"); - return; - } -} - CompVersion ComponentLoader::GetCompVersionFromComConfig(const CompConfig& cCfg) { CompVersion compVersions; @@ -404,8 +270,8 @@ void ComponentLoader::ParseSinkSupportedFeaturesFromJson(cJSON *sinkSupportedFea void ComponentLoader::CheckAndParseFeatures(cJSON *component, CompConfig &config) { - cJSON *sourceFeatureFilters = cJSON_GetObjectItem(component, SOURCE_FEATURE_FILTER.c_str()); - cJSON *sinkSupportedFeatures = cJSON_GetObjectItem(component, SINK_SUPPORTED_FEATURE.c_str()); + cJSON *sourceFeatureFilters = cJSON_GetObjectItem(component, SOURCE_FEATURE_FILTER); + cJSON *sinkSupportedFeatures = cJSON_GetObjectItem(component, SINK_SUPPORTED_FEATURE); if (sourceFeatureFilters || sinkSupportedFeatures) { config.haveFeature = true; if (IsArray(sourceFeatureFilters)) { diff --git a/services/distributedhardwarefwkservice/src/componentmanager/component_disable.cpp b/services/distributedhardwarefwkservice/src/componentmanager/component_disable.cpp index ad09679f..b03f5be3 100644 --- a/services/distributedhardwarefwkservice/src/componentmanager/component_disable.cpp +++ b/services/distributedhardwarefwkservice/src/componentmanager/component_disable.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2024 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,6 @@ #include "component_disable.h" #include "anonymous_string.h" -#include "constants.h" #include "dh_utils_hisysevent.h" #include "dh_utils_tool.h" #include "distributed_hardware_errno.h" @@ -24,6 +23,9 @@ namespace OHOS { namespace DistributedHardware { +namespace { + constexpr int32_t DISABLE_TIMEOUT_MS = 500; +} #undef DH_LOG_TAG #define DH_LOG_TAG "ComponentDisable" diff --git a/services/distributedhardwarefwkservice/src/componentmanager/component_enable.cpp b/services/distributedhardwarefwkservice/src/componentmanager/component_enable.cpp index ef10d2db..2a12e664 100644 --- a/services/distributedhardwarefwkservice/src/componentmanager/component_enable.cpp +++ b/services/distributedhardwarefwkservice/src/componentmanager/component_enable.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2024 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,6 @@ #include "component_enable.h" #include "anonymous_string.h" -#include "constants.h" #include "dh_utils_hisysevent.h" #include "dh_utils_tool.h" #include "distributed_hardware_errno.h" @@ -24,6 +23,9 @@ namespace OHOS { namespace DistributedHardware { +namespace { + constexpr int32_t ENABLE_TIMEOUT_MS = 1000; +} #undef DH_LOG_TAG #define DH_LOG_TAG "ComponentEnable" diff --git a/services/distributedhardwarefwkservice/src/hidumphelper/enabled_comps_dump.cpp b/services/distributedhardwarefwkservice/src/hidumphelper/enabled_comps_dump.cpp index d7f62755..83ebf81d 100644 --- a/services/distributedhardwarefwkservice/src/hidumphelper/enabled_comps_dump.cpp +++ b/services/distributedhardwarefwkservice/src/hidumphelper/enabled_comps_dump.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,9 +13,10 @@ * limitations under the License. */ -#include "dh_utils_tool.h" #include "enabled_comps_dump.h" +#include "dh_utils_tool.h" + namespace OHOS { namespace DistributedHardware { IMPLEMENT_SINGLE_INSTANCE(EnabledCompsDump); diff --git a/services/distributedhardwarefwkservice/src/hidumphelper/hidump_helper.cpp b/services/distributedhardwarefwkservice/src/hidumphelper/hidump_helper.cpp index 3cdbf6d1..2d650fa8 100644 --- a/services/distributedhardwarefwkservice/src/hidumphelper/hidump_helper.cpp +++ b/services/distributedhardwarefwkservice/src/hidumphelper/hidump_helper.cpp @@ -23,6 +23,7 @@ #include "component_manager.h" #include "distributed_hardware_errno.h" #include "distributed_hardware_log.h" +#include "enabled_comps_dump.h" #include "task_board.h" namespace OHOS { diff --git a/services/distributedhardwarefwkservice/src/localhardwaremanager/plugin_listener_impl.cpp b/services/distributedhardwarefwkservice/src/localhardwaremanager/plugin_listener_impl.cpp index 3b9e8db0..c8c689fb 100644 --- a/services/distributedhardwarefwkservice/src/localhardwaremanager/plugin_listener_impl.cpp +++ b/services/distributedhardwarefwkservice/src/localhardwaremanager/plugin_listener_impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -18,7 +18,6 @@ #include "anonymous_string.h" #include "capability_info.h" #include "capability_info_manager.h" -#include "constants.h" #include "dh_context.h" #include "dh_utils_tool.h" #include "distributed_hardware_errno.h" diff --git a/services/distributedhardwarefwkservice/src/lowlatency/low_latency_listener.cpp b/services/distributedhardwarefwkservice/src/lowlatency/low_latency_listener.cpp index bd121ab0..f67cd61a 100644 --- a/services/distributedhardwarefwkservice/src/lowlatency/low_latency_listener.cpp +++ b/services/distributedhardwarefwkservice/src/lowlatency/low_latency_listener.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -53,14 +53,14 @@ void LowLatencyListener::OnMessage(const DHTopic topic, const std::string& messa DHLOGE("jsonStr parse failed"); return; } - cJSON *dhTypeJson = cJSON_GetObjectItem(jsonObj, DH_TYPE.c_str()); + cJSON *dhTypeJson = cJSON_GetObjectItem(jsonObj, DH_TYPE); if (!IsUInt32(dhTypeJson)) { DHLOGE("The DH_TYPE key is invalid!"); cJSON_Delete(jsonObj); return; } - cJSON *enableJson = cJSON_GetObjectItem(jsonObj, LOW_LATENCY_ENABLE.c_str()); + cJSON *enableJson = cJSON_GetObjectItem(jsonObj, LOW_LATENCY_ENABLE); if (!IsBool(enableJson)) { DHLOGE("The LOW_LATENCY_ENABLE key is invalid!"); cJSON_Delete(jsonObj); diff --git a/services/distributedhardwarefwkservice/src/resourcemanager/capability_info.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/capability_info.cpp index 73b6c7ac..6791f727 100644 --- a/services/distributedhardwarefwkservice/src/resourcemanager/capability_info.cpp +++ b/services/distributedhardwarefwkservice/src/resourcemanager/capability_info.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -192,13 +192,13 @@ void ToJson(cJSON *jsonObject, const CapabilityInfo &capability) DHLOGE("Json pointer is nullptr!"); return; } - cJSON_AddStringToObject(jsonObject, DH_ID.c_str(), capability.GetDHId().c_str()); - cJSON_AddStringToObject(jsonObject, DEV_ID.c_str(), capability.GetDeviceId().c_str()); - cJSON_AddStringToObject(jsonObject, DEV_NAME.c_str(), capability.GetDeviceName().c_str()); - cJSON_AddNumberToObject(jsonObject, DEV_TYPE.c_str(), (double)capability.GetDeviceType()); - cJSON_AddNumberToObject(jsonObject, DH_TYPE.c_str(), (double)capability.GetDHType()); - cJSON_AddStringToObject(jsonObject, DH_ATTRS.c_str(), capability.GetDHAttrs().c_str()); - cJSON_AddStringToObject(jsonObject, DH_SUBTYPE.c_str(), capability.GetDHSubtype().c_str()); + cJSON_AddStringToObject(jsonObject, DH_ID, capability.GetDHId().c_str()); + cJSON_AddStringToObject(jsonObject, DEV_ID, capability.GetDeviceId().c_str()); + cJSON_AddStringToObject(jsonObject, DEV_NAME, capability.GetDeviceName().c_str()); + cJSON_AddNumberToObject(jsonObject, DEV_TYPE, static_cast(capability.GetDeviceType())); + cJSON_AddNumberToObject(jsonObject, DH_TYPE, static_cast(capability.GetDHType())); + cJSON_AddStringToObject(jsonObject, DH_ATTRS, capability.GetDHAttrs().c_str()); + cJSON_AddStringToObject(jsonObject, DH_SUBTYPE, capability.GetDHSubtype().c_str()); } void FromJson(const cJSON *jsonObject, CapabilityInfo &capability) @@ -207,49 +207,49 @@ void FromJson(const cJSON *jsonObject, CapabilityInfo &capability) DHLOGE("Json pointer is nullptr!"); return; } - cJSON *dhIdJson = cJSON_GetObjectItem(jsonObject, DH_ID.c_str()); + cJSON *dhIdJson = cJSON_GetObjectItem(jsonObject, DH_ID); if (!IsString(dhIdJson)) { DHLOGE("DH_ID is invalid!"); return; } capability.SetDHId(dhIdJson->valuestring); - cJSON *devIdJson = cJSON_GetObjectItem(jsonObject, DEV_ID.c_str()); + cJSON *devIdJson = cJSON_GetObjectItem(jsonObject, DEV_ID); if (!IsString(devIdJson)) { DHLOGE("DEV_ID is invalid!"); return; } capability.SetDeviceId(devIdJson->valuestring); - cJSON *devNameJson = cJSON_GetObjectItem(jsonObject, DEV_NAME.c_str()); + cJSON *devNameJson = cJSON_GetObjectItem(jsonObject, DEV_NAME); if (!IsString(devNameJson)) { DHLOGE("DEV_NAME is invalid!"); return; } capability.SetDeviceName(devNameJson->valuestring); - cJSON *devTypeJson = cJSON_GetObjectItem(jsonObject, DEV_TYPE.c_str()); + cJSON *devTypeJson = cJSON_GetObjectItem(jsonObject, DEV_TYPE); if (!IsUInt16(devTypeJson)) { DHLOGE("DEV_TYPE is invalid!"); return; } capability.SetDeviceType(static_cast(devTypeJson->valueint)); - cJSON *dhTypeJson = cJSON_GetObjectItem(jsonObject, DH_TYPE.c_str()); + cJSON *dhTypeJson = cJSON_GetObjectItem(jsonObject, DH_TYPE); if (!IsUInt32(dhTypeJson)) { DHLOGE("DH_TYPE is invalid!"); return; } capability.SetDHType((DHType)dhTypeJson->valueint); - cJSON *dhAttrsJson = cJSON_GetObjectItem(jsonObject, DH_ATTRS.c_str()); + cJSON *dhAttrsJson = cJSON_GetObjectItem(jsonObject, DH_ATTRS); if (!IsString(dhAttrsJson)) { DHLOGE("DH_ATTRS is invalid!"); return; } capability.SetDHAttrs(dhAttrsJson->valuestring); - cJSON *dhSubtypeJson = cJSON_GetObjectItem(jsonObject, DH_SUBTYPE.c_str()); + cJSON *dhSubtypeJson = cJSON_GetObjectItem(jsonObject, DH_SUBTYPE); if (!IsString(dhSubtypeJson)) { DHLOGE("DH_SUBTYPE is invalid!"); return; diff --git a/services/distributedhardwarefwkservice/src/resourcemanager/meta_capability_info.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/meta_capability_info.cpp index b0f33f0f..d6253c52 100644 --- a/services/distributedhardwarefwkservice/src/resourcemanager/meta_capability_info.cpp +++ b/services/distributedhardwarefwkservice/src/resourcemanager/meta_capability_info.cpp @@ -166,62 +166,62 @@ void ToJson(cJSON *jsonObject, const MetaCapabilityInfo &metaCapInfo) DHLOGE("Json pointer is nullptr!"); return; } - cJSON_AddStringToObject(jsonObject, DH_ID.c_str(), metaCapInfo.GetDHId().c_str()); - cJSON_AddStringToObject(jsonObject, DEV_ID.c_str(), metaCapInfo.GetDeviceId().c_str()); - cJSON_AddStringToObject(jsonObject, DEV_NAME.c_str(), metaCapInfo.GetDeviceName().c_str()); - cJSON_AddNumberToObject(jsonObject, DEV_TYPE.c_str(), (double)metaCapInfo.GetDeviceType()); - cJSON_AddNumberToObject(jsonObject, DH_TYPE.c_str(), (double)metaCapInfo.GetDHType()); - cJSON_AddStringToObject(jsonObject, DH_ATTRS.c_str(), metaCapInfo.GetDHAttrs().c_str()); - cJSON_AddStringToObject(jsonObject, DH_SUBTYPE.c_str(), metaCapInfo.GetDHSubtype().c_str()); - cJSON_AddStringToObject(jsonObject, DEV_UDID_HASH.c_str(), metaCapInfo.GetUdidHash().c_str()); - cJSON_AddStringToObject(jsonObject, SINK_VER.c_str(), metaCapInfo.GetSinkVersion().c_str()); + cJSON_AddStringToObject(jsonObject, DH_ID, metaCapInfo.GetDHId().c_str()); + cJSON_AddStringToObject(jsonObject, DEV_ID, metaCapInfo.GetDeviceId().c_str()); + cJSON_AddStringToObject(jsonObject, DEV_NAME, metaCapInfo.GetDeviceName().c_str()); + cJSON_AddNumberToObject(jsonObject, DEV_TYPE, static_cast(metaCapInfo.GetDeviceType())); + cJSON_AddNumberToObject(jsonObject, DH_TYPE, static_cast(metaCapInfo.GetDHType())); + cJSON_AddStringToObject(jsonObject, DH_ATTRS, metaCapInfo.GetDHAttrs().c_str()); + cJSON_AddStringToObject(jsonObject, DH_SUBTYPE, metaCapInfo.GetDHSubtype().c_str()); + cJSON_AddStringToObject(jsonObject, DEV_UDID_HASH, metaCapInfo.GetUdidHash().c_str()); + cJSON_AddStringToObject(jsonObject, SINK_VER, metaCapInfo.GetSinkVersion().c_str()); cJSON *jsonObjCompVersion = cJSON_CreateObject(); if (jsonObjCompVersion == NULL) { DHLOGE("Failed to create cJSON object."); return; } ToJson(jsonObjCompVersion, metaCapInfo.GetCompVersion()); - cJSON_AddItemToObject(jsonObject, COMP_VER.c_str(), jsonObjCompVersion); + cJSON_AddItemToObject(jsonObject, COMP_VER, jsonObjCompVersion); } void FromJson(const cJSON *jsonObject, MetaCapabilityInfo &metaCapInfo) { - cJSON *dhIdJson = cJSON_GetObjectItem(jsonObject, DH_ID.c_str()); + cJSON *dhIdJson = cJSON_GetObjectItem(jsonObject, DH_ID); if (!IsString(dhIdJson)) { DHLOGE("DH_ID is invalid!"); return; } metaCapInfo.SetDHId(dhIdJson->valuestring); - cJSON *devIdJson = cJSON_GetObjectItem(jsonObject, DEV_ID.c_str()); + cJSON *devIdJson = cJSON_GetObjectItem(jsonObject, DEV_ID); if (!IsString(devIdJson)) { DHLOGE("DEV_ID is invalid!"); return; } metaCapInfo.SetDeviceId(devIdJson->valuestring); - cJSON *devNameJson = cJSON_GetObjectItem(jsonObject, DEV_NAME.c_str()); + cJSON *devNameJson = cJSON_GetObjectItem(jsonObject, DEV_NAME); if (!IsString(devNameJson)) { DHLOGE("DEV_NAME is invalid!"); return; } metaCapInfo.SetDeviceName(devNameJson->valuestring); - cJSON *devTypeJson = cJSON_GetObjectItem(jsonObject, DEV_TYPE.c_str()); + cJSON *devTypeJson = cJSON_GetObjectItem(jsonObject, DEV_TYPE); if (!IsUInt16(devTypeJson)) { DHLOGE("DEV_TYPE is invalid!"); return; } metaCapInfo.SetDeviceType(static_cast(devTypeJson->valueint)); - cJSON *dhTypeJson = cJSON_GetObjectItem(jsonObject, DH_TYPE.c_str()); + cJSON *dhTypeJson = cJSON_GetObjectItem(jsonObject, DH_TYPE); if (!IsUInt32(dhTypeJson)) { DHLOGE("DH_TYPE is invalid!"); return; } metaCapInfo.SetDHType((DHType)dhTypeJson->valueint); - cJSON *dhAttrsObj = cJSON_GetObjectItem(jsonObject, DH_ATTRS.c_str()); + cJSON *dhAttrsObj = cJSON_GetObjectItem(jsonObject, DH_ATTRS); if (!IsString(dhAttrsObj)) { DHLOGE("DH_ATTRS is invalid!"); return; @@ -233,28 +233,28 @@ void FromJson(const cJSON *jsonObject, MetaCapabilityInfo &metaCapInfo) void FromJsonContinue(const cJSON *jsonObject, MetaCapabilityInfo &metaCapInfo) { - cJSON *dhSubtypeJson = cJSON_GetObjectItem(jsonObject, DH_SUBTYPE.c_str()); + cJSON *dhSubtypeJson = cJSON_GetObjectItem(jsonObject, DH_SUBTYPE); if (!IsString(dhSubtypeJson)) { DHLOGE("DH_SUBTYPE is invalid!"); return; } metaCapInfo.SetDHSubtype(dhSubtypeJson->valuestring); - cJSON *udidHashJson = cJSON_GetObjectItem(jsonObject, DEV_UDID_HASH.c_str()); + cJSON *udidHashJson = cJSON_GetObjectItem(jsonObject, DEV_UDID_HASH); if (!IsString(udidHashJson)) { DHLOGE("DEV_UDID_HASH is invalid!"); return; } metaCapInfo.SetUdidHash(udidHashJson->valuestring); - cJSON *sinkVerJson = cJSON_GetObjectItem(jsonObject, SINK_VER.c_str()); + cJSON *sinkVerJson = cJSON_GetObjectItem(jsonObject, SINK_VER); if (!IsString(sinkVerJson)) { DHLOGE("SINK_VER is invalid!"); return; } metaCapInfo.SetSinkVersion(sinkVerJson->valuestring); - cJSON *compVersionJson = cJSON_GetObjectItem(jsonObject, COMP_VER.c_str()); + cJSON *compVersionJson = cJSON_GetObjectItem(jsonObject, COMP_VER); if (compVersionJson == nullptr) { DHLOGE("CompVersion is invalid!"); return; diff --git a/services/distributedhardwarefwkservice/src/resourcemanager/meta_info_manager.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/meta_info_manager.cpp index 7f46f0b1..7930e162 100644 --- a/services/distributedhardwarefwkservice/src/resourcemanager/meta_info_manager.cpp +++ b/services/distributedhardwarefwkservice/src/resourcemanager/meta_info_manager.cpp @@ -254,26 +254,6 @@ int32_t MetaInfoManager::GetDataByKeyPrefix(const std::string &keyPrefix, MetaCa return DH_FWK_SUCCESS; } -int32_t MetaInfoManager::RemoveMetaInfoByKey(const std::string &key) -{ - if (!IsKeySizeValid(key)) { - return ERR_DH_FWK_PARA_INVALID; - } - DHLOGI("Remove device metaInfo, key: %{public}s", GetAnonyString(key).c_str()); - std::lock_guard lock(metaInfoMgrMutex_); - if (dbAdapterPtr_ == nullptr) { - DHLOGE("dbAdapterPtr_ is null"); - return ERR_DH_FWK_RESOURCE_DB_ADAPTER_POINTER_NULL; - } - - globalMetaInfoMap_.erase(key); - if (dbAdapterPtr_->RemoveDataByKey(key) != DH_FWK_SUCCESS) { - DHLOGE("Remove device metaData failed, key: %{public}s", GetAnonyString(key).c_str()); - return ERR_DH_FWK_RESOURCE_DB_ADAPTER_OPERATION_FAIL; - } - return DH_FWK_SUCCESS; -} - int32_t MetaInfoManager::GetMetaCapInfo(const std::string &udidHash, const std::string &dhId, std::shared_ptr &metaCapPtr) { diff --git a/services/distributedhardwarefwkservice/src/resourcemanager/version_info.cpp b/services/distributedhardwarefwkservice/src/resourcemanager/version_info.cpp index a4f7d7d2..e31af4bb 100644 --- a/services/distributedhardwarefwkservice/src/resourcemanager/version_info.cpp +++ b/services/distributedhardwarefwkservice/src/resourcemanager/version_info.cpp @@ -70,11 +70,11 @@ void ToJson(cJSON *jsonObject, const CompVersion &compVer) DHLOGE("Json pointer is nullptr!"); return; } - cJSON_AddStringToObject(jsonObject, NAME.c_str(), compVer.name.c_str()); - cJSON_AddNumberToObject(jsonObject, TYPE.c_str(), (double)compVer.dhType); - cJSON_AddStringToObject(jsonObject, HANDLER.c_str(), compVer.handlerVersion.c_str()); - cJSON_AddStringToObject(jsonObject, SOURCE_VER.c_str(), compVer.sourceVersion.c_str()); - cJSON_AddStringToObject(jsonObject, SINK_VER.c_str(), compVer.sinkVersion.c_str()); + cJSON_AddStringToObject(jsonObject, NAME, compVer.name.c_str()); + cJSON_AddNumberToObject(jsonObject, TYPE, (double)compVer.dhType); + cJSON_AddStringToObject(jsonObject, HANDLER, compVer.handlerVersion.c_str()); + cJSON_AddStringToObject(jsonObject, SOURCE_VER, compVer.sourceVersion.c_str()); + cJSON_AddStringToObject(jsonObject, SINK_VER, compVer.sinkVersion.c_str()); if (compVer.haveFeature) { cJSON *sourceFeatureFilters = cJSON_CreateArray(); if (sourceFeatureFilters == NULL) { @@ -90,11 +90,11 @@ void ToJson(cJSON *jsonObject, const CompVersion &compVer) for (const auto &filter : compVer.sourceFeatureFilters) { cJSON_AddItemToArray(sourceFeatureFilters, cJSON_CreateString(filter.c_str())); } - cJSON_AddItemToObject(jsonObject, SOURCE_FEATURE_FILTER.c_str(), sourceFeatureFilters); + cJSON_AddItemToObject(jsonObject, SOURCE_FEATURE_FILTER, sourceFeatureFilters); for (const auto &feature : compVer.sinkSupportedFeatures) { cJSON_AddItemToArray(sinkSupportedFeatures, cJSON_CreateString(feature.c_str())); } - cJSON_AddItemToObject(jsonObject, SINK_SUPPORTED_FEATURE.c_str(), sinkSupportedFeatures); + cJSON_AddItemToObject(jsonObject, SINK_SUPPORTED_FEATURE, sinkSupportedFeatures); } } @@ -104,8 +104,8 @@ void ToJson(cJSON *jsonObject, const VersionInfo &versionInfo) DHLOGE("Json pointer is nullptr!"); return; } - cJSON_AddStringToObject(jsonObject, DEV_ID.c_str(), versionInfo.deviceId.c_str()); - cJSON_AddStringToObject(jsonObject, DH_VER.c_str(), versionInfo.dhVersion.c_str()); + cJSON_AddStringToObject(jsonObject, DEV_ID, versionInfo.deviceId.c_str()); + cJSON_AddStringToObject(jsonObject, DH_VER, versionInfo.dhVersion.c_str()); cJSON *compVers = cJSON_CreateArray(); if (compVers == NULL) { @@ -122,7 +122,7 @@ void ToJson(cJSON *jsonObject, const VersionInfo &versionInfo) ToJson(compVer, compVersion.second); cJSON_AddItemToArray(compVers, compVer); } - cJSON_AddItemToObject(jsonObject, COMP_VER.c_str(), compVers); + cJSON_AddItemToObject(jsonObject, COMP_VER, compVers); } void FromJson(const cJSON *jsonObject, CompVersion &compVer) @@ -131,28 +131,28 @@ void FromJson(const cJSON *jsonObject, CompVersion &compVer) DHLOGE("Json pointer is nullptr!"); return; } - cJSON *nameJson = cJSON_GetObjectItem(jsonObject, NAME.c_str()); + cJSON *nameJson = cJSON_GetObjectItem(jsonObject, NAME); if (IsString(nameJson)) { compVer.name = nameJson->valuestring; } - cJSON *typeJson = cJSON_GetObjectItem(jsonObject, TYPE.c_str()); + cJSON *typeJson = cJSON_GetObjectItem(jsonObject, TYPE); if (IsUInt32(typeJson) && (DHType)typeJson->valueint <= DHType::MAX_DH) { compVer.dhType = (DHType)typeJson->valueint; } - cJSON *handlerJson = cJSON_GetObjectItem(jsonObject, HANDLER.c_str()); + cJSON *handlerJson = cJSON_GetObjectItem(jsonObject, HANDLER); if (IsString(handlerJson)) { compVer.handlerVersion = handlerJson->valuestring; } - cJSON *sourceVerJson = cJSON_GetObjectItem(jsonObject, SOURCE_VER.c_str()); + cJSON *sourceVerJson = cJSON_GetObjectItem(jsonObject, SOURCE_VER); if (IsString(sourceVerJson)) { compVer.sourceVersion = sourceVerJson->valuestring; } - cJSON *sinkVerJson = cJSON_GetObjectItem(jsonObject, SINK_VER.c_str()); + cJSON *sinkVerJson = cJSON_GetObjectItem(jsonObject, SINK_VER); if (IsString(sinkVerJson)) { compVer.sinkVersion = sinkVerJson->valuestring; } - cJSON *sourceFeatureFilters = cJSON_GetObjectItem(jsonObject, SOURCE_FEATURE_FILTER.c_str()); - cJSON *sinkSupportedFeatures = cJSON_GetObjectItem(jsonObject, SINK_SUPPORTED_FEATURE.c_str()); + cJSON *sourceFeatureFilters = cJSON_GetObjectItem(jsonObject, SOURCE_FEATURE_FILTER); + cJSON *sinkSupportedFeatures = cJSON_GetObjectItem(jsonObject, SINK_SUPPORTED_FEATURE); if (sourceFeatureFilters || sinkSupportedFeatures) { compVer.haveFeature = true; if (sourceFeatureFilters) { @@ -180,17 +180,17 @@ void FromJson(const cJSON *jsonObject, VersionInfo &versionInfo) DHLOGE("Json pointer is nullptr!"); return; } - cJSON *devIdJson = cJSON_GetObjectItem(jsonObject, DEV_ID.c_str()); + cJSON *devIdJson = cJSON_GetObjectItem(jsonObject, DEV_ID); if (IsString(devIdJson)) { versionInfo.deviceId = devIdJson->valuestring; } - cJSON *dhVerJson = cJSON_GetObjectItem(jsonObject, DH_VER.c_str()); + cJSON *dhVerJson = cJSON_GetObjectItem(jsonObject, DH_VER); if (IsString(dhVerJson)) { versionInfo.dhVersion = dhVerJson->valuestring; } - const cJSON *compVer = cJSON_GetObjectItem(jsonObject, COMP_VER.c_str()); + const cJSON *compVer = cJSON_GetObjectItem(jsonObject, COMP_VER); if (compVer != NULL) { cJSON *compVerObj = nullptr; cJSON_ArrayForEach(compVerObj, compVer) { diff --git a/services/distributedhardwarefwkservice/src/task/disable_task.cpp b/services/distributedhardwarefwkservice/src/task/disable_task.cpp index 992c2fdf..17a8ac17 100644 --- a/services/distributedhardwarefwkservice/src/task/disable_task.cpp +++ b/services/distributedhardwarefwkservice/src/task/disable_task.cpp @@ -22,7 +22,6 @@ #include "anonymous_string.h" #include "capability_utils.h" #include "component_manager.h" -#include "constants.h" #include "dh_context.h" #include "dh_utils_hitrace.h" #include "dh_utils_tool.h" @@ -33,6 +32,10 @@ namespace OHOS { namespace DistributedHardware { +namespace { + constexpr const char *DISABLE_TASK_INNER = "DisableTask"; +} + #undef DH_LOG_TAG #define DH_LOG_TAG "DisableTask" diff --git a/services/distributedhardwarefwkservice/src/task/enable_task.cpp b/services/distributedhardwarefwkservice/src/task/enable_task.cpp index 06d705a3..c61baa76 100644 --- a/services/distributedhardwarefwkservice/src/task/enable_task.cpp +++ b/services/distributedhardwarefwkservice/src/task/enable_task.cpp @@ -22,7 +22,6 @@ #include "anonymous_string.h" #include "capability_utils.h" #include "component_manager.h" -#include "constants.h" #include "dh_utils_hitrace.h" #include "dh_utils_tool.h" #include "distributed_hardware_errno.h" @@ -31,6 +30,10 @@ namespace OHOS { namespace DistributedHardware { +namespace { + constexpr const char *ENABLE_TASK_INNER = "EnableTask"; +} + #undef DH_LOG_TAG #define DH_LOG_TAG "EnableTask" diff --git a/services/distributedhardwarefwkservice/src/task/meta_disable_task.cpp b/services/distributedhardwarefwkservice/src/task/meta_disable_task.cpp index 8397d13b..26a4c589 100644 --- a/services/distributedhardwarefwkservice/src/task/meta_disable_task.cpp +++ b/services/distributedhardwarefwkservice/src/task/meta_disable_task.cpp @@ -31,6 +31,10 @@ namespace OHOS { namespace DistributedHardware { +namespace { + constexpr const char *META_DISABLE_TASK_INNER = "MetaDisableTask"; +} + #undef DH_LOG_TAG #define DH_LOG_TAG "MetaDisableTask" diff --git a/services/distributedhardwarefwkservice/src/task/meta_enable_task.cpp b/services/distributedhardwarefwkservice/src/task/meta_enable_task.cpp index 50dca43f..f2372a3e 100644 --- a/services/distributedhardwarefwkservice/src/task/meta_enable_task.cpp +++ b/services/distributedhardwarefwkservice/src/task/meta_enable_task.cpp @@ -30,6 +30,9 @@ namespace OHOS { namespace DistributedHardware { +namespace { + constexpr const char *META_ENABLE_TASK_INNER = "MetaEnableTask"; +} #undef DH_LOG_TAG #define DH_LOG_TAG "MetaEnableTask" diff --git a/services/distributedhardwarefwkservice/src/task/offline_task.cpp b/services/distributedhardwarefwkservice/src/task/offline_task.cpp index b4307fff..32e99581 100644 --- a/services/distributedhardwarefwkservice/src/task/offline_task.cpp +++ b/services/distributedhardwarefwkservice/src/task/offline_task.cpp @@ -22,7 +22,6 @@ #include "anonymous_string.h" #include "capability_info_manager.h" -#include "constants.h" #include "dh_context.h" #include "dh_utils_tool.h" #include "distributed_hardware_errno.h" @@ -37,6 +36,7 @@ namespace OHOS { namespace DistributedHardware { namespace { constexpr uint16_t PHONE_TYPE = 14; + constexpr const char *OFFLINE_TASK_INNER = "OffLineTask"; } #undef DH_LOG_TAG #define DH_LOG_TAG "OffLineTask" diff --git a/services/distributedhardwarefwkservice/src/task/task.cpp b/services/distributedhardwarefwkservice/src/task/task.cpp index 9237ef4c..6d9d4b3f 100644 --- a/services/distributedhardwarefwkservice/src/task/task.cpp +++ b/services/distributedhardwarefwkservice/src/task/task.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -15,11 +15,14 @@ #include "task.h" -#include "constants.h" #include "dh_utils_tool.h" namespace OHOS { namespace DistributedHardware { +namespace { + const std::string DH_TASK_NAME_PREFIX = "Task_"; +} + Task::Task(const std::string &networkId, const std::string &uuid, const std::string &udid, const std::string &dhId, const DHType dhType) : id_(DH_TASK_NAME_PREFIX + GetRandomID()), networkId_(networkId), uuid_(uuid), udid_(udid), dhId_(dhId), dhType_(dhType) diff --git a/services/distributedhardwarefwkservice/src/task/task_board.cpp b/services/distributedhardwarefwkservice/src/task/task_board.cpp index e123d069..00e6cf10 100644 --- a/services/distributedhardwarefwkservice/src/task/task_board.cpp +++ b/services/distributedhardwarefwkservice/src/task/task_board.cpp @@ -16,8 +16,6 @@ #include "task_board.h" #include "anonymous_string.h" -#include "dh_context.h" -#include "dh_utils_tool.h" #include "distributed_hardware_errno.h" #include "distributed_hardware_log.h" diff --git a/services/distributedhardwarefwkservice/src/task/task_executor.cpp b/services/distributedhardwarefwkservice/src/task/task_executor.cpp index 946655e0..94f7103c 100644 --- a/services/distributedhardwarefwkservice/src/task/task_executor.cpp +++ b/services/distributedhardwarefwkservice/src/task/task_executor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2024 Huawei Device Co., Ltd. + * Copyright (c) 2021-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -20,7 +20,6 @@ #include "ffrt.h" -#include "constants.h" #include "dh_context.h" #include "distributed_hardware_errno.h" #include "distributed_hardware_log.h" @@ -29,6 +28,7 @@ namespace OHOS { namespace DistributedHardware { namespace { const uint32_t MAX_TASK_QUEUE_LENGTH = 256; + constexpr const char *TRIGGER_TASK = "TriggerTask"; } IMPLEMENT_SINGLE_INSTANCE(TaskExecutor); TaskExecutor::TaskExecutor() : taskThreadFlag_(true) diff --git a/services/distributedhardwarefwkservice/src/transport/dh_transport.cpp b/services/distributedhardwarefwkservice/src/transport/dh_transport.cpp index 6cc4ac13..832cf913 100644 --- a/services/distributedhardwarefwkservice/src/transport/dh_transport.cpp +++ b/services/distributedhardwarefwkservice/src/transport/dh_transport.cpp @@ -37,6 +37,7 @@ namespace { // Dsoftbus sendBytes max message length: 4MB const uint32_t MAX_SEND_MSG_LENGTH = 4 * 1024 * 1024; const uint32_t INTERCEPT_STRING_LENGTH = 20; +const std::string DH_FWK_SESSION_NAME = "ohos.dhardware.session_"; static QosTV g_qosInfo[] = { { .qos = QOS_TYPE_MIN_BW, .value = 256 * 1024}, { .qos = QOS_TYPE_MAX_LATENCY, .value = 8000 }, diff --git a/services/distributedhardwarefwkservice/src/utils/dh_context.cpp b/services/distributedhardwarefwkservice/src/utils/dh_context.cpp index ae19d4d6..35c7b7c3 100644 --- a/services/distributedhardwarefwkservice/src/utils/dh_context.cpp +++ b/services/distributedhardwarefwkservice/src/utils/dh_context.cpp @@ -29,6 +29,11 @@ namespace OHOS { namespace DistributedHardware { +namespace { + constexpr const char *ISOMERISM_EVENT_KEY = "isomerism_event"; + const std::string ISOMERISM_EVENT_CONNECT_VAL = "isomerism_connect"; + const std::string ISOMERISM_EVENT_DISCONNECT_VAL = "isomerism_disconnect"; +} IMPLEMENT_SINGLE_INSTANCE(DHContext); DHContext::DHContext() { @@ -324,13 +329,13 @@ void DHContext::DHFWKIsomerismListener::OnMessage(const DHTopic topic, const std DHLOGE("OnMessage error, parse failed"); return; } - cJSON *eventObj = cJSON_GetObjectItemCaseSensitive(messageJson, ISOMERISM_EVENT_KEY.c_str()); + cJSON *eventObj = cJSON_GetObjectItemCaseSensitive(messageJson, ISOMERISM_EVENT_KEY); if (!IsString(eventObj)) { cJSON_Delete(messageJson); DHLOGE("OnMessage event invaild"); return; } - cJSON *devObj = cJSON_GetObjectItemCaseSensitive(messageJson, DEV_ID.c_str()); + cJSON *devObj = cJSON_GetObjectItemCaseSensitive(messageJson, DEV_ID); if (!IsString(devObj)) { cJSON_Delete(messageJson); DHLOGE("OnMessage deviceId invaild"); diff --git a/services/distributedhardwarefwkservice/src/utils/dh_timer.cpp b/services/distributedhardwarefwkservice/src/utils/dh_timer.cpp index 2a9d74d4..1f64626e 100644 --- a/services/distributedhardwarefwkservice/src/utils/dh_timer.cpp +++ b/services/distributedhardwarefwkservice/src/utils/dh_timer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024 Huawei Device Co., Ltd. + * Copyright (c) 2022-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -24,6 +24,10 @@ namespace OHOS { namespace DistributedHardware { +namespace { + constexpr const char *EVENT_RUN = "EventRun"; +} + #undef DH_LOG_TAG #define DH_LOG_TAG "DHTimer" diff --git a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn index 4df296c7..76542cac 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanager_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("AccessManagerFuzzTest") { include_dirs = [ "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", "${common_path}/log/include", "${services_path}/distributedhardwarefwkservice/include", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/accessmanageroffline_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/accessmanageroffline_fuzzer/BUILD.gn index d279ec14..ee465732 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/accessmanageroffline_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/accessmanageroffline_fuzzer/BUILD.gn @@ -23,7 +23,6 @@ ohos_fuzztest("AccessManagerOfflineFuzzTest") { include_dirs = [ "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", "${common_path}/log/include", "${services_path}/distributedhardwarefwkservice/include", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/capabilityinfomanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/capabilityinfomanager_fuzzer/BUILD.gn index 5bcf4410..e145d2a2 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/capabilityinfomanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/capabilityinfomanager_fuzzer/BUILD.gn @@ -23,8 +23,6 @@ ohos_fuzztest("CapabilityInfoManagerFuzzTest") { include_dirs = [ "${utils_path}/include", - "${utils_path}/include/eventbus", - "${utils_path}/include/log", "${common_path}/log/include", "${common_path}/utils/include", "${services_path}/distributedhardwarefwkservice/include/resourcemanager", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/capabilityinfomanager_fuzzer/capabilityinfomanager_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/capabilityinfomanager_fuzzer/capabilityinfomanager_fuzzer.cpp index caac7096..c3103c8c 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/capabilityinfomanager_fuzzer/capabilityinfomanager_fuzzer.cpp +++ b/services/distributedhardwarefwkservice/test/fuzztest/capabilityinfomanager_fuzzer/capabilityinfomanager_fuzzer.cpp @@ -155,9 +155,9 @@ void CapabilityInfoManagerOnChangeInsertFuzzTest(const uint8_t* data, size_t siz std::string uuId(reinterpret_cast(data), size); DHContext::GetInstance().AddOnlineDevice(udId, uuId, networkId); std::string deviceId = Sha256(uuId); - cJSON_AddStringToObject(insertJson, DH_ID.c_str(), "111111"); - cJSON_AddStringToObject(insertJson, DEV_ID.c_str(), deviceId.c_str()); - cJSON_AddStringToObject(insertJson, DEV_NAME.c_str(), "dev_name"); + cJSON_AddStringToObject(insertJson, DH_ID, "111111"); + cJSON_AddStringToObject(insertJson, DEV_ID, deviceId.c_str()); + cJSON_AddStringToObject(insertJson, DEV_NAME, "dev_name"); char* cjson = cJSON_PrintUnformatted(insertJson); if (cjson == nullptr) { cJSON_Delete(insertJson); @@ -199,9 +199,9 @@ void CapabilityInfoManagerOnChangeUpdateFuzzTest(const uint8_t* data, size_t siz std::string uuId(reinterpret_cast(data), size); DHContext::GetInstance().AddOnlineDevice(udId, uuId, networkId); std::string deviceId = Sha256(uuId); - cJSON_AddStringToObject(updateJson, DH_ID.c_str(), "222222"); - cJSON_AddStringToObject(updateJson, DEV_ID.c_str(), deviceId.c_str()); - cJSON_AddStringToObject(updateJson, DEV_NAME.c_str(), "dev_name"); + cJSON_AddStringToObject(updateJson, DH_ID, "222222"); + cJSON_AddStringToObject(updateJson, DEV_ID, deviceId.c_str()); + cJSON_AddStringToObject(updateJson, DEV_NAME, "dev_name"); char* cjson = cJSON_PrintUnformatted(updateJson); if (cjson == nullptr) { cJSON_Delete(updateJson); @@ -243,9 +243,9 @@ void CapabilityInfoManagerOnChangeDeleteFuzzTest(const uint8_t* data, size_t siz std::string uuId(reinterpret_cast(data), size); DHContext::GetInstance().AddOnlineDevice(udId, uuId, networkId); std::string deviceId = Sha256(uuId); - cJSON_AddStringToObject(deleteJson, DH_ID.c_str(), "333333"); - cJSON_AddStringToObject(deleteJson, DEV_ID.c_str(), deviceId.c_str()); - cJSON_AddStringToObject(deleteJson, DEV_NAME.c_str(), "dev_name"); + cJSON_AddStringToObject(deleteJson, DH_ID, "333333"); + cJSON_AddStringToObject(deleteJson, DEV_ID, deviceId.c_str()); + cJSON_AddStringToObject(deleteJson, DEV_NAME, "dev_name"); char* cjson = cJSON_PrintUnformatted(deleteJson); if (cjson == nullptr) { cJSON_Delete(deleteJson); diff --git a/services/distributedhardwarefwkservice/test/fuzztest/componentdisable_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/componentdisable_fuzzer/BUILD.gn index d4226586..b153ef33 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/componentdisable_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/componentdisable_fuzzer/BUILD.gn @@ -23,8 +23,6 @@ ohos_fuzztest("ComponentDisableFuzzTest") { include_dirs = [ "${utils_path}/include", - "${utils_path}/include/eventbus", - "${utils_path}/include/log", "${common_path}/log/include", "${common_path}/utils/include", "${services_path}/distributedhardwarefwkservice/include/componentdisable", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/componentenable_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/componentenable_fuzzer/BUILD.gn index cb3e9e1a..deefb379 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/componentenable_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/componentenable_fuzzer/BUILD.gn @@ -23,8 +23,6 @@ ohos_fuzztest("ComponentEnableFuzzTest") { include_dirs = [ "${utils_path}/include", - "${utils_path}/include/eventbus", - "${utils_path}/include/log", "${common_path}/log/include", "${common_path}/utils/include", "${services_path}/distributedhardwarefwkservice/include/componentenable", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/componentloader_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/componentloader_fuzzer/BUILD.gn index f4376cf1..51da25a7 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/componentloader_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/componentloader_fuzzer/BUILD.gn @@ -25,8 +25,6 @@ ohos_fuzztest("ComponentLoaderFuzzTest") { include_dirs = [ "include", "${utils_path}/include", - "${utils_path}/include/eventbus", - "${utils_path}/include/log", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/versionmanager", "${services_path}/distributedhardwarefwkservice/include/resourcemanager", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn index 254f56b2..e5e82900 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/BUILD.gn @@ -25,7 +25,6 @@ ohos_fuzztest("ComponentManagerFuzzTest") { "${av_trans_path}/common/include", "${innerkits_path}/include", "${utils_path}/include", - "${utils_path}/include/log", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/componentmanager", "${services_path}/distributedhardwarefwkservice/include/lowlatency", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/dhcommtool_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/dhcommtool_fuzzer/BUILD.gn index 79b94926..d799f4b0 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/dhcommtool_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/dhcommtool_fuzzer/BUILD.gn @@ -23,7 +23,6 @@ ohos_fuzztest("DhCommToolFuzzTest") { include_dirs = [ "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/transport", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/dhmanagerfactory_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/dhmanagerfactory_fuzzer/BUILD.gn index 8577bc13..7e97ff80 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/dhmanagerfactory_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/dhmanagerfactory_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("DhManagerFactoryFuzzTest") { include_dirs = [ "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", "${common_path}/log/include", "${services_path}/distributedhardwarefwkservice/include", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/dhtransport_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/dhtransport_fuzzer/BUILD.gn index 336f975d..3553a512 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/dhtransport_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/dhtransport_fuzzer/BUILD.gn @@ -23,7 +23,6 @@ ohos_fuzztest("DhTransportFuzzTest") { include_dirs = [ "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", "${common_path}/log/include", "${services_path}/distributedhardwarefwkservice/include", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/distributedfwkservices_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/distributedfwkservices_fuzzer/BUILD.gn index 0df53991..3c6b2dc1 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/distributedfwkservices_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/distributedfwkservices_fuzzer/BUILD.gn @@ -25,7 +25,6 @@ ohos_fuzztest("DistributedFwkServicesFuzzTest") { "${av_trans_path}/common/include", "include", "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", "${common_path}/log/include", "${services_path}/distributedhardwarefwkservice/include", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/enabledcompsdump_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/enabledcompsdump_fuzzer/BUILD.gn index a31f7cd3..7f1db7bc 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/enabledcompsdump_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/enabledcompsdump_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("EnabledCompsDumpFuzzTest") { include_dirs = [ "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", "${common_path}/log/include", "${services_path}/distributedhardwarefwkservice/include", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/metainfomgr_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/metainfomgr_fuzzer/BUILD.gn index a3553e6a..79d3f7c2 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/metainfomgr_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/metainfomgr_fuzzer/BUILD.gn @@ -23,10 +23,8 @@ ohos_fuzztest("MetaInfoMgrFuzzTest") { include_dirs = [ "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", "${common_path}/log/include", - "${utils_path}/include/eventbus", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/transport", "${services_path}/distributedhardwarefwkservice/include/componentmanager", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/metainfomgr_fuzzer/metainfomgr_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/metainfomgr_fuzzer/metainfomgr_fuzzer.cpp index cf0c2725..c4f11d23 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/metainfomgr_fuzzer/metainfomgr_fuzzer.cpp +++ b/services/distributedhardwarefwkservice/test/fuzztest/metainfomgr_fuzzer/metainfomgr_fuzzer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2024-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -45,15 +45,6 @@ void GetDataByKeyPrefixFuzzTest(const uint8_t* data, size_t size) MetaInfoManager::GetInstance()->GetDataByKeyPrefix(keyPrefix, metaCapMap); } -void RemoveMetaInfoByKeyFuzzTest(const uint8_t* data, size_t size) -{ - if ((data == nullptr) || (size == 0)) { - return; - } - std::string key(reinterpret_cast(data), size); - MetaInfoManager::GetInstance()->RemoveMetaInfoByKey(key); -} - void GetMetaCapInfoFuzzTest(const uint8_t* data, size_t size) { if ((data == nullptr) || (size == 0)) { @@ -79,7 +70,6 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) /* Run your code on data */ OHOS::DistributedHardware::SyncMetaInfoFromDBFuzzTest(data, size); OHOS::DistributedHardware::GetDataByKeyPrefixFuzzTest(data, size); - OHOS::DistributedHardware::RemoveMetaInfoByKeyFuzzTest(data, size); OHOS::DistributedHardware::GetMetaCapInfoFuzzTest(data, size); return 0; } diff --git a/services/distributedhardwarefwkservice/test/fuzztest/publisher_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/publisher_fuzzer/BUILD.gn index 21ce98eb..b61d9adf 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/publisher_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/publisher_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("PublisherFuzzTest") { include_dirs = [ "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", "${common_path}/log/include", "${innerkits_path}/include", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/publisheritem_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/publisheritem_fuzzer/BUILD.gn index bcf40e43..665372b9 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/publisheritem_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/publisheritem_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("PublisherItemFuzzTest") { include_dirs = [ "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", "${common_path}/log/include", "${innerkits_path}/include", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn index bd1fed31..a274ba75 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/BUILD.gn @@ -24,8 +24,6 @@ ohos_fuzztest("ResourceManagerFuzzTest") { include_dirs = [ "${utils_path}/include", - "${utils_path}/include/log", - "${utils_path}/include/eventbus", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/resourcemanager", "${services_path}/distributedhardwarefwkservice/include/utils", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/task_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/task_fuzzer/BUILD.gn index db98bfad..1fcb2be9 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/task_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/task_fuzzer/BUILD.gn @@ -26,7 +26,6 @@ ohos_fuzztest("TaskFuzzTest") { include_dirs = [ "include", "${utils_path}/include", - "${utils_path}/include/log", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/task", "${services_path}/distributedhardwarefwkservice/include/utils", diff --git a/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/BUILD.gn b/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/BUILD.gn index 829df032..815e0473 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/fuzztest/versioninfomanager_fuzzer/BUILD.gn @@ -24,8 +24,6 @@ ohos_fuzztest("VersioninfoManagerFuzzTest") { include_dirs = [ "${utils_path}/include", - "${utils_path}/include/log", - "${utils_path}/include/eventbus", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/resourcemanager", "${services_path}/distributedhardwarefwkservice/include/utils", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn index b6cdbec5..a69bf176 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/accessmanager/BUILD.gn @@ -20,14 +20,12 @@ module_out_path = unittest_output_path config("module_private_config") { include_dirs = [ "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", "${common_path}/log/include", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/utils", "${services_path}/distributedhardwarefwkservice/include/accessmanager", "${services_path}/distributedhardwarefwkservice/include/resourcemanager", - "${utils_path}/include/eventbus", ] } diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn index c0b634f4..a4040af4 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn @@ -22,8 +22,6 @@ config("module_private_config") { include_dirs = [ "include", "${utils_path}/include", - "${utils_path}/include/eventbus", - "${utils_path}/include/log", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/hidumphelper", "${services_path}/distributedhardwarefwkservice/include/versionmanager", 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 4a2624ea..4aaecdad 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 @@ -445,329 +445,8 @@ HWTEST_F(ComponentLoaderTest, component_loader_test_028, TestSize.Level1) EXPECT_EQ(dhType, DHType::UNKNOWN); } -/** - * @tc.name: component_loader_test_029 - * @tc.desc: Verify the from_json function. - * @tc.type: FUNC - * @tc.require: AR000GHSK3 - */ -HWTEST_F(ComponentLoaderTest, component_loader_test_029, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddNumberToObject(json, COMP_NAME.c_str(), 4801); - - from_json(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(true, cfg.name.empty()); -} - -/** - * @tc.name: component_loader_test_030 - * @tc.desc: Verify the from_json function. - * @tc.type: FUNC - * @tc.require: AR000GHSK3 - */ -HWTEST_F(ComponentLoaderTest, component_loader_test_030, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name"); - cJSON_AddNumberToObject(json, COMP_TYPE.c_str(), 0x02); - - from_json(json, cfg); - cJSON_Delete(json); - EXPECT_NE(DHType::AUDIO, cfg.type); -} - -/** - * @tc.name: component_loader_test_031 - * @tc.desc: Verify the from_json function. - * @tc.type: FUNC - * @tc.require: AR000GHSK3 - */ -HWTEST_F(ComponentLoaderTest, component_loader_test_031, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name"); - cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "DHType::AUDIO"); - cJSON_AddNumberToObject(json, COMP_HANDLER_LOC.c_str(), 4801); - - from_json(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(true, cfg.compHandlerLoc.empty()); -} - -/** - * @tc.name: component_loader_test_032 - * @tc.desc: Verify the from_json function. - * @tc.type: FUNC - * @tc.require: AR000GHSK3 - */ -HWTEST_F(ComponentLoaderTest, component_loader_test_032, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name"); - cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "DHType::AUDIO"); - cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc"); - cJSON_AddNumberToObject(json, COMP_HANDLER_VERSION.c_str(), 4801); - - from_json(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(true, cfg.compHandlerVersion.empty()); -} - -/** - * @tc.name: component_loader_test_033 - * @tc.desc: Verify the from_json function. - * @tc.type: FUNC - * @tc.require: AR000GHSK3 - */ -HWTEST_F(ComponentLoaderTest, component_loader_test_033, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name"); - cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "DHType::AUDIO"); - cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc"); - cJSON_AddStringToObject(json, COMP_HANDLER_VERSION.c_str(), "comp_handler_version"); - cJSON_AddNumberToObject(json, COMP_SOURCE_LOC.c_str(), 4801); - - from_json(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(true, cfg.compSourceLoc.empty()); -} - -/** - * @tc.name: component_loader_test_034 - * @tc.desc: Verify the from_json function. - * @tc.type: FUNC - * @tc.require: AR000GHSK3 - */ -HWTEST_F(ComponentLoaderTest, component_loader_test_034, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name"); - cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "DHType::AUDIO"); - cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc"); - cJSON_AddStringToObject(json, COMP_HANDLER_VERSION.c_str(), "comp_handler_version"); - cJSON_AddStringToObject(json, COMP_SOURCE_LOC.c_str(), "comp_source_loc"); - cJSON_AddNumberToObject(json, COMP_SOURCE_VERSION.c_str(), 4801); - - from_json(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(true, cfg.compSourceVersion.empty()); -} - -/** - * @tc.name: component_loader_test_035 - * @tc.desc: Verify the from_json function. - * @tc.type: FUNC - * @tc.require: AR000GHSK3 - */ -HWTEST_F(ComponentLoaderTest, component_loader_test_035, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name"); - cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "DHType::AUDIO"); - cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc"); - cJSON_AddStringToObject(json, COMP_HANDLER_VERSION.c_str(), "comp_handler_version"); - cJSON_AddStringToObject(json, COMP_SOURCE_LOC.c_str(), "comp_source_loc"); - cJSON_AddStringToObject(json, COMP_SOURCE_VERSION.c_str(), "comp_source_version"); - cJSON_AddStringToObject(json, COMP_SOURCE_SA_ID.c_str(), "comp_source_sa_id"); - - from_json(json, cfg); - cJSON_Delete(json); - EXPECT_NE(4801, cfg.compSourceSaId); -} - -/** - * @tc.name: component_loader_test_036 - * @tc.desc: Verify the from_json function. - * @tc.type: FUNC - * @tc.require: AR000GHSK3 - */ -HWTEST_F(ComponentLoaderTest, component_loader_test_036, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name"); - cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "DHType::AUDIO"); - cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc"); - cJSON_AddStringToObject(json, COMP_HANDLER_VERSION.c_str(), "comp_handler_version"); - cJSON_AddStringToObject(json, COMP_SOURCE_LOC.c_str(), "comp_source_loc"); - cJSON_AddStringToObject(json, COMP_SOURCE_VERSION.c_str(), "comp_source_version"); - cJSON_AddStringToObject(json, COMP_SOURCE_SA_ID.c_str(), "4801"); - cJSON_AddNumberToObject(json, COMP_SINK_LOC.c_str(), 4802); - - from_json(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(true, cfg.compSinkLoc.empty()); -} - -/** - * @tc.name: component_loader_test_037 - * @tc.desc: Verify the from_json function. - * @tc.type: FUNC - * @tc.require: AR000GHSK3 - */ -HWTEST_F(ComponentLoaderTest, component_loader_test_037, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name"); - cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "DHType::AUDIO"); - cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc"); - cJSON_AddStringToObject(json, COMP_HANDLER_VERSION.c_str(), "comp_handler_version"); - cJSON_AddStringToObject(json, COMP_SOURCE_LOC.c_str(), "comp_source_loc"); - cJSON_AddStringToObject(json, COMP_SOURCE_VERSION.c_str(), "comp_source_version"); - cJSON_AddNumberToObject(json, COMP_SOURCE_SA_ID.c_str(), 4801); - cJSON_AddStringToObject(json, COMP_SINK_LOC.c_str(), "comp_sink_loc"); - cJSON_AddNumberToObject(json, COMP_SINK_VERSION.c_str(), 4802); - - from_json(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(true, cfg.compSinkVersion.empty()); -} - -/** - * @tc.name: component_loader_test_038 - * @tc.desc: Verify the from_json function. - * @tc.type: FUNC - * @tc.require: AR000GHSK3 - */ -HWTEST_F(ComponentLoaderTest, component_loader_test_038, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name"); - cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "DHType::AUDIO"); - cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc"); - cJSON_AddStringToObject(json, COMP_HANDLER_VERSION.c_str(), "comp_handler_version"); - cJSON_AddStringToObject(json, COMP_SOURCE_LOC.c_str(), "comp_source_loc"); - cJSON_AddStringToObject(json, COMP_SOURCE_VERSION.c_str(), "comp_source_version"); - cJSON_AddNumberToObject(json, COMP_SOURCE_SA_ID.c_str(), 4801); - cJSON_AddStringToObject(json, COMP_SINK_LOC.c_str(), "comp_sink_loc"); - cJSON_AddStringToObject(json, COMP_SINK_VERSION.c_str(), "comp_sink_version"); - cJSON_AddStringToObject(json, COMP_SINK_SA_ID.c_str(), "4802"); - - from_json(json, cfg); - cJSON_Delete(json); - EXPECT_NE(4802, cfg.compSinkSaId); -} - -/** - * @tc.name: component_loader_test_039 - * @tc.desc: Verify the from_json function. - * @tc.type: FUNC - * @tc.require: AR000GHSK3 - */ -HWTEST_F(ComponentLoaderTest, component_loader_test_039, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_NAME.c_str(), "name"); - cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "DHType::AUDIO"); - cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc"); - cJSON_AddStringToObject(json, COMP_HANDLER_VERSION.c_str(), "comp_handler_version"); - cJSON_AddStringToObject(json, COMP_SOURCE_LOC.c_str(), "comp_source_loc"); - cJSON_AddStringToObject(json, COMP_SOURCE_VERSION.c_str(), "comp_source_version"); - cJSON_AddNumberToObject(json, COMP_SOURCE_SA_ID.c_str(), 4801); - cJSON_AddStringToObject(json, COMP_SINK_LOC.c_str(), "comp_sink_loc"); - cJSON_AddStringToObject(json, COMP_SINK_VERSION.c_str(), "comp_sink_version"); - cJSON_AddNumberToObject(json, COMP_SINK_SA_ID.c_str(), 4802); - - from_json(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(4802, cfg.compSinkSaId); -} - -HWTEST_F(ComponentLoaderTest, ParseSink_001, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddNumberToObject(json, COMP_SINK_LOC.c_str(), 100); - auto ret = ParseSink(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED); -} - -HWTEST_F(ComponentLoaderTest, ParseSink_002, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_SINK_LOC.c_str(), "comp_sink_loc_test"); - cJSON_AddNumberToObject(json, COMP_SINK_VERSION.c_str(), 100); - auto ret = ParseSink(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED); -} - -HWTEST_F(ComponentLoaderTest, ParseSink_003, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_SINK_LOC.c_str(), "comp_sink_loc_test"); - cJSON_AddStringToObject(json, COMP_SINK_VERSION.c_str(), "1.0"); - cJSON_AddStringToObject(json, COMP_SINK_SA_ID.c_str(), "comp_sink_sa_id_test"); - auto ret = ParseSink(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED); -} - -HWTEST_F(ComponentLoaderTest, ParseSink_004, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_SINK_LOC.c_str(), "comp_sink_loc_test"); - cJSON_AddStringToObject(json, COMP_SINK_VERSION.c_str(), "1.0"); - cJSON_AddNumberToObject(json, COMP_SINK_SA_ID.c_str(), 4801); - auto ret = ParseSink(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(ret, DH_FWK_SUCCESS); -} - HWTEST_F(ComponentLoaderTest, ParseResourceDesc_001, TestSize.Level1) { - CompConfig cfg; - cJSON *array = cJSON_CreateArray(); - ASSERT_TRUE(array != nullptr); - cJSON *obj = cJSON_CreateObject(); - if (obj == nullptr) { - cJSON_Delete(array); - return; - } - cJSON_AddStringToObject(obj, COMP_SUBTYPE.c_str(), "comp_subtype"); - cJSON_AddBoolToObject(obj, COMP_SENSITIVE.c_str(), true); - cJSON_AddItemToArray(array, obj); - cJSON *json = cJSON_CreateObject(); - if (json == nullptr) { - cJSON_Delete(array); - return; - } - cJSON_AddItemToObject(json, COMP_RESOURCE_DESC.c_str(), array); - auto ret = ParseResourceDesc(json, cfg); - cJSON_Delete(json); - CompConfig config; cJSON *component = cJSON_CreateObject(); ASSERT_TRUE(component != nullptr); @@ -784,19 +463,10 @@ HWTEST_F(ComponentLoaderTest, ParseResourceDesc_001, TestSize.Level1) cJSON_AddStringToObject(component, COMP_RESOURCE_DESC.c_str(), "comp_resource_desc"); ComponentLoader::GetInstance().ParseCompConfigFromJson(component, config); cJSON_Delete(component); - EXPECT_EQ(ret, DH_FWK_SUCCESS); } HWTEST_F(ComponentLoaderTest, ParseResourceDesc_002, TestSize.Level1) { - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddNumberToObject(json, COMP_NAME.c_str(), 100); - auto ret = ParseComponent(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED); - CompConfig config1; cJSON *component1 = cJSON_CreateObject(); ASSERT_TRUE(component1 != nullptr); @@ -811,27 +481,10 @@ HWTEST_F(ComponentLoaderTest, ParseResourceDesc_002, TestSize.Level1) cJSON_AddStringToObject(component1, COMP_SINK_VERSION.c_str(), "com_sink_version_test"); cJSON_AddNumberToObject(component1, COMP_SINK_SA_ID.c_str(), 4802); cJSON_AddStringToObject(component1, COMP_RESOURCE_DESC.c_str(), "comp_resource_desc"); - ComponentLoader::GetInstance().ParseCompConfigFromJson(component1, config1); + ASSERT_NO_FATAL_FAILURE(ComponentLoader::GetInstance().ParseCompConfigFromJson(component1, config1)); cJSON_Delete(component1); } -HWTEST_F(ComponentLoaderTest, ParseResourceDesc_003, TestSize.Level1) -{ - CompConfig cfg; - cJSON *jsonArr = cJSON_CreateArray(); - ASSERT_TRUE(jsonArr != nullptr); - cJSON *json = cJSON_CreateObject(); - if (json == nullptr) { - cJSON_Delete(jsonArr); - return; - } - cJSON_AddNumberToObject(json, COMP_SUBTYPE.c_str(), 1); - cJSON_AddItemToArray(jsonArr, json); - auto ret = ParseResourceDesc(jsonArr, cfg); - cJSON_Delete(jsonArr); - EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED); -} - HWTEST_F(ComponentLoaderTest, ParseResourceDescFromJson_003, TestSize.Level1) { CompConfig config; @@ -856,152 +509,6 @@ HWTEST_F(ComponentLoaderTest, ParseResourceDescFromJson_003, TestSize.Level1) EXPECT_TRUE(config.compResourceDesc.empty()); } -HWTEST_F(ComponentLoaderTest, from_json_001, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddNumberToObject(json, COMP_NAME.c_str(), 100); - from_json(json, cfg); - cJSON_Delete(json); - - cJSON *Json1 = cJSON_CreateObject(); - ASSERT_TRUE(Json1 != nullptr); - cJSON_AddStringToObject(Json1, COMP_NAME.c_str(), "comp_name_test"); - cJSON_AddStringToObject(Json1, COMP_TYPE.c_str(), "comp_type_test"); - cJSON_AddStringToObject(Json1, COMP_HANDLER_LOC.c_str(), "comp_handler_loc_test"); - cJSON_AddStringToObject(Json1, COMP_HANDLER_VERSION.c_str(), "1.0"); - cJSON_AddNumberToObject(Json1, COMP_SOURCE_LOC.c_str(), 100); - from_json(Json1, cfg); - cJSON_Delete(Json1); - - cJSON *Json2 = cJSON_CreateObject(); - ASSERT_TRUE(Json2 != nullptr); - cJSON_AddStringToObject(Json2, COMP_NAME.c_str(), "comp_name_test"); - cJSON_AddStringToObject(Json2, COMP_TYPE.c_str(), "comp_type_test"); - cJSON_AddStringToObject(Json2, COMP_HANDLER_LOC.c_str(), "comp_handler_loc_test"); - cJSON_AddStringToObject(Json2, COMP_HANDLER_VERSION.c_str(), "1.0"); - cJSON_AddStringToObject(Json2, COMP_SOURCE_LOC.c_str(), "comp_source_loc_test"); - cJSON_AddStringToObject(Json2, COMP_SOURCE_VERSION.c_str(), "1.0"); - cJSON_AddNumberToObject(Json2, COMP_SOURCE_SA_ID.c_str(), 4801); - cJSON_AddNumberToObject(Json2, COMP_SINK_LOC.c_str(), 100); - EXPECT_NO_FATAL_FAILURE(from_json(Json2, cfg)); - cJSON_Delete(Json2); -} - -HWTEST_F(ComponentLoaderTest, ParseComponent_001, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddNumberToObject(json, COMP_NAME.c_str(), 100); - auto ret = ParseComponent(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED); -} - -HWTEST_F(ComponentLoaderTest, ParseComponent_002, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_NAME.c_str(), "comp_name_test"); - cJSON_AddNumberToObject(json, COMP_TYPE.c_str(), 100); - auto ret = ParseComponent(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED); -} - -HWTEST_F(ComponentLoaderTest, ParseComponent_003, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_NAME.c_str(), "comp_name_test"); - cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "comp_type_test"); - cJSON_AddNumberToObject(json, COMP_HANDLER_LOC.c_str(), 100); - auto ret = ParseComponent(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED); -} - -HWTEST_F(ComponentLoaderTest, ParseComponent_004, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_NAME.c_str(), "comp_name_test"); - cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "comp_type_test"); - cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc_test"); - cJSON_AddNumberToObject(json, COMP_HANDLER_VERSION.c_str(), 100); - auto ret = ParseComponent(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED); -} - -HWTEST_F(ComponentLoaderTest, ParseComponent_005, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_NAME.c_str(), "comp_name_test"); - cJSON_AddStringToObject(json, COMP_TYPE.c_str(), "comp_type_test"); - cJSON_AddStringToObject(json, COMP_HANDLER_LOC.c_str(), "comp_handler_loc_test"); - cJSON_AddStringToObject(json, COMP_HANDLER_VERSION.c_str(), "1.0"); - auto ret = ParseComponent(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(ret, DH_FWK_SUCCESS); -} - -HWTEST_F(ComponentLoaderTest, ParseSource_001, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddNumberToObject(json, COMP_SOURCE_LOC.c_str(), 100); - auto ret = ParseSource(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED); -} - -HWTEST_F(ComponentLoaderTest, ParseSource_002, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_SOURCE_LOC.c_str(), "comp_source_loc_test"); - cJSON_AddNumberToObject(json, COMP_SOURCE_VERSION.c_str(), 100); - auto ret = ParseSource(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED); -} - -HWTEST_F(ComponentLoaderTest, ParseSource_003, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_SOURCE_LOC.c_str(), "comp_source_loc_test"); - cJSON_AddStringToObject(json, COMP_SOURCE_VERSION.c_str(), "1.0"); - cJSON_AddStringToObject(json, COMP_SOURCE_SA_ID.c_str(), "4801"); - auto ret = ParseSource(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(ret, ERR_DH_FWK_JSON_PARSE_FAILED); -} - -HWTEST_F(ComponentLoaderTest, ParseSource_004, TestSize.Level1) -{ - CompConfig cfg; - cJSON *json = cJSON_CreateObject(); - ASSERT_TRUE(json != nullptr); - cJSON_AddStringToObject(json, COMP_SOURCE_LOC.c_str(), "comp_source_loc_test"); - cJSON_AddStringToObject(json, COMP_SOURCE_VERSION.c_str(), "1.0"); - cJSON_AddNumberToObject(json, COMP_SOURCE_SA_ID.c_str(), 4801); - auto ret = ParseSource(json, cfg); - cJSON_Delete(json); - EXPECT_EQ(ret, DH_FWK_SUCCESS); -} - HWTEST_F(ComponentLoaderTest, GetHardwareHandler_003, TestSize.Level1) { ComponentLoader::GetInstance().compHandlerMap_.clear(); diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn index 1f03bf3b..d6fe8df2 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn @@ -24,8 +24,6 @@ config("module_private_config") { "include", "${innerkits_path}/include", "${utils_path}/include", - "${utils_path}/include/log", - "${utils_path}/include/eventbus", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/componentloader", "${services_path}/distributedhardwarefwkservice/include/componentmanager", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_monitior/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_monitior/BUILD.gn index 73c5355a..bb271cce 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_monitior/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_monitior/BUILD.gn @@ -22,8 +22,6 @@ config("module_private_config") { include_dirs = [ "include", "${utils_path}/include", - "${utils_path}/include/log", - "${utils_path}/include/eventbus", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/componentloader", "${services_path}/distributedhardwarefwkservice/include/componentmanager", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_privacy/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_privacy/BUILD.gn index 3189d10a..4b5ca7df 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_privacy/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_privacy/BUILD.gn @@ -20,8 +20,6 @@ config("module_private_config") { visibility = [ ":*" ] include_dirs = [ "${utils_path}/include", - "${utils_path}/include/log", - "${utils_path}/include/eventbus", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/componentloader", "${services_path}/distributedhardwarefwkservice/include/componentmanager", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn index 91fd2690..f6c3fa0c 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/dbadapter/BUILD.gn @@ -22,8 +22,6 @@ config("module_private_config") { include_dirs = [ "include", "${utils_path}/include", - "${utils_path}/include/log", - "${utils_path}/include/eventbus", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/resourcemanager", "${services_path}/distributedhardwarefwkservice/include/utils", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn index c965a22e..e0bc6be8 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwaremanager/BUILD.gn @@ -22,7 +22,6 @@ config("module_private_config") { include_dirs = [ "include", "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/log/include", "${common_path}/utils/include", "${services_path}/distributedhardwarefwkservice/include", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn index e3104003..47348140 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwareservice/BUILD.gn @@ -24,8 +24,6 @@ config("module_private_config") { "include", "${innerkits_path}/include", "${utils_path}/include", - "${utils_path}/include/log", - "${utils_path}/include/eventbus", "${common_path}/log/include", "${common_path}/utils/include", "${services_path}/distributedhardwarefwkservice/include", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwarestub/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwarestub/BUILD.gn index fbcbadbf..93d92848 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwarestub/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/distributedhardwarestub/BUILD.gn @@ -24,8 +24,6 @@ config("module_private_config") { "include", "${innerkits_path}/include", "${utils_path}/include", - "${utils_path}/include/log", - "${utils_path}/include/eventbus", "${common_path}/log/include", "${common_path}/utils/include", "${services_path}/distributedhardwarefwkservice/include", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/hidumphelper/hidumphelper/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/hidumphelper/hidumphelper/BUILD.gn index 1de204d7..6efa6ce6 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/hidumphelper/hidumphelper/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/hidumphelper/hidumphelper/BUILD.gn @@ -23,9 +23,7 @@ config("module_private_config") { "include", "${av_trans_path}/common/include", "${common_path}/utils/include", - "${utils_path}/include/log", "${innerkits_path}/include", - "${utils_path}/include/eventbus", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/hidumphelper", "${services_path}/distributedhardwarefwkservice/include/resourcemanager", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn index 1ab32b4e..ec3aa4a8 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/localhardwaremanager/BUILD.gn @@ -23,8 +23,6 @@ config("module_private_config") { include_dirs = [ "include", "${utils_path}/include", - "${utils_path}/include/eventbus", - "${utils_path}/include/log", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/versionmanager", "${services_path}/distributedhardwarefwkservice/include/resourcemanager", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/pluginlistenerimpl/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/pluginlistenerimpl/BUILD.gn index e38bd190..0a7d772a 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/pluginlistenerimpl/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/localhardwaremanager/pluginlistenerimpl/BUILD.gn @@ -22,8 +22,6 @@ config("module_private_config") { include_dirs = [ "include", "${utils_path}/include", - "${utils_path}/include/eventbus", - "${utils_path}/include/log", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/versionmanager", "${services_path}/distributedhardwarefwkservice/include/resourcemanager", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn index 8db8f5a6..71f2f3b3 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/BUILD.gn @@ -22,8 +22,6 @@ config("module_private_config") { include_dirs = [ "include", "${utils_path}/include", - "${utils_path}/include/log", - "${utils_path}/include/eventbus", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/resourcemanager", "${services_path}/distributedhardwarefwkservice/include/task", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/capability_info_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/capability_info_test.cpp index 1ab206af..6126cfbe 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/capability_info_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/capability_info_test.cpp @@ -62,7 +62,7 @@ HWTEST_F(CapabilityInfoTest, FromJson_002, TestSize.Level1) { cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddNumberToObject(jsonObj, DH_ID.c_str(), 1); + cJSON_AddNumberToObject(jsonObj, DH_ID, 1); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); @@ -80,8 +80,8 @@ HWTEST_F(CapabilityInfoTest, FromJson_003, TestSize.Level1) { cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), "dhid_test"); - cJSON_AddNumberToObject(jsonObj, DEV_ID.c_str(), 1); + cJSON_AddStringToObject(jsonObj, DH_ID, "dhid_test"); + cJSON_AddNumberToObject(jsonObj, DEV_ID, 1); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); @@ -99,9 +99,9 @@ HWTEST_F(CapabilityInfoTest, FromJson_004, TestSize.Level1) { cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), "dhid_test"); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), "devid_test"); - cJSON_AddNumberToObject(jsonObj, DEV_NAME.c_str(), 1); + cJSON_AddStringToObject(jsonObj, DH_ID, "dhid_test"); + cJSON_AddStringToObject(jsonObj, DEV_ID, "devid_test"); + cJSON_AddNumberToObject(jsonObj, DEV_NAME, 1); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); @@ -119,10 +119,10 @@ HWTEST_F(CapabilityInfoTest, FromJson_005, TestSize.Level1) { cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), "dhid_test"); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), "devid_test"); - cJSON_AddStringToObject(jsonObj, DEV_NAME.c_str(), "devname_test"); - cJSON_AddStringToObject(jsonObj, DEV_TYPE.c_str(), "devtype_test"); + cJSON_AddStringToObject(jsonObj, DH_ID, "dhid_test"); + cJSON_AddStringToObject(jsonObj, DEV_ID, "devid_test"); + cJSON_AddStringToObject(jsonObj, DEV_NAME, "devname_test"); + cJSON_AddStringToObject(jsonObj, DEV_TYPE, "devtype_test"); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); @@ -141,11 +141,11 @@ HWTEST_F(CapabilityInfoTest, FromJson_006, TestSize.Level1) const uint16_t devType = 1; cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), "dhid_test"); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), "devid_test"); - cJSON_AddStringToObject(jsonObj, DEV_NAME.c_str(), "devname_test"); - cJSON_AddNumberToObject(jsonObj, DEV_TYPE.c_str(), devType); - cJSON_AddStringToObject(jsonObj, DH_TYPE.c_str(), "dhtype_test"); + cJSON_AddStringToObject(jsonObj, DH_ID, "dhid_test"); + cJSON_AddStringToObject(jsonObj, DEV_ID, "devid_test"); + cJSON_AddStringToObject(jsonObj, DEV_NAME, "devname_test"); + cJSON_AddNumberToObject(jsonObj, DEV_TYPE, devType); + cJSON_AddStringToObject(jsonObj, DH_TYPE, "dhtype_test"); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); @@ -165,12 +165,12 @@ HWTEST_F(CapabilityInfoTest, FromJson_007, TestSize.Level1) const uint32_t dhType = 1; cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), "dhid_test"); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), "devid_test"); - cJSON_AddStringToObject(jsonObj, DEV_NAME.c_str(), "devname_test"); - cJSON_AddNumberToObject(jsonObj, DEV_TYPE.c_str(), devType); - cJSON_AddNumberToObject(jsonObj, DH_TYPE.c_str(), dhType); - cJSON_AddNumberToObject(jsonObj, DH_ATTRS.c_str(), 1); + cJSON_AddStringToObject(jsonObj, DH_ID, "dhid_test"); + cJSON_AddStringToObject(jsonObj, DEV_ID, "devid_test"); + cJSON_AddStringToObject(jsonObj, DEV_NAME, "devname_test"); + cJSON_AddNumberToObject(jsonObj, DEV_TYPE, devType); + cJSON_AddNumberToObject(jsonObj, DH_TYPE, dhType); + cJSON_AddNumberToObject(jsonObj, DH_ATTRS, 1); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); @@ -190,13 +190,13 @@ HWTEST_F(CapabilityInfoTest, FromJson_008, TestSize.Level1) const uint32_t dhType = 1; cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), "dhid_test"); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), "devid_test"); - cJSON_AddStringToObject(jsonObj, DEV_NAME.c_str(), "devname_test"); - cJSON_AddNumberToObject(jsonObj, DEV_TYPE.c_str(), devType); - cJSON_AddNumberToObject(jsonObj, DH_TYPE.c_str(), dhType); - cJSON_AddStringToObject(jsonObj, DH_ATTRS.c_str(), "dhattrs_test"); - cJSON_AddNumberToObject(jsonObj, DH_SUBTYPE.c_str(), 1); + cJSON_AddStringToObject(jsonObj, DH_ID, "dhid_test"); + cJSON_AddStringToObject(jsonObj, DEV_ID, "devid_test"); + cJSON_AddStringToObject(jsonObj, DEV_NAME, "devname_test"); + cJSON_AddNumberToObject(jsonObj, DEV_TYPE, devType); + cJSON_AddNumberToObject(jsonObj, DH_TYPE, dhType); + cJSON_AddStringToObject(jsonObj, DH_ATTRS, "dhattrs_test"); + cJSON_AddNumberToObject(jsonObj, DH_SUBTYPE, 1); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); @@ -216,13 +216,13 @@ HWTEST_F(CapabilityInfoTest, FromJson_009, TestSize.Level1) const uint32_t dhType = 1; cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), "dhid_test"); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), "devid_test"); - cJSON_AddStringToObject(jsonObj, DEV_NAME.c_str(), "devname_test"); - cJSON_AddNumberToObject(jsonObj, DEV_TYPE.c_str(), devType); - cJSON_AddNumberToObject(jsonObj, DH_TYPE.c_str(), dhType); - cJSON_AddStringToObject(jsonObj, DH_ATTRS.c_str(), "dhattrs_test"); - cJSON_AddStringToObject(jsonObj, DH_SUBTYPE.c_str(), "dhsubtype_test"); + cJSON_AddStringToObject(jsonObj, DH_ID, "dhid_test"); + cJSON_AddStringToObject(jsonObj, DEV_ID, "devid_test"); + cJSON_AddStringToObject(jsonObj, DEV_NAME, "devname_test"); + cJSON_AddNumberToObject(jsonObj, DEV_TYPE, devType); + cJSON_AddNumberToObject(jsonObj, DH_TYPE, dhType); + cJSON_AddStringToObject(jsonObj, DH_ATTRS, "dhattrs_test"); + cJSON_AddStringToObject(jsonObj, DH_SUBTYPE, "dhsubtype_test"); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/meta_cap_info_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/meta_cap_info_test.cpp index f1f2a92d..4bbf8ca0 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/meta_cap_info_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/meta_cap_info_test.cpp @@ -76,7 +76,7 @@ HWTEST_F(MetaCapInfoTest, FromJsonString_002, TestSize.Level1) CompVersion{ .sinkVersion = "" }); cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), DHID_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DH_ID, DHID_TEST.c_str()); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); @@ -101,7 +101,7 @@ HWTEST_F(MetaCapInfoTest, FromJson_001, TestSize.Level1) MetaCapabilityInfo metaCapInfo; cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddNumberToObject(jsonObj, DH_ID.c_str(), 1); + cJSON_AddNumberToObject(jsonObj, DH_ID, 1); EXPECT_NO_FATAL_FAILURE(FromJson(jsonObj, metaCapInfo)); cJSON_Delete(jsonObj); } @@ -111,8 +111,8 @@ HWTEST_F(MetaCapInfoTest, FromJson_002, TestSize.Level1) MetaCapabilityInfo metaCapInfo; cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), DHID_TEST.c_str()); - cJSON_AddNumberToObject(jsonObj, DEV_ID.c_str(), 1); + cJSON_AddStringToObject(jsonObj, DH_ID, DHID_TEST.c_str()); + cJSON_AddNumberToObject(jsonObj, DEV_ID, 1); EXPECT_NO_FATAL_FAILURE(FromJson(jsonObj, metaCapInfo)); cJSON_Delete(jsonObj); } @@ -122,9 +122,9 @@ HWTEST_F(MetaCapInfoTest, FromJson_003, TestSize.Level1) MetaCapabilityInfo metaCapInfo; cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), DHID_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), DEVID_TEST.c_str()); - cJSON_AddNumberToObject(jsonObj, DEV_NAME.c_str(), 1); + cJSON_AddStringToObject(jsonObj, DH_ID, DHID_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DEV_ID, DEVID_TEST.c_str()); + cJSON_AddNumberToObject(jsonObj, DEV_NAME, 1); EXPECT_NO_FATAL_FAILURE(FromJson(jsonObj, metaCapInfo)); cJSON_Delete(jsonObj); } @@ -135,10 +135,10 @@ HWTEST_F(MetaCapInfoTest, FromJson_004, TestSize.Level1) cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); std::string devTypeTest = "devTypeTest"; - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), DHID_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), DEVID_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DEV_NAME.c_str(), DEVNAME_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DEV_TYPE.c_str(), devTypeTest.c_str()); + cJSON_AddStringToObject(jsonObj, DH_ID, DHID_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DEV_ID, DEVID_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DEV_NAME, DEVNAME_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DEV_TYPE, devTypeTest.c_str()); EXPECT_NO_FATAL_FAILURE(FromJson(jsonObj, metaCapInfo)); cJSON_Delete(jsonObj); } @@ -149,11 +149,11 @@ HWTEST_F(MetaCapInfoTest, FromJson_005, TestSize.Level1) cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); std::string dhTypeTest = "dhTypeTest"; - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), DHID_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), DEVID_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DEV_NAME.c_str(), DEVNAME_TEST.c_str()); - cJSON_AddNumberToObject(jsonObj, DEV_TYPE.c_str(), DEV_TYPE_TEST); - cJSON_AddStringToObject(jsonObj, DH_TYPE.c_str(), dhTypeTest.c_str()); + cJSON_AddStringToObject(jsonObj, DH_ID, DHID_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DEV_ID, DEVID_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DEV_NAME, DEVNAME_TEST.c_str()); + cJSON_AddNumberToObject(jsonObj, DEV_TYPE, DEV_TYPE_TEST); + cJSON_AddStringToObject(jsonObj, DH_TYPE, dhTypeTest.c_str()); EXPECT_NO_FATAL_FAILURE(FromJson(jsonObj, metaCapInfo)); cJSON_Delete(jsonObj); } @@ -164,12 +164,12 @@ HWTEST_F(MetaCapInfoTest, FromJson_006, TestSize.Level1) cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); std::string dhTypeTest = "dhTypeTest"; - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), DHID_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), DEVID_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DEV_NAME.c_str(), DEVNAME_TEST.c_str()); - cJSON_AddNumberToObject(jsonObj, DEV_TYPE.c_str(), DEV_TYPE_TEST); - cJSON_AddNumberToObject(jsonObj, DH_TYPE.c_str(), DH_TYPE_TEST); - cJSON_AddNumberToObject(jsonObj, DH_ATTRS.c_str(), 1); + cJSON_AddStringToObject(jsonObj, DH_ID, DHID_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DEV_ID, DEVID_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DEV_NAME, DEVNAME_TEST.c_str()); + cJSON_AddNumberToObject(jsonObj, DEV_TYPE, DEV_TYPE_TEST); + cJSON_AddNumberToObject(jsonObj, DH_TYPE, DH_TYPE_TEST); + cJSON_AddNumberToObject(jsonObj, DH_ATTRS, 1); EXPECT_NO_FATAL_FAILURE(FromJson(jsonObj, metaCapInfo)); cJSON_Delete(jsonObj); } @@ -180,13 +180,13 @@ HWTEST_F(MetaCapInfoTest, FromJson_007, TestSize.Level1) cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); std::string dhTypeTest = "dhTypeTest"; - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), DHID_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), DEVID_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DEV_NAME.c_str(), DEVNAME_TEST.c_str()); - cJSON_AddNumberToObject(jsonObj, DEV_TYPE.c_str(), DEV_TYPE_TEST); - cJSON_AddNumberToObject(jsonObj, DH_TYPE.c_str(), DH_TYPE_TEST); - cJSON_AddStringToObject(jsonObj, DH_ATTRS.c_str(), DHATTRS_TEST.c_str()); - cJSON_AddNumberToObject(jsonObj, DH_SUBTYPE.c_str(), 1); + cJSON_AddStringToObject(jsonObj, DH_ID, DHID_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DEV_ID, DEVID_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DEV_NAME, DEVNAME_TEST.c_str()); + cJSON_AddNumberToObject(jsonObj, DEV_TYPE, DEV_TYPE_TEST); + cJSON_AddNumberToObject(jsonObj, DH_TYPE, DH_TYPE_TEST); + cJSON_AddStringToObject(jsonObj, DH_ATTRS, DHATTRS_TEST.c_str()); + cJSON_AddNumberToObject(jsonObj, DH_SUBTYPE, 1); EXPECT_NO_FATAL_FAILURE(FromJson(jsonObj, metaCapInfo)); cJSON_Delete(jsonObj); } @@ -197,14 +197,14 @@ HWTEST_F(MetaCapInfoTest, FromJson_008, TestSize.Level1) cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); std::string dhTypeTest = "dhTypeTest"; - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), DHID_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), DEVID_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DEV_NAME.c_str(), DEVNAME_TEST.c_str()); - cJSON_AddNumberToObject(jsonObj, DEV_TYPE.c_str(), DEV_TYPE_TEST); - cJSON_AddNumberToObject(jsonObj, DH_TYPE.c_str(), DH_TYPE_TEST); - cJSON_AddStringToObject(jsonObj, DH_ATTRS.c_str(), DHATTRS_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DH_SUBTYPE.c_str(), DHSUBTYPE_TEST.c_str()); - cJSON_AddNumberToObject(jsonObj, DEV_UDID_HASH.c_str(), 1); + cJSON_AddStringToObject(jsonObj, DH_ID, DHID_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DEV_ID, DEVID_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DEV_NAME, DEVNAME_TEST.c_str()); + cJSON_AddNumberToObject(jsonObj, DEV_TYPE, DEV_TYPE_TEST); + cJSON_AddNumberToObject(jsonObj, DH_TYPE, DH_TYPE_TEST); + cJSON_AddStringToObject(jsonObj, DH_ATTRS, DHATTRS_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DH_SUBTYPE, DHSUBTYPE_TEST.c_str()); + cJSON_AddNumberToObject(jsonObj, DEV_UDID_HASH, 1); EXPECT_NO_FATAL_FAILURE(FromJson(jsonObj, metaCapInfo)); cJSON_Delete(jsonObj); } @@ -215,15 +215,15 @@ HWTEST_F(MetaCapInfoTest, FromJson_009, TestSize.Level1) cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); std::string dhTypeTest = "dhTypeTest"; - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), DHID_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), DEVID_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DEV_NAME.c_str(), DEVNAME_TEST.c_str()); - cJSON_AddNumberToObject(jsonObj, DEV_TYPE.c_str(), DEV_TYPE_TEST); - cJSON_AddNumberToObject(jsonObj, DH_TYPE.c_str(), DH_TYPE_TEST); - cJSON_AddStringToObject(jsonObj, DH_ATTRS.c_str(), DHATTRS_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DH_SUBTYPE.c_str(), DHSUBTYPE_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DEV_UDID_HASH.c_str(), UDIDHASH_TEST.c_str()); - cJSON_AddNumberToObject(jsonObj, SINK_VER.c_str(), 1); + cJSON_AddStringToObject(jsonObj, DH_ID, DHID_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DEV_ID, DEVID_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DEV_NAME, DEVNAME_TEST.c_str()); + cJSON_AddNumberToObject(jsonObj, DEV_TYPE, DEV_TYPE_TEST); + cJSON_AddNumberToObject(jsonObj, DH_TYPE, DH_TYPE_TEST); + cJSON_AddStringToObject(jsonObj, DH_ATTRS, DHATTRS_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DH_SUBTYPE, DHSUBTYPE_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DEV_UDID_HASH, UDIDHASH_TEST.c_str()); + cJSON_AddNumberToObject(jsonObj, SINK_VER, 1); EXPECT_NO_FATAL_FAILURE(FromJson(jsonObj, metaCapInfo)); cJSON_Delete(jsonObj); } @@ -233,15 +233,15 @@ HWTEST_F(MetaCapInfoTest, FromJson_010, TestSize.Level1) MetaCapabilityInfo metaCapInfo; cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), DHID_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), DEVID_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DEV_NAME.c_str(), DEVNAME_TEST.c_str()); - cJSON_AddNumberToObject(jsonObj, DEV_TYPE.c_str(), DEV_TYPE_TEST); - cJSON_AddNumberToObject(jsonObj, DH_TYPE.c_str(), DH_TYPE_TEST); - cJSON_AddStringToObject(jsonObj, DH_ATTRS.c_str(), DHATTRS_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DH_SUBTYPE.c_str(), DHSUBTYPE_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, DEV_UDID_HASH.c_str(), UDIDHASH_TEST.c_str()); - cJSON_AddStringToObject(jsonObj, SINK_VER.c_str(), SINKVER_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DH_ID, DHID_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DEV_ID, DEVID_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DEV_NAME, DEVNAME_TEST.c_str()); + cJSON_AddNumberToObject(jsonObj, DEV_TYPE, DEV_TYPE_TEST); + cJSON_AddNumberToObject(jsonObj, DH_TYPE, DH_TYPE_TEST); + cJSON_AddStringToObject(jsonObj, DH_ATTRS, DHATTRS_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DH_SUBTYPE, DHSUBTYPE_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, DEV_UDID_HASH, UDIDHASH_TEST.c_str()); + cJSON_AddStringToObject(jsonObj, SINK_VER, SINKVER_TEST.c_str()); EXPECT_NO_FATAL_FAILURE(FromJson(jsonObj, metaCapInfo)); cJSON_Delete(jsonObj); } diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/meta_info_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/meta_info_manager_test.cpp index 8372f2ea..24b83654 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/meta_info_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/meta_info_manager_test.cpp @@ -175,26 +175,6 @@ HWTEST_F(MetaInfoMgrTest, GetDataByKeyPrefix_002, TestSize.Level1) MetaInfoManager::GetInstance()->UnInit(); } -HWTEST_F(MetaInfoMgrTest, RemoveMetaInfoByKey_001, TestSize.Level1) -{ - std::string key = ""; - auto ret = MetaInfoManager::GetInstance()->RemoveMetaInfoByKey(key); - EXPECT_EQ(ERR_DH_FWK_PARA_INVALID, ret); - - key = "key_test"; - ret = MetaInfoManager::GetInstance()->RemoveMetaInfoByKey(key); - EXPECT_EQ(ERR_DH_FWK_RESOURCE_DB_ADAPTER_POINTER_NULL, ret); -} - -HWTEST_F(MetaInfoMgrTest, RemoveMetaInfoByKey_002, TestSize.Level1) -{ - std::string key = "key_test"; - MetaInfoManager::GetInstance()->Init(); - auto ret = MetaInfoManager::GetInstance()->RemoveMetaInfoByKey(key); - EXPECT_EQ(DH_FWK_SUCCESS, ret); - MetaInfoManager::GetInstance()->UnInit(); -} - HWTEST_F(MetaInfoMgrTest, GetMetaCapInfo_001, TestSize.Level1) { std::string udidHash = ""; @@ -426,8 +406,8 @@ HWTEST_F(MetaInfoMgrTest, HandleMetaCapabilityAddChange_001, TestSize.Level1) { cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), "111111"); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), "222222"); + cJSON_AddStringToObject(jsonObj, DH_ID, "111111"); + cJSON_AddStringToObject(jsonObj, DEV_ID, "222222"); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); @@ -456,8 +436,8 @@ HWTEST_F(MetaInfoMgrTest, HandleMetaCapabilityAddChange_002, TestSize.Level1) DHContext::GetInstance().devIdEntrySet_.insert(idEntry); cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), "111111"); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), deviceId.c_str()); + cJSON_AddStringToObject(jsonObj, DH_ID, "111111"); + cJSON_AddStringToObject(jsonObj, DEV_ID, deviceId.c_str()); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); @@ -481,8 +461,8 @@ HWTEST_F(MetaInfoMgrTest, HandleMetaCapabilityAddChange_003, TestSize.Level1) std::string deviceId = Sha256(uuid); cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), "111111"); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), deviceId.c_str()); + cJSON_AddStringToObject(jsonObj, DH_ID, "111111"); + cJSON_AddStringToObject(jsonObj, DEV_ID, deviceId.c_str()); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); @@ -505,8 +485,8 @@ HWTEST_F(MetaInfoMgrTest, HandleMetaCapabilityUpdateChange_001, TestSize.Level1) { cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), "111111"); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), "222222"); + cJSON_AddStringToObject(jsonObj, DH_ID, "111111"); + cJSON_AddStringToObject(jsonObj, DEV_ID, "222222"); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); @@ -534,8 +514,8 @@ HWTEST_F(MetaInfoMgrTest, HandleMetaCapabilityUpdateChange_002, TestSize.Level1) }; cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), "111111"); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), deviceId.c_str()); + cJSON_AddStringToObject(jsonObj, DH_ID, "111111"); + cJSON_AddStringToObject(jsonObj, DEV_ID, deviceId.c_str()); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); @@ -559,8 +539,8 @@ HWTEST_F(MetaInfoMgrTest, HandleMetaCapabilityUpdateChange_003, TestSize.Level1) std::string deviceId = Sha256(uuid); cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), "111111"); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), deviceId.c_str()); + cJSON_AddStringToObject(jsonObj, DH_ID, "111111"); + cJSON_AddStringToObject(jsonObj, DEV_ID, deviceId.c_str()); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); @@ -589,8 +569,8 @@ HWTEST_F(MetaInfoMgrTest, HandleMetaCapabilityDeleteChange_001, TestSize.Level1) { cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), "111111"); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), "222222"); + cJSON_AddStringToObject(jsonObj, DH_ID, "111111"); + cJSON_AddStringToObject(jsonObj, DEV_ID, "222222"); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/resource_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/resource_manager_test.cpp index 9dfc400e..f5dc7c25 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/resource_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/resource_manager_test.cpp @@ -436,8 +436,8 @@ HWTEST_F(ResourceManagerTest, HandleCapabilityChange_001, TestSize.Level1) { cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), "111111"); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), "222222"); + cJSON_AddStringToObject(jsonObj, DH_ID, "111111"); + cJSON_AddStringToObject(jsonObj, DEV_ID, "222222"); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); @@ -480,8 +480,8 @@ HWTEST_F(ResourceManagerTest, HandleCapabilityChange_002, TestSize.Level1) DHContext::GetInstance().devIdEntrySet_.insert(idEntry); cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), "111111"); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), deviceId.c_str()); + cJSON_AddStringToObject(jsonObj, DH_ID, "111111"); + cJSON_AddStringToObject(jsonObj, DEV_ID, deviceId.c_str()); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); @@ -520,8 +520,8 @@ HWTEST_F(ResourceManagerTest, HandleCapabilityChange_003, TestSize.Level1) DHContext::GetInstance().AddOnlineDevice("111111", uuid, "222222"); cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DH_ID.c_str(), "111111"); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), deviceId.c_str()); + cJSON_AddStringToObject(jsonObj, DH_ID, "111111"); + cJSON_AddStringToObject(jsonObj, DEV_ID, deviceId.c_str()); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/version_info_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/version_info_test.cpp index 8c1c2a3f..33e772a0 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/version_info_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/version_info_test.cpp @@ -95,11 +95,11 @@ HWTEST_F(VersionInfoTest, FromJson_CompVersion_002, TestSize.Level1) const uint32_t dhType = 1; cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, NAME.c_str(), "name_test"); - cJSON_AddNumberToObject(jsonObj, TYPE.c_str(), dhType); - cJSON_AddStringToObject(jsonObj, HANDLER.c_str(), "handler_ver_1.0"); - cJSON_AddStringToObject(jsonObj, SOURCE_VER.c_str(), "source_ver_1.0"); - cJSON_AddStringToObject(jsonObj, SINK_VER.c_str(), "sink_ver_1.0"); + cJSON_AddStringToObject(jsonObj, NAME, "name_test"); + cJSON_AddNumberToObject(jsonObj, TYPE, dhType); + cJSON_AddStringToObject(jsonObj, HANDLER, "handler_ver_1.0"); + cJSON_AddStringToObject(jsonObj, SOURCE_VER, "source_ver_1.0"); + cJSON_AddStringToObject(jsonObj, SINK_VER, "sink_ver_1.0"); CompVersion compVer; FromJson(jsonObj, compVer); cJSON_Delete(jsonObj); @@ -110,11 +110,11 @@ HWTEST_F(VersionInfoTest, FromJson_CompVersion_003, TestSize.Level1) { cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddNumberToObject(jsonObj, NAME.c_str(), 1); - cJSON_AddStringToObject(jsonObj, TYPE.c_str(), "dhType_audio"); - cJSON_AddNumberToObject(jsonObj, HANDLER.c_str(), 1); - cJSON_AddNumberToObject(jsonObj, SOURCE_VER.c_str(), 1); - cJSON_AddNumberToObject(jsonObj, SINK_VER.c_str(), 1); + cJSON_AddNumberToObject(jsonObj, NAME, 1); + cJSON_AddStringToObject(jsonObj, TYPE, "dhType_audio"); + cJSON_AddNumberToObject(jsonObj, HANDLER, 1); + cJSON_AddNumberToObject(jsonObj, SOURCE_VER, 1); + cJSON_AddNumberToObject(jsonObj, SINK_VER, 1); CompVersion compVer; FromJson(jsonObj, compVer); cJSON_Delete(jsonObj); @@ -133,8 +133,8 @@ HWTEST_F(VersionInfoTest, FromJson_VersionInfo_002, TestSize.Level1) { cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), "devid_123"); - cJSON_AddStringToObject(jsonObj, DH_VER.c_str(), "dhver_1.0"); + cJSON_AddStringToObject(jsonObj, DEV_ID, "devid_123"); + cJSON_AddStringToObject(jsonObj, DH_VER, "dhver_1.0"); cJSON * jsonArr = cJSON_CreateArray(); if (jsonArr == nullptr) { @@ -142,7 +142,7 @@ HWTEST_F(VersionInfoTest, FromJson_VersionInfo_002, TestSize.Level1) return; } cJSON_AddItemToArray(jsonArr, cJSON_CreateString("com_ver_test")); - cJSON_AddItemToObject(jsonObj, COMP_VER.c_str(), jsonArr); + cJSON_AddItemToObject(jsonObj, COMP_VER, jsonArr); VersionInfo verInfo; FromJson(jsonObj, verInfo); cJSON_Delete(jsonObj); @@ -153,8 +153,8 @@ HWTEST_F(VersionInfoTest, FromJson_VersionInfo_003, TestSize.Level1) { cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddNumberToObject(jsonObj, DEV_ID.c_str(), 1); - cJSON_AddNumberToObject(jsonObj, DH_VER.c_str(), 1); + cJSON_AddNumberToObject(jsonObj, DEV_ID, 1); + cJSON_AddNumberToObject(jsonObj, DH_VER, 1); VersionInfo verInfo; FromJson(jsonObj, verInfo); cJSON_Delete(jsonObj); diff --git a/services/distributedhardwarefwkservice/test/unittest/common/task/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/task/BUILD.gn index 7abb5f7e..26ab12cf 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/task/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/task/BUILD.gn @@ -24,7 +24,6 @@ config("module_private_config") { "include", "${innerkits_path}/include", "${utils_path}/include", - "${utils_path}/include/log", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/componentloader", "${services_path}/distributedhardwarefwkservice/include/componentmanager", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/transport/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/transport/BUILD.gn index 8a6467b8..2e687b58 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/transport/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/transport/BUILD.gn @@ -21,7 +21,6 @@ config("module_private_config") { include_dirs = [ "include", "${utils_path}/include", - "${utils_path}/include/log", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/resourcemanager", "${services_path}/distributedhardwarefwkservice/include/transport", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/utils/dh_context_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/utils/dh_context_test.cpp index ba818839..0cc8386f 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/utils/dh_context_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/utils/dh_context_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) 2024-2025 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -322,7 +322,7 @@ HWTEST_F(DhContextTest, OnMessage_004, TestSize.Level1) cJSON *json = cJSON_CreateObject(); ASSERT_TRUE(json != nullptr); cJSON_AddStringToObject(json, eventKey.c_str(), "isomerism_event_test"); - cJSON_AddStringToObject(json, DEV_ID.c_str(), "Dev_Id_test"); + cJSON_AddStringToObject(json, DEV_ID, "Dev_Id_test"); char* cjson = cJSON_PrintUnformatted(json); if (cjson == nullptr) { @@ -346,7 +346,7 @@ HWTEST_F(DhContextTest, OnMessage_005, TestSize.Level1) cJSON *json = cJSON_CreateObject(); ASSERT_TRUE(json != nullptr); cJSON_AddStringToObject(json, eventKey.c_str(), "isomerism_event_test"); - cJSON_AddNumberToObject(json, DEV_ID.c_str(), 1); + cJSON_AddNumberToObject(json, DEV_ID, 1); char* cjson = cJSON_PrintUnformatted(json); if (cjson == nullptr) { @@ -370,7 +370,7 @@ HWTEST_F(DhContextTest, OnMessage_006, TestSize.Level1) cJSON *json = cJSON_CreateObject(); ASSERT_TRUE(json != nullptr); cJSON_AddStringToObject(json, eventKey.c_str(), "isomerism_event_test"); - cJSON_AddStringToObject(json, DEV_ID.c_str(), "dev_id_test"); + cJSON_AddStringToObject(json, DEV_ID, "dev_id_test"); char* cjson = cJSON_PrintUnformatted(json); if (cjson == nullptr) { @@ -394,7 +394,7 @@ HWTEST_F(DhContextTest, OnMessage_007, TestSize.Level1) cJSON *json = cJSON_CreateObject(); ASSERT_TRUE(json != nullptr); cJSON_AddStringToObject(json, eventKey.c_str(), "isomerism_connect"); - cJSON_AddStringToObject(json, DEV_ID.c_str(), "dev_id_test"); + cJSON_AddStringToObject(json, DEV_ID, "dev_id_test"); char* cjson = cJSON_PrintUnformatted(json); if (cjson == nullptr) { @@ -418,7 +418,7 @@ HWTEST_F(DhContextTest, OnMessage_008, TestSize.Level1) cJSON *json = cJSON_CreateObject(); ASSERT_TRUE(json != nullptr); cJSON_AddStringToObject(json, eventKey.c_str(), "isomerism_disconnect"); - cJSON_AddStringToObject(json, DEV_ID.c_str(), "dev_id_test"); + cJSON_AddStringToObject(json, DEV_ID, "dev_id_test"); char* cjson = cJSON_PrintUnformatted(json); if (cjson == nullptr) { diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/BUILD.gn index fa678a89..21a6413d 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/BUILD.gn @@ -22,8 +22,6 @@ config("module_private_config") { include_dirs = [ "include", "${utils_path}/include", - "${utils_path}/include/log", - "${utils_path}/include/eventbus", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/resourcemanager", "${services_path}/distributedhardwarefwkservice/include/utils", diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/src/version_info_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/src/version_info_manager_test.cpp index e2c3fd55..f23e3930 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/src/version_info_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/versioninfomanager/src/version_info_manager_test.cpp @@ -411,8 +411,8 @@ HWTEST_F(VersionInfoManagerTest, HandleVersionChange_001, TestSize.Level1) { cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), "222222"); - cJSON_AddStringToObject(jsonObj, DH_VER.c_str(), "1.0"); + cJSON_AddStringToObject(jsonObj, DEV_ID, "222222"); + cJSON_AddStringToObject(jsonObj, DH_VER, "1.0"); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); @@ -454,8 +454,8 @@ HWTEST_F(VersionInfoManagerTest, HandleVersionChange_002, TestSize.Level1) DHContext::GetInstance().AddOnlineDevice("111111", uuid, "222222"); cJSON *jsonObj = cJSON_CreateObject(); ASSERT_TRUE(jsonObj != nullptr); - cJSON_AddStringToObject(jsonObj, DEV_ID.c_str(), "222222"); - cJSON_AddStringToObject(jsonObj, DH_VER.c_str(), "1.0"); + cJSON_AddStringToObject(jsonObj, DEV_ID, "222222"); + cJSON_AddStringToObject(jsonObj, DH_VER, "1.0"); char* cjson = cJSON_PrintUnformatted(jsonObj); if (cjson == nullptr) { cJSON_Delete(jsonObj); diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn index fa0ca667..7fb04db8 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/BUILD.gn @@ -22,8 +22,6 @@ config("module_private_config") { include_dirs = [ "include", "${utils_path}/include", - "${utils_path}/include/eventbus", - "${utils_path}/include/log", "${services_path}/distributedhardwarefwkservice/include", "${services_path}/distributedhardwarefwkservice/include/componentloader", "${services_path}/distributedhardwarefwkservice/include/resourcemanager", diff --git a/utils/BUILD.gn b/utils/BUILD.gn index 4ffdda81..5064b360 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -38,7 +38,6 @@ ohos_shared_library("distributedhardwareutils") { "${common_path}/log/include", "${common_path}/utils/include", "include", - "include/log", ] sources = [ @@ -81,7 +80,6 @@ ohos_shared_library("distributedhardwareutils") { "hitrace:hitrace_meter", "init:libbegetutil", "openssl:libcrypto_shared", - "safwk:system_ability_fwk", "zlib:shared_libz", ] diff --git a/utils/include/log/dh_log.h b/utils/include/log/dh_log.h deleted file mode 100644 index 109cda79..00000000 --- a/utils/include/log/dh_log.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2021-2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef OHOS_DH_LOG_H -#define OHOS_DH_LOG_H - -#include - -#include "hilog/log.h" - -namespace OHOS { -namespace DistributedHardware { -#undef LOG_TAG -#define LOG_TAG "DHFWK" - -#define ULOGD(fmt, ...) HILOG_DEBUG(LOG_CORE, \ - "[%{public}s][%{public}s]:" fmt, DH_LOG_TAG, __FUNCTION__, ##__VA_ARGS__) - -#define ULOGI(fmt, ...) HILOG_INFO(LOG_CORE, \ - "[%{public}s][%{public}s]:" fmt, DH_LOG_TAG, __FUNCTION__, ##__VA_ARGS__) - -#define ULOGW(fmt, ...) HILOG_WARN(LOG_CORE, \ - "[%{public}s][%{public}s]:" fmt, DH_LOG_TAG, __FUNCTION__, ##__VA_ARGS__) - -#define ULOGE(fmt, ...) HILOG_ERROR(LOG_CORE, \ - "[%{public}s][%{public}s]:" fmt, DH_LOG_TAG, __FUNCTION__, ##__VA_ARGS__) -} // namespace DistributedHardware -} // namespace OHOS -#endif diff --git a/utils/test/fuzztest/utils_fuzzer/BUILD.gn b/utils/test/fuzztest/utils_fuzzer/BUILD.gn index 798da868..fe1485b6 100644 --- a/utils/test/fuzztest/utils_fuzzer/BUILD.gn +++ b/utils/test/fuzztest/utils_fuzzer/BUILD.gn @@ -24,7 +24,6 @@ ohos_fuzztest("UtilsFuzzTest") { include_dirs = [ "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", ] cflags = [ diff --git a/utils/test/unittest/common/histreamer_ability_parser/BUILD.gn b/utils/test/unittest/common/histreamer_ability_parser/BUILD.gn index 2b30c27b..2f64105f 100644 --- a/utils/test/unittest/common/histreamer_ability_parser/BUILD.gn +++ b/utils/test/unittest/common/histreamer_ability_parser/BUILD.gn @@ -22,7 +22,6 @@ config("module_private_config") { include_dirs = [ "include", "${utils_path}/include", - "${utils_path}/include/log", ] } diff --git a/utils/test/unittest/common/utilstool/BUILD.gn b/utils/test/unittest/common/utilstool/BUILD.gn index 20820fee..cdbc3907 100644 --- a/utils/test/unittest/common/utilstool/BUILD.gn +++ b/utils/test/unittest/common/utilstool/BUILD.gn @@ -22,7 +22,6 @@ config("module_private_config") { include_dirs = [ "include", "${utils_path}/include", - "${utils_path}/include/log", "${common_path}/utils/include", ] } -- Gitee