From df9ae7230f92e19b4ef7a52ec7c74c3e77ad1fb8 Mon Sep 17 00:00:00 2001 From: bird_j Date: Fri, 24 Sep 2021 03:55:56 +0000 Subject: [PATCH] =?UTF-8?q?ActsPlayerAPITest=E5=88=B7=E6=96=B0=20Signed-of?= =?UTF-8?q?f-by:=20bird=5Fj=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../media/media_cpp_test_standard/BUILD.gn | 1 + .../player/src/api/ActsPlayerAPITest.cpp | 124 +++++++++--------- 2 files changed, 63 insertions(+), 62 deletions(-) diff --git a/multimedia/media/media_cpp_test_standard/BUILD.gn b/multimedia/media/media_cpp_test_standard/BUILD.gn index a8f3a38e5..853d01dc0 100755 --- a/multimedia/media/media_cpp_test_standard/BUILD.gn +++ b/multimedia/media/media_cpp_test_standard/BUILD.gn @@ -28,6 +28,7 @@ ohos_moduletest_suite("ActsMediaCppStandardTest") { sources = [ "player/src/TestParamsConfig.cpp", "player/src/TestPlayer.cpp", + "player/src/api/ActsPlayerAPITest.cpp", "player/src/function/ActsPlayerFuncAsyncTest.cpp", "player/src/function/ActsPlayerFuncTest.cpp", "player/src/function/ActsPlayerStateAsyncTest.cpp", diff --git a/multimedia/media/media_cpp_test_standard/player/src/api/ActsPlayerAPITest.cpp b/multimedia/media/media_cpp_test_standard/player/src/api/ActsPlayerAPITest.cpp index f83d3ad4a..529050769 100644 --- a/multimedia/media/media_cpp_test_standard/player/src/api/ActsPlayerAPITest.cpp +++ b/multimedia/media/media_cpp_test_standard/player/src/api/ActsPlayerAPITest.cpp @@ -18,7 +18,7 @@ using namespace std; using namespace OHOS; using namespace OHOS::Media; using namespace testing::ext; -using namespace PlayerNameSpace; +using namespace TestPlayerBasic; /** * @tc.number : SUB_MEDIA_PLAYER_APITest_SetSource_0100 @@ -27,11 +27,11 @@ using namespace PlayerNameSpace; */ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_SetSource_0100, Reliability | MediumTest | Level2) { - PlayerSignal testObj; - std::shared_ptr player = std::make_shared(&testObj); + std::shared_ptr testObj = std::make_shared(); + std::shared_ptr player = std::make_shared(testObj); ASSERT_NE(nullptr, player); ASSERT_EQ(true, player->CreatePlayer()); - std::string uri = GetUri(); + std::string uri = TestParamsConfig::GetInstance().GetUri(); ASSERT_EQ(RET_OK, player->SetSource(uri)); } @@ -42,17 +42,17 @@ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_SetSource_0100, Reliability */ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Prepare_0100, Reliability | MediumTest | Level2) { - PlayerSignal testObj; - std::shared_ptr player = std::make_shared(&testObj); + std::shared_ptr testObj = std::make_shared(); + std::shared_ptr player = std::make_shared(testObj); ASSERT_NE(nullptr, player); ASSERT_EQ(true, player->CreatePlayer()); - std::string uri = GetUri(); + std::string uri = TestParamsConfig::GetInstance().GetUri(); ASSERT_EQ(RET_OK, player->SetSource(uri)); - std::shared_ptr testCallback = std::make_shared(&testObj); + std::shared_ptr testCallback = std::make_shared(testObj); EXPECT_EQ(RET_OK, player->SetPlayerCallback(testCallback)); ASSERT_EQ(RET_OK, player->Prepare()); EXPECT_EQ(RET_OK, player->Reset()); - EXPECT_EQ(RET_OK, testCallback->errorNum); + EXPECT_EQ(RET_OK, testCallback->errorNum_); } /** @@ -62,17 +62,17 @@ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Prepare_0100, Reliability | */ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_PrepareAsync_0100, Reliability | MediumTest | Level2) { - PlayerSignal testObj; - std::shared_ptr player = std::make_shared(&testObj); + std::shared_ptr testObj = std::make_shared(); + std::shared_ptr player = std::make_shared(testObj); ASSERT_NE(nullptr, player); ASSERT_EQ(true, player->CreatePlayer()); - std::string uri = GetUri(); + std::string uri = TestParamsConfig::GetInstance().GetUri(); ASSERT_EQ(RET_OK, player->SetSource(uri)); - std::shared_ptr testCallback = std::make_shared(&testObj); + std::shared_ptr testCallback = std::make_shared(testObj); EXPECT_EQ(RET_OK, player->SetPlayerCallback(testCallback)); ASSERT_EQ(RET_OK, player->PrepareAsync()); EXPECT_EQ(RET_OK, player->Reset()); - EXPECT_EQ(RET_OK, testCallback->errorNum); + EXPECT_EQ(RET_OK, testCallback->errorNum_); } /** @@ -82,21 +82,21 @@ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_PrepareAsync_0100, Reliabil */ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Play_0100, Reliability | MediumTest | Level2) { - PlayerSignal testObj; - std::shared_ptr player = std::make_shared(&testObj); + std::shared_ptr testObj = std::make_shared(); + std::shared_ptr player = std::make_shared(testObj); ASSERT_NE(nullptr, player); ASSERT_EQ(true, player->CreatePlayer()); - std::string uri = GetUri(); + std::string uri = TestParamsConfig::GetInstance().GetUri(); ASSERT_EQ(RET_OK, player->SetSource(uri)); sptr videoSurface = player->GetVideoSurface(g_sub_config); EXPECT_EQ(RET_OK, player->SetVideoSurface(videoSurface)); - std::shared_ptr testCallback = std::make_shared(&testObj); + std::shared_ptr testCallback = std::make_shared(testObj); EXPECT_EQ(RET_OK, player->SetPlayerCallback(testCallback)); ASSERT_EQ(RET_OK, player->PrepareAsync()); EXPECT_EQ(RET_OK, player->Play()); EXPECT_TRUE(player->IsPlaying()); EXPECT_EQ(RET_OK, player->Reset()); - EXPECT_EQ(RET_OK, testCallback->errorNum); + EXPECT_EQ(RET_OK, testCallback->errorNum_); } @@ -107,22 +107,22 @@ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Play_0100, Reliability | Me */ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Stop_0100, Reliability | MediumTest | Level2) { - PlayerSignal testObj; - std::shared_ptr player = std::make_shared(&testObj); + std::shared_ptr testObj = std::make_shared(); + std::shared_ptr player = std::make_shared(testObj); ASSERT_NE(nullptr, player); ASSERT_EQ(true, player->CreatePlayer()); - std::string uri = GetUri(); + std::string uri = TestParamsConfig::GetInstance().GetUri(); ASSERT_EQ(RET_OK, player->SetSource(uri)); sptr videoSurface = player->GetVideoSurface(g_sub_config); EXPECT_EQ(RET_OK, player->SetVideoSurface(videoSurface)); - std::shared_ptr testCallback = std::make_shared(&testObj); + std::shared_ptr testCallback = std::make_shared(testObj); EXPECT_EQ(RET_OK, player->SetPlayerCallback(testCallback)); ASSERT_EQ(RET_OK, player->Prepare()); EXPECT_EQ(RET_OK, player->Play()); EXPECT_TRUE(player->IsPlaying()); EXPECT_EQ(RET_OK, player->Stop()); EXPECT_EQ(RET_OK, player->Reset()); - EXPECT_EQ(RET_OK, testCallback->errorNum); + EXPECT_EQ(RET_OK, testCallback->errorNum_); } /** @@ -132,15 +132,15 @@ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Stop_0100, Reliability | Me */ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Pause_0100, Reliability | MediumTest | Level2) { - PlayerSignal testObj; - std::shared_ptr player = std::make_shared(&testObj); + std::shared_ptr testObj = std::make_shared(); + std::shared_ptr player = std::make_shared(testObj); ASSERT_NE(nullptr, player); ASSERT_EQ(true, player->CreatePlayer()); - std::string uri = GetUri(); + std::string uri = TestParamsConfig::GetInstance().GetUri(); ASSERT_EQ(RET_OK, player->SetSource(uri)); sptr videoSurface = player->GetVideoSurface(g_sub_config); EXPECT_EQ(RET_OK, player->SetVideoSurface(videoSurface)); - std::shared_ptr testCallback = std::make_shared(&testObj); + std::shared_ptr testCallback = std::make_shared(testObj); EXPECT_EQ(RET_OK, player->SetPlayerCallback(testCallback)); ASSERT_EQ(RET_OK, player->Prepare()); EXPECT_EQ(RET_OK, player->Play()); @@ -148,7 +148,7 @@ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Pause_0100, Reliability | M EXPECT_EQ(RET_OK, player->Pause()); EXPECT_FALSE(player->IsPlaying()); EXPECT_EQ(RET_OK, player->Reset()); - EXPECT_EQ(RET_OK, testCallback->errorNum); + EXPECT_EQ(RET_OK, testCallback->errorNum_); } /** @@ -158,16 +158,16 @@ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Pause_0100, Reliability | M */ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Reset_0100, Reliability | MediumTest | Level2) { - PlayerSignal testObj; - std::shared_ptr player = std::make_shared(&testObj); + std::shared_ptr testObj = std::make_shared(); + std::shared_ptr player = std::make_shared(testObj); ASSERT_NE(nullptr, player); ASSERT_EQ(true, player->CreatePlayer()); - std::string uri = GetUri(); + std::string uri = TestParamsConfig::GetInstance().GetUri(); int32_t time; ASSERT_EQ(RET_OK, player->SetSource(uri)); sptr videoSurface = player->GetVideoSurface(g_sub_config); EXPECT_EQ(RET_OK, player->SetVideoSurface(videoSurface)); - std::shared_ptr testCallback = std::make_shared(&testObj); + std::shared_ptr testCallback = std::make_shared(testObj); EXPECT_EQ(RET_OK, player->SetPlayerCallback(testCallback)); ASSERT_EQ(RET_OK, player->Prepare()); EXPECT_EQ(RET_OK, player->Play()); @@ -176,7 +176,7 @@ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Reset_0100, Reliability | M EXPECT_EQ(RET_OK, player->GetCurrentTime(time)); EXPECT_NEAR(SEEK_TIME_2_SEC, time, DELTA_TIME); EXPECT_EQ(RET_OK, player->Reset()); - EXPECT_EQ(RET_OK, testCallback->errorNum); + EXPECT_EQ(RET_OK, testCallback->errorNum_); } /** @@ -186,16 +186,16 @@ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Reset_0100, Reliability | M */ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Seek_0100, Reliability | MediumTest | Level2) { - PlayerSignal testObj; - std::shared_ptr player = std::make_shared(&testObj); + std::shared_ptr testObj = std::make_shared(); + std::shared_ptr player = std::make_shared(testObj); ASSERT_NE(nullptr, player); ASSERT_EQ(true, player->CreatePlayer()); - std::string uri = GetUri(); + std::string uri = TestParamsConfig::GetInstance().GetUri(); int32_t time; ASSERT_EQ(RET_OK, player->SetSource(uri)); sptr videoSurface = player->GetVideoSurface(g_sub_config); EXPECT_EQ(RET_OK, player->SetVideoSurface(videoSurface)); - std::shared_ptr testCallback = std::make_shared(&testObj); + std::shared_ptr testCallback = std::make_shared(testObj); EXPECT_EQ(RET_OK, player->SetPlayerCallback(testCallback)); ASSERT_EQ(RET_OK, player->Prepare()); EXPECT_EQ(RET_OK, player->Play()); @@ -204,7 +204,7 @@ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Seek_0100, Reliability | Me EXPECT_EQ(RET_OK, player->GetCurrentTime(time)); EXPECT_NEAR(SEEK_TIME_2_SEC, time, DELTA_TIME); EXPECT_EQ(RET_OK, player->Reset()); - EXPECT_EQ(RET_OK, testCallback->errorNum); + EXPECT_EQ(RET_OK, testCallback->errorNum_); } /** @@ -214,16 +214,16 @@ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Seek_0100, Reliability | Me */ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Seek_0200, Reliability | MediumTest | Level2) { - PlayerSignal testObj; - std::shared_ptr player = std::make_shared(&testObj); + std::shared_ptr testObj = std::make_shared(); + std::shared_ptr player = std::make_shared(testObj); ASSERT_NE(nullptr, player); ASSERT_EQ(true, player->CreatePlayer()); - std::string uri = GetUri(); + std::string uri = TestParamsConfig::GetInstance().GetUri(); int32_t time; ASSERT_EQ(RET_OK, player->SetSource(uri)); sptr videoSurface = player->GetVideoSurface(g_sub_config); EXPECT_EQ(RET_OK, player->SetVideoSurface(videoSurface)); - std::shared_ptr testCallback = std::make_shared(&testObj); + std::shared_ptr testCallback = std::make_shared(testObj); EXPECT_EQ(RET_OK, player->SetPlayerCallback(testCallback)); ASSERT_EQ(RET_OK, player->Prepare()); EXPECT_EQ(RET_OK, player->Play()); @@ -234,7 +234,7 @@ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Seek_0200, Reliability | Me EXPECT_EQ(RET_OK, player->GetCurrentTime(time)); EXPECT_NEAR(SEEK_TIME_2_SEC, time, DELTA_TIME); EXPECT_EQ(RET_OK, player->Reset()); - EXPECT_EQ(RET_OK, testCallback->errorNum); + EXPECT_EQ(RET_OK, testCallback->errorNum_); } /** @@ -244,16 +244,16 @@ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Seek_0200, Reliability | Me */ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Seek_0300, Reliability | MediumTest | Level2) { - PlayerSignal testObj; - std::shared_ptr player = std::make_shared(&testObj); + std::shared_ptr testObj = std::make_shared(); + std::shared_ptr player = std::make_shared(testObj); ASSERT_NE(nullptr, player); ASSERT_EQ(true, player->CreatePlayer()); - std::string uri = GetUri(); + std::string uri = TestParamsConfig::GetInstance().GetUri(); int32_t time; ASSERT_EQ(RET_OK, player->SetSource(uri)); sptr videoSurface = player->GetVideoSurface(g_sub_config); EXPECT_EQ(RET_OK, player->SetVideoSurface(videoSurface)); - std::shared_ptr testCallback = std::make_shared(&testObj); + std::shared_ptr testCallback = std::make_shared(testObj); EXPECT_EQ(RET_OK, player->SetPlayerCallback(testCallback)); ASSERT_EQ(RET_OK, player->Prepare()); EXPECT_EQ(RET_OK, player->Play()); @@ -275,7 +275,7 @@ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Seek_0300, Reliability | Me EXPECT_EQ(RET_OK, player->Stop()); EXPECT_FALSE(player->IsPlaying()); EXPECT_EQ(RET_OK, player->Reset()); - EXPECT_EQ(RET_OK, testCallback->errorNum); + EXPECT_EQ(RET_OK, testCallback->errorNum_); } /** @@ -285,16 +285,16 @@ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_Seek_0300, Reliability | Me */ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_SetVolume_0100, Reliability | MediumTest | Level2) { - PlayerSignal testObj; - std::shared_ptr player = std::make_shared(&testObj); + std::shared_ptr testObj = std::make_shared(); + std::shared_ptr player = std::make_shared(testObj); ASSERT_NE(nullptr, player); ASSERT_EQ(true, player->CreatePlayer()); - std::string uri = GetUri(); + std::string uri = TestParamsConfig::GetInstance().GetUri(); int32_t time; ASSERT_EQ(RET_OK, player->SetSource(uri)); sptr videoSurface = player->GetVideoSurface(g_sub_config); EXPECT_EQ(RET_OK, player->SetVideoSurface(videoSurface)); - std::shared_ptr testCallback = std::make_shared(&testObj); + std::shared_ptr testCallback = std::make_shared(testObj); EXPECT_EQ(RET_OK, player->SetPlayerCallback(testCallback)); ASSERT_EQ(RET_OK, player->Prepare()); EXPECT_EQ(RET_OK, player->Play()); @@ -308,7 +308,7 @@ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_SetVolume_0100, Reliability EXPECT_EQ(RET_OK, player->Stop()); EXPECT_FALSE(player->IsPlaying()); EXPECT_EQ(RET_OK, player->Reset()); - EXPECT_EQ(RET_OK, testCallback->errorNum); + EXPECT_EQ(RET_OK, testCallback->errorNum_); } /** @@ -318,16 +318,16 @@ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_SetVolume_0100, Reliability */ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_SetPlaybackSpeed_0100, Reliability | MediumTest | Level2) { - PlayerSignal testObj; - std::shared_ptr player = std::make_shared(&testObj); + std::shared_ptr testObj = std::make_shared(); + std::shared_ptr player = std::make_shared(testObj); ASSERT_NE(nullptr, player); ASSERT_EQ(true, player->CreatePlayer()); - std::string uri = GetUri(); + std::string uri = TestParamsConfig::GetInstance().GetUri(); ASSERT_EQ(RET_OK, player->SetSource(uri)); PlaybackRateMode mode; sptr videoSurface = player->GetVideoSurface(g_sub_config); EXPECT_EQ(RET_OK, player->SetVideoSurface(videoSurface)); - std::shared_ptr testCallback = std::make_shared(&testObj); + std::shared_ptr testCallback = std::make_shared(testObj); EXPECT_EQ(RET_OK, player->SetPlayerCallback(testCallback)); ASSERT_EQ(RET_OK, player->Prepare()); EXPECT_EQ(RET_OK, player->Play()); @@ -344,18 +344,18 @@ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_SetPlaybackSpeed_0100, Reli */ HWTEST_F(ActsPlayerAPITest, SUB_MEDIA_PLAYER_APITest_GetParameter_0100, Reliability | MediumTest | Level2) { - PlayerSignal testObj; - std::shared_ptr player = std::make_shared(&testObj); + std::shared_ptr testObj = std::make_shared(); + std::shared_ptr player = std::make_shared(testObj); ASSERT_NE(nullptr, player); ASSERT_EQ(true, player->CreatePlayer()); - std::string uri = GetUri(); + std::string uri = TestParamsConfig::GetInstance().GetUri(); int32_t time; int32_t duration; int32_t defaultDuration; ASSERT_EQ(RET_OK, player->SetSource(uri)); sptr videoSurface = player->GetVideoSurface(g_sub_config); EXPECT_EQ(RET_OK, player->SetVideoSurface(videoSurface)); - std::shared_ptr testCallback = std::make_shared(&testObj); + std::shared_ptr testCallback = std::make_shared(testObj); EXPECT_EQ(RET_OK, player->SetPlayerCallback(testCallback)); // prepare ASSERT_EQ(RET_OK, player->PrepareAsync()); -- GitLab