From 53847b399f40665e0a6d4036a6706bad04dc663a Mon Sep 17 00:00:00 2001 From: w30042960 Date: Thu, 5 Sep 2024 09:35:24 +0800 Subject: [PATCH] modify ut Signed-off-by: w30042960 --- .../av_transport_input_filter_test.cpp | 133 +++++------------ .../av_transport_output_filter_test.cpp | 92 +++--------- .../src/histreamer_ability_querier_test.cpp | 139 +++++------------- 3 files changed, 90 insertions(+), 274 deletions(-) diff --git a/av_transport/av_trans_engine/filters/test/av_transport_input_filter_test/av_transport_input_filter_test.cpp b/av_transport/av_trans_engine/filters/test/av_transport_input_filter_test/av_transport_input_filter_test.cpp index cfe13c5c..3b1f42f1 100644 --- a/av_transport/av_trans_engine/filters/test/av_transport_input_filter_test/av_transport_input_filter_test.cpp +++ b/av_transport/av_trans_engine/filters/test/av_transport_input_filter_test/av_transport_input_filter_test.cpp @@ -52,9 +52,7 @@ HWTEST_F(AvTransportInputFilterTest, SetParameter_001, testing::ext::TestSize.Le FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); int32_t key = -1; Any value = VideoBitStreamFormat::ANNEXB; - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); ErrorCode ret = avInputTest_->SetParameter(key, value); EXPECT_EQ(ErrorCode::ERROR_INVALID_PARAMETER_VALUE, ret); } @@ -65,9 +63,7 @@ HWTEST_F(AvTransportInputFilterTest, SetParameter_002, testing::ext::TestSize.Le FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); int32_t key = static_cast(Plugin::Tag::MIME); Any value = MEDIA_MIME_VIDEO_H264; - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); ErrorCode ret = avInputTest_->SetParameter(key, value); EXPECT_EQ(ErrorCode::SUCCESS, ret); @@ -81,9 +77,7 @@ HWTEST_F(AvTransportInputFilterTest, GetParameter_001, testing::ext::TestSize.Le { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); int32_t key = -1; Any value = VideoBitStreamFormat::ANNEXB; ErrorCode ret = avInputTest_->GetParameter(key, value); @@ -94,9 +88,7 @@ HWTEST_F(AvTransportInputFilterTest, GetParameter_002, testing::ext::TestSize.Le { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); int32_t key = static_cast(Plugin::Tag::MIME); Any value = VideoBitStreamFormat::ANNEXB; ErrorCode ret = avInputTest_->GetParameter(key, value); @@ -107,9 +99,7 @@ HWTEST_F(AvTransportInputFilterTest, Prepare_001, testing::ext::TestSize.Level1) { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); ErrorCode ret = avInputTest_->Prepare(); EXPECT_EQ(ErrorCode::ERROR_INVALID_STATE, ret); } @@ -118,9 +108,7 @@ HWTEST_F(AvTransportInputFilterTest, Prepare_002, testing::ext::TestSize.Level1) { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); avInputTest_->state_ = FilterState::INITIALIZED; ErrorCode ret = avInputTest_->Prepare(); EXPECT_EQ(ErrorCode::ERROR_INVALID_PARAMETER_VALUE, ret); @@ -130,9 +118,7 @@ HWTEST_F(AvTransportInputFilterTest, Start_001, testing::ext::TestSize.Level1) { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); ErrorCode ret = avInputTest_->Start(); EXPECT_EQ(ErrorCode::ERROR_INVALID_STATE, ret); @@ -149,9 +135,7 @@ HWTEST_F(AvTransportInputFilterTest, Start_002, testing::ext::TestSize.Level1) { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); avInputTest_->state_ = FilterState::READY; avInputTest_->plugin_ = PluginManager::Instance().CreateGenericPlugin("AVTransDaudioInputPlugin"); @@ -163,9 +147,7 @@ HWTEST_F(AvTransportInputFilterTest, Stop_001, testing::ext::TestSize.Level1) { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); ErrorCode ret = avInputTest_->Stop(); EXPECT_EQ(ErrorCode::ERROR_NULL_POINTER, ret); avInputTest_->plugin_ = @@ -184,9 +166,7 @@ HWTEST_F(AvTransportInputFilterTest, Stop_002, testing::ext::TestSize.Level1) { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); avInputTest_->state_ = FilterState::RUNNING; avInputTest_->plugin_ = PluginManager::Instance().CreateGenericPlugin("AVTransDaudioInputPlugin"); @@ -198,9 +178,7 @@ HWTEST_F(AvTransportInputFilterTest, Pause_001, testing::ext::TestSize.Level1) { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); ErrorCode ret = avInputTest_->Pause(); EXPECT_EQ(ErrorCode::ERROR_INVALID_STATE, ret); @@ -213,9 +191,7 @@ HWTEST_F(AvTransportInputFilterTest, Pause_002, testing::ext::TestSize.Level1) { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); avInputTest_->state_ = FilterState::READY; ErrorCode ret = avInputTest_->Pause(); EXPECT_EQ(ErrorCode::ERROR_NULL_POINTER, ret); @@ -229,9 +205,7 @@ HWTEST_F(AvTransportInputFilterTest, Pause_003, testing::ext::TestSize.Level1) { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); avInputTest_->state_ = FilterState::RUNNING; avInputTest_->plugin_ = PluginManager::Instance().CreateGenericPlugin("AVTransDaudioInputPlugin"); @@ -243,9 +217,7 @@ HWTEST_F(AvTransportInputFilterTest, Resume_001, testing::ext::TestSize.Level1) { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); ErrorCode ret = avInputTest_->Resume(); EXPECT_EQ(ErrorCode::ERROR_NULL_POINTER, ret); } @@ -254,9 +226,7 @@ HWTEST_F(AvTransportInputFilterTest, Resume_002, testing::ext::TestSize.Level1) { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); avInputTest_->plugin_ = PluginManager::Instance().CreateGenericPlugin("AVTransDaudioInputPlugin"); ErrorCode ret = avInputTest_->Resume(); @@ -267,9 +237,7 @@ HWTEST_F(AvTransportInputFilterTest, FindPlugin_001, testing::ext::TestSize.Leve { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); ErrorCode ret = avInputTest_->FindPlugin(); EXPECT_EQ(ErrorCode::ERROR_INVALID_PARAMETER_VALUE, ret); @@ -289,9 +257,7 @@ HWTEST_F(AvTransportInputFilterTest, DoNegotiate_001, testing::ext::TestSize.Lev { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); CapabilitySet outCaps; bool ret = avInputTest_->DoNegotiate(outCaps); EXPECT_EQ(false, ret); @@ -306,9 +272,7 @@ HWTEST_F(AvTransportInputFilterTest, CreatePlugin_001, testing::ext::TestSize.Le { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); std::shared_ptr selectedInfo = nullptr; ErrorCode ret = avInputTest_->CreatePlugin(selectedInfo); EXPECT_EQ(ErrorCode::ERROR_INVALID_PARAMETER_VALUE, ret); @@ -323,9 +287,7 @@ HWTEST_F(AvTransportInputFilterTest, CreatePlugin_002, testing::ext::TestSize.Le { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); std::shared_ptr selectedInfo = std::make_shared(); avInputTest_->plugin_ = nullptr; selectedInfo->name = "name"; @@ -336,9 +298,7 @@ HWTEST_F(AvTransportInputFilterTest, CreatePlugin_002, testing::ext::TestSize.Le ret = avInputTest_->CreatePlugin(selectedInfo); EXPECT_EQ(ErrorCode::SUCCESS, ret); - if (avInputTest_->pluginInfo_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_->pluginInfo_ != nullptr); avInputTest_->pluginInfo_->name = "name"; avInputTest_->CreatePlugin(selectedInfo); EXPECT_EQ(ErrorCode::SUCCESS, ret); @@ -354,6 +314,7 @@ HWTEST_F(AvTransportInputFilterTest, ConfigMeta_001, testing::ext::TestSize.Leve if (avInputTest_ == nullptr) { return; } + ASSERT_TRUE(avInputTest_ != nullptr); Plugin::Meta meta; ErrorCode ret = avInputTest_->ConfigMeta(meta); EXPECT_EQ(ErrorCode::ERROR_NOT_EXISTED, ret); @@ -374,9 +335,7 @@ HWTEST_F(AvTransportInputFilterTest, ConfigVideoMeta_001, testing::ext::TestSize { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); Plugin::Meta meta; ErrorCode ret = avInputTest_->ConfigVideoMeta(meta); EXPECT_EQ(ErrorCode::SUCCESS, ret); @@ -417,9 +376,7 @@ HWTEST_F(AvTransportInputFilterTest, TransAudioChannelLayout_001, testing::ext:: { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); int layoutPtr = 3; OHOS::Media::Plugin::AudioChannelLayout ret = avInputTest_->TransAudioChannelLayout(layoutPtr); EXPECT_EQ(OHOS::Media::Plugin::AudioChannelLayout::UNKNOWN, ret); @@ -433,9 +390,7 @@ HWTEST_F(AvTransportInputFilterTest, TransAudioSampleFormat_001, testing::ext::T { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); int layoutPtr = 5; OHOS::Media::Plugin::AudioSampleFormat ret = avInputTest_->TransAudioSampleFormat(layoutPtr); EXPECT_EQ(OHOS::Media::Plugin::AudioSampleFormat::NONE, ret); @@ -449,9 +404,7 @@ HWTEST_F(AvTransportInputFilterTest, ConfigAudioMeta_001, testing::ext::TestSize { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); Plugin::Meta meta; int32_t key = static_cast(Plugin::Tag::AUDIO_CHANNELS); uint32_t value = 100; @@ -493,9 +446,7 @@ HWTEST_F(AvTransportInputFilterTest, ConfigAudioMeta_001, testing::ext::TestSize HWTEST_F(AvTransportInputFilterTest, ConfigDownStream_001, testing::ext::TestSize.Level1) { auto avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); Plugin::Meta meta; ErrorCode ret = avInputTest_->ConfigDownStream(meta); EXPECT_EQ(ErrorCode::ERROR_INVALID_PARAMETER_VALUE, ret); @@ -505,9 +456,7 @@ HWTEST_F(AvTransportInputFilterTest, InitPlugin_001, testing::ext::TestSize.Leve { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); avInputTest_->plugin_ = nullptr; ErrorCode ret = avInputTest_->InitPlugin(); EXPECT_EQ(ErrorCode::ERROR_INVALID_PARAMETER_VALUE, ret); @@ -522,9 +471,7 @@ HWTEST_F(AvTransportInputFilterTest, ConfigPlugin_001, testing::ext::TestSize.Le { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); ErrorCode ret = avInputTest_->ConfigPlugin(); EXPECT_EQ(ErrorCode::ERROR_NULL_POINTER, ret); @@ -538,9 +485,7 @@ HWTEST_F(AvTransportInputFilterTest, SetPluginParams_001, testing::ext::TestSize { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); ErrorCode ret = avInputTest_->SetPluginParams(); EXPECT_EQ(ErrorCode::ERROR_NULL_POINTER, ret); } @@ -548,9 +493,7 @@ HWTEST_F(AvTransportInputFilterTest, SetPluginParams_001, testing::ext::TestSize HWTEST_F(AvTransportInputFilterTest, SetPluginParams_002, testing::ext::TestSize.Level1) { auto avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); avInputTest_->plugin_ = PluginManager::Instance().CreateGenericPlugin("AVTransDaudioInputPlugin"); avInputTest_->paramsMap_.clear(); @@ -578,9 +521,7 @@ HWTEST_F(AvTransportInputFilterTest, PreparePlugin_001, testing::ext::TestSize.L { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); ErrorCode ret = avInputTest_->PreparePlugin(); EXPECT_EQ(ErrorCode::ERROR_NULL_POINTER, ret); @@ -594,9 +535,7 @@ HWTEST_F(AvTransportInputFilterTest, PushData_001, testing::ext::TestSize.Level1 { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); std::string inPort; AVBufferPtr buffer; int64_t offset = 0; @@ -608,9 +547,7 @@ HWTEST_F(AvTransportInputFilterTest, SetEventCallBack_001, testing::ext::TestSiz { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); avInputTest_->plugin_ = nullptr; ErrorCode ret = avInputTest_->SetEventCallBack(); EXPECT_EQ(ErrorCode::ERROR_NULL_POINTER, ret); @@ -625,9 +562,7 @@ HWTEST_F(AvTransportInputFilterTest, SetDataCallBack_001, testing::ext::TestSize { std::shared_ptr avInputTest_ = FilterFactory::Instance().CreateFilterWithType(AVINPUT_NAME, FILTERNAME); - if (avInputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avInputTest_ != nullptr); std::shared_ptr buffer = nullptr; avInputTest_->OnDataCallback(buffer); avInputTest_->plugin_ = nullptr; diff --git a/av_transport/av_trans_engine/filters/test/av_transport_output_filter_test/av_transport_output_filter_test.cpp b/av_transport/av_trans_engine/filters/test/av_transport_output_filter_test/av_transport_output_filter_test.cpp index 42c61f9e..44257ad4 100644 --- a/av_transport/av_trans_engine/filters/test/av_transport_output_filter_test/av_transport_output_filter_test.cpp +++ b/av_transport/av_trans_engine/filters/test/av_transport_output_filter_test/av_transport_output_filter_test.cpp @@ -49,18 +49,14 @@ HWTEST_F(AvTransportOutputFilterTest, SetParameter_001, testing::ext::TestSize.L { int32_t key = -1; Any value = VideoBitStreamFormat::ANNEXB; - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); ErrorCode ret = avOutputTest_->SetParameter(key, value); EXPECT_EQ(ErrorCode::ERROR_INVALID_PARAMETER_VALUE, ret); } HWTEST_F(AvTransportOutputFilterTest, SetParameter_002, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); int32_t key = static_cast(Plugin::Tag::MIME); Any value = MEDIA_MIME_AUDIO_RAW; ErrorCode ret = avOutputTest_->SetParameter(key, value); @@ -74,9 +70,7 @@ HWTEST_F(AvTransportOutputFilterTest, SetParameter_002, testing::ext::TestSize.L HWTEST_F(AvTransportOutputFilterTest, GetParameter_001, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); int32_t key = -1; Any value = VideoBitStreamFormat::ANNEXB; ErrorCode ret = avOutputTest_->GetParameter(key, value); @@ -85,9 +79,7 @@ HWTEST_F(AvTransportOutputFilterTest, GetParameter_001, testing::ext::TestSize.L HWTEST_F(AvTransportOutputFilterTest, GetParameter_002, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); int32_t key = static_cast(Plugin::Tag::MIME); Any value = VideoBitStreamFormat::ANNEXB; ErrorCode ret = avOutputTest_->GetParameter(key, value); @@ -96,18 +88,14 @@ HWTEST_F(AvTransportOutputFilterTest, GetParameter_002, testing::ext::TestSize.L HWTEST_F(AvTransportOutputFilterTest, Prepare_001, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); ErrorCode ret = avOutputTest_->Prepare(); EXPECT_EQ(ErrorCode::ERROR_INVALID_STATE, ret); } HWTEST_F(AvTransportOutputFilterTest, Prepare_002, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); avOutputTest_->state_ = FilterState::INITIALIZED; ErrorCode ret = avOutputTest_->Prepare(); EXPECT_EQ(ErrorCode::ERROR_INVALID_PARAMETER_VALUE, ret); @@ -115,9 +103,7 @@ HWTEST_F(AvTransportOutputFilterTest, Prepare_002, testing::ext::TestSize.Level1 HWTEST_F(AvTransportOutputFilterTest, Start_001, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); ErrorCode ret = avOutputTest_->Start(); EXPECT_EQ(ErrorCode::ERROR_INVALID_STATE, ret); @@ -132,9 +118,7 @@ HWTEST_F(AvTransportOutputFilterTest, Start_001, testing::ext::TestSize.Level1) HWTEST_F(AvTransportOutputFilterTest, Start_002, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); avOutputTest_->plugin_ = PluginManager::Instance().CreateGenericPlugin("AVTransDaudioOutputPlugin"); avOutputTest_->state_ = FilterState::READY; @@ -144,9 +128,7 @@ HWTEST_F(AvTransportOutputFilterTest, Start_002, testing::ext::TestSize.Level1) HWTEST_F(AvTransportOutputFilterTest, Stop_001, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); avOutputTest_->plugin_ = nullptr; ErrorCode ret = avOutputTest_->Stop(); EXPECT_EQ(ErrorCode::ERROR_NULL_POINTER, ret); @@ -159,9 +141,7 @@ HWTEST_F(AvTransportOutputFilterTest, Stop_001, testing::ext::TestSize.Level1) HWTEST_F(AvTransportOutputFilterTest, Stop_002, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); avOutputTest_->state_ = FilterState::RUNNING; avOutputTest_->plugin_ = PluginManager::Instance().CreateGenericPlugin("AVTransDaudioOutputPlugin"); @@ -171,18 +151,14 @@ HWTEST_F(AvTransportOutputFilterTest, Stop_002, testing::ext::TestSize.Level1) HWTEST_F(AvTransportOutputFilterTest, FindPlugin_001, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); ErrorCode ret = avOutputTest_->FindPlugin(); EXPECT_EQ(ErrorCode::ERROR_INVALID_PARAMETER_VALUE, ret); } HWTEST_F(AvTransportOutputFilterTest, FindPlugin_002, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); int32_t key = static_cast(Plugin::Tag::MIME); Any value = 100; avOutputTest_->plugin_ = @@ -199,9 +175,7 @@ HWTEST_F(AvTransportOutputFilterTest, FindPlugin_002, testing::ext::TestSize.Lev HWTEST_F(AvTransportOutputFilterTest, Negotiate_001, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); std::string inPort = "inPort_test"; std::shared_ptr upstreamCap; Plugin::Capability negotiatedCap; @@ -218,9 +192,7 @@ HWTEST_F(AvTransportOutputFilterTest, Negotiate_001, testing::ext::TestSize.Leve HWTEST_F(AvTransportOutputFilterTest, CreatePlugin_001, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); std::shared_ptr selectedInfo = nullptr; ErrorCode ret = avOutputTest_->CreatePlugin(selectedInfo); EXPECT_EQ(ErrorCode::ERROR_INVALID_PARAMETER_VALUE, ret); @@ -260,9 +232,7 @@ HWTEST_F(AvTransportOutputFilterTest, CreatePlugin_001, testing::ext::TestSize.L HWTEST_F(AvTransportOutputFilterTest, CreatePlugin_002, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); std::shared_ptr selectedInfo = PluginManager::Instance().GetPluginInfo( PluginType::GENERIC_PLUGIN, ""); ErrorCode ret = avOutputTest_->CreatePlugin(selectedInfo); @@ -271,9 +241,7 @@ HWTEST_F(AvTransportOutputFilterTest, CreatePlugin_002, testing::ext::TestSize.L HWTEST_F(AvTransportOutputFilterTest, InitPlugin_001, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); avOutputTest_->plugin_ = nullptr; ErrorCode ret = avOutputTest_->InitPlugin(); EXPECT_EQ(ErrorCode::ERROR_INVALID_PARAMETER_VALUE, ret); @@ -286,9 +254,7 @@ HWTEST_F(AvTransportOutputFilterTest, InitPlugin_001, testing::ext::TestSize.Lev HWTEST_F(AvTransportOutputFilterTest, ConfigPlugin_001, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); ErrorCode ret = avOutputTest_->ConfigPlugin(); EXPECT_EQ(ErrorCode::ERROR_NULL_POINTER, ret); @@ -300,9 +266,7 @@ HWTEST_F(AvTransportOutputFilterTest, ConfigPlugin_001, testing::ext::TestSize.L HWTEST_F(AvTransportOutputFilterTest, PreparePlugin_001, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); avOutputTest_->plugin_ = nullptr; ErrorCode ret = avOutputTest_->PreparePlugin(); EXPECT_EQ(ErrorCode::ERROR_INVALID_PARAMETER_TYPE, ret); @@ -310,9 +274,7 @@ HWTEST_F(AvTransportOutputFilterTest, PreparePlugin_001, testing::ext::TestSize. HWTEST_F(AvTransportOutputFilterTest, PreparePlugin_002, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); ErrorCode ret = avOutputTest_->PreparePlugin(); EXPECT_EQ(ErrorCode::ERROR_INVALID_PARAMETER_TYPE, ret); @@ -324,9 +286,7 @@ HWTEST_F(AvTransportOutputFilterTest, PreparePlugin_002, testing::ext::TestSize. HWTEST_F(AvTransportOutputFilterTest, PushData_001, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); std::string inPort; AVBufferPtr buffer; int64_t offset = 0; @@ -351,9 +311,7 @@ HWTEST_F(AvTransportOutputFilterTest, PushData_001, testing::ext::TestSize.Level HWTEST_F(AvTransportOutputFilterTest, SetPluginParams_001, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); avOutputTest_->plugin_ = nullptr; ErrorCode ret = avOutputTest_->SetPluginParams(); EXPECT_EQ(ErrorCode::ERROR_NULL_POINTER, ret); @@ -402,9 +360,7 @@ HWTEST_F(AvTransportOutputFilterTest, SetPluginParams_001, testing::ext::TestSiz HWTEST_F(AvTransportOutputFilterTest, SetEventCallBack_001, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); avOutputTest_->plugin_ = PluginManager::Instance().CreateGenericPlugin("AVTransDaudioOutputPlugin"); ErrorCode ret = avOutputTest_->SetEventCallBack(); @@ -417,9 +373,7 @@ HWTEST_F(AvTransportOutputFilterTest, SetEventCallBack_001, testing::ext::TestSi HWTEST_F(AvTransportOutputFilterTest, SetDataCallBack_001, testing::ext::TestSize.Level1) { - if (avOutputTest_ == nullptr) { - return; - } + ASSERT_TRUE(avOutputTest_ != nullptr); avOutputTest_->plugin_ = PluginManager::Instance().CreateGenericPlugin("AVTransDaudioOutputPlugin"); std::shared_ptr buffer = nullptr; 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 60a3fc57..2c859f1e 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 @@ -210,17 +210,13 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_008, Test HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_009, TestSize.Level0) { cJSON *jsonObject = cJSON_CreateObject(); - if (jsonObject == nullptr) { - return; - } + ASSERT_TRUE(jsonObject != nullptr); cJSON_AddStringToObject(jsonObject, KEY.c_str(), TEST_STR.c_str()); EXPECT_TRUE(IsString(jsonObject, KEY)); cJSON_Delete(jsonObject); cJSON *jsonObject2 = cJSON_CreateObject(); - if (jsonObject2 == nullptr) { - return; - } + ASSERT_TRUE(jsonObject2 != nullptr); cJSON_AddNumberToObject(jsonObject2, KEY.c_str(), 1); EXPECT_FALSE(IsString(jsonObject2, KEY)); cJSON_Delete(jsonObject2); @@ -235,9 +231,7 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_009, Test HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_010, TestSize.Level0) { cJSON *jsonObject = cJSON_CreateObject(); - if (jsonObject == nullptr) { - return; - } + ASSERT_TRUE(jsonObject != nullptr); const uint8_t num_s = 1; cJSON_AddNumberToObject(jsonObject, KEY.c_str(), num_s); EXPECT_TRUE(IsUInt8(jsonObject, KEY)); @@ -257,9 +251,7 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_010, Test HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_011, TestSize.Level0) { cJSON *jsonObject = cJSON_CreateObject(); - if (jsonObject == nullptr) { - return; - } + ASSERT_TRUE(jsonObject != nullptr); const uint32_t num_s = 1; cJSON_AddNumberToObject(jsonObject, KEY.c_str(), num_s); EXPECT_TRUE(IsUInt32(jsonObject, KEY)); @@ -279,9 +271,7 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_011, Test HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_012, TestSize.Level0) { cJSON *jsonObject = cJSON_CreateObject(); - if (jsonObject == nullptr) { - return; - } + ASSERT_TRUE(jsonObject != nullptr); AudioEncoderIn audioEncoderIn; cJSON_AddNumberToObject(jsonObject, MIME.c_str(), UINT16_ONE); FromJson(jsonObject, audioEncoderIn); @@ -298,9 +288,7 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_012, Test HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_013, TestSize.Level0) { cJSON *jsonObject = cJSON_CreateObject(); - if (jsonObject == nullptr) { - return; - } + ASSERT_TRUE(jsonObject != nullptr); AudioEncoderOut audioEncoderOut; cJSON_AddNumberToObject(jsonObject, MIME.c_str(), UINT16_ONE); FromJson(jsonObject, audioEncoderOut); @@ -336,19 +324,14 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_014, Test AudioEncoder audioEncoder; ToJson(jsonObject, audioEncoder); jsonObject = cJSON_CreateObject(); - if (jsonObject == nullptr) { - return; - } + ASSERT_TRUE(jsonObject != nullptr); cJSON_AddNumberToObject(jsonObject, NAME.c_str(), UINT16_ONE); FromJson(jsonObject, audioEncoder); EXPECT_TRUE(audioEncoder.name.empty()); cJSON_Delete(jsonObject); cJSON *jsonObject2 = cJSON_CreateObject(); - if (jsonObject2 == nullptr) { - return; - } - + ASSERT_TRUE(jsonObject2 != nullptr); cJSON_AddStringToObject(jsonObject2, NAME.c_str(), AUDIO_ENCODER_NAME.c_str()); FromJson(jsonObject2, audioEncoder); EXPECT_EQ(AUDIO_ENCODER_NAME, audioEncoder.name); @@ -376,19 +359,14 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_015, Test AudioDecoderIn audioDecoderIn; ToJson(jsonObject, audioDecoderIn); jsonObject = cJSON_CreateObject(); - if (jsonObject == nullptr) { - return; - } + ASSERT_TRUE(jsonObject != nullptr); cJSON_AddNumberToObject(jsonObject, MIME.c_str(), UINT16_ONE); FromJson(jsonObject, audioDecoderIn); EXPECT_TRUE(audioDecoderIn.mime.empty()); cJSON_Delete(jsonObject); cJSON *jsonObject2 = cJSON_CreateObject(); - if (jsonObject2 == nullptr) { - return; - } - + ASSERT_TRUE(jsonObject2 != nullptr); cJSON_AddStringToObject(jsonObject2, MIME.c_str(), AUDIO_DECODERIN_MIME.c_str()); FromJson(jsonObject2, audioDecoderIn); EXPECT_EQ(AUDIO_DECODERIN_MIME, audioDecoderIn.mime); @@ -408,19 +386,14 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_016, Test AudioDecoderOut audioDecoderOut; ToJson(jsonObject, audioDecoderOut); jsonObject = cJSON_CreateObject(); - if (jsonObject == nullptr) { - return; - } + ASSERT_TRUE(jsonObject != nullptr); cJSON_AddNumberToObject(jsonObject, MIME.c_str(), UINT16_ONE); FromJson(jsonObject, audioDecoderOut); EXPECT_TRUE(audioDecoderOut.mime.empty()); cJSON_Delete(jsonObject); cJSON *jsonObject2 = cJSON_CreateObject(); - if (jsonObject2 == nullptr) { - return; - } - + ASSERT_TRUE(jsonObject2 != nullptr); cJSON_AddStringToObject(jsonObject2, MIME.c_str(), AUDIO_DECODEROUT_MIME.c_str()); FromJson(jsonObject2, audioDecoderOut); EXPECT_EQ(AUDIO_DECODEROUT_MIME, audioDecoderOut.mime); @@ -440,19 +413,14 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_017, Test AudioDecoder audioDecoder; ToJson(jsonObject, audioDecoder); jsonObject = cJSON_CreateObject(); - if (jsonObject == nullptr) { - return; - } + ASSERT_TRUE(jsonObject != nullptr); cJSON_AddNumberToObject(jsonObject, NAME.c_str(), UINT16_ONE); FromJson(jsonObject, audioDecoder); EXPECT_TRUE(audioDecoder.name.empty()); cJSON_Delete(jsonObject); cJSON *jsonObject2 = cJSON_CreateObject(); - if (jsonObject2 == nullptr) { - return; - } - + ASSERT_TRUE(jsonObject2 != nullptr); cJSON_AddStringToObject(jsonObject2, NAME.c_str(), AUDIO_DECODER_NAME.c_str()); FromJson(jsonObject2, audioDecoder); EXPECT_EQ(AUDIO_DECODER_NAME, audioDecoder.name); @@ -485,19 +453,14 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_018, Test ToJson(jsonObject, videoEncoderIn); FromJson(jsonObject, videoEncoderIn); jsonObject = cJSON_CreateObject(); - if (jsonObject == nullptr) { - return; - } + ASSERT_TRUE(jsonObject != nullptr); cJSON_AddNumberToObject(jsonObject, MIME.c_str(), UINT16_ONE); FromJson(jsonObject, videoEncoderIn); EXPECT_TRUE(videoEncoderIn.mime.empty()); cJSON_Delete(jsonObject); cJSON *jsonObject2 = cJSON_CreateObject(); - if (jsonObject2 == nullptr) { - return; - } - + ASSERT_TRUE(jsonObject2 != nullptr); cJSON_AddStringToObject(jsonObject2, MIME.c_str(), VIDEO_ENCODERIN_MIME.c_str()); FromJson(jsonObject2, videoEncoderIn); EXPECT_EQ(VIDEO_ENCODERIN_MIME, videoEncoderIn.mime); @@ -518,9 +481,7 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_019, Test ToJson(jsonObject, videoEncoderOut); FromJson(jsonObject, videoEncoderOut); jsonObject = cJSON_CreateObject(); - if (jsonObject == nullptr) { - return; - } + ASSERT_TRUE(jsonObject != nullptr); cJSON_AddNumberToObject(jsonObject, MIME.c_str(), UINT16_ONE); FromJson(jsonObject, videoEncoderOut); EXPECT_TRUE(videoEncoderOut.mime.empty()); @@ -540,19 +501,14 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_020, Test ToJson(jsonObject, videoEncoder); FromJson(jsonObject, videoEncoder); jsonObject = cJSON_CreateObject(); - if (jsonObject == nullptr) { - return; - } + ASSERT_TRUE(jsonObject != nullptr); cJSON_AddNumberToObject(jsonObject, NAME.c_str(), UINT16_ONE); FromJson(jsonObject, videoEncoder); EXPECT_TRUE(videoEncoder.name.empty()); cJSON_Delete(jsonObject); cJSON *jsonObject2 = cJSON_CreateObject(); - if (jsonObject2 == nullptr) { - return; - } - + ASSERT_TRUE(jsonObject2 != nullptr); cJSON_AddStringToObject(jsonObject2, NAME.c_str(), VIDEO_ENCODER_NAME.c_str()); FromJson(jsonObject2, videoEncoder); EXPECT_EQ(VIDEO_ENCODER_NAME, videoEncoder.name); @@ -580,9 +536,7 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_020, Test HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_021, TestSize.Level0) { cJSON *jsonObject = cJSON_CreateObject(); - if (jsonObject == nullptr) { - return; - } + ASSERT_TRUE(jsonObject != nullptr); VideoDecoderIn videoDecoderIn; cJSON_AddNumberToObject(jsonObject, MIME.c_str(), UINT16_ONE); FromJson(jsonObject, videoDecoderIn); @@ -590,10 +544,7 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_021, Test cJSON_Delete(jsonObject); cJSON *jsonObject2 = cJSON_CreateObject(); - if (jsonObject2 == nullptr) { - return; - } - + ASSERT_TRUE(jsonObject2 != nullptr); cJSON_AddStringToObject(jsonObject2, MIME.c_str(), VIDEO_DECODERIN_MIME.c_str()); FromJson(jsonObject2, videoDecoderIn); EXPECT_EQ(VIDEO_DECODERIN_MIME, videoDecoderIn.mime); @@ -610,9 +561,7 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_021, Test HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_022, TestSize.Level0) { cJSON *jsonObject = cJSON_CreateObject(); - if (jsonObject == nullptr) { - return; - } + ASSERT_TRUE(jsonObject != nullptr); VideoDecoderOut videoDecoderOut; cJSON_AddNumberToObject(jsonObject, MIME.c_str(), UINT16_ONE); FromJson(jsonObject, videoDecoderOut); @@ -620,10 +569,7 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_022, Test cJSON_Delete(jsonObject); cJSON *jsonObject2 = cJSON_CreateObject(); - if (jsonObject2 == nullptr) { - return; - } - + ASSERT_TRUE(jsonObject2 != nullptr); cJSON_AddStringToObject(jsonObject2, MIME.c_str(), VIDEO_DECODEROUT_MIME.c_str()); FromJson(jsonObject2, videoDecoderOut); EXPECT_EQ(VIDEO_DECODEROUT_MIME, videoDecoderOut.mime); @@ -640,9 +586,7 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_022, Test HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_023, TestSize.Level0) { cJSON *jsonObject = cJSON_CreateObject(); - if (jsonObject == nullptr) { - return; - } + ASSERT_TRUE(jsonObject != nullptr); VideoDecoder videoDecoder; cJSON_AddNumberToObject(jsonObject, NAME.c_str(), UINT16_ONE); FromJson(jsonObject, videoDecoder); @@ -650,10 +594,7 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_023, Test cJSON_Delete(jsonObject); cJSON *jsonObject2 = cJSON_CreateObject(); - if (jsonObject2 == nullptr) { - return; - } - + ASSERT_TRUE(jsonObject2 != nullptr); cJSON_AddStringToObject(jsonObject2, NAME.c_str(), VIDEO_DECODER_NAME.c_str()); FromJson(jsonObject2, videoDecoder); EXPECT_EQ(VIDEO_DECODER_NAME, videoDecoder.name); @@ -687,9 +628,7 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_024, Test ToJson(jsonObject, audioEncoderIn); jsonObject = cJSON_CreateObject(); - if (jsonObject == nullptr) { - return; - } + ASSERT_TRUE(jsonObject != nullptr); cJSON_AddStringToObject(jsonObject, MIME.c_str(), "MIME"); cJSON *sampleRateJson = cJSON_CreateArray(); if (sampleRateJson == nullptr) { @@ -702,22 +641,18 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_024, Test cJSON_Delete(jsonObject); cJSON *jsonObject2 = cJSON_CreateObject(); - if (jsonObject2 == nullptr) { - return; - } + ASSERT_TRUE(jsonObject2 != nullptr); cJSON_AddNumberToObject(jsonObject2, MIME.c_str(), 1); FromJson(jsonObject2, audioEncoderIn); cJSON_Delete(jsonObject2); cJSON *jsonObject3 = cJSON_CreateObject(); - if (jsonObject3 == nullptr) { - return; - } + ASSERT_TRUE(jsonObject3 != nullptr); cJSON_AddStringToObject(jsonObject3, MIME.c_str(), "MIME"); cJSON *sampleRateJson1 = cJSON_CreateObject(); if (sampleRateJson1 == nullptr) { cJSON_Delete(jsonObject3); - return; + ASSERT_TRUE(sampleRateJson1 != nullptr); } cJSON_AddItemToArray(sampleRateJson1, cJSON_CreateNumber(1)); cJSON_AddItemToObject(jsonObject3, SAMPLE_RATE.c_str(), sampleRateJson1); @@ -738,9 +673,7 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_025, Test ToJson(jsonObject, audioEncoderOut); jsonObject = cJSON_CreateObject(); - if (jsonObject == nullptr) { - return; - } + ASSERT_TRUE(jsonObject != nullptr); cJSON_AddStringToObject(jsonObject, MIME.c_str(), "MIME"); cJSON_AddNumberToObject(jsonObject, AD_MPEG_VER.c_str(), 1); cJSON_AddNumberToObject(jsonObject, AUDIO_AAC_PROFILE.c_str(), 2); @@ -749,18 +682,14 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_025, Test cJSON_Delete(jsonObject); cJSON *jsonObject2 = cJSON_CreateObject(); - if (jsonObject2 == nullptr) { - return; - } + ASSERT_TRUE(jsonObject2 != nullptr); cJSON_AddStringToObject(jsonObject2, MIME.c_str(), "MIME"); cJSON_AddStringToObject(jsonObject2, AD_MPEG_VER.c_str(), "VER"); FromJson(jsonObject2, audioEncoderOut); cJSON_Delete(jsonObject2); cJSON *jsonObject3 = cJSON_CreateObject(); - if (jsonObject3 == nullptr) { - return; - } + ASSERT_TRUE(jsonObject3 != nullptr); cJSON_AddStringToObject(jsonObject3, MIME.c_str(), "MIME"); cJSON_AddNumberToObject(jsonObject3, AD_MPEG_VER.c_str(), 1); cJSON_AddStringToObject(jsonObject3, AUDIO_AAC_PROFILE.c_str(), "PROFILE"); @@ -769,9 +698,7 @@ HWTEST_F(HistreamerAbilityQuerierTest, histreamer_ability_querier_test_025, Test cJSON *jsonObject4 = cJSON_CreateObject(); - if (jsonObject4 == nullptr) { - return; - } + ASSERT_TRUE(jsonObject4 != nullptr); cJSON_AddStringToObject(jsonObject4, MIME.c_str(), "MIME"); cJSON_AddNumberToObject(jsonObject4, AD_MPEG_VER.c_str(), 1); cJSON_AddNumberToObject(jsonObject4, AUDIO_AAC_PROFILE.c_str(), 2); -- Gitee