From 7ec471396ba5c885d6b42421b505d27e392af83e Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Wed, 17 Aug 2022 09:30:51 +0800 Subject: [PATCH 1/4] modify MIC to AUDIO Signed-off-by: wanderer-dl122 --- common/utils/include/device_type.h | 6 ++---- .../src/ipc/distributed_hardware_proxy.cpp | 4 ++-- .../src/componentloader/component_loader.cpp | 3 +-- .../componentmanager_fuzzer.cpp | 2 +- .../resourcemanager_fuzzer.cpp | 2 +- .../src/component_manager_test.cpp | 16 ++++++++-------- .../src/resource_manager_test.cpp | 12 ++++++------ .../test/unittest/common/task/src/task_test.cpp | 8 ++++---- .../versionmanager/src/version_manager_test.cpp | 8 ++++---- 9 files changed, 29 insertions(+), 32 deletions(-) diff --git a/common/utils/include/device_type.h b/common/utils/include/device_type.h index aa205318..deea1c59 100644 --- a/common/utils/include/device_type.h +++ b/common/utils/include/device_type.h @@ -24,8 +24,7 @@ namespace DistributedHardware { enum class DHType : uint32_t { UNKNOWN = 0x0, // unknown device CAMERA = 0x01, // Camera - MIC = 0x02, // Mic - SPEAKER = 0x04, // Speaker + AUDIO = 0x02, // Mic DISPLAY = 0x08, // Display GPS = 0x10, // GPS INPUT = 0x20, // Key board @@ -38,8 +37,7 @@ enum class DHType : uint32_t { const std::unordered_map DHTypeStrMap = { { DHType::CAMERA, "CAMERA" }, - { DHType::MIC, "MIC" }, - { DHType::SPEAKER, "SPEAKER" }, + { DHType::AUDIO, "AUDIO" }, { DHType::DISPLAY, "DISPLAY" }, { DHType::GPS, "GPS" }, { DHType::INPUT, "INPUT" }, diff --git a/interfaces/inner_kits/src/ipc/distributed_hardware_proxy.cpp b/interfaces/inner_kits/src/ipc/distributed_hardware_proxy.cpp index 53d2e6e1..0b2e7346 100644 --- a/interfaces/inner_kits/src/ipc/distributed_hardware_proxy.cpp +++ b/interfaces/inner_kits/src/ipc/distributed_hardware_proxy.cpp @@ -29,8 +29,8 @@ namespace DistributedHardware { #undef DH_LOG_TAG #define DH_LOG_TAG "DistributedHardwareProxy" const std::unordered_set DH_TYPE_SET { - DHType::UNKNOWN, DHType::CAMERA, DHType::MIC, DHType::SPEAKER, DHType::DISPLAY, DHType::GPS, - DHType::INPUT, DHType::HFP, DHType::A2D, DHType::VIRMODEM_MIC, DHType::VIRMODEM_SPEAKER, DHType::MAX_DH, + DHType::UNKNOWN, DHType::CAMERA, DHType::AUDIO, DHType::DISPLAY, DHType::GPS, DHType::INPUT, + DHType::HFP, DHType::A2D, DHType::VIRMODEM_MIC, DHType::VIRMODEM_SPEAKER, DHType::MAX_DH, }; int32_t DistributedHardwareProxy::RegisterPublisherListener(const DHTopic topic, diff --git a/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp b/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp index 05de0cb8..0188d461 100644 --- a/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp +++ b/services/distributedhardwarefwkservice/src/componentloader/component_loader.cpp @@ -58,8 +58,7 @@ const std::string LIB_LOAD_PATH = "/system/lib/"; std::map g_mapDhTypeName = { { "UNKNOWN", DHType::UNKNOWN }, { "CAMERA", DHType::CAMERA }, - { "MIC", DHType::MIC }, - { "SPEAKER", DHType::SPEAKER }, + { "AUDIO", DHType::AUDIO }, { "DISPLAY", DHType::DISPLAY }, { "GPS", DHType::GPS }, { "INPUT", DHType::INPUT }, diff --git a/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp index d001bbb3..31ca68e4 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp +++ b/services/distributedhardwarefwkservice/test/fuzztest/componentmanager_fuzzer/componentmanager_fuzzer.cpp @@ -30,7 +30,7 @@ namespace DistributedHardware { namespace { const uint32_t DH_TYPE_SIZE = 10; const DHType dhTypeFuzz[DH_TYPE_SIZE] = { - DHType::CAMERA, DHType::MIC, DHType::SPEAKER, DHType::DISPLAY, DHType::VIRMODEM_MIC, + DHType::CAMERA, DHType::AUDIO, DHType::DISPLAY, DHType::VIRMODEM_MIC, DHType::INPUT, DHType::A2D, DHType::GPS, DHType::HFP, DHType::VIRMODEM_SPEAKER }; } diff --git a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp index 0d209797..848d7135 100644 --- a/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp +++ b/services/distributedhardwarefwkservice/test/fuzztest/resourcemanager_fuzzer/resourcemanager_fuzzer.cpp @@ -31,7 +31,7 @@ namespace DistributedHardware { namespace { const uint32_t DH_TYPE_SIZE = 10; const DHType dhTypeFuzz[DH_TYPE_SIZE] = { - DHType::CAMERA, DHType::MIC, DHType::SPEAKER, DHType::DISPLAY, DHType::VIRMODEM_MIC, + DHType::CAMERA, DHType::AUDIO, DHType::DISPLAY, DHType::VIRMODEM_MIC, DHType::INPUT, DHType::A2D, DHType::GPS, DHType::HFP, DHType::VIRMODEM_SPEAKER }; } diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/src/component_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/src/component_manager_test.cpp index b279b506..727d7c78 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/src/component_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/src/component_manager_test.cpp @@ -152,12 +152,12 @@ HWTEST_F(ComponentManagerTest, init_test_003, TestSize.Level0) ComponentManager::GetInstance().compSource_.insert(std::make_pair(DHType::CAMERA, &cameraSource)); EXPECT_CALL(cameraSource, InitSource(testing::_)).Times(1).WillOnce(testing::Invoke(handler)); - MockIDistributedHardwareSource speakerSource; - ComponentManager::GetInstance().compSource_.insert(std::make_pair(DHType::SPEAKER, &speakerSource)); - EXPECT_CALL(speakerSource, InitSource(testing::_)).Times(1).WillOnce(testing::Invoke(handler)); + MockIDistributedHardwareSource displaySource; + ComponentManager::GetInstance().compSource_.insert(std::make_pair(DHType::DISPLAY, &displaySource)); + EXPECT_CALL(displaySource, InitSource(testing::_)).Times(1).WillOnce(testing::Invoke(handler)); MockIDistributedHardwareSink micSink; - ComponentManager::GetInstance().compSink_.insert(std::make_pair(DHType::MIC, &micSink)); + ComponentManager::GetInstance().compSink_.insert(std::make_pair(DHType::AUDIO, &micSink)); EXPECT_CALL(micSink, InitSink(testing::_)).Times(1).WillOnce(testing::Invoke(handler)); auto start = std::chrono::system_clock::now(); @@ -187,12 +187,12 @@ HWTEST_F(ComponentManagerTest, unInit_test_001, TestSize.Level0) ComponentManager::GetInstance().compSource_.insert(std::make_pair(DHType::CAMERA, &cameraSource)); EXPECT_CALL(cameraSource, ReleaseSource()).Times(1).WillOnce(testing::Invoke(handler)); - MockIDistributedHardwareSink speakerSink; - ComponentManager::GetInstance().compSink_.insert(std::make_pair(DHType::SPEAKER, &speakerSink)); - EXPECT_CALL(speakerSink, ReleaseSink()).Times(1).WillOnce(testing::Invoke(handler)); + MockIDistributedHardwareSink displaycSink; + ComponentManager::GetInstance().compSink_.insert(std::make_pair(DHType::DISPLAY, &displaycSink)); + EXPECT_CALL(displaycSink, ReleaseSink()).Times(1).WillOnce(testing::Invoke(handler)); MockIDistributedHardwareSink micSink; - ComponentManager::GetInstance().compSink_.insert(std::make_pair(DHType::MIC, &micSink)); + ComponentManager::GetInstance().compSink_.insert(std::make_pair(DHType::AUDIO, &micSink)); EXPECT_CALL(micSink, ReleaseSink()).Times(1).WillOnce(testing::Invoke(handler)); auto start = std::chrono::system_clock::now(); diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp index e67d9e04..3b3f4306 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp @@ -43,7 +43,7 @@ const string DEV_ID_1 = "bb536a637105409e904d4da83790a4a8"; const string DEV_NAME = "Dev1"; const string DH_ID_0 = "Camera_0"; const string DH_ID_1 = "Mic_0"; -const string DH_ID_2 = "Speaker_0"; +const string DH_ID_2 = "Gps_0"; const string DH_ID_3 = "Display_0"; const string DH_ID_4 = "Input_0"; const string DH_ATTR_0 = "attr0"; @@ -51,7 +51,7 @@ const string DH_ATTR_1 = "attr1"; constexpr uint16_t TEST_DEV_TYPE_PAD = 0x11; constexpr uint32_t TEST_DH_TYPE_CAMERA = 0x01; constexpr uint32_t TEST_DH_TYPE_MIC = 0x02; -constexpr uint32_t TEST_DH_TYPE_SPEAKER = 0x4; +constexpr uint32_t TEST_DH_TYPE_GPS = 0x10; constexpr uint32_t TEST_DH_TYPE_DISPLAY = 0x08; constexpr uint32_t TEST_DH_TYPE_BUTTON = 0x20; constexpr uint32_t TEST_SIZE_0 = 0; @@ -63,9 +63,9 @@ const std::string EMPTY_PREFIX = ""; const shared_ptr CAP_INFO_0 = make_shared(DH_ID_0, DEV_ID_0, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::CAMERA, DH_ATTR_0); const shared_ptr CAP_INFO_1 = - make_shared(DH_ID_1, DEV_ID_0, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::MIC, DH_ATTR_0); + make_shared(DH_ID_1, DEV_ID_0, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::AUDIO, DH_ATTR_0); const shared_ptr CAP_INFO_2 = - make_shared(DH_ID_2, DEV_ID_0, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::SPEAKER, DH_ATTR_0); + make_shared(DH_ID_2, DEV_ID_0, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::GPS, DH_ATTR_0); const shared_ptr CAP_INFO_3 = make_shared(DH_ID_3, DEV_ID_0, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::DISPLAY, DH_ATTR_0); const shared_ptr CAP_INFO_4 = @@ -74,9 +74,9 @@ const shared_ptr CAP_INFO_4 = const shared_ptr CAP_INFO_5 = make_shared(DH_ID_0, DEV_ID_1, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::CAMERA, DH_ATTR_1); const shared_ptr CAP_INFO_6 = - make_shared(DH_ID_1, DEV_ID_1, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::MIC, DH_ATTR_1); + make_shared(DH_ID_1, DEV_ID_1, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::AUDIO, DH_ATTR_1); const shared_ptr CAP_INFO_7 = - make_shared(DH_ID_2, DEV_ID_1, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::SPEAKER, DH_ATTR_1); + make_shared(DH_ID_2, DEV_ID_1, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::GPS, DH_ATTR_1); const shared_ptr CAP_INFO_8 = make_shared(DH_ID_3, DEV_ID_1, DEV_NAME, TEST_DEV_TYPE_PAD, DHType::DISPLAY, DH_ATTR_1); const shared_ptr CAP_INFO_9 = diff --git a/services/distributedhardwarefwkservice/test/unittest/common/task/src/task_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/task/src/task_test.cpp index 6a473835..8a9fdf71 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/task/src/task_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/task/src/task_test.cpp @@ -38,16 +38,16 @@ namespace { const std::string DEV_ID_1 = "bb536a637105409e904d4da83790a4a8"; const std::string DEV_NETWORK_ID_1 = "nt36a637105409e904d4da83790a4a8"; const MockDevInfo DEV_INFO_11 = { DEV_NETWORK_ID_1, DEV_ID_1, "Camera_1", DHType::CAMERA }; -const MockDevInfo DEV_INFO_12 = { DEV_NETWORK_ID_1, DEV_ID_1, "Speaker_1", DHType::SPEAKER }; -const MockDevInfo DEV_INFO_13 = { DEV_NETWORK_ID_1, DEV_ID_1, "Mic_1", DHType::MIC }; +const MockDevInfo DEV_INFO_12 = { DEV_NETWORK_ID_1, DEV_ID_1, "Gps_1", DHType::GPS }; +const MockDevInfo DEV_INFO_13 = { DEV_NETWORK_ID_1, DEV_ID_1, "Audio_1", DHType::AUDIO }; const MockDevInfo DEV_INFO_14 = { DEV_NETWORK_ID_1, DEV_ID_1, "Display_1", DHType::DISPLAY }; const MockDevInfo DEV_INFO_15 = { DEV_NETWORK_ID_1, DEV_ID_1, "Input_1", DHType::INPUT }; const std::string DEV_ID_2 = "06d177ffa09543389f3b445b4722f9be"; const std::string DEV_NETWORK_ID_2 = "ntd177ffa09543389f3b445b4722f9be"; const MockDevInfo DEV_INFO_21 = { DEV_NETWORK_ID_2, DEV_ID_2, "Camera_1", DHType::CAMERA }; -const MockDevInfo DEV_INFO_22 = { DEV_NETWORK_ID_2, DEV_ID_2, "Speaker_1", DHType::SPEAKER }; -const MockDevInfo DEV_INFO_23 = { DEV_NETWORK_ID_2, DEV_ID_2, "Mic_1", DHType::MIC }; +const MockDevInfo DEV_INFO_22 = { DEV_NETWORK_ID_2, DEV_ID_2, "Gps_1", DHType::GPS }; +const MockDevInfo DEV_INFO_23 = { DEV_NETWORK_ID_2, DEV_ID_2, "Audio_1", DHType::AUDIO }; const MockDevInfo DEV_INFO_24 = { DEV_NETWORK_ID_2, DEV_ID_2, "Display_1", DHType::DISPLAY }; const MockDevInfo DEV_INFO_25 = { DEV_NETWORK_ID_2, DEV_ID_2, "Input_1", DHType::INPUT }; diff --git a/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/src/version_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/src/version_manager_test.cpp index 874900c8..13cfe7b0 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/src/version_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/versionmanager/src/version_manager_test.cpp @@ -52,7 +52,7 @@ const std::string TEST_SINK_VERSION_2 = "2.0"; const std::string TEST_SINK_VERSION_3 = "2.0"; const std::string TEST_DH_VERSION = "3.1"; const std::string TEST_COMPONENT_NAME_1 = "distributed_camera"; -const std::string TEST_COMPONENT_NAME_2 = "distributed_speaker"; +const std::string TEST_COMPONENT_NAME_2 = "distributed_audio"; const std::string TEST_COMPONENT_NAME_3 = "distributed_mic"; } @@ -91,10 +91,10 @@ HWTEST_F(VersionManagerTest, version_manager_test_002, TestSize.Level0) CompVersionGetValue(cVs1, TEST_COMPONENT_NAME_1, DHType::CAMERA, TEST_HANDLER_VERSION_1, TEST_SOURCE_VERSION_1, TEST_SINK_VERSION_1); CompVersion cVs2; - CompVersionGetValue(cVs2, TEST_COMPONENT_NAME_2, DHType::SPEAKER, TEST_HANDLER_VERSION_2, TEST_SOURCE_VERSION_2, + CompVersionGetValue(cVs2, TEST_COMPONENT_NAME_2, DHType::AUDIO, TEST_HANDLER_VERSION_2, TEST_SOURCE_VERSION_2, TEST_SINK_VERSION_2); CompVersion cVs3; - CompVersionGetValue(cVs3, TEST_COMPONENT_NAME_3, DHType::MIC, TEST_HANDLER_VERSION_3, TEST_SOURCE_VERSION_3, + CompVersionGetValue(cVs3, TEST_COMPONENT_NAME_3, DHType::DISPLAY, TEST_HANDLER_VERSION_3, TEST_SOURCE_VERSION_3, TEST_SINK_VERSION_3); dhVersion.uuid = TEST_DEVICE_ID_1; dhVersion.dhVersion = TEST_DH_VERSION; @@ -131,7 +131,7 @@ HWTEST_F(VersionManagerTest, version_manager_test_004, TestSize.Level0) DHVersion dhVersion; int32_t ret = VersionManager::GetInstance().GetDHVersion(TEST_DEVICE_ID_2, dhVersion); EXPECT_EQ(DH_FWK_SUCCESS, ret); - EXPECT_EQ(TEST_HANDLER_VERSION_2, dhVersion.compVersions[DHType::SPEAKER].handlerVersion); + EXPECT_EQ(TEST_HANDLER_VERSION_2, dhVersion.compVersions[DHType::AUDIO].handlerVersion); EXPECT_EQ(TEST_DH_VERSION, dhVersion.dhVersion); ret = VersionManager::GetInstance().GetDHVersion(TEST_DEVICE_ID_3, dhVersion); EXPECT_EQ(ERR_DH_FWK_VERSION_DEVICE_ID_NOT_EXIST, ret); -- Gitee From c6bb796726685c594c9a079090e2bef66eec9b95 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Wed, 17 Aug 2022 09:34:00 +0800 Subject: [PATCH 2/4] modify MIC to AUDIO Signed-off-by: wanderer-dl122 --- common/utils/include/device_type.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/utils/include/device_type.h b/common/utils/include/device_type.h index deea1c59..475efc4c 100644 --- a/common/utils/include/device_type.h +++ b/common/utils/include/device_type.h @@ -24,7 +24,7 @@ namespace DistributedHardware { enum class DHType : uint32_t { UNKNOWN = 0x0, // unknown device CAMERA = 0x01, // Camera - AUDIO = 0x02, // Mic + AUDIO = 0x02, // Mic DISPLAY = 0x08, // Display GPS = 0x10, // GPS INPUT = 0x20, // Key board -- Gitee From 93434ca512d8223ae966c3cc7e497d2ffc308f55 Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Wed, 17 Aug 2022 09:35:38 +0800 Subject: [PATCH 3/4] modify MIC to AUDIO Signed-off-by: wanderer-dl122 --- interfaces/inner_kits/src/ipc/distributed_hardware_proxy.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/inner_kits/src/ipc/distributed_hardware_proxy.cpp b/interfaces/inner_kits/src/ipc/distributed_hardware_proxy.cpp index 0b2e7346..d6c8fdc3 100644 --- a/interfaces/inner_kits/src/ipc/distributed_hardware_proxy.cpp +++ b/interfaces/inner_kits/src/ipc/distributed_hardware_proxy.cpp @@ -29,8 +29,8 @@ namespace DistributedHardware { #undef DH_LOG_TAG #define DH_LOG_TAG "DistributedHardwareProxy" const std::unordered_set DH_TYPE_SET { - DHType::UNKNOWN, DHType::CAMERA, DHType::AUDIO, DHType::DISPLAY, DHType::GPS, DHType::INPUT, - DHType::HFP, DHType::A2D, DHType::VIRMODEM_MIC, DHType::VIRMODEM_SPEAKER, DHType::MAX_DH, + DHType::UNKNOWN, DHType::CAMERA, DHType::AUDIO, DHType::DISPLAY, DHType::GPS, DHType::INPUT, + DHType::HFP, DHType::A2D, DHType::VIRMODEM_MIC, DHType::VIRMODEM_SPEAKER, DHType::MAX_DH, }; int32_t DistributedHardwareProxy::RegisterPublisherListener(const DHTopic topic, -- Gitee From 153491a0cf51a52e02141185ceb788d389d59b6c Mon Sep 17 00:00:00 2001 From: wanderer-dl122 Date: Wed, 17 Aug 2022 10:51:50 +0800 Subject: [PATCH 4/4] modify MIC to AUDIO Signed-off-by: wanderer-dl122 --- .../common/resourcemanager/src/resource_manager_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp index 3b3f4306..3fb148b9 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/resourcemanager/src/resource_manager_test.cpp @@ -243,7 +243,7 @@ HWTEST_F(ResourceManagerTest, resource_manager_test_008, TestSize.Level0) map queryMap10 { { CapabilityInfoFilter::FILTER_DH_TYPE, to_string(TEST_DH_TYPE_MIC) } }; map queryMap11 { { CapabilityInfoFilter::FILTER_DH_TYPE, - to_string(TEST_DH_TYPE_SPEAKER) } }; + to_string(TEST_DH_TYPE_GPS) } }; map queryMap12 { { CapabilityInfoFilter::FILTER_DH_TYPE, to_string(TEST_DH_TYPE_DISPLAY) } }; map queryMap13 { { CapabilityInfoFilter::FILTER_DH_TYPE, -- Gitee