From 40e52fdf7dbd97abb80b4ce74b0130546d9069e6 Mon Sep 17 00:00:00 2001 From: w30042960 Date: Fri, 1 Dec 2023 14:23:13 +0800 Subject: [PATCH] modify UT Signed-off-by: w30042960 --- .../src/daudio_hdi_handler_test.cpp | 3 +- .../managersink/src/daudio_sink_dev_test.cpp | 2 +- .../src/daudio_sink_manager_test.cpp | 27 --------------- .../src/daudio_sink_service_test.cpp | 25 -------------- .../src/daudio_source_service_test.cpp | 13 -------- .../audio_adapter_internal_test.cpp | 33 ------------------- .../audio_render_internal_test.cpp | 19 ----------- 7 files changed, 2 insertions(+), 120 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 aaa392bb..8c0258bf 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 @@ -147,9 +147,8 @@ HWTEST_F(DAudioHdiHandlerTest, UnRegisterAudioDevice_001, TestSize.Level1) */ HWTEST_F(DAudioHdiHandlerTest, UnInitHdiHandler_001, TestSize.Level1) { - EXPECT_EQ(HDF_SUCCESS, hdiHandler_->UninitHdiHandler()); hdiHandler_->audioSrvHdf_ = nullptr; - EXPECT_EQ(HDF_SUCCESS, hdiHandler_->UninitHdiHandler()); + EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, hdiHandler_->UninitHdiHandler()); } } // DistributedHardware } // OHOS 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 30dd9f95..9e8bda78 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 @@ -83,7 +83,7 @@ HWTEST_F(DAudioSinkDevTest, TaskPlayStatusChange_001, TestSize.Level1) int32_t dhId = 1; auto spkClient = std::make_shared(devId, dhId, sinkDev_); sinkDev_->spkClientMap_.insert(std::make_pair(DEFAULT_RENDER_ID, spkClient)); - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, sinkDev_->TaskPlayStatusChange("{\"dhId\":\"1\"}")); + EXPECT_EQ(DH_SUCCESS, sinkDev_->TaskPlayStatusChange("{\"dhId\":\"1\"}")); } /** 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 712f30dc..cd2d833b 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 @@ -56,33 +56,6 @@ HWTEST_F(DAudioSinkManagerTest, Init_001, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, daudioSinkManager.UnInit()); } -/** - * @tc.name: CreateAudioDevice_001 - * @tc.desc: Verify the CreateAudioDevice function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSinkManagerTest, CreateAudioDevice_001, TestSize.Level1) -{ - std::string devId = "devId"; - EXPECT_EQ(ERR_DH_AUDIO_FAILED, daudioSinkManager.CreateAudioDevice(devId)); - daudioSinkManager.channelState_ = ChannelState::SPK_CONTROL_OPENED; - daudioSinkManager.LoadAVReceiverEngineProvider(); - EXPECT_EQ(DH_SUCCESS, daudioSinkManager.CreateAudioDevice(devId)); - daudioSinkManager.channelState_ = ChannelState::MIC_CONTROL_OPENED; - daudioSinkManager.LoadAVSenderEngineProvider(); - EXPECT_EQ(DH_SUCCESS, daudioSinkManager.CreateAudioDevice(devId)); - sptr dAudioSinkIpcCallbackProxy(new DAudioSinkIpcCallbackProxy(remoteObject_)); - auto dev = std::make_shared(devId, dAudioSinkIpcCallbackProxy); - daudioSinkManager.audioDevMap_.emplace(devId, dev); - EXPECT_EQ(DH_SUCCESS, daudioSinkManager.CreateAudioDevice(devId)); - daudioSinkManager.channelState_ = ChannelState::MIC_CONTROL_OPENED; - daudioSinkManager.sendProviderPtr_ = nullptr; - EXPECT_EQ(ERR_DH_AUDIO_FAILED, daudioSinkManager.CreateAudioDevice(devId)); - daudioSinkManager.ClearAudioDev(devId); - daudioSinkManager.OnSinkDevReleased(devId); -} - /** * @tc.name: DAudioNotify_001 * @tc.desc: Verify the DAudioNotify function. diff --git a/services/audiomanager/test/unittest/servicesink/src/daudio_sink_service_test.cpp b/services/audiomanager/test/unittest/servicesink/src/daudio_sink_service_test.cpp index 55dfa438..33e87e87 100644 --- a/services/audiomanager/test/unittest/servicesink/src/daudio_sink_service_test.cpp +++ b/services/audiomanager/test/unittest/servicesink/src/daudio_sink_service_test.cpp @@ -80,17 +80,6 @@ HWTEST_F(DAudioSinkServiceTest, InitSink_001, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, sinkSrv_->InitSink(param, dAudioSinkIpcCallbackProxy)); } -/** - * @tc.name: ReleaseSink_001 - * @tc.desc: Verify the ReleaseSink function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSinkServiceTest, ReleaseSink_001, TestSize.Level1) -{ - EXPECT_EQ(ERR_DH_AUDIO_SA_LOAD_FAILED, sinkSrv_->ReleaseSink()); -} - /** * @tc.name: SubscribeLocalHardware_001 * @tc.desc: Verify the SubscribeLocalHardware function. @@ -127,19 +116,5 @@ HWTEST_F(DAudioSinkServiceTest, UnsubscribeLocalHardware_001, TestSize.Level1) EXPECT_EQ(DH_SUCCESS, sinkSrv_->UnsubscribeLocalHardware(dhId)); sinkSrv_->ReleaseSink(); } - -/** - * @tc.name: PauseDistributedHardware_001 - * @tc.desc: Verify the PauseDistributedHardware function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSinkServiceTest, PauseDistributedHardware_001, TestSize.Level1) -{ - std::string networkId = "networkId"; - EXPECT_EQ(DH_SUCCESS, sinkSrv_->PauseDistributedHardware(networkId)); - EXPECT_EQ(DH_SUCCESS, sinkSrv_->ResumeDistributedHardware(networkId)); - EXPECT_EQ(DH_SUCCESS, sinkSrv_->StopDistributedHardware(networkId)); -} } // DistributedHardware } // OHOS diff --git a/services/audiomanager/test/unittest/servicesource/src/daudio_source_service_test.cpp b/services/audiomanager/test/unittest/servicesource/src/daudio_source_service_test.cpp index 3a3b5a22..178c5442 100644 --- a/services/audiomanager/test/unittest/servicesource/src/daudio_source_service_test.cpp +++ b/services/audiomanager/test/unittest/servicesource/src/daudio_source_service_test.cpp @@ -92,18 +92,5 @@ HWTEST_F(DAudioSourceServiceTest, ConfigDistributedHardware_001, TestSize.Level1 EXPECT_EQ(DH_SUCCESS, sourceSrv_->ConfigDistributedHardware(devId, dhId, key, value)); } - -/** - * @tc.name: Dump_001 - * @tc.desc: Verify the Dump function. - * @tc.type: FUNC - * @tc.require: AR000H0E5F - */ -HWTEST_F(DAudioSourceServiceTest, Dump_001, TestSize.Level1) -{ - int32_t fd = 0; - const std::vector args; - sourceSrv_->Dump(fd, args); -} } // DistributedHardware } // OHOS diff --git a/services/hdfaudioclient/test/unittest/audio_adapter_internal/audio_adapter_internal_test.cpp b/services/hdfaudioclient/test/unittest/audio_adapter_internal/audio_adapter_internal_test.cpp index f510d6d4..2455a5ac 100644 --- a/services/hdfaudioclient/test/unittest/audio_adapter_internal/audio_adapter_internal_test.cpp +++ b/services/hdfaudioclient/test/unittest/audio_adapter_internal/audio_adapter_internal_test.cpp @@ -418,39 +418,6 @@ HWTEST_F(AudioAdapterTest, GetExtraParamsInternal_002, TestSize.Level1) delete value; } -/** -* @tc.name: UpdateAudioRouteInternal -* @tc.desc: Verify the abnormal branch of the UpdateAudioRouteInternal, when param is null. -* @tc.type: FUNC -* @tc.require: AR000H0E6H -*/ -HWTEST_F(AudioAdapterTest, UpdateAudioRouteInternal_003, TestSize.Level1) -{ - auto adapterContext = std::make_unique(); - struct ::AudioRoute *route = new struct ::AudioRoute; - route->sourcesNum = 1; - auto node = new ::AudioRouteNode; - node->type = static_cast(0); - route->sources = node; - route->sinksNum = 0; - int32_t *routeHandle = new int32_t(0); - - int32_t ret = adapterContext->instance_.UpdateAudioRoute(&adapterContext->instance_, route, routeHandle); - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); - node->type = static_cast(1); - ret = adapterContext->instance_.UpdateAudioRoute(&adapterContext->instance_, route, routeHandle); - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); - node->type = static_cast(2); - ret = adapterContext->instance_.UpdateAudioRoute(&adapterContext->instance_, route, routeHandle); - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); - node->type = static_cast(3); - ret = adapterContext->instance_.UpdateAudioRoute(&adapterContext->instance_, route, routeHandle); - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); - delete route; - delete node; - delete routeHandle; -} - /** * @tc.name: RegExtraParamObserverInternal * @tc.desc: Verify the abnormal branch of the RegExtraParamObserverInternal, when param is null. diff --git a/services/hdfaudioclient/test/unittest/audio_render_internal/audio_render_internal_test.cpp b/services/hdfaudioclient/test/unittest/audio_render_internal/audio_render_internal_test.cpp index 5cd54cef..10d591a7 100644 --- a/services/hdfaudioclient/test/unittest/audio_render_internal/audio_render_internal_test.cpp +++ b/services/hdfaudioclient/test/unittest/audio_render_internal/audio_render_internal_test.cpp @@ -90,25 +90,6 @@ HWTEST_F(AudioRenderTest, GetRenderPositionInternal_001, TestSize.Level1) EXPECT_EQ(ERR_DH_AUDIO_HDI_INVALID_PARAM, ret); } -/** -* @tc.name: GetRenderPositionInternal -* @tc.desc: Verify the abnormal branch of the GetRenderPositionInternal, when param is null. -* @tc.type: FUNC -* @tc.require: AR000H0E6H -*/ -HWTEST_F(AudioRenderTest, GetRenderPositionInternal_002, TestSize.Level1) -{ - struct AudioRenderContext renderContext; - struct AudioRender *render = new AudioRender; - uint64_t *frames = new uint64_t; - struct ::AudioTimeStamp *time = new ::AudioTimeStamp; - int32_t ret = renderContext.instance_.GetRenderPosition(render, frames, time); - delete render; - delete frames; - delete time; - EXPECT_EQ(ERR_DH_AUDIO_NULLPTR, ret); -} - /** * @tc.name: SetRenderSpeedInternal * @tc.desc: Verify the abnormal branch of the SetRenderSpeedInternal, when param is null. -- Gitee