From 861d61306a778c6d3698cba7c65744385987be12 Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Wed, 18 Sep 2024 10:50:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AE=BE=E5=A4=87=E4=B8=8A=E4=B8=8B?= =?UTF-8?q?=E7=BA=BF=E6=97=B6=E5=BA=8F=E9=97=AE=E9=A2=98=E5=9B=9E=E5=90=88?= =?UTF-8?q?5.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-tiangang4 --- .../include/utils/dh_context.h | 22 +++- .../distributed_hardware_manager_factory.cpp | 4 +- .../src/task/offline_task.cpp | 13 +- .../src/utils/dh_context.cpp | 24 +++- .../src/component_loader_test.cpp | 114 ------------------ .../src/component_manager_test.cpp | 24 ---- .../src/resource_manager_test.cpp | 11 -- .../unittest/common/utils/dh_context_test.cpp | 6 +- .../src/version_manager_test.cpp | 47 ++------ 9 files changed, 61 insertions(+), 204 deletions(-) diff --git a/services/distributedhardwarefwkservice/include/utils/dh_context.h b/services/distributedhardwarefwkservice/include/utils/dh_context.h index 5dccad6c..8df0adcb 100644 --- a/services/distributedhardwarefwkservice/include/utils/dh_context.h +++ b/services/distributedhardwarefwkservice/include/utils/dh_context.h @@ -52,11 +52,15 @@ struct DeviceIdEntry { bool operator < (const DeviceIdEntry &other) const { - return networkId.compare(other.networkId) < 0 || - uuid.compare(other.uuid) < 0 || - deviceId.compare(other.deviceId) < 0 || - udid.compare(other.udid) < 0 || - udidHash.compare(other.udidHash) < 0; + return (networkId.compare(other.networkId) < 0) || + ((networkId.compare(other.networkId) == 0) && (uuid.compare(other.uuid) < 0)) || + ((networkId.compare(other.networkId) == 0) && (uuid.compare(other.uuid) == 0) && + (deviceId.compare(other.deviceId) < 0)) || + ((networkId.compare(other.networkId) == 0) && (uuid.compare(other.uuid) == 0) && + (deviceId.compare(other.deviceId) == 0) && (udid.compare(other.udid) < 0)) || + ((networkId.compare(other.networkId) == 0) && (uuid.compare(other.uuid) == 0) && + (deviceId.compare(other.deviceId) == 0) && (udid.compare(other.udid) == 0) && + (udidHash.compare(other.udidHash) < 0)); } }; @@ -69,7 +73,7 @@ public: /* Save online device UUID and networkId when devices online */ void AddOnlineDevice(const std::string &udid, const std::string &uuid, const std::string &networkId); - void RemoveOnlineDeviceByUUID(const std::string &uuid); + void RemoveOnlineDeviceIdEntryByNetworkId(const std::string &networkId); bool IsDeviceOnline(const std::string &uuid); size_t GetOnlineCount(); std::string GetNetworkIdByUUID(const std::string &uuid); @@ -77,6 +81,9 @@ public: std::string GetUdidHashIdByUUID(const std::string &uuid); std::string GetUUIDByNetworkId(const std::string &networkId); std::string GetUDIDByNetworkId(const std::string &networkId); + void AddRealTimeOnlineDeviceNetworkId(const std::string &networkId); + void DeleteRealTimeOnlineDeviceNetworkId(const std::string &networkId); + size_t GetRealTimeOnlineDeviceCount(); /* DeviceId is which is hashed by sha256 */ std::string GetUUIDByDeviceId(const std::string &deviceId); /** @@ -127,6 +134,9 @@ private: std::set devIdEntrySet_; std::shared_mutex onlineDevMutex_; + std::set realTimeOnLineNetworkIdSet_; + std::shared_mutex realTimeNetworkIdMutex_; + std::shared_ptr eventHandler_; /* true for system in sleeping, false for NOT in sleeping */ std::atomic isSleeping_ = false; diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp index afe777f0..3758a320 100644 --- a/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp +++ b/services/distributedhardwarefwkservice/src/distributed_hardware_manager_factory.cpp @@ -167,6 +167,7 @@ int32_t DistributedHardwareManagerFactory::SendOnLineEvent(const std::string &ne } DHContext::GetInstance().AddOnlineDevice(udid, uuid, networkId); + DHContext::GetInstance().AddRealTimeOnlineDeviceNetworkId(networkId); if (!isInit && !Init()) { DHLOGE("distributedHardwareMgr is null"); @@ -199,7 +200,8 @@ int32_t DistributedHardwareManagerFactory::SendOffLineEvent(const std::string &n return ERR_DH_FWK_HARDWARE_MANAGER_DEVICE_REPEAT_OFFLINE; } - if (DHContext::GetInstance().GetOnlineCount() == 1 && + DHContext::GetInstance().DeleteRealTimeOnlineDeviceNetworkId(networkId); + if (DHContext::GetInstance().GetRealTimeOnlineDeviceCount() == 0 && DHContext::GetInstance().GetIsomerismConnectCount() == 0) { flagUnInit_.store(true); DHLOGI("no online device, set uninit flag true"); diff --git a/services/distributedhardwarefwkservice/src/task/offline_task.cpp b/services/distributedhardwarefwkservice/src/task/offline_task.cpp index a352acb1..776bafbd 100644 --- a/services/distributedhardwarefwkservice/src/task/offline_task.cpp +++ b/services/distributedhardwarefwkservice/src/task/offline_task.cpp @@ -89,6 +89,12 @@ void OffLineTask::DoTaskInner() this->SetTaskState(TaskState::SUCCESS); DHLOGD("Finish OffLine task, remove it, id: %{public}s", GetId().c_str()); TaskBoard::GetInstance().RemoveTask(this->GetId()); + if (DHContext::GetInstance().GetRealTimeOnlineDeviceCount() == 0 && + DHContext::GetInstance().GetIsomerismConnectCount() == 0 && + TaskBoard::GetInstance().IsAllTaskFinish()) { + DHLOGI("all devices are offline, start to free the resource"); + DistributedHardwareManagerFactory::GetInstance().UnInit(); + } } void OffLineTask::CreateDisableTask() @@ -136,12 +142,7 @@ void OffLineTask::WaitDisableTaskFinish() std::unique_lock waitLock(unFinishTaskMtx_); finishCondVar_.wait(waitLock, [&] { return this->unFinishChildrenTasks_.empty(); }); DHLOGI("all disable task finish"); - DHContext::GetInstance().RemoveOnlineDeviceByUUID(GetUUID()); - if (DHContext::GetInstance().GetOnlineCount() == 0 && - DHContext::GetInstance().GetIsomerismConnectCount() == 0) { - DHLOGI("all devices are offline, start to free the resource"); - DistributedHardwareManagerFactory::GetInstance().UnInit(); - } + DHContext::GetInstance().RemoveOnlineDeviceIdEntryByNetworkId(GetNetworkId()); } void OffLineTask::ClearOffLineInfo() diff --git a/services/distributedhardwarefwkservice/src/utils/dh_context.cpp b/services/distributedhardwarefwkservice/src/utils/dh_context.cpp index a2794e7f..866591f9 100644 --- a/services/distributedhardwarefwkservice/src/utils/dh_context.cpp +++ b/services/distributedhardwarefwkservice/src/utils/dh_context.cpp @@ -135,11 +135,11 @@ void DHContext::AddOnlineDevice(const std::string &udid, const std::string &uuid devIdEntrySet_.insert(idEntry); } -void DHContext::RemoveOnlineDeviceByUUID(const std::string &uuid) +void DHContext::RemoveOnlineDeviceIdEntryByNetworkId(const std::string &networkId) { std::unique_lock lock(onlineDevMutex_); for (auto iter = devIdEntrySet_.begin(); iter != devIdEntrySet_.end(); iter++) { - if (iter->uuid == uuid) { + if (iter->networkId == networkId) { devIdEntrySet_.erase(iter); break; } @@ -275,6 +275,26 @@ std::string DHContext::GetDeviceIdByDBGetPrefix(const std::string &prefix) return id; } +void DHContext::AddRealTimeOnlineDeviceNetworkId(const std::string &networkId) +{ + DHLOGI("AddRealTimeOnlineDeviceNetworkId: %{public}s", GetAnonyString(networkId).c_str()); + std::shared_lock lock(realTimeNetworkIdMutex_); + realTimeOnLineNetworkIdSet_.insert(networkId); +} + +void DHContext::DeleteRealTimeOnlineDeviceNetworkId(const std::string &networkId) +{ + DHLOGI("DeleteRealTimeOnlineDeviceNetworkId: %{public}s", GetAnonyString(networkId).c_str()); + std::shared_lock lock(realTimeNetworkIdMutex_); + realTimeOnLineNetworkIdSet_.erase(networkId); +} + +size_t DHContext::GetRealTimeOnlineDeviceCount() +{ + std::shared_lock lock(realTimeNetworkIdMutex_); + return realTimeOnLineNetworkIdSet_.size(); +} + void DHContext::RegisDHFWKIsomerismListener() { sptr dhFwkIsomerismListener(new (std::nothrow) DHFWKIsomerismListener()); 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 075d4403..42629dab 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 @@ -100,21 +100,6 @@ HWTEST_F(ComponentLoaderTest, GetHardwareHandler_001, TestSize.Level0) ComponentLoader::GetInstance().compHandlerMap_.clear(); } -/** - * @tc.name: GetHardwareHandler_002 - * @tc.desc: Verify the GetHardwareHandler function. - * @tc.type: FUNC - * @tc.require: AR000GHSK3 - */ -HWTEST_F(ComponentLoaderTest, GetHardwareHandler_002, TestSize.Level0) -{ - ComponentLoader::GetInstance().Init(); - IHardwareHandler *hardwareHandlerPtr = nullptr; - auto ret = ComponentLoader::GetInstance().GetHardwareHandler(DHType::AUDIO, hardwareHandlerPtr); - EXPECT_EQ(DH_FWK_SUCCESS, ret); - ComponentLoader::GetInstance().UnInit(); -} - /** * @tc.name: GetSource_001 * @tc.desc: Verify the GetSource function. @@ -134,21 +119,6 @@ HWTEST_F(ComponentLoaderTest, GetSource_001, TestSize.Level0) EXPECT_EQ(ERR_DH_FWK_LOADER_HANDLER_IS_NULL, ret); } -/** - * @tc.name: GetSource_002 - * @tc.desc: Verify the GetSource function. - * @tc.type: FUNC - * @tc.require: AR000GHSK3 - */ -HWTEST_F(ComponentLoaderTest, GetSource_002, TestSize.Level0) -{ - ComponentLoader::GetInstance().Init(); - IDistributedHardwareSource *sourcePtr = nullptr; - auto ret = ComponentLoader::GetInstance().GetSource(DHType::AUDIO, sourcePtr); - EXPECT_EQ(DH_FWK_SUCCESS, ret); - ComponentLoader::GetInstance().UnInit(); -} - /** * @tc.name: GetSink_001 * @tc.desc: Verify the GetSink function. @@ -168,21 +138,6 @@ HWTEST_F(ComponentLoaderTest, GetSink_001, TestSize.Level0) EXPECT_EQ(ERR_DH_FWK_LOADER_HANDLER_IS_NULL, ret); } -/** - * @tc.name: GetSink_002 - * @tc.desc: Verify the GetSink function. - * @tc.type: FUNC - * @tc.require: AR000GHSK3 - */ -HWTEST_F(ComponentLoaderTest, GetSink_002, TestSize.Level0) -{ - ComponentLoader::GetInstance().Init(); - IDistributedHardwareSink *sinkPtr = nullptr; - auto ret = ComponentLoader::GetInstance().GetSink(DHType::AUDIO, sinkPtr); - EXPECT_EQ(DH_FWK_SUCCESS, ret); - ComponentLoader::GetInstance().UnInit(); -} - /** * @tc.name: Readfile_001 * @tc.desc: Verify the Readfile function. @@ -196,63 +151,6 @@ HWTEST_F(ComponentLoaderTest, Readfile_001, TestSize.Level0) EXPECT_EQ("", ret); } -/** - * @tc.name: ReleaseHardwareHandler_001 - * @tc.desc: Verify the ReleaseHardwareHandler function. - * @tc.type: FUNC - * @tc.require: AR000GHSK3 - */ -HWTEST_F(ComponentLoaderTest, ReleaseHardwareHandler_001, TestSize.Level0) -{ - auto ret = ComponentLoader::GetInstance().ReleaseHardwareHandler(DHType::AUDIO); - EXPECT_EQ(ERR_DH_FWK_TYPE_NOT_EXIST, ret); - - CompHandler comHandler; - comHandler.hardwareHandler = nullptr; - ComponentLoader::GetInstance().compHandlerMap_[DHType::AUDIO] = comHandler; - ret = ComponentLoader::GetInstance().ReleaseHardwareHandler(DHType::AUDIO); - EXPECT_EQ(ERR_DH_FWK_LOADER_HANDLER_IS_NULL, ret); - ComponentLoader::GetInstance().compHandlerMap_.clear(); -} - -/** - * @tc.name: ReleaseSource_001 - * @tc.desc: Verify the ReleaseSource function. - * @tc.type: FUNC - * @tc.require: AR000GHSK3 - */ -HWTEST_F(ComponentLoaderTest, ReleaseSource_001, TestSize.Level0) -{ - auto ret = ComponentLoader::GetInstance().ReleaseSource(DHType::AUDIO); - EXPECT_EQ(ERR_DH_FWK_TYPE_NOT_EXIST, ret); - - CompHandler comHandler; - comHandler.sourceHandler = nullptr; - ComponentLoader::GetInstance().compHandlerMap_[DHType::AUDIO] = comHandler; - ret = ComponentLoader::GetInstance().ReleaseSource(DHType::AUDIO); - EXPECT_EQ(ERR_DH_FWK_LOADER_HANDLER_IS_NULL, ret); - ComponentLoader::GetInstance().compHandlerMap_.clear(); -} - -/** - * @tc.name: ReleaseSink_001 - * @tc.desc: Verify the ReleaseSink function. - * @tc.type: FUNC - * @tc.require: AR000GHSK3 - */ -HWTEST_F(ComponentLoaderTest, ReleaseSink_001, TestSize.Level0) -{ - auto ret = ComponentLoader::GetInstance().ReleaseSink(DHType::AUDIO); - EXPECT_EQ(ERR_DH_FWK_TYPE_NOT_EXIST, ret); - - CompHandler comHandler; - comHandler.sinkHandler = nullptr; - ComponentLoader::GetInstance().compHandlerMap_[DHType::AUDIO] = comHandler; - ret = ComponentLoader::GetInstance().ReleaseSink(DHType::AUDIO); - EXPECT_EQ(ERR_DH_FWK_LOADER_HANDLER_IS_NULL, ret); - ComponentLoader::GetInstance().compHandlerMap_.clear(); -} - /** * @tc.name: GetHandler_001 * @tc.desc: Verify the GetHandler function. @@ -350,18 +248,6 @@ HWTEST_F(ComponentLoaderTest, GetSourceSaId_001, TestSize.Level0) EXPECT_EQ(1, ret); } -/** - * @tc.name: component_loader_test_022 - * @tc.desc: Verify the ParseConfig function. - * @tc.type: FUNC - * @tc.require: AR000GHSK3 - */ -HWTEST_F(ComponentLoaderTest, component_loader_test_022, TestSize.Level0) -{ - int32_t ret = ComponentLoader::GetInstance().ParseConfig(); - EXPECT_EQ(DH_FWK_SUCCESS, ret); -} - /** * @tc.name: component_loader_test_023 * @tc.desc: Verify the ReleaseHandler function. diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/src/component_manager_test.cpp b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/src/component_manager_test.cpp index 0693a52c..79750cae 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/src/component_manager_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/src/component_manager_test.cpp @@ -404,30 +404,6 @@ HWTEST_F(ComponentManagerTest, WaitForResult_001, TestSize.Level0) EXPECT_EQ(true, ret); } -/** - * @tc.name: InitCompSource_001 - * @tc.desc: Verify the InitCompSource function - * @tc.type: FUNC - * @tc.require: AR000GHSJM - */ -HWTEST_F(ComponentManagerTest, InitCompSource_001, TestSize.Level0) -{ - bool ret = ComponentManager::GetInstance().InitCompSource(); - EXPECT_EQ(true, ret); -} - -/** - * @tc.name: InitCompSink_001 - * @tc.desc: Verify the InitCompSink function - * @tc.type: FUNC - * @tc.require: AR000GHSJM - */ -HWTEST_F(ComponentManagerTest, InitCompSink_001, TestSize.Level0) -{ - bool ret = ComponentManager::GetInstance().InitCompSink(); - EXPECT_EQ(true, ret); -} - /** * @tc.name: Enable_001 * @tc.desc: Verify the Enable function 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 fa2f446f..605a69c5 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 @@ -1027,17 +1027,6 @@ HWTEST_F(ResourceManagerTest, SyncMetaInfoFromDB_001, TestSize.Level0) EXPECT_EQ(ERR_DH_FWK_RESOURCE_DB_ADAPTER_OPERATION_FAIL, ret); } -HWTEST_F(ResourceManagerTest, SyncRemoteMetaInfos_001, TestSize.Level0) -{ - MetaInfoManager::GetInstance()->dbAdapterPtr_ = nullptr; - auto ret = MetaInfoManager::GetInstance()->SyncRemoteMetaInfos(); - EXPECT_EQ(ERR_DH_FWK_RESOURCE_DB_ADAPTER_POINTER_NULL, ret); - - MetaInfoManager::GetInstance()->Init(); - ret = MetaInfoManager::GetInstance()->SyncRemoteMetaInfos(); - EXPECT_EQ(DH_FWK_SUCCESS, ret); -} - HWTEST_F(ResourceManagerTest, GetDataByKeyPrefix_003, TestSize.Level0) { std::string keyPrefix = "keyPrefix_test"; 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 6f42a26f..da166b21 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/utils/dh_context_test.cpp +++ b/services/distributedhardwarefwkservice/test/unittest/common/utils/dh_context_test.cpp @@ -76,12 +76,12 @@ HWTEST_F(DhContextTest, AddOnlineDevice_002, TestSize.Level1) EXPECT_EQ(false, DHContext::GetInstance().devIdEntrySet_.empty()); } -HWTEST_F(DhContextTest, RemoveOnlineDeviceByUUID_001, TestSize.Level1) +HWTEST_F(DhContextTest, RemoveOnlineDeviceIdEntryByNetworkId_001, TestSize.Level1) { - DHContext::GetInstance().RemoveOnlineDeviceByUUID("123"); + DHContext::GetInstance().RemoveOnlineDeviceIdEntryByNetworkId("123"); EXPECT_EQ(false, DHContext::GetInstance().devIdEntrySet_.empty()); - DHContext::GetInstance().RemoveOnlineDeviceByUUID(TEST_UUID); + DHContext::GetInstance().RemoveOnlineDeviceIdEntryByNetworkId(TEST_NETWORKID); EXPECT_EQ(true, DHContext::GetInstance().devIdEntrySet_.empty()); } 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 45383b2f..e2bbfb43 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 @@ -56,28 +56,6 @@ const std::string TEST_COMPONENT_NAME_2 = "distributed_audio"; const std::string TEST_COMPONENT_NAME_3 = "distributed_mic"; } -/** - * @tc.name: version_manager_test_001 - * @tc.desc: Verify the Init function. - * @tc.type: FUNC - * @tc.require: AR000GHSKN - */ -HWTEST_F(VersionManagerTest, version_manager_test_001, TestSize.Level0) -{ - auto ret = VersionManager::GetInstance().Init(); - EXPECT_EQ(DH_FWK_SUCCESS, ret); -} - -void CompVersionGetValue(CompVersion &cVs, std::string name, DHType dhType, std::string handlerVersion, - std::string sourceVersion, std::string sinkVersion) -{ - cVs.name = name; - cVs.dhType = dhType; - cVs.handlerVersion = handlerVersion; - cVs.sourceVersion = sourceVersion; - cVs.sinkVersion = sinkVersion; -} - /** * @tc.name: version_manager_test_002 * @tc.desc: Verify AddDHVersion function @@ -87,15 +65,12 @@ void CompVersionGetValue(CompVersion &cVs, std::string name, DHType dhType, std: HWTEST_F(VersionManagerTest, version_manager_test_002, TestSize.Level0) { DHVersion dhVersion; - CompVersion cVs1; - CompVersionGetValue(cVs1, TEST_COMPONENT_NAME_1, DHType::CAMERA, TEST_HANDLER_VERSION_1, TEST_SOURCE_VERSION_1, - TEST_SINK_VERSION_1); - CompVersion cVs2; - 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::SCREEN, TEST_HANDLER_VERSION_3, TEST_SOURCE_VERSION_3, - TEST_SINK_VERSION_3); + CompVersion cVs1 { TEST_COMPONENT_NAME_1, DHType::CAMERA, TEST_HANDLER_VERSION_1, TEST_SOURCE_VERSION_1, + TEST_SINK_VERSION_1 }; + CompVersion cVs2 { TEST_COMPONENT_NAME_2, DHType::AUDIO, TEST_HANDLER_VERSION_2, TEST_SOURCE_VERSION_2, + TEST_SINK_VERSION_2 }; + CompVersion cVs3 { TEST_COMPONENT_NAME_3, DHType::SCREEN, TEST_HANDLER_VERSION_3, TEST_SOURCE_VERSION_3, + TEST_SINK_VERSION_3 }; dhVersion.uuid = TEST_DEVICE_ID_1; dhVersion.dhVersion = TEST_DH_VERSION; dhVersion.compVersions.insert(std::make_pair(cVs1.dhType, cVs1)); @@ -164,9 +139,8 @@ HWTEST_F(VersionManagerTest, version_manager_test_005, TestSize.Level0) HWTEST_F(VersionManagerTest, version_manager_test_006, TestSize.Level0) { DHVersion dhVersion; - CompVersion cVs1; - CompVersionGetValue(cVs1, TEST_COMPONENT_NAME_1, DHType::CAMERA, TEST_HANDLER_VERSION_1, TEST_SOURCE_VERSION_1, - TEST_SINK_VERSION_1); + CompVersion cVs1 { TEST_COMPONENT_NAME_1, DHType::CAMERA, TEST_HANDLER_VERSION_1, TEST_SOURCE_VERSION_1, + TEST_SINK_VERSION_1 }; dhVersion.uuid = TEST_DEVICE_ID_1; dhVersion.dhVersion = TEST_DH_VERSION; dhVersion.compVersions.insert(std::make_pair(cVs1.dhType, cVs1)); @@ -185,9 +159,8 @@ HWTEST_F(VersionManagerTest, version_manager_test_006, TestSize.Level0) HWTEST_F(VersionManagerTest, version_manager_test_007, TestSize.Level0) { DHVersion dhVersion; - CompVersion cVs1; - CompVersionGetValue(cVs1, TEST_COMPONENT_NAME_1, DHType::CAMERA, TEST_HANDLER_VERSION_1, TEST_SOURCE_VERSION_1, - TEST_SINK_VERSION_1); + CompVersion cVs1 { TEST_COMPONENT_NAME_1, DHType::CAMERA, TEST_HANDLER_VERSION_1, TEST_SOURCE_VERSION_1, + TEST_SINK_VERSION_1 }; dhVersion.uuid = TEST_DEVICE_ID_1; dhVersion.dhVersion = TEST_DH_VERSION; dhVersion.compVersions.insert(std::make_pair(cVs1.dhType, cVs1)); -- Gitee