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 c832d20637e49d27e615512f0049bc1b5694f0ca..a1e5d6c14505d3cd04b982fd51b839a8a2e41210 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 @@ -593,7 +593,7 @@ HWTEST_F(AudioAdapterInterfaceImpTest, CloseRenderDevice_001, TestSize.Level1) EXPECT_EQ(HDF_SUCCESS, AdapterTest_->CloseRenderDevice(devDesc)); AdapterTest_->spkPinInUse_ = 1; AdapterTest_->extSpkCallback_ = new MockIDAudioCallback(); - EXPECT_EQ(ERR_DH_AUDIO_HDF_WAIT_TIMEOUT, AdapterTest_->CloseRenderDevice(devDesc)); + EXPECT_EQ(HDF_SUCCESS, AdapterTest_->CloseRenderDevice(devDesc)); AdapterTest_->extSpkCallback_ = new MockRevertIDAudioCallback(); EXPECT_EQ(HDF_SUCCESS, AdapterTest_->CloseRenderDevice(devDesc)); } @@ -626,7 +626,7 @@ HWTEST_F(AudioAdapterInterfaceImpTest, CloseCaptureDevice_001, TestSize.Level1) AdapterTest_->extMicCallback_ = new MockIDAudioCallback(); EXPECT_EQ(HDF_SUCCESS, AdapterTest_->CloseCaptureDevice(devDesc)); AdapterTest_->micPinInUse_ = 1; - EXPECT_EQ(ERR_DH_AUDIO_HDF_WAIT_TIMEOUT, AdapterTest_->CloseCaptureDevice(devDesc)); + EXPECT_EQ(HDF_SUCCESS, AdapterTest_->CloseCaptureDevice(devDesc)); } /** diff --git a/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp b/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp index c61c680d9ce30f710dbd5454b2481e596252cae2..08a60b637676776aaeb44dabb13c43a795623f09 100644 --- a/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp +++ b/services/audiomanager/test/unittest/managersink/src/daudio_sink_dev_test.cpp @@ -94,7 +94,7 @@ HWTEST_F(DAudioSinkDevTest, TaskOpenCtrlChannel_001, TestSize.Level1) HWTEST_F(DAudioSinkDevTest, TaskOpenCtrlChannel_002, TestSize.Level1) { std::string args = "args"; - EXPECT_NE(DH_SUCCESS, sinkDev_->TaskOpenCtrlChannel(args)); + EXPECT_EQ(DH_SUCCESS, sinkDev_->TaskOpenCtrlChannel(args)); EXPECT_EQ(DH_SUCCESS, sinkDev_->TaskOpenCtrlChannel(args)); } 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 30b2dc90d099553e1ce3d3e2d481d465c8c918db..3c9c4bf59916f4b98789b82a910fa958ad3d5a83 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 @@ -51,12 +51,12 @@ HWTEST_F(DAudioSinkManagerTest, Init_001, TestSize.Level1) HWTEST_F(DAudioSinkManagerTest, CreateAudioDevice_001, TestSize.Level1) { std::string devId = "devId"; - EXPECT_EQ(DH_SUCCESS, daudioSinkManager.CreateAudioDevice(devId)); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, daudioSinkManager.CreateAudioDevice(devId)); daudioSinkManager.channelState_ = ChannelState::SPK_CONTROL_OPENED; - daudioSinkManager.rcvProviderPtr_ = std::make_shared().get(); + daudioSinkManager.LoadAVReceiverEngineProvider(); EXPECT_EQ(DH_SUCCESS, daudioSinkManager.CreateAudioDevice(devId)); daudioSinkManager.channelState_ = ChannelState::MIC_CONTROL_OPENED; - daudioSinkManager.sendProviderPtr_ = std::make_shared().get(); + daudioSinkManager.LoadAVSenderEngineProvider(); EXPECT_EQ(DH_SUCCESS, daudioSinkManager.CreateAudioDevice(devId)); auto dev = std::make_shared(devId); daudioSinkManager.audioDevMap_.emplace(devId, dev); diff --git a/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp index 7a4b63b61ed75471f88afe6872f8cff1f92459f4..e737045ec242ec6c00573f05d19851b2934e96d4 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp @@ -155,10 +155,10 @@ HWTEST_F(DAudioSourceDevTest, CreatTasks_003, TestSize.Level1) { sourceDev_->AwakeAudioDev(); AudioEvent event = AudioEvent(OPEN_SPEAKER, ""); - EXPECT_EQ(ERR_DH_AUDIO_SA_OPEN_CTRL_FAILED, sourceDev_->HandleOpenDSpeaker(event)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleOpenDSpeaker(event)); event.type = OPEN_MIC; - EXPECT_EQ(ERR_DH_AUDIO_SA_OPEN_CTRL_FAILED, sourceDev_->HandleOpenDMic(event)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleOpenDMic(event)); } /** @@ -844,7 +844,7 @@ HWTEST_F(DAudioSourceDevTest, TaskOpenCtrlChannel_001, TestSize.Level1) sourceDev_->rpcResult_ = true; sourceDev_->rpcNotify_ = sourceDev_->EVENT_NOTIFY_OPEN_MIC; jParam = { { KEY_DH_ID, DH_ID_SPK } }; - EXPECT_NE(DH_SUCCESS, sourceDev_->TaskOpenCtrlChannel(jParam.dump())); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskOpenCtrlChannel(jParam.dump())); } /**