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 a1e5d6c14505d3cd04b982fd51b839a8a2e41210..c832d20637e49d27e615512f0049bc1b5694f0ca 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(HDF_SUCCESS, AdapterTest_->CloseRenderDevice(devDesc)); + EXPECT_EQ(ERR_DH_AUDIO_HDF_WAIT_TIMEOUT, 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(HDF_SUCCESS, AdapterTest_->CloseCaptureDevice(devDesc)); + EXPECT_EQ(ERR_DH_AUDIO_HDF_WAIT_TIMEOUT, AdapterTest_->CloseCaptureDevice(devDesc)); } /** diff --git a/services/audioclient/test/unittest/micclient/src/dmic_client_test.cpp b/services/audioclient/test/unittest/micclient/src/dmic_client_test.cpp index cfe5d88e8ca274cc7b862bf7caedb5f1e37855fb..8010937c84cbb0058bfea6455bd22228fe839890 100644 --- a/services/audioclient/test/unittest/micclient/src/dmic_client_test.cpp +++ b/services/audioclient/test/unittest/micclient/src/dmic_client_test.cpp @@ -94,7 +94,7 @@ HWTEST_F(DMicClientTest, SetUp_001, TestSize.Level1) micClient_->SetAttrs(devId, clientCallback); AudioParam audioParam; EXPECT_NE(DH_SUCCESS, micClient_->SetUp(audioParam)); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_ERROR, micClient_->SetUp(audioParam_)); + EXPECT_EQ(DH_SUCCESS, micClient_->SetUp(audioParam_)); } /** @@ -159,7 +159,7 @@ HWTEST_F(DMicClientTest, StopCapture002, TestSize.Level1) micClient_->isCaptureReady_.store(true); EXPECT_EQ(ERR_DH_AUDIO_CLIENT_CAPTURER_OR_MICTRANS_INSTANCE, micClient_->StopCapture()); micClient_->SetUp(audioParam_); - EXPECT_EQ(ERR_DH_AUDIO_FAILED, micClient_->StopCapture()); + EXPECT_EQ(ERR_DH_AUDIO_SA_STATUS_ERR, micClient_->StopCapture()); } /** diff --git a/services/audioclient/test/unittest/spkclient/src/dspeaker_client_test.cpp b/services/audioclient/test/unittest/spkclient/src/dspeaker_client_test.cpp index efd68bdd480f5491a205ddb7de11f95433318b32..b9747a73cfce679420664ff0dcc93455dc1204bc 100644 --- a/services/audioclient/test/unittest/spkclient/src/dspeaker_client_test.cpp +++ b/services/audioclient/test/unittest/spkclient/src/dspeaker_client_test.cpp @@ -99,11 +99,11 @@ HWTEST_F(DSpeakerClientTest, OnStateChange_001, TestSize.Level1) HWTEST_F(DSpeakerClientTest, SetUp_001, TestSize.Level1) { AudioParam audioParam; - EXPECT_NE(DH_SUCCESS, speakerClient_->SetUp(audioParam)); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_ERROR, speakerClient_->SetUp(audioParam_)); + EXPECT_EQ(DH_SUCCESS, speakerClient_->SetUp(audioParam)); + EXPECT_EQ(DH_SUCCESS, speakerClient_->SetUp(audioParam_)); speakerClient_->speakerTrans_ = nullptr; EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, speakerClient_->SetUp(audioParam)); - EXPECT_EQ(ERR_DH_AUDIO_SA_STATUS_ERR, speakerClient_->Release()); + EXPECT_EQ(DH_SUCCESS, speakerClient_->Release()); speakerClient_->clientStatus_ = AudioStatus::STATUS_READY; EXPECT_EQ(ERR_DH_AUDIO_CLIENT_RENDER_RELEASE_FAILED, speakerClient_->Release()); } 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 5e9903a305b8cfbf3f82a9d845153c6d1a1b7f30..7a4b63b61ed75471f88afe6872f8cff1f92459f4 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 @@ -287,7 +287,7 @@ HWTEST_F(DAudioSourceDevTest, HandleDMicClosed_002, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, OpenCtrlTrans_001, TestSize.Level1) { AudioEvent event; - EXPECT_EQ(ERR_DH_AUDIO_SA_OPEN_CTRL_FAILED, sourceDev_->OpenCtrlTrans(event)); + EXPECT_NE(ERR_DH_AUDIO_SA_OPEN_CTRL_FAILED, sourceDev_->OpenCtrlTrans(event)); EXPECT_EQ(DH_SUCCESS, sourceDev_->OpenCtrlTrans(event)); sourceDev_->audioCtrlMgr_ = std::make_shared(DEV_ID, sourceDev_); sourceDev_->audioCtrlMgr_->isOpened_ = true; @@ -311,7 +311,7 @@ HWTEST_F(DAudioSourceDevTest, CloseCtrlTrans_001, TestSize.Level1) bool isSpk = false; EXPECT_EQ(DH_SUCCESS, sourceDev_->CloseCtrlTrans(event, isSpk)); sourceDev_->audioCtrlMgr_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->CloseCtrlTrans(event, isSpk)); + EXPECT_NE(ERR_DH_AUDIO_NULLPTR, sourceDev_->CloseCtrlTrans(event, isSpk)); EXPECT_EQ(DH_SUCCESS, sourceDev_->CloseCtrlTrans(event, isSpk)); } @@ -700,10 +700,10 @@ HWTEST_F(DAudioSourceDevTest, TaskOpenDSpeaker_001, TestSize.Level1) json jParam_spk = { { KEY_DH_ID, DH_ID_SPK } }; sourceDev_->isRpcOpen_.store(false); - EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskOpenDSpeaker(jParam_spk.dump())); + EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDSpeaker(jParam_spk.dump())); sourceDev_->isRpcOpen_.store(true); - EXPECT_EQ(ERR_DH_AUDIO_SA_RPC_WAIT_TIMEOUT, sourceDev_->TaskOpenDSpeaker(jParam_spk.dump())); + EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDSpeaker(jParam_spk.dump())); sourceDev_->rpcResult_ = true; sourceDev_->rpcNotify_ = sourceDev_->EVENT_NOTIFY_OPEN_SPK; @@ -727,7 +727,7 @@ HWTEST_F(DAudioSourceDevTest, TaskCloseDSpeaker_001, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskCloseDSpeaker(tempLongStr)); sourceDev_->speaker_->isOpened_ = true; - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseDSpeaker(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDSpeaker(ARGS)); sourceDev_->speaker_->isOpened_ = false; EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDSpeaker(ARGS)); @@ -762,17 +762,17 @@ HWTEST_F(DAudioSourceDevTest, TaskOpenDMic_001, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_SA_MIC_DEVICE_NOT_INIT, sourceDev_->TaskOpenDMic("")); sourceDev_->mic_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskOpenDMic("")); + EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDMic("")); - EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskOpenDMic("")); + EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDMic("")); std::string tempLongStr(DAUDIO_MAX_JSON_LEN + 1, 'a'); - EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskOpenDMic(tempLongStr)); + EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDMic(tempLongStr)); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_ERROR, sourceDev_->TaskOpenDMic(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDMic(ARGS)); json jParam_mic = { { KEY_DH_ID, DH_ID_MIC } }; - EXPECT_EQ(ERR_DH_AUDIO_TRANS_ERROR, sourceDev_->TaskOpenDMic(jParam_mic.dump())); + EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDMic(jParam_mic.dump())); } /** @@ -792,7 +792,7 @@ HWTEST_F(DAudioSourceDevTest, TaskCloseDMic_001, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskCloseDMic(tempLongStr)); sourceDev_->mic_->isOpened_ = true; - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseDMic(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDMic(ARGS)); sourceDev_->mic_->isOpened_ = false; EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDMic(ARGS)); @@ -824,22 +824,22 @@ HWTEST_F(DAudioSourceDevTest, TaskCloseDMic_002, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, TaskOpenCtrlChannel_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskOpenCtrlChannel("")); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskOpenCtrlChannel("")); sourceDev_->audioCtrlMgr_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskOpenCtrlChannel("")); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskOpenCtrlChannel("")); std::string tempLongStr(DAUDIO_MAX_JSON_LEN + 1, 'a'); - EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskOpenCtrlChannel(tempLongStr)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskOpenCtrlChannel(tempLongStr)); - EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskOpenCtrlChannel(ARGS)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskOpenCtrlChannel(ARGS)); json jParam = { { KEY_DH_ID, DH_ID_SPK } }; sourceDev_->isRpcOpen_.store(false); - EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskOpenCtrlChannel(jParam.dump())); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskOpenCtrlChannel(jParam.dump())); sourceDev_->isRpcOpen_.store(true); - EXPECT_EQ(ERR_DH_AUDIO_SA_RPC_WAIT_TIMEOUT, sourceDev_->TaskOpenCtrlChannel(jParam.dump())); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskOpenCtrlChannel(jParam.dump())); sourceDev_->rpcResult_ = true; sourceDev_->rpcNotify_ = sourceDev_->EVENT_NOTIFY_OPEN_MIC; @@ -1071,7 +1071,7 @@ HWTEST_F(DAudioSourceDevTest, NotifySinkDev_001, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->NotifySinkDev(CLOSE_MIC, jAudioParam, DH_ID_SPK)); sourceDev_->isRpcOpen_.store(true); - EXPECT_EQ(ERR_DH_AUDIO_SA_RPC_WAIT_TIMEOUT, sourceDev_->NotifySinkDev(CLOSE_MIC, jAudioParam, DH_ID_SPK)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->NotifySinkDev(CLOSE_MIC, jAudioParam, DH_ID_SPK)); sourceDev_->mic_ = std::make_shared(DEV_ID, sourceDev_); sourceDev_->speaker_ = std::make_shared(DEV_ID, sourceDev_); EXPECT_EQ(DH_SUCCESS, sourceDev_->NotifySinkDev(CLOSE_MIC, jAudioParam, DH_ID_SPK)); 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 08e21f8d8602afba8cf6b2f0ecd32148acd25117..3c06e208e573768670459c657ff3748f972581ac 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp @@ -58,7 +58,7 @@ HWTEST_F(DMicDevTest, InitReceiverEngine_001, TestSize.Level1) size_t size = 4096; auto audioData = std::make_shared(size); mic_->OnEngineTransDataAvailable(audioData); - EXPECT_EQ(DH_SUCCESS, mic_->InitReceiverEngine(providerPtr)); + EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, mic_->InitReceiverEngine(providerPtr)); mic_->micTrans_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, mic_->InitReceiverEngine(providerPtr)); } @@ -208,7 +208,7 @@ HWTEST_F(DMicDevTest, Start_001, TestSize.Level1) HWTEST_F(DMicDevTest, Start_002, TestSize.Level1) { mic_->micTrans_ = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_TRANS_ERROR, mic_->SetUp()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, mic_->SetUp()); EXPECT_NE(DH_SUCCESS, mic_->Start()); mic_->micTrans_ = std::make_shared(); @@ -249,7 +249,7 @@ HWTEST_F(DMicDevTest, Stop_001, TestSize.Level1) HWTEST_F(DMicDevTest, Stop_002, TestSize.Level1) { mic_->micTrans_ = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_TRANS_ERROR, mic_->SetUp()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, mic_->SetUp()); EXPECT_NE(DH_SUCCESS, mic_->Start()); EXPECT_EQ(DH_SUCCESS, mic_->Stop()); EXPECT_FALSE(mic_->IsOpened()); diff --git a/services/audiomanager/test/unittest/sourcedevice/src/dspeaker_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/dspeaker_dev_test.cpp index c889ff69969d34594f2d82444011ce2830bbf4a6..1f57e888ba1ae5408480e71a1a6aec7e148e276f 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/dspeaker_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/dspeaker_dev_test.cpp @@ -55,7 +55,7 @@ HWTEST_F(DSpeakerDevTest, InitSenderEngine_001, TestSize.Level1) spk_->OnEngineTransEvent(event); std::shared_ptr message = nullptr; spk_->OnEngineTransMessage(message); - EXPECT_EQ(DH_SUCCESS, spk_->InitSenderEngine(providerPtr)); + EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, spk_->InitSenderEngine(providerPtr)); spk_->speakerTrans_ = std::make_shared(); EXPECT_EQ(DH_SUCCESS, spk_->InitSenderEngine(providerPtr)); }