From 85f4619ba04868e2709349b3d149fe98c7533190 Mon Sep 17 00:00:00 2001 From: shihaojie6128 Date: Fri, 9 May 2025 14:02:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9DT=E7=9C=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: shihaojie6128 --- .../src/av_audio_receiver_engine_test.cpp | 15 ++++------- .../src/av_receiver_engine_test.cpp | 26 ++++++------------- .../src/av_audio_sender_engine_test.cpp | 13 +++------- .../src/av_sender_engine_test.cpp | 10 +++---- .../src/histreamer_ability_querier_test.cpp | 4 +-- 5 files changed, 21 insertions(+), 47 deletions(-) diff --git a/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine/src/av_audio_receiver_engine_test.cpp b/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine/src/av_audio_receiver_engine_test.cpp index d273feda..e1b7eee7 100644 --- a/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine/src/av_audio_receiver_engine_test.cpp +++ b/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine/src/av_audio_receiver_engine_test.cpp @@ -292,8 +292,7 @@ HWTEST_F(AvAudioReceiverEngineTest, SetParameterInner_002, testing::ext::TestSiz receiver->SetParameterInner(AVTransTag::START_AV_SYNC, "8"); receiver->SetParameterInner(AVTransTag::STOP_AV_SYNC, "0"); receiver->SetParameterInner(AVTransTag::SHARED_MEMORY_FD, "1"); - receiver->SetParameterInner(AVTransTag::ENGINE_READY, "2"); - EXPECT_EQ(receiver->meta_, nullptr); + EXPECT_NO_FATAL_FAILURE(receiver->SetParameterInner(AVTransTag::ENGINE_READY, "2")); } HWTEST_F(AvAudioReceiverEngineTest, SetParameterInner_003, testing::ext::TestSize.Level1) @@ -381,8 +380,7 @@ HWTEST_F(AvAudioReceiverEngineTest, SetParameter_005, testing::ext::TestSize.Lev receiver->SetParameter(AVTransTag::START_AV_SYNC, "13"); receiver->SetParameter(AVTransTag::STOP_AV_SYNC, "14"); receiver->SetParameter(AVTransTag::SHARED_MEMORY_FD, "15"); - receiver->SetParameter(AVTransTag::ENGINE_READY, "16"); - EXPECT_EQ(receiver->meta_, nullptr); + EXPECT_NO_FATAL_FAILURE(receiver->SetParameter(AVTransTag::ENGINE_READY, "16")); } HWTEST_F(AvAudioReceiverEngineTest, SetParameter_006, testing::ext::TestSize.Level1) @@ -556,8 +554,7 @@ HWTEST_F(AvAudioReceiverEngineTest, OnChannelEvent_003, testing::ext::TestSize.L receiver->OnChannelEvent(event); event.type = EventType::EVENT_DATA_RECEIVED; - receiver->OnChannelEvent(event); - EXPECT_EQ(StateId::INITIALIZED, receiver->currentState_); + EXPECT_NO_FATAL_FAILURE(receiver->OnChannelEvent(event)); } HWTEST_F(AvAudioReceiverEngineTest, OnChannelEvent_004, testing::ext::TestSize.Level1) @@ -690,12 +687,10 @@ HWTEST_F(AvAudioReceiverEngineTest, OnEvent_001, testing::ext::TestSize.Level1) event.type = Pipeline::EventType::EVENT_READY; receiver->currentState_ = StateId::INITIALIZED; - receiver->OnEvent(event); - EXPECT_EQ(StateId::INITIALIZED, receiver->currentState_); + EXPECT_NO_FATAL_FAILURE(receiver->OnEvent(event)); receiver->receiverCallback_ = std::make_shared(); - receiver->OnEvent(event); - EXPECT_EQ(StateId::INITIALIZED, receiver->currentState_); + EXPECT_NO_FATAL_FAILURE(receiver->OnEvent(event)); } HWTEST_F(AvAudioReceiverEngineTest, LinkAudioDecoderFilter_001, testing::ext::TestSize.Level1) diff --git a/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine/src/av_receiver_engine_test.cpp b/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine/src/av_receiver_engine_test.cpp index 64d8a1c1..5cfc33eb 100644 --- a/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine/src/av_receiver_engine_test.cpp +++ b/av_transport/av_trans_engine/av_receiver/test/unittest/av_receiver_engine/src/av_receiver_engine_test.cpp @@ -499,9 +499,7 @@ HWTEST_F(AvReceiverEngineTest, OnChannelEvent_002, testing::ext::TestSize.Level1 transEvent.content = "content"; transEvent.type = EventType::EVENT_CHANNEL_OPEN_FAIL; receiver->receiverCallback_ = std::make_shared(); - receiver->OnChannelEvent(transEvent); - - EXPECT_EQ(StateId::INITIALIZED, receiver->currentState_); + EXPECT_NO_FATAL_FAILURE(receiver->OnChannelEvent(transEvent)); } HWTEST_F(AvReceiverEngineTest, OnChannelEvent_003, testing::ext::TestSize.Level1) @@ -533,9 +531,7 @@ HWTEST_F(AvReceiverEngineTest, OnChannelEvent_004, testing::ext::TestSize.Level1 AVTransEvent event; event.content = "content"; event.type = EventType::EVENT_REMOVE_STREAM; - receiver->OnChannelEvent(event); - receiver->currentState_ = StateId::BUTT; - EXPECT_EQ(StateId::BUTT, receiver->currentState_); + EXPECT_NO_FATAL_FAILURE(receiver->OnChannelEvent(event)); } HWTEST_F(AvReceiverEngineTest, Release_001, testing::ext::TestSize.Level1) @@ -767,12 +763,10 @@ HWTEST_F(AvReceiverEngineTest, OnEvent_001, testing::ext::TestSize.Level1) event.param = PluginEventType::EVENT_CHANNEL_OPEN_FAIL; receiver->currentState_ = StateId::INITIALIZED; - receiver->OnEvent(event); - EXPECT_EQ(StateId::INITIALIZED, receiver->currentState_); + EXPECT_NO_FATAL_FAILURE(receiver->OnEvent(event)); receiver->receiverCallback_ = std::make_shared(); - receiver->OnEvent(event); - EXPECT_EQ(StateId::INITIALIZED, receiver->currentState_); + EXPECT_NO_FATAL_FAILURE(receiver->OnEvent(event)); } HWTEST_F(AvReceiverEngineTest, OnEvent_002, testing::ext::TestSize.Level1) @@ -786,16 +780,13 @@ HWTEST_F(AvReceiverEngineTest, OnEvent_002, testing::ext::TestSize.Level1) std::shared_ptr buffer = nullptr; event.param = buffer; receiver->currentState_ = StateId::INITIALIZED; - receiver->OnEvent(event); - EXPECT_EQ(StateId::INITIALIZED, receiver->currentState_); + EXPECT_NO_FATAL_FAILURE(receiver->OnEvent(event)); event.param = std::make_shared(); - receiver->OnEvent(event); - EXPECT_EQ(StateId::INITIALIZED, receiver->currentState_); + EXPECT_NO_FATAL_FAILURE(receiver->OnEvent(event)); receiver->receiverCallback_ = std::make_shared(); event.type = OHOS::Media::EventType::EVENT_PLUGIN_EVENT; event.param = PluginEvent{PluginEventType::AUDIO_INTERRUPT, 0, "aaa"}; - receiver->OnEvent(event); - EXPECT_EQ(StateId::INITIALIZED, receiver->currentState_); + EXPECT_NO_FATAL_FAILURE(receiver->OnEvent(event)); } HWTEST_F(AvReceiverEngineTest, SetParameterInner_001, testing::ext::TestSize.Level1) @@ -866,8 +857,7 @@ HWTEST_F(AvReceiverEngineTest, OnStreamReceived_001, testing::ext::TestSize.Leve receiver->currentState_ = StateId::INITIALIZED; StreamData *data = nullptr; StreamData *ext = nullptr; - receiver->OnStreamReceived(data, ext); - EXPECT_EQ(StateId::INITIALIZED, receiver->currentState_); + EXPECT_NO_FATAL_FAILURE(receiver->OnStreamReceived(data, ext)); } } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/src/av_audio_sender_engine_test.cpp b/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/src/av_audio_sender_engine_test.cpp index 855cbfa6..08eceec3 100644 --- a/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/src/av_audio_sender_engine_test.cpp +++ b/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/src/av_audio_sender_engine_test.cpp @@ -424,8 +424,7 @@ HWTEST_F(AvAudioSenderEngineTest, SetParameter_014, testing::ext::TestSize.Level sender->SetParameter(AVTransTag::START_AV_SYNC, "13"); sender->SetParameter(AVTransTag::STOP_AV_SYNC, "14"); sender->SetParameter(AVTransTag::SHARED_MEMORY_FD, "15"); - sender->SetParameter(AVTransTag::ENGINE_READY, "16"); - EXPECT_EQ(sender->meta_, nullptr); + EXPECT_NO_FATAL_FAILURE(sender->SetParameter(AVTransTag::ENGINE_READY, "16")); } HWTEST_F(AvAudioSenderEngineTest, SetParameterInner_001, testing::ext::TestSize.Level1) @@ -813,9 +812,7 @@ HWTEST_F(AvAudioSenderEngineTest, OnChannelEvent_004, testing::ext::TestSize.Lev sender->OnChannelEvent(event); event.type = EventType::EVENT_ADD_STREAM; - sender->OnChannelEvent(event); - - EXPECT_EQ(StateId::INITIALIZED, sender->currentState_); + EXPECT_NO_FATAL_FAILURE(sender->OnChannelEvent(event)); } HWTEST_F(AvAudioSenderEngineTest, OnEvent_001, testing::ext::TestSize.Level1) @@ -829,12 +826,10 @@ HWTEST_F(AvAudioSenderEngineTest, OnEvent_001, testing::ext::TestSize.Level1) event.type = Pipeline::EventType::EVENT_READY; sender->currentState_ = StateId::INITIALIZED; - sender->OnEvent(event); - EXPECT_EQ(StateId::INITIALIZED, sender->currentState_); + EXPECT_NO_FATAL_FAILURE(sender->OnEvent(event)); sender->senderCallback_ = std::make_shared(); - sender->OnEvent(event); - EXPECT_EQ(StateId::INITIALIZED, sender->currentState_); + EXPECT_NO_FATAL_FAILURE(sender->OnEvent(event)); } HWTEST_F(AvAudioSenderEngineTest, OnCallback_001, testing::ext::TestSize.Level1) diff --git a/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/src/av_sender_engine_test.cpp b/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/src/av_sender_engine_test.cpp index d9f3ab94..04c31bf4 100644 --- a/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/src/av_sender_engine_test.cpp +++ b/av_transport/av_trans_engine/av_sender/test/unittest/av_sender_engine/src/av_sender_engine_test.cpp @@ -766,9 +766,7 @@ HWTEST_F(AvSenderEngineTest, OnChannelEvent_004, testing::ext::TestSize.Level1) sender->OnChannelEvent(event); event.type = EventType::EVENT_ADD_STREAM; - sender->OnChannelEvent(event); - - EXPECT_EQ(StateId::INITIALIZED, sender->currentState_); + EXPECT_NO_FATAL_FAILURE(sender->OnChannelEvent(event)); } HWTEST_F(AvSenderEngineTest, OnEvent_001, testing::ext::TestSize.Level1) @@ -783,12 +781,10 @@ HWTEST_F(AvSenderEngineTest, OnEvent_001, testing::ext::TestSize.Level1) event.param = PluginEventType::EVENT_CHANNEL_OPEN_FAIL; sender->currentState_ = StateId::INITIALIZED; - sender->OnEvent(event); - EXPECT_EQ(StateId::INITIALIZED, sender->currentState_); + EXPECT_NO_FATAL_FAILURE(sender->OnEvent(event)); sender->senderCallback_ = std::make_shared(); - sender->OnEvent(event); - EXPECT_EQ(StateId::INITIALIZED, sender->currentState_); + EXPECT_NO_FATAL_FAILURE(sender->OnEvent(event)); } } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/av_transport/av_trans_handler/histreamer_ability_querier/test/unittest/common/src/histreamer_ability_querier_test.cpp b/av_transport/av_trans_handler/histreamer_ability_querier/test/unittest/common/src/histreamer_ability_querier_test.cpp index 33d87758..dba09feb 100644 --- a/av_transport/av_trans_handler/histreamer_ability_querier/test/unittest/common/src/histreamer_ability_querier_test.cpp +++ b/av_transport/av_trans_handler/histreamer_ability_querier/test/unittest/common/src/histreamer_ability_querier_test.cpp @@ -295,9 +295,7 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_013, Test EXPECT_TRUE(audioEncoderOut.mime.empty()); cJSON_Delete(jsonObject); cJSON *jsonObject2 = cJSON_CreateObject(); - if (jsonObject2 == nullptr) { - return; - } + ASSERT_NE(jsonObject2, nullptr); cJSON_AddStringToObject(jsonObject2, MIME.c_str(), AUDIO_ENCODEROUT_MIME.c_str()); cJSON_AddNumberToObject(jsonObject2, AD_MPEG_VER.c_str(), AD_MPEG_VER_VALUE); -- Gitee