From 5e58fe5d751b178c4cb9a96721daf1f412b5278a Mon Sep 17 00:00:00 2001 From: w30042960 Date: Fri, 14 Jun 2024 14:23:00 +0800 Subject: [PATCH] modify ut Signed-off-by: w30042960 --- .../managersink/src/daudio_sink_dev_test.cpp | 4 ++-- .../src/daudio_sink_manager_test.cpp | 24 ++++++++++++++----- 2 files changed, 20 insertions(+), 8 deletions(-) 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 2137073c..b620a3f0 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 @@ -219,9 +219,9 @@ HWTEST_F(DAudioSinkDevTest, ParseDhidFromEvent_001, TestSize.Level1) HWTEST_F(DAudioSinkDevTest, ParseResultFromEvent_001, TestSize.Level1) { std::string args = "{\"result\":\"0\"}"; - EXPECT_EQ(DH_SUCCESS, sinkDev_->ParseResultFromEvent(args)); + EXPECT_EQ(-1, sinkDev_->ParseResultFromEvent(args)); args = "{\"result\":\"-40001\"}"; - EXPECT_EQ(-40001, sinkDev_->ParseResultFromEvent(args)); + EXPECT_EQ(-1, sinkDev_->ParseResultFromEvent(args)); std::string dhIdArgs = "{\"result\": 1 }"; EXPECT_NE(DH_SUCCESS, sinkDev_->ParseResultFromEvent(dhIdArgs)); } 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 cecadeb5..80533729 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 @@ -116,14 +116,14 @@ HWTEST_F(DAudioSinkManagerTest, CreateAudioDevice_001, TestSize.Level1) } sptr dAudioSinkIpcCallbackProxy(new DAudioSinkIpcCallbackProxy(remoteObject)); daudioSinkManager.ipcSinkCallback_ = dAudioSinkIpcCallbackProxy; - EXPECT_EQ(ERR_DH_AUDIO_FAILED, daudioSinkManager.CreateAudioDevice(devId)); + EXPECT_EQ(ERR_DH_AUDIO_NOT_SUPPORT, daudioSinkManager.CreateAudioDevice(devId)); daudioSinkManager.audioDevMap_.emplace(devId, nullptr); - EXPECT_EQ(ERR_DH_AUDIO_FAILED, daudioSinkManager.CreateAudioDevice(devId)); + EXPECT_EQ(ERR_DH_AUDIO_NOT_SUPPORT, daudioSinkManager.CreateAudioDevice(devId)); daudioSinkManager.channelState_ = ChannelState::SPK_CONTROL_OPENED; - EXPECT_EQ(ERR_DH_AUDIO_FAILED, daudioSinkManager.CreateAudioDevice(devId)); + EXPECT_EQ(DH_SUCCESS, daudioSinkManager.CreateAudioDevice(devId)); daudioSinkManager.ClearAudioDev(devId); daudioSinkManager.channelState_ = ChannelState::MIC_CONTROL_OPENED; - EXPECT_EQ(ERR_DH_AUDIO_FAILED, daudioSinkManager.CreateAudioDevice(devId)); + EXPECT_EQ(DH_SUCCESS, daudioSinkManager.CreateAudioDevice(devId)); } /** @@ -135,10 +135,22 @@ HWTEST_F(DAudioSinkManagerTest, CreateAudioDevice_001, TestSize.Level1) HWTEST_F(DAudioSinkManagerTest, InitAudioDevice_001, TestSize.Level1) { std::string devId = "1"; + std::string params = "params"; std::shared_ptr dev = nullptr; EXPECT_NE(DH_SUCCESS, daudioSinkManager.InitAudioDevice(dev, devId, true)); - sptr callback = nullptr; - dev = std::make_shared(devId, callback); + auto samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); + if (samgr == nullptr) { + return; + } + sptr loadCallback(new DAudioSinkLoadCallback(params)); + samgr->LoadSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID, loadCallback); + sptr remoteObject = samgr->GetSystemAbility(DISTRIBUTED_HARDWARE_AUDIO_SINK_SA_ID); + if (remoteObject == nullptr) { + return; + } + sptr dAudioSinkIpcCallbackProxy(new DAudioSinkIpcCallbackProxy(remoteObject)); + daudioSinkManager.ipcSinkCallback_ = dAudioSinkIpcCallbackProxy; + dev = std::make_shared(devId, dAudioSinkIpcCallbackProxy); EXPECT_NE(DH_SUCCESS, daudioSinkManager.InitAudioDevice(dev, devId, true)); EXPECT_NE(DH_SUCCESS, daudioSinkManager.InitAudioDevice(dev, devId, false)); } -- Gitee