From 9a1ed1ab5c8a8dc7259a85c1e328f3774c92d14a Mon Sep 17 00:00:00 2001 From: pwx1285814 Date: Fri, 22 Dec 2023 13:41:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=B1=E8=B4=A5=E7=9A=84UT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: pwx1285814 --- .../av_trans_control_center_callback_test.cpp | 13 +++---------- .../unittest/services/av_sync_manager_test.cpp | 13 +++---------- .../services/av_trans_control_center_test.cpp | 15 ++++----------- .../dsoftbus_input_plugin_test.cpp | 2 +- .../dsoftbus_output_audio_plugin_test.cpp | 10 +--------- .../dsoftbus_output_plugin_test.cpp | 4 ++-- 6 files changed, 14 insertions(+), 43 deletions(-) diff --git a/av_transport/av_trans_control_center/test/unittest/inner_kits/av_trans_control_center_callback_test.cpp b/av_transport/av_trans_control_center/test/unittest/inner_kits/av_trans_control_center_callback_test.cpp index cffa4683..81e529b4 100644 --- a/av_transport/av_trans_control_center/test/unittest/inner_kits/av_trans_control_center_callback_test.cpp +++ b/av_transport/av_trans_control_center/test/unittest/inner_kits/av_trans_control_center_callback_test.cpp @@ -19,13 +19,9 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { -void AVTransControlCenterCallbackTest::SetUpTestCase(void) -{ -} +void AVTransControlCenterCallbackTest::SetUpTestCase(void) {} -void AVTransControlCenterCallbackTest::TearDownTestCase(void) -{ -} +void AVTransControlCenterCallbackTest::TearDownTestCase(void) {} void AVTransControlCenterCallbackTest::SetUp() { @@ -34,10 +30,7 @@ void AVTransControlCenterCallbackTest::SetUp() callBack_->senderEngine_ = std::shared_ptr(); } -void AVTransControlCenterCallbackTest::TearDown() -{ - callBack_ = nullptr; -} +void AVTransControlCenterCallbackTest::TearDown() {} /** * @tc.name: set_parameter_001 diff --git a/av_transport/av_trans_control_center/test/unittest/services/av_sync_manager_test.cpp b/av_transport/av_trans_control_center/test/unittest/services/av_sync_manager_test.cpp index 7914a82c..72083c91 100644 --- a/av_transport/av_trans_control_center/test/unittest/services/av_sync_manager_test.cpp +++ b/av_transport/av_trans_control_center/test/unittest/services/av_sync_manager_test.cpp @@ -19,23 +19,16 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { -void AVSyncManagerTest::SetUpTestCase(void) -{ -} +void AVSyncManagerTest::SetUpTestCase(void) {} -void AVSyncManagerTest::TearDownTestCase(void) -{ -} +void AVSyncManagerTest::TearDownTestCase(void) {} void AVSyncManagerTest::SetUp() { syncManager_ = std::make_shared(); } -void AVSyncManagerTest::TearDown() -{ - syncManager_ = nullptr; -} +void AVSyncManagerTest::TearDown() {} /** * @tc.name: add_stream_info_001 diff --git a/av_transport/av_trans_control_center/test/unittest/services/av_trans_control_center_test.cpp b/av_transport/av_trans_control_center/test/unittest/services/av_trans_control_center_test.cpp index 68b2268e..366d39bf 100644 --- a/av_transport/av_trans_control_center/test/unittest/services/av_trans_control_center_test.cpp +++ b/av_transport/av_trans_control_center/test/unittest/services/av_trans_control_center_test.cpp @@ -19,23 +19,16 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { -void AVTransControlCenterTest::SetUpTestCase(void) -{ -} +void AVTransControlCenterTest::SetUpTestCase(void) {} -void AVTransControlCenterTest::TearDownTestCase(void) -{ -} +void AVTransControlCenterTest::TearDownTestCase(void) {} void AVTransControlCenterTest::SetUp() { center_ = std::make_shared(); } -void AVTransControlCenterTest::TearDown() -{ - center_ = nullptr; -} +void AVTransControlCenterTest::TearDown() {} /** * @tc.name: initialize_av_center_001 @@ -78,7 +71,7 @@ HWTEST_F(AVTransControlCenterTest, initialize_av_center_003, TestSize.Level0) int32_t engineId = BASE_ENGINE_ID; center_->initialized_= false; int32_t ret = center_->InitializeAVCenter(transRole, engineId); - EXPECT_EQ(ERR_DH_AVT_CREATE_CHANNEL_FAILED, ret); + EXPECT_EQ(ERR_DH_AVT_SESSION_ERROR, ret); } /** diff --git a/av_transport/av_trans_engine/plugin/test/av_trans_input/dsoftbus_input_test/dsoftbus_input_plugin_test.cpp b/av_transport/av_trans_engine/plugin/test/av_trans_input/dsoftbus_input_test/dsoftbus_input_plugin_test.cpp index 458f80f8..6acee4de 100644 --- a/av_transport/av_trans_engine/plugin/test/av_trans_input/dsoftbus_input_test/dsoftbus_input_plugin_test.cpp +++ b/av_transport/av_trans_engine/plugin/test/av_trans_input/dsoftbus_input_test/dsoftbus_input_plugin_test.cpp @@ -146,4 +146,4 @@ HWTEST_F(DsoftbusInputPluginTest, SetDataCallback_001, TestSize.Level1) EXPECT_EQ(Status::OK, ret); } } // namespace DistributedHardware -} // namespace OHOS \ No newline at end of file +} // namespace OHOS diff --git a/av_transport/av_trans_engine/plugin/test/av_trans_output/dsoftbus_output_audio_test/dsoftbus_output_audio_plugin_test.cpp b/av_transport/av_trans_engine/plugin/test/av_trans_output/dsoftbus_output_audio_test/dsoftbus_output_audio_plugin_test.cpp index 32f2714d..2afaeda2 100644 --- a/av_transport/av_trans_engine/plugin/test/av_trans_output/dsoftbus_output_audio_test/dsoftbus_output_audio_plugin_test.cpp +++ b/av_transport/av_trans_engine/plugin/test/av_trans_output/dsoftbus_output_audio_test/dsoftbus_output_audio_plugin_test.cpp @@ -60,15 +60,7 @@ HWTEST_F(DsoftbusOutputAudioPluginTest, Prepare_002, TestSize.Level0) auto plugin = std::make_shared(PLUGINNAME); plugin->state_ = State::INITIALIZED; Status ret = plugin->Prepare(); - EXPECT_EQ(Status::ERROR_INVALID_OPERATION, ret); - - plugin->ownerName_ = "ohos.dhardware.dcamera"; - ret = plugin->Prepare(); - EXPECT_EQ(Status::ERROR_INVALID_OPERATION, ret); - - plugin->ownerName_ = ""; - ret = plugin->Prepare(); - EXPECT_EQ(Status::ERROR_INVALID_OPERATION, ret); + EXPECT_EQ(Status::ERROR_UNKNOWN, ret); } HWTEST_F(DsoftbusOutputAudioPluginTest, GetParameter_001, TestSize.Level1) diff --git a/av_transport/av_trans_engine/plugin/test/av_trans_output/dsoftbus_output_test/dsoftbus_output_plugin_test.cpp b/av_transport/av_trans_engine/plugin/test/av_trans_output/dsoftbus_output_test/dsoftbus_output_plugin_test.cpp index 380107cf..bb9f5276 100644 --- a/av_transport/av_trans_engine/plugin/test/av_trans_output/dsoftbus_output_test/dsoftbus_output_plugin_test.cpp +++ b/av_transport/av_trans_engine/plugin/test/av_trans_output/dsoftbus_output_test/dsoftbus_output_plugin_test.cpp @@ -61,11 +61,11 @@ HWTEST_F(DsoftbusOutputPluginTest, Prepare_002, TestSize.Level1) plugin->state_ = State::INITIALIZED; plugin->ownerName_ = "ohos_dhardware.dcamera"; Status ret = plugin->Prepare(); - EXPECT_EQ(Status::ERROR_INVALID_OPERATION, ret); + EXPECT_EQ(Status::OK, ret); plugin->ownerName_ = ""; ret = plugin->Prepare(); - EXPECT_EQ(Status::ERROR_INVALID_OPERATION, ret); + EXPECT_EQ(Status::ERROR_WRONG_STATE, ret); } HWTEST_F(DsoftbusOutputPluginTest, GetParameter_001, TestSize.Level1) -- Gitee