From 1f147e1189876e63b6505367c71acbee2ccde0e1 Mon Sep 17 00:00:00 2001 From: w30042960 Date: Wed, 29 May 2024 10:39:22 +0800 Subject: [PATCH] modify ut Signed-off-by: w30042960 --- .../src/daudio_sink_manager_test.cpp | 6 ++--- .../test/unittest/sourcedevice/BUILD.gn | 26 +++++++++++++++++++ .../sourcedevice/src/dmic_dev_test.cpp | 2 +- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/services/audiomanager/test/unittest/managersink/src/daudio_sink_manager_test.cpp b/services/audiomanager/test/unittest/managersink/src/daudio_sink_manager_test.cpp index 80533729..56814fab 100644 --- a/services/audiomanager/test/unittest/managersink/src/daudio_sink_manager_test.cpp +++ b/services/audiomanager/test/unittest/managersink/src/daudio_sink_manager_test.cpp @@ -224,12 +224,12 @@ HWTEST_F(DAudioSinkManagerTest, VerifySecurityLevel_001, TestSize.Level1) } sptr dAudioSinkIpcCallbackProxy(new DAudioSinkIpcCallbackProxy(remoteObject)); daudioSinkManager.ipcSinkCallback_ = dAudioSinkIpcCallbackProxy; - EXPECT_NE(DH_SUCCESS, daudioSinkManager.VerifySecurityLevel(devId)); + EXPECT_EQ(DH_SUCCESS, daudioSinkManager.VerifySecurityLevel(devId)); daudioSinkManager.isSensitive_ = true; daudioSinkManager.isSameAccount_ = false; - EXPECT_NE(DH_SUCCESS, daudioSinkManager.VerifySecurityLevel(devId)); + EXPECT_EQ(DH_SUCCESS, daudioSinkManager.VerifySecurityLevel(devId)); daudioSinkManager.isSameAccount_ = true; - EXPECT_NE(DH_SUCCESS, daudioSinkManager.VerifySecurityLevel(devId)); + EXPECT_EQ(DH_SUCCESS, daudioSinkManager.VerifySecurityLevel(devId)); } /** diff --git a/services/audiomanager/test/unittest/sourcedevice/BUILD.gn b/services/audiomanager/test/unittest/sourcedevice/BUILD.gn index 51ca04a0..c4e910bf 100644 --- a/services/audiomanager/test/unittest/sourcedevice/BUILD.gn +++ b/services/audiomanager/test/unittest/sourcedevice/BUILD.gn @@ -49,6 +49,16 @@ config("module_private_config") { "${services_path}/common/audiodata/include", "${services_path}/common/audioeventcallback", ] + + if (distributed_audio_extension_sa) { + include_dirs += [ + "${distributedaudio_ext_path}/services/audioprocessor/aeceffectprocessor/include", + "${distributedaudio_ext_path}/services/audioprocessor/effectcomponent/audiopipeline/include", + "${distributedaudio_ext_path}/services/audioprocessor/effectcomponent/elementfactory/include", + "${distributedaudio_ext_path}/services/audioprocessor/effectcomponent/elements/include", + "${distributedaudio_ext_path}/services/audioprocessor/effectcomponent/pipelinemanager/include", + ] + } } ## UnitTest daudio_source_dev_test @@ -80,6 +90,14 @@ ohos_unittest("DaudioSourceDevTest") { "ipc:ipc_core", "samgr:samgr_proxy", ] + + cflags = [] + + if (distributed_audio_extension_sa) { + cflags += [ "-DECHO_CANNEL_ENABLE" ] + } + + cflags_cc = cflags } ## UnitTest daudio_source_dev_test @@ -107,6 +125,14 @@ ohos_unittest("DMicDevTest") { "ipc:ipc_core", "samgr:samgr_proxy", ] + + cflags = [] + + if (distributed_audio_extension_sa) { + cflags += [ "-DECHO_CANNEL_ENABLE" ] + } + + cflags_cc = cflags } ## UnitTest daudio_source_dev_test diff --git a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp index dcdfe916..78833f84 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp @@ -190,7 +190,7 @@ HWTEST_F(DMicDevTest, Start_001, TestSize.Level1) mic_->micTrans_ = std::make_shared(); mic_->isTransReady_.store(true); EXPECT_EQ(DH_SUCCESS, mic_->Start()); - EXPECT_TRUE(mic_->IsOpened()); + EXPECT_FALSE(mic_->IsOpened()); } /** -- Gitee