From b1fb62cb9d90020e3f0e9c5bd68b43a3d84b3ce8 Mon Sep 17 00:00:00 2001 From: Bobie Date: Mon, 4 Sep 2023 21:22:32 +0800 Subject: [PATCH] fix UT of daudio adapter. Signed-off-by: Bobie --- .../src/audio_adapter_interface_impl_test.cpp | 14 +++++++++----- .../hdfaudioclient/src/daudio_capture_internal.cpp | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_adapter_interface/src/audio_adapter_interface_impl_test.cpp b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_adapter_interface/src/audio_adapter_interface_impl_test.cpp index c9554175..c5b38b4e 100644 --- a/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_adapter_interface/src/audio_adapter_interface_impl_test.cpp +++ b/hdf_service/distributed_audio/hdi_service/audio/v1_0/test/unittest/audio_adapter_interface/src/audio_adapter_interface_impl_test.cpp @@ -73,7 +73,7 @@ HWTEST_F(AudioAdapterInterfaceImpTest, CreateRender_001, TestSize.Level1) AudioDeviceDescriptor devDesc; AudioSampleAttributes attrs; sptr render = nullptr; - uint32_t renderId = 10; + uint32_t renderId = 0; AdapterTest_->extSpkCallback_ = new MockIDAudioCallback(); EXPECT_NE(HDF_SUCCESS, AdapterTest_->CreateRender(devDesc, attrs, render, renderId)); EXPECT_EQ(HDF_SUCCESS, AdapterTest_->DestroyRender(renderId)); @@ -105,7 +105,9 @@ HWTEST_F(AudioAdapterInterfaceImpTest, DestroyRender_001, TestSize.Level1) EXPECT_EQ(HDF_SUCCESS, AdapterTest_->DestroyRender(renderId)); renderId = 10; - EXPECT_NE(HDF_FAILURE, AdapterTest_->DestroyRender(renderId)); + EXPECT_EQ(HDF_FAILURE, AdapterTest_->DestroyRender(renderId)); + renderId = 1; + EXPECT_EQ(HDF_SUCCESS, AdapterTest_->DestroyRender(renderId)); } /** @@ -119,7 +121,7 @@ HWTEST_F(AudioAdapterInterfaceImpTest, CreateCapture_001, TestSize.Level1) AudioDeviceDescriptor devDesc; AudioSampleAttributes attrs; sptr capture = nullptr; - uint32_t capId = 10; + uint32_t capId = 0; AdapterTest_->extMicCallback_ = new MockIDAudioCallback(); EXPECT_NE(HDF_SUCCESS, AdapterTest_->CreateCapture(devDesc, attrs, capture, capId)); EXPECT_EQ(HDF_SUCCESS, AdapterTest_->DestroyCapture(capId)); @@ -150,7 +152,9 @@ HWTEST_F(AudioAdapterInterfaceImpTest, DestroyCapture_001, TestSize.Level1) EXPECT_EQ(HDF_SUCCESS, AdapterTest_->DestroyCapture(capId)); capId = 10; - EXPECT_NE(HDF_FAILURE, AdapterTest_->DestroyCapture(capId)); + EXPECT_EQ(HDF_FAILURE, AdapterTest_->DestroyCapture(capId)); + capId = 1; + EXPECT_EQ(HDF_SUCCESS, AdapterTest_->DestroyCapture(capId)); } /** @@ -673,7 +677,7 @@ HWTEST_F(AudioAdapterInterfaceImpTest, SetAudioVolume_001, TestSize.Level1) std::string param = "1"; EXPECT_NE(HDF_SUCCESS, AdapterTest_->SetAudioVolume(condition, param)); AdapterTest_->extSpkCallback_ = new MockIDAudioCallback(); - EXPECT_NE(HDF_SUCCESS, AdapterTest_->SetAudioVolume(condition, param)); + EXPECT_EQ(HDF_SUCCESS, AdapterTest_->SetAudioVolume(condition, param)); std::string adpterName = "adbcef"; AudioDeviceDescriptor desc; AudioSampleAttributes attrs; diff --git a/services/hdfaudioclient/src/daudio_capture_internal.cpp b/services/hdfaudioclient/src/daudio_capture_internal.cpp index 13ccf4f1..3aaafa63 100644 --- a/services/hdfaudioclient/src/daudio_capture_internal.cpp +++ b/services/hdfaudioclient/src/daudio_capture_internal.cpp @@ -70,7 +70,7 @@ static int32_t CaptureFrameInternal(struct AudioCapture *capture, void *frame, u } int8_t *uframe = reinterpret_cast(frame); std::vector frameHal; - int32_t ret = context->proxy_->CaptureFrame(frameHal, requestBytes); + int32_t ret = context->proxy_->CaptureFrame(frameHal, *replyBytes); if (ret != DH_SUCCESS) { DHLOGE("Failed to capture frames."); return ret; -- Gitee