From e1fe095d8ecec7e778f36f0577d59acf7809f395 Mon Sep 17 00:00:00 2001 From: wu-jinpeng981212 Date: Fri, 13 Oct 2023 17:54:45 +0800 Subject: [PATCH] =?UTF-8?q?UT=E9=97=AE=E9=A2=98=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wu-jinpeng981212 --- .../src/daudio_hdi_handler_test.cpp | 5 +- .../managersink/src/daudio_sink_dev_test.cpp | 2 +- .../src/daudio_source_dev_test.cpp | 146 ++++++++++++------ .../sourcedevice/src/dmic_dev_test.cpp | 6 +- .../sourcedevice/src/dspeaker_dev_test.cpp | 2 +- 5 files changed, 109 insertions(+), 52 deletions(-) diff --git a/services/audiohdiproxy/test/unittest/daudio_hdi_handler/src/daudio_hdi_handler_test.cpp b/services/audiohdiproxy/test/unittest/daudio_hdi_handler/src/daudio_hdi_handler_test.cpp index 75ede48b..990c089b 100644 --- a/services/audiohdiproxy/test/unittest/daudio_hdi_handler/src/daudio_hdi_handler_test.cpp +++ b/services/audiohdiproxy/test/unittest/daudio_hdi_handler/src/daudio_hdi_handler_test.cpp @@ -76,8 +76,9 @@ HWTEST_F(DAudioHdiHandlerTest, RegisterAudioDevice_002, TestSize.Level1) { EXPECT_EQ(HDF_SUCCESS, hdiHandler_->InitHdiHandler()); std::shared_ptr callbackObjParam = std::make_shared(); - EXPECT_EQ(HDF_SUCCESS, hdiHandler_->RegisterAudioDevice(devId_, dhId_, capability_, callbackObjParam)); - EXPECT_EQ(HDF_SUCCESS, hdiHandler_->UnRegisterAudioDevice(devId_, dhId_)); + EXPECT_EQ(ERR_DH_AUDIO_HDI_CALL_FAILED, + hdiHandler_->RegisterAudioDevice(devId_, dhId_, capability_, callbackObjParam)); + EXPECT_EQ(ERR_DH_AUDIO_HDI_CALL_FAILED, hdiHandler_->UnRegisterAudioDevice(devId_, dhId_)); } /** 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 720f05a5..effb77a5 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 @@ -230,7 +230,7 @@ HWTEST_F(DAudioSinkDevTest, TaskOpenDMic_002, TestSize.Level1) HWTEST_F(DAudioSinkDevTest, TaskCloseDMic_001, TestSize.Level1) { std::string args; - EXPECT_EQ(DH_SUCCESS, sinkDev_->TaskCloseDMic(args)); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sinkDev_->TaskCloseDMic(args)); } /** 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 a4cd2620..d98600c3 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 @@ -14,6 +14,7 @@ */ #include "daudio_source_dev_test.h" +#include "nlohmann/json.hpp" #include "audio_encode_transport.h" #include "audio_decode_transport.h" @@ -57,7 +58,6 @@ HWTEST_F(DAudioSourceDevTest, CreatTasks_001, TestSize.Level1) { EXPECT_EQ(DH_SUCCESS, sourceDev_->AwakeAudioDev()); EXPECT_EQ(DH_SUCCESS, sourceDev_->EnableDAudio(DH_ID_SPK, ATTRS)); - AudioEvent event = AudioEvent(OPEN_SPEAKER, ""); EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleOpenDSpeaker(event)); event.type = SPEAKER_OPENED; @@ -65,8 +65,12 @@ HWTEST_F(DAudioSourceDevTest, CreatTasks_001, TestSize.Level1) event.type = CLOSE_SPEAKER; EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleCloseDSpeaker(event)); event.type = SPEAKER_CLOSED; - EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleDSpeakerClosed(event)); - + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->HandleDSpeakerClosed(event)); + json infoJs; + infoJs["dhId"] = "1"; + std::string speakContent = infoJs.dump(); + AudioEvent openEvent = AudioEvent(CLOSE_SPEAKER, speakContent); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->HandleDSpeakerClosed(openEvent)); event.type = OPEN_MIC; EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleOpenDMic(event)); event.type = MIC_OPENED; @@ -74,8 +78,12 @@ HWTEST_F(DAudioSourceDevTest, CreatTasks_001, TestSize.Level1) event.type = CLOSE_MIC; EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleCloseDMic(event)); event.type = MIC_CLOSED; - EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleDMicClosed(event)); - + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->HandleDMicClosed(event)); + json js; + js["dhId"] = "1"; + std::string micContent = js.dump(); + AudioEvent closeEvent = AudioEvent(MIC_CLOSED, micContent); + EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleDMicClosed(closeEvent)); int32_t dhId = DEFAULT_RENDER_ID; auto speaker = std::make_shared(DEV_ID, sourceDev_); sourceDev_->deviceMap_[dhId] = speaker; @@ -86,19 +94,16 @@ HWTEST_F(DAudioSourceDevTest, CreatTasks_001, TestSize.Level1) mic->isOpened_ = true; event.type = CTRL_CLOSED; EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleCtrlTransClosed(event)); - event.type = VOLUME_SET; EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleVolumeSet(event)); event.type = VOLUME_MUTE_SET; EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleVolumeSet(event)); event.type = VOLUME_CHANGE; EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleVolumeChange(event)); - event.type = AUDIO_FOCUS_CHANGE; EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleFocusChange(event)); event.type = AUDIO_RENDER_STATE_CHANGE; EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleRenderStateChange(event)); - EXPECT_EQ(DH_SUCCESS, sourceDev_->DisableDAudio(DH_ID_SPK)); sourceDev_->SleepAudioDev(); } @@ -120,7 +125,13 @@ HWTEST_F(DAudioSourceDevTest, CreatTasks_002, TestSize.Level1) event.type = CLOSE_SPEAKER; EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->HandleCloseDSpeaker(event)); event.type = SPEAKER_CLOSED; - EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleDSpeakerClosed(event)); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->HandleDSpeakerClosed(event)); + json infoJs; + infoJs["dhId"] = "1"; + std::string speakContent = infoJs.dump(); + AudioEvent speakEvent = AudioEvent(SPEAKER_CLOSED, speakContent); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->HandleDSpeakerClosed(speakEvent)); + event.type = OPEN_MIC; EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->HandleOpenDMic(event)); @@ -129,7 +140,12 @@ HWTEST_F(DAudioSourceDevTest, CreatTasks_002, TestSize.Level1) event.type = CLOSE_MIC; EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->HandleCloseDMic(event)); event.type = MIC_CLOSED; - EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleDMicClosed(event)); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->HandleDMicClosed(event)); + json js; + js["dhId"] = "1"; + std::string content = js.dump(); + AudioEvent cloceEvent = AudioEvent(MIC_CLOSED, content); + EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleDMicClosed(cloceEvent)); event.type = CTRL_CLOSED; EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleCtrlTransClosed(event)); @@ -265,7 +281,12 @@ HWTEST_F(DAudioSourceDevTest, WaitForRPC_002, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, HandleDMicClosed_001, TestSize.Level1) { AudioEvent event; - EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleDMicClosed(event)); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->HandleDMicClosed(event)); + json js; + js["dhId"] = "1"; + std::string content = js.dump(); + AudioEvent openEvent = AudioEvent(MIC_CLOSED, content); + EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleDMicClosed(openEvent)); sourceDev_->SleepAudioDev(); } @@ -279,7 +300,12 @@ HWTEST_F(DAudioSourceDevTest, HandleDMicClosed_002, TestSize.Level1) { AudioEvent event; sourceDev_->mic_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleDMicClosed(event)); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->HandleDMicClosed(event)); + json js; + js["dhId"] = "1"; + std::string content = js.dump(); + AudioEvent openEvent = AudioEvent(MIC_CLOSED, content); + EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleDMicClosed(openEvent)); } /** @@ -529,10 +555,10 @@ HWTEST_F(DAudioSourceDevTest, TaskDisableDAudio_001, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_NOT_SUPPORT, sourceDev_->TaskDisableDAudio(jParam.dump())); json jParam_spk = { { KEY_DEV_ID, DEV_ID }, { KEY_DH_ID, DH_ID_SPK } }; - EXPECT_NE(DH_SUCCESS, sourceDev_->TaskDisableDAudio(jParam_spk.dump())); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskDisableDAudio(jParam_spk.dump())); json jParam_mic = { { KEY_DEV_ID, DEV_ID }, { KEY_DH_ID, DH_ID_MIC } }; - EXPECT_NE(DH_SUCCESS, sourceDev_->TaskDisableDAudio(jParam_mic.dump())); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskDisableDAudio(jParam_mic.dump())); } /** @@ -600,10 +626,10 @@ HWTEST_F(DAudioSourceDevTest, EnableDSpeaker_001, TestSize.Level1) auto speaker = std::make_shared(DEV_ID, sourceDev_); int32_t dhId = DEFAULT_RENDER_ID; sourceDev_->deviceMap_[dhId] = speaker; - EXPECT_NE(DH_SUCCESS, sourceDev_->EnableDSpeaker(dhId, ATTRS)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->EnableDSpeaker(dhId, ATTRS)); sourceDev_->deviceMap_[dhId] = nullptr; - EXPECT_NE(DH_SUCCESS, sourceDev_->EnableDSpeaker(dhId, ATTRS)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->EnableDSpeaker(dhId, ATTRS)); } /** @@ -631,10 +657,10 @@ HWTEST_F(DAudioSourceDevTest, EnableDMic_001, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, DisableDSpeaker_001, TestSize.Level1) { int32_t dhId = 0; - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->DisableDSpeaker(dhId)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->DisableDSpeaker(dhId)); sourceDev_->speaker_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_NE(DH_SUCCESS, sourceDev_->DisableDSpeaker(dhId)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->DisableDSpeaker(dhId)); sourceDev_->speaker_ = nullptr; } @@ -647,10 +673,10 @@ HWTEST_F(DAudioSourceDevTest, DisableDSpeaker_001, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, DisableDMic_001, TestSize.Level1) { int32_t dhId = 0; - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->DisableDMic(dhId)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->DisableDMic(dhId)); sourceDev_->mic_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_NE(DH_SUCCESS, sourceDev_->DisableDMic(dhId)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->DisableDMic(dhId)); sourceDev_->mic_ = nullptr; } @@ -662,22 +688,22 @@ HWTEST_F(DAudioSourceDevTest, DisableDMic_001, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, TaskOpenDSpeaker_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_SA_SPEAKER_DEVICE_NOT_INIT, sourceDev_->TaskOpenDSpeaker("")); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskOpenDSpeaker("")); sourceDev_->speaker_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskOpenDSpeaker("")); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskOpenDSpeaker("")); std::string tempLongStr(DAUDIO_MAX_JSON_LEN + 1, 'a'); - EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskOpenDSpeaker(tempLongStr)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskOpenDSpeaker(tempLongStr)); - EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskOpenDSpeaker(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskOpenDSpeaker(ARGS)); json jParam_spk = { { KEY_DH_ID, DH_ID_SPK } }; sourceDev_->isRpcOpen_.store(false); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDSpeaker(jParam_spk.dump())); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskOpenDSpeaker(jParam_spk.dump())); sourceDev_->isRpcOpen_.store(true); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDSpeaker(jParam_spk.dump())); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskOpenDSpeaker(jParam_spk.dump())); sourceDev_->rpcResult_ = true; sourceDev_->rpcNotify_ = sourceDev_->EVENT_NOTIFY_OPEN_SPK; @@ -692,15 +718,30 @@ HWTEST_F(DAudioSourceDevTest, TaskOpenDSpeaker_001, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, TaskCloseDSpeaker_001, TestSize.Level1) { - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseDSpeaker(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDSpeaker(ARGS)); + json js; + js["dhId"] = "1"; + std::string content = js.dump(); + AudioEvent closeSpeak = AudioEvent(CLOSE_SPEAKER, content); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseDSpeaker(closeSpeak.content)); int32_t dhId = DEFAULT_RENDER_ID; auto speaker = std::make_shared(DEV_ID, sourceDev_); sourceDev_->deviceMap_[dhId] = speaker; - EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskCloseDSpeaker("")); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDSpeaker("")); + json infoJs; + infoJs["dhId"] = "1"; + std::string SpeakerContent = infoJs.dump(); + AudioEvent openEvent = AudioEvent(CLOSE_SPEAKER, SpeakerContent); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseDSpeaker(openEvent.content)); std::string tempLongStr(DAUDIO_MAX_JSON_LEN + 1, 'a'); - EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskCloseDSpeaker(tempLongStr)); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDSpeaker(tempLongStr)); + json inJs; + inJs["dhId"] = "1"; + std::string speakerContent = inJs.dump(); + AudioEvent tempLong = AudioEvent(CLOSE_SPEAKER, speakerContent); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseDSpeaker(tempLong.content)); speaker->isOpened_ = true; EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDSpeaker(ARGS)); @@ -742,17 +783,17 @@ HWTEST_F(DAudioSourceDevTest, TaskOpenDMic_001, TestSize.Level1) auto mic = std::make_shared(DEV_ID, sourceDev_); int32_t dhId = DEFAULT_CAPTURE_ID; sourceDev_->deviceMap_[dhId] = mic; - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDMic("")); + EXPECT_EQ(ERR_DH_AUDIO_SA_MIC_DEVICE_NOT_INIT, sourceDev_->TaskOpenDMic("")); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDMic("")); + EXPECT_EQ(ERR_DH_AUDIO_SA_MIC_DEVICE_NOT_INIT, sourceDev_->TaskOpenDMic("")); std::string tempLongStr(DAUDIO_MAX_JSON_LEN + 1, 'a'); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDMic(tempLongStr)); + EXPECT_EQ(ERR_DH_AUDIO_SA_MIC_DEVICE_NOT_INIT, sourceDev_->TaskOpenDMic(tempLongStr)); - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDMic(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_SA_MIC_DEVICE_NOT_INIT, sourceDev_->TaskOpenDMic(ARGS)); json jParam_mic = { { KEY_DH_ID, DH_ID_MIC } }; - EXPECT_EQ(ERR_DH_AUDIO_TRANS_NULL_VALUE, sourceDev_->TaskOpenDMic(jParam_mic.dump())); + EXPECT_EQ(ERR_DH_AUDIO_SA_MIC_DEVICE_NOT_INIT, sourceDev_->TaskOpenDMic(jParam_mic.dump())); } /** @@ -763,16 +804,31 @@ HWTEST_F(DAudioSourceDevTest, TaskOpenDMic_001, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, TaskCloseDMic_001, TestSize.Level1) { - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseDMic(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDMic(ARGS)); + json js; + js["dhId"] = "1"; + std::string content = js.dump(); + AudioEvent closeArgs = AudioEvent(CLOSE_MIC, content); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseDMic(closeArgs.content)); auto mic = std::make_shared(DEV_ID, sourceDev_); int32_t dhId = DEFAULT_CAPTURE_ID; sourceDev_->deviceMap_[dhId] = mic; - EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskCloseDMic("")); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDMic("")); + json infoJs; + infoJs["dhId"] = "1"; + std::string micContent = infoJs.dump(); + AudioEvent closeMic = AudioEvent(CLOSE_MIC, micContent); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseDMic(closeMic.content)); std::string tempLongStr(DAUDIO_MAX_JSON_LEN + 1, 'a'); - EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskCloseDMic(tempLongStr)); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDMic(tempLongStr)); + json inJs; + inJs["dhId"] = "1"; + std::string closeContent = inJs.dump(); + AudioEvent tempLong = AudioEvent(CLOSE_MIC, closeContent); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseDMic(tempLong.content)); mic->isOpened_ = true; EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDMic(ARGS)); @@ -829,7 +885,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())); } /** @@ -866,7 +922,7 @@ HWTEST_F(DAudioSourceDevTest, TaskCloseCtrlChannel_002, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, TaskSetVolume_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskSetVolume(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskSetVolume(ARGS)); } /** @@ -961,7 +1017,7 @@ HWTEST_F(DAudioSourceDevTest, TaskSpkMmapStop_001, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskSpkMmapStop(ARGS)); sourceDev_->speaker_ = std::make_shared(DEV_ID, nullptr); - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskSpkMmapStop(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskSpkMmapStop(ARGS)); } /** @@ -998,7 +1054,7 @@ HWTEST_F(DAudioSourceDevTest, TaskMicMmapStop_001, TestSize.Level1) int32_t dhId = DEFAULT_CAPTURE_ID; sourceDev_->deviceMap_[dhId] = mic; - EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskMicMmapStop(ARGS)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->TaskMicMmapStop(ARGS)); } @@ -1016,7 +1072,7 @@ HWTEST_F(DAudioSourceDevTest, NotifyHDF_001, TestSize.Level1) EXPECT_NE(DH_SUCCESS, sourceDev_->NotifyHDF(type, result, dhId)); sourceDev_->mic_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(DH_SUCCESS, sourceDev_->NotifyHDF(type, result, dhId)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->NotifyHDF(type, result, dhId)); } /** @@ -1033,7 +1089,7 @@ HWTEST_F(DAudioSourceDevTest, NotifyHDF_002, TestSize.Level1) EXPECT_NE(DH_SUCCESS, sourceDev_->NotifyHDF(type, result, dhId)); sourceDev_->speaker_ = std::make_shared(DEV_ID, sourceDev_); - EXPECT_EQ(DH_SUCCESS, sourceDev_->NotifyHDF(type, result, dhId)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->NotifyHDF(type, result, dhId)); } /** @@ -1047,7 +1103,7 @@ HWTEST_F(DAudioSourceDevTest, NotifyHDF_003, TestSize.Level1) AudioEventType type = EVENT_UNKNOWN; std::string result = "result"; int32_t dhId = 1; - EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->NotifyHDF(type, result, dhId)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->NotifyHDF(type, result, dhId)); } /** @@ -1066,7 +1122,7 @@ HWTEST_F(DAudioSourceDevTest, NotifySinkDev_001, TestSize.Level1) 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)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, 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 30af534d..860910d2 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp @@ -71,7 +71,7 @@ HWTEST_F(DMicDevTest, InitReceiverEngine_001, TestSize.Level1) */ HWTEST_F(DMicDevTest, EnableDMic_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_FAILED, mic_->EnableDevice(DH_ID, CAP)); + EXPECT_EQ(ERR_DH_AUDIO_HDI_PROXY_NOT_INIT, mic_->EnableDevice(DH_ID, CAP)); EXPECT_EQ(ERR_DH_AUDIO_HDI_PROXY_NOT_INIT, mic_->EnableDevice(DH_ID, CAP)); mic_->enabledPorts_.insert(DH_ID_MIC); @@ -89,10 +89,10 @@ HWTEST_F(DMicDevTest, DisableDMic_001, TestSize.Level1) mic_->enabledPorts_.insert(DH_ID); EXPECT_EQ(ERR_DH_AUDIO_HDI_PROXY_NOT_INIT, mic_->DisableDevice(DH_ID)); - EXPECT_EQ(ERR_DH_AUDIO_FAILED, mic_->DisableDevice(DH_ID)); + EXPECT_EQ(ERR_DH_AUDIO_HDI_PROXY_NOT_INIT, mic_->DisableDevice(DH_ID)); mic_->curPort_ = DH_ID_MIC; - EXPECT_EQ(ERR_DH_AUDIO_FAILED, mic_->DisableDevice(DH_ID_MIC)); + EXPECT_EQ(ERR_DH_AUDIO_HDI_PROXY_NOT_INIT, mic_->DisableDevice(DH_ID_MIC)); 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 3e52a1cf..8a921424 100644 --- a/services/audiomanager/test/unittest/sourcedevice/src/dspeaker_dev_test.cpp +++ b/services/audiomanager/test/unittest/sourcedevice/src/dspeaker_dev_test.cpp @@ -68,7 +68,7 @@ HWTEST_F(DSpeakerDevTest, InitSenderEngine_001, TestSize.Level1) */ HWTEST_F(DSpeakerDevTest, EnableDSpeaker_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_FAILED, spk_->EnableDevice(DH_ID, CAP)); + EXPECT_EQ(ERR_DH_AUDIO_HDI_PROXY_NOT_INIT, spk_->EnableDevice(DH_ID, CAP)); EXPECT_EQ(ERR_DH_AUDIO_HDI_PROXY_NOT_INIT, spk_->EnableDevice(DH_ID, CAP)); spk_->enabledPorts_.insert(DH_ID_SPK); -- Gitee