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 970c928357f5e43481f90122a48f34d842c7af49..c1af1c60d301052c8a7e08b87016c815cbe5a8ea 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 @@ -285,7 +285,7 @@ HWTEST_F(AudioAdapterInterfaceImpTest, SetExtraParams_001, TestSize.Level1) std::string value = "world"; EXPECT_EQ(HDF_SUCCESS, AdapterTest_->SetExtraParams(key, condition, value)); key = AudioExtParamKey::AUDIO_EXT_PARAM_KEY_VOLUME; - EXPECT_NE(HDF_SUCCESS, AdapterTest_->SetExtraParams(key, condition, value)); + EXPECT_EQ(HDF_SUCCESS, AdapterTest_->SetExtraParams(key, condition, value)); key = AudioExtParamKey::AUDIO_EXT_PARAM_KEY_LOWPOWER; EXPECT_NE(HDF_SUCCESS, AdapterTest_->SetExtraParams(key, condition, value)); } @@ -625,7 +625,7 @@ HWTEST_F(AudioAdapterInterfaceImpTest, CloseRenderDevice_001, TestSize.Level1) int32_t dhId = 1; sptr callback(nullptr); AdapterTest_->spkPinInUse_ = 0; - EXPECT_EQ(HDF_SUCCESS, AdapterTest_->CloseRenderDevice(devDesc, callback, dhId)); + EXPECT_EQ(ERR_DH_AUDIO_HDF_NULLPTR, AdapterTest_->CloseRenderDevice(devDesc, callback, dhId)); AdapterTest_->spkPinInUse_ = 1; callback = new MockIDAudioCallback(); EXPECT_EQ(HDF_SUCCESS, AdapterTest_->CloseRenderDevice(devDesc, callback, dhId)); @@ -706,7 +706,7 @@ HWTEST_F(AudioAdapterInterfaceImpTest, SetAudioVolume_001, TestSize.Level1) std::string condition = "EVENT_TYPE=4;VOLUME_GROUP_ID=2;AUDIO_VOLUME_TYPE=1;"; std::string param = "1"; int32_t dhId = 1; - EXPECT_NE(HDF_SUCCESS, AdapterTest_->SetAudioVolume(condition, param)); + EXPECT_EQ(HDF_SUCCESS, AdapterTest_->SetAudioVolume(condition, param)); AdapterTest_->extCallbackMap_[dhId] = new MockIDAudioCallback(); EXPECT_EQ(HDF_SUCCESS, AdapterTest_->SetAudioVolume(condition, param)); std::string adpterName = "adbcef"; @@ -902,7 +902,7 @@ HWTEST_F(AudioAdapterInterfaceImpTest, HandleVolumeChangeEvent_001, TestSize.Lev new AudioRenderInterfaceImpl(adpterName, desc, attrs, callback)); EXPECT_NE(HDF_SUCCESS, AdapterTest_->HandleVolumeChangeEvent(event)); AdapterTest_->paramCallback_ = new MockIAudioParamCallback(); - EXPECT_EQ(HDF_SUCCESS, AdapterTest_->HandleVolumeChangeEvent(event)); + EXPECT_NE(HDF_SUCCESS, AdapterTest_->HandleVolumeChangeEvent(event)); } /** @@ -1104,11 +1104,11 @@ HWTEST_F(AudioAdapterInterfaceImpTest, WaitForSANotify_001, TestSize.Level1) AdapterTest_->spkWaitCond_.notify_one(); }}); AudioDeviceEvent event = EVENT_OPEN_SPK; - AdapterTest_->isSpkOpened_ = false; - EXPECT_EQ(ERR_DH_AUDIO_HDF_OPEN_DEVICE_FAIL, AdapterTest_->WaitForSANotify(event)); - AudioDeviceEvent event1 = EVENT_CLOSE_SPK ; AdapterTest_->isSpkOpened_ = true; - EXPECT_EQ(ERR_DH_AUDIO_HDF_CLOSE_DEVICE_FAIL, AdapterTest_->WaitForSANotify(event1)); + EXPECT_EQ(DH_SUCCESS, AdapterTest_->WaitForSANotify(event)); + AudioDeviceEvent event1 = EVENT_CLOSE_SPK ; + AdapterTest_->isSpkOpened_ = false; + EXPECT_EQ(DH_SUCCESS, AdapterTest_->WaitForSANotify(event1)); flag = 0; if (th.joinable()) { th.join(); @@ -1155,11 +1155,12 @@ HWTEST_F(AudioAdapterInterfaceImpTest, WaitForSANotify_003, TestSize.Level1) AdapterTest_->micWaitCond_.notify_one(); }}); AudioDeviceEvent event = EVENT_OPEN_MIC; - EXPECT_EQ(ERR_DH_AUDIO_HDF_OPEN_DEVICE_FAIL, AdapterTest_->WaitForSANotify(event)); + AdapterTest_->isMicOpened_ = true; + EXPECT_EQ(HDF_SUCCESS, AdapterTest_->WaitForSANotify(event)); AudioDeviceEvent event1 = EVENT_CLOSE_MIC; - AdapterTest_->isMicOpened_ = true; - EXPECT_EQ(ERR_DH_AUDIO_HDF_CLOSE_DEVICE_FAIL, AdapterTest_->WaitForSANotify(event1)); + AdapterTest_->isMicOpened_ = false; + EXPECT_EQ(HDF_SUCCESS, AdapterTest_->WaitForSANotify(event1)); flag = 0; if (th.joinable()) { th.join(); @@ -1250,9 +1251,8 @@ HWTEST_F(AudioAdapterInterfaceImpTest, HandleDeviceClosed_003, TestSize.Level1) AdapterTest_->paramCallback_ = new MockRevertIAudioParamCallback(); EXPECT_EQ(HDF_SUCCESS, AdapterTest_->HandleDeviceClosed(event)); } - } // V1_0 } // Audio } // Distributedaudio } // HDI -} // OHOS +} // OHOS \ No newline at end of file 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 d2ef5d506a900e1eda91e6ec69230f9d9c8e2548..c15854ec0ab29f910d749d0c69a1c3de0354cf83 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 @@ -71,7 +71,7 @@ HWTEST_F(DAudioSinkDevTest, TaskPlayStatusChange_001, TestSize.Level1) std::string devId = "devid"; int32_t dhId = 1; sinkDev_->speakerClient_ = std::make_shared(devId, dhId, sinkDev_); - EXPECT_EQ(ERR_DH_AUDIO_FAILED, sinkDev_->TaskPlayStatusChange(AUDIO_EVENT_PAUSE)); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sinkDev_->TaskPlayStatusChange("{\"dhId\":\"1\"}")); } /** @@ -335,11 +335,10 @@ HWTEST_F(DAudioSinkDevTest, TaskFocusChange_002, TestSize.Level1) */ HWTEST_F(DAudioSinkDevTest, TaskRenderStateChange_001, TestSize.Level1) { - std::string args; - std::string dhId = "dhId"; + std::string args = "{\"dhId\":\"123\"}"; + std::string dhId = "123"; int32_t result = 0; sinkDev_->NotifySourceDev(AUDIO_START, dhId, result); - sinkDev_->NotifySourceDev(NOTIFY_OPEN_CTRL_RESULT, dhId, result); EXPECT_NE(DH_SUCCESS, sinkDev_->TaskRenderStateChange(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 2a83ab6927757ae90d511247732f9db28e2faa4f..22880eba59541e9db812c43b7110792c31515b79 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 @@ -25,7 +25,7 @@ namespace DistributedHardware { const std::string ATTRS = "attrs"; const std::string DEV_ID = "devId"; const std::string FUNC_NAME = "funcName"; -const std::string ARGS = "args"; +const std::string ARGS = "{\"dhId\":\"1\"}"; const std::string DH_ID_MIC = "134217728"; const std::string DH_ID_SPK = "1"; const std::string DH_ID_UNKNOWN = "0"; @@ -65,7 +65,7 @@ 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_NULLPTR, sourceDev_->HandleDSpeakerClosed(event)); event.type = OPEN_MIC; EXPECT_EQ(DH_SUCCESS, sourceDev_->HandleOpenDMic(event)); @@ -120,7 +120,7 @@ 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_NULLPTR, sourceDev_->HandleDSpeakerClosed(event)); event.type = OPEN_MIC; EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->HandleOpenDMic(event)); @@ -467,10 +467,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())); } /** @@ -538,10 +538,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)); } /** @@ -572,7 +572,7 @@ HWTEST_F(DAudioSourceDevTest, DisableDSpeaker_001, TestSize.Level1) 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; } @@ -588,7 +588,7 @@ HWTEST_F(DAudioSourceDevTest, DisableDMic_001, TestSize.Level1) 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; } @@ -608,7 +608,7 @@ HWTEST_F(DAudioSourceDevTest, TaskOpenDSpeaker_001, TestSize.Level1) 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_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); @@ -641,10 +641,10 @@ HWTEST_F(DAudioSourceDevTest, TaskCloseDSpeaker_001, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDSpeaker(tempLongStr)); speaker->isOpened_ = true; - EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDSpeaker(ARGS)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseDSpeaker(ARGS)); speaker->isOpened_ = false; - EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDSpeaker(ARGS)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseDSpeaker(ARGS)); json jParam_spk = { { KEY_DH_ID, DH_ID_SPK } }; EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseDSpeaker(jParam_spk.dump())); @@ -710,10 +710,10 @@ HWTEST_F(DAudioSourceDevTest, TaskCloseDMic_001, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_SA_PARAM_INVALID, sourceDev_->TaskCloseDMic(tempLongStr)); mic->isOpened_ = true; - EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDMic(ARGS)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseDMic(ARGS)); mic->isOpened_ = false; - EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskCloseDMic(ARGS)); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseDMic(ARGS)); json jParam_mic = { { KEY_DH_ID, DH_ID_MIC } }; EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskCloseDMic(jParam_mic.dump())); @@ -744,7 +744,12 @@ HWTEST_F(DAudioSourceDevTest, TaskCloseDMic_002, TestSize.Level1) */ HWTEST_F(DAudioSourceDevTest, TaskSetVolume_001, TestSize.Level1) { - EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->TaskSetVolume(ARGS)); + int32_t dhId = 3; + json jParam = { { STREAM_MUTE_STATUS, 3 }, { "dhId", "3" } }; + auto speaker = std::make_shared(DEV_ID, sourceDev_); + sourceDev_->deviceMap_[dhId] = speaker; + speaker->speakerTrans_ = std::make_shared(DEV_ID); + EXPECT_EQ(DH_SUCCESS, sourceDev_->TaskSetVolume(jParam.dump())); } /** @@ -894,7 +899,8 @@ 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(ERR_DH_AUDIO_NULLPTR, sourceDev_->NotifyHDF(type, result, dhId)); + sourceDev_->deviceMap_[dhId] = sourceDev_->mic_; + EXPECT_EQ(DH_SUCCESS, sourceDev_->NotifyHDF(type, result, dhId)); } /** @@ -911,7 +917,8 @@ 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(ERR_DH_AUDIO_NULLPTR, sourceDev_->NotifyHDF(type, result, dhId)); + sourceDev_->deviceMap_[dhId] = sourceDev_->speaker_; + EXPECT_EQ(DH_SUCCESS, sourceDev_->NotifyHDF(type, result, dhId)); } /** @@ -925,7 +932,10 @@ HWTEST_F(DAudioSourceDevTest, NotifyHDF_003, TestSize.Level1) AudioEventType type = EVENT_UNKNOWN; std::string result = "result"; int32_t dhId = 1; - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sourceDev_->NotifyHDF(type, result, dhId)); + + sourceDev_->speaker_ = std::make_shared(DEV_ID, sourceDev_); + sourceDev_->deviceMap_[dhId] = sourceDev_->speaker_; + EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->NotifyHDF(type, result, dhId)); } /** @@ -937,6 +947,7 @@ HWTEST_F(DAudioSourceDevTest, NotifyHDF_003, TestSize.Level1) HWTEST_F(DAudioSourceDevTest, NotifySinkDev_001, TestSize.Level1) { json jAudioParam; + int32_t dhId = 1; sourceDev_->isRpcOpen_.store(false); EXPECT_EQ(ERR_DH_AUDIO_FAILED, sourceDev_->NotifySinkDev(CLOSE_MIC, jAudioParam, DH_ID_SPK)); @@ -944,7 +955,8 @@ 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(ERR_DH_AUDIO_NULLPTR, sourceDev_->NotifySinkDev(CLOSE_MIC, jAudioParam, DH_ID_SPK)); + sourceDev_->deviceMap_[dhId] = sourceDev_->speaker_; + EXPECT_EQ(DH_SUCCESS, sourceDev_->NotifySinkDev(CLOSE_MIC, jAudioParam, DH_ID_SPK)); } /** diff --git a/services/audiotransport/test/unittest/audioctrlchannel/src/audio_ctrl_channel_test.cpp b/services/audiotransport/test/unittest/audioctrlchannel/src/audio_ctrl_channel_test.cpp index e3921eaadd4d32fd548f63b3f8d151e827068194..2f27d654dd97cba1e39fb58f549fc7d215c69058 100644 --- a/services/audiotransport/test/unittest/audioctrlchannel/src/audio_ctrl_channel_test.cpp +++ b/services/audiotransport/test/unittest/audioctrlchannel/src/audio_ctrl_channel_test.cpp @@ -108,7 +108,7 @@ HWTEST_F(AudioCtrlChannelTest, SendEvent_001, TestSize.Level1) ctrlChannel_->OnSessionOpened(sessionId, result); AudioEvent event; - EXPECT_EQ(ERR_DH_AUDIO_TRANS_ERROR, ctrlChannel_->SendEvent(event)); + EXPECT_EQ(DH_SUCCESS, ctrlChannel_->SendEvent(event)); } /** @@ -130,7 +130,7 @@ HWTEST_F(AudioCtrlChannelTest, OnSessionClosed_001, TestSize.Level1) ctrlChannel_->channelListener_ = listener; ctrlChannel_->OnSessionClosed(sessionId); AudioEvent event; - EXPECT_EQ(ERR_DH_AUDIO_TRANS_ERROR, ctrlChannel_->SendEvent(event)); + EXPECT_EQ(DH_SUCCESS, ctrlChannel_->SendEvent(event)); } /**