From d4f58ba5811341c9432c4d7aed924916b384e6f4 Mon Sep 17 00:00:00 2001 From: w30042960 Date: Tue, 23 May 2023 22:12:15 +0800 Subject: [PATCH 1/2] modify UT Signed-off-by: w30042960 --- .../src/audio_render_interface_impl_test.cpp | 4 +--- .../audio_adapter_internal_test.cpp | 23 ------------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_render_interface/src/audio_render_interface_impl_test.cpp b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_render_interface/src/audio_render_interface_impl_test.cpp index 6074d047..87176cfc 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_render_interface/src/audio_render_interface_impl_test.cpp +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_render_interface/src/audio_render_interface_impl_test.cpp @@ -84,8 +84,6 @@ HWTEST_F(AudioRenderInterfaceImplTest, RenderFrame_002, TestSize.Level1) audioRenderInterfaceImpl_->renderStatus_ = RENDER_STATUS_START; audioRenderInterfaceImpl_->audioExtCallback_ = nullptr; EXPECT_EQ(HDF_FAILURE, audioRenderInterfaceImpl_->RenderFrame(frame, replyBytes)); - audioRenderInterfaceImpl_->audioExtCallback_ = new MockIDAudioCallback(); - EXPECT_EQ(HDF_SUCCESS, audioRenderInterfaceImpl_->RenderFrame(frame, replyBytes)); } /** @@ -94,7 +92,7 @@ HWTEST_F(AudioRenderInterfaceImplTest, RenderFrame_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: AR000H0E6H */ -HWTEST_F(AudioRenderInterfaceImplTest, RenderFrame_003, TestSize.Level1) +HWTEST_F(AudioRenderInterfaceImplTest, RenderFrame_002, TestSize.Level1) { std::vector frame; uint64_t replyBytes = 0; diff --git a/services/hdfaudioclient/test/unittest/audio_adapter_internal/audio_adapter_internal_test.cpp b/services/hdfaudioclient/test/unittest/audio_adapter_internal/audio_adapter_internal_test.cpp index 943c03b3..a1f167a0 100644 --- a/services/hdfaudioclient/test/unittest/audio_adapter_internal/audio_adapter_internal_test.cpp +++ b/services/hdfaudioclient/test/unittest/audio_adapter_internal/audio_adapter_internal_test.cpp @@ -94,29 +94,6 @@ HWTEST_F(AudioAdapterTest, CreateRenderInternal_001, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_HDI_INVALID_PARAM, ret); } -/** -* @tc.name: CreateRenderInternal -* @tc.desc: Verify the abnormal branch of the CreateRenderInternal, when param is null. -* @tc.type: FUNC -* @tc.require: AR000H0E6H -*/ -HWTEST_F(AudioAdapterTest, CreateRenderInternal_002, TestSize.Level1) -{ - auto adapterContext1 = std::make_unique(); - const struct ::AudioDeviceDescriptor *desc = new ::AudioDeviceDescriptor; - const struct ::AudioSampleAttributes *attrs = new ::AudioSampleAttributes; - struct AudioRender *render = new AudioRender; - int32_t ret = adapterContext1->instance_.CreateRender(&adapterContext1->instance_, desc, attrs, &render); - EXPECT_EQ(ERR_DH_AUDIO_HDI_NULLPTR, ret); - auto adapterContext = std::make_unique(); - adapterContext->proxy_ = new MockIAudioAdapter(); - adapterContext->adapterName_ = "adapterName"; - EXPECT_EQ(DH_SUCCESS, adapterContext->instance_.CreateRender(&adapterContext->instance_, desc, attrs, &render)); - delete desc; - delete attrs; - delete render; -} - /** * @tc.name: DestroyRenderInternal * @tc.desc: Verify the abnormal branch of the DestroyRenderInternal, when param is null. -- Gitee From 10d24dc94f6b759078330c940f476196ccb72c4b Mon Sep 17 00:00:00 2001 From: w30042960 Date: Wed, 24 May 2023 09:01:54 +0800 Subject: [PATCH 2/2] modify ut Signed-off-by: w30042960 --- .../src/audio_render_interface_impl_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_render_interface/src/audio_render_interface_impl_test.cpp b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_render_interface/src/audio_render_interface_impl_test.cpp index 87176cfc..72161307 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_render_interface/src/audio_render_interface_impl_test.cpp +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_render_interface/src/audio_render_interface_impl_test.cpp @@ -92,7 +92,7 @@ HWTEST_F(AudioRenderInterfaceImplTest, RenderFrame_002, TestSize.Level1) * @tc.type: FUNC * @tc.require: AR000H0E6H */ -HWTEST_F(AudioRenderInterfaceImplTest, RenderFrame_002, TestSize.Level1) +HWTEST_F(AudioRenderInterfaceImplTest, RenderFrame_003, TestSize.Level1) { std::vector frame; uint64_t replyBytes = 0; -- Gitee