From b18ef40041df1532807d0d23dd71b3da1f64f1f1 Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Thu, 17 Oct 2024 16:23:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=B1=E8=B4=A5UT=E7=94=A8?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-tiangang4 --- .../unittest/common/componentloader/BUILD.gn | 4 + .../src/component_loader_test.cpp | 91 ++++++++++--------- .../component_manager/BUILD.gn | 4 + .../src/component_manager_test.cpp | 24 ++--- 4 files changed, 70 insertions(+), 53 deletions(-) diff --git a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn index 966f20c4..7821e817 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentloader/BUILD.gn @@ -69,6 +69,10 @@ ohos_unittest("ComponentLoaderTest") { "LOG_DOMAIN=0xD004100", ] + if (!distributed_hardware_fwk_low_latency) { + defines += [ "DHARDWARE_CLOSE_UT" ] + } + if (powermgr_power_manager_fwk) { external_deps += [ "power_manager:powermgr_client" ] defines += [ "POWER_MANAGER_ENABLE" ] 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 5e8307f5..d5d90bf8 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,20 +100,22 @@ 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(); -} +#ifdef DHARDWARE_CLOSE_UT + /** + * @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(); + } +#endif /** * @tc.name: GetSource_001 @@ -134,20 +136,22 @@ 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(); -} +#ifdef DHARDWARE_CLOSE_UT + /** + * @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(); + } +#endif /** * @tc.name: GetSink_001 @@ -168,20 +172,22 @@ 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(); -} +#ifdef DHARDWARE_CLOSE_UT + /** + * @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(); + } +#endif /** * @tc.name: Readfile_001 @@ -204,6 +210,7 @@ HWTEST_F(ComponentLoaderTest, Readfile_001, TestSize.Level0) */ HWTEST_F(ComponentLoaderTest, ReleaseHardwareHandler_001, TestSize.Level0) { + ComponentLoader::GetInstance().compHandlerMap_.clear(); auto ret = ComponentLoader::GetInstance().ReleaseHardwareHandler(DHType::AUDIO); EXPECT_EQ(ERR_DH_FWK_TYPE_NOT_EXIST, ret); 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 e121d203..45f05507 100644 --- a/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn +++ b/services/distributedhardwarefwkservice/test/unittest/common/componentmanager/component_manager/BUILD.gn @@ -76,6 +76,10 @@ ohos_unittest("ComponentManagerTest") { "LOG_DOMAIN=0xD004100", ] + if (!distributed_hardware_fwk_low_latency) { + defines += [ "DHARDWARE_CLOSE_UT" ] + } + if (powermgr_power_manager_fwk) { external_deps += [ "power_manager:powermgr_client" ] defines += [ "POWER_MANAGER_ENABLE" ] 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 047d3202..e18ff379 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 @@ -403,17 +403,19 @@ 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); -} +#ifdef DHARDWARE_CLOSE_UT + /** + * @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); + } +#endif /** * @tc.name: InitCompSink_001 -- Gitee