media test 同步刷新 Signed-off-by: NOBUGGERS <ruanmeng@huawei.com>

multimedia/media/media_cpp_test_standard/include/mediatest_log.h

-
 /*
  * Copyright (C) 2021 Huawei Device Co., Ltd.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,14 +13,17 @@
  * limitations under the License.
  */
 
+#ifndef MEDIA_LOG_TEST_H
+#define MEDIA_LOG_TEST_H
+
 #include "media_log.h"
 #include "securec.h"
 
-#define LOGMAXSIZE 200
+#define LOG_MAX_SIZE 200
 #define MEDIA_INFO_LOG(fmt, ...) \
 do { \
-    char ch[LOGMAXSIZE]; \
-    (void)sprintf_s(ch, LOGMAXSIZE, fmt, ##__VA_ARGS__); \
+    char ch[LOG_MAX_SIZE]; \
+    (void)sprintf_s(ch, LOG_MAX_SIZE, fmt, ##__VA_ARGS__); \
     (void)printf("%s", ch); \
     (void)printf("\n"); \
     __MEDIA_LOG(::OHOS::HiviewDFX::HiLog::Info, "%{public}s", ch); \
@@ -29,15 +31,15 @@ do { \
 
 #define MEDIA_DEBUG_LOG(fmt, ...) \
 do { \
-    char ch[LOGMAXSIZE]; \
-    (void)sprintf_s(ch, LOGMAXSIZE, fmt, ##__VA_ARGS__); \
+    char ch[LOG_MAX_SIZE]; \
+    (void)sprintf_s(ch, LOG_MAX_SIZE, fmt, ##__VA_ARGS__); \
     __MEDIA_LOG(::OHOS::HiviewDFX::HiLog::Debug, "%{public}s", ch); \
 } while (0)
 
 #define MEDIA_ERROR_LOG(fmt, ...) \
 do { \
-    char ch[LOGMAXSIZE]; \
-    (void)sprintf_s(ch, LOGMAXSIZE, fmt, ##__VA_ARGS__); \
+    char ch[LOG_MAX_SIZE]; \
+    (void)sprintf_s(ch, LOG_MAX_SIZE, fmt, ##__VA_ARGS__); \
     (void)printf("%s", ch); \
     (void)printf("\n"); \
     __MEDIA_LOG(::OHOS::HiviewDFX::HiLog::Error, "%{public}s", ch); \
@@ -55,4 +57,5 @@ namespace MediaTest {
     const int THIRD_ARG = 3;
     const int HEIGHT = 720;
     const int WIDTH = 1280;
-}
\ No newline at end of file
+}
+#endif

multimedia/media/media_cpp_test_standard/player/include/ActsPlayerAPITest.h

@@ -25,6 +25,7 @@ public:
     static void SetUpTestCase(void)
     {
         MEDIA_DEBUG_LOG("ActsPlayerAPITest::SetUpTestCase");
+        TestPlayerBasic::TestParamsConfig::GetInstance().InitMountPath();
     };
     // TearDownTestCase: after all testcases
     static void TearDownTestCase(void)

multimedia/media/media_cpp_test_standard/player/include/ActsPlayerFuncTest.h

@@ -25,7 +25,7 @@ public:
     static void SetUpTestCase(void)
     {
         MEDIA_DEBUG_LOG("ActsPlayerFuncTest::SetUpTestCase");
-        TestPlayerBasic::TestParamsConfig::GetInstance().InitPlayProtocol();
+        TestPlayerBasic::TestParamsConfig::GetInstance().InitMountPath();
     };
     // TearDownTestCase: after all testcases
     static void TearDownTestCase(void)
@@ -35,6 +35,7 @@ public:
     // SetUp
     void SetUp(void)
     {
+        uri_ = TestPlayerBasic::TestParamsConfig::GetInstance().GetUri();
         const ::testing::TestInfo * const testInfo = ::testing::UnitTest::GetInstance()->current_test_info();
         MEDIA_DEBUG_LOG("ActsPlayerFuncTest::SetUp:%s", testInfo->name());
     };
@@ -45,6 +46,11 @@ public:
         MEDIA_DEBUG_LOG("ActsPlayerFuncTest::TearDown:%s", testInfo->name());
     };
     static void LocalPlayFunc(const std::string uri, bool isAsync, WindowConfig config = g_sub_config);
+    static void *LocalMultiPlayFunc(void *threadArg);
+    void PreparePlayEnv(std::shared_ptr<TestPlayer> &player);
+    std::string uri_ = "";
+    std::shared_ptr<TestPlayerCallback> testCallback_;
+    std::shared_ptr<PlayerSignal> testObj_;
 };
 }
 }

multimedia/media/media_cpp_test_standard/player/include/TestParamsConfig.h

@@ -16,8 +16,8 @@
 #ifndef PLAYER_COMMON_TEST_H
 #define PLAYER_COMMON_TEST_H
 
-#include "gtest/gtest.h"
 #include "mediatest_log.h"
+#include "gtest/gtest.h"
 #include "player.h"
 
 namespace {
@@ -37,6 +37,7 @@ namespace {
 namespace TestPlayerBasic {
 class TestParamsConfig {
 public:
+    DISALLOW_COPY_AND_MOVE(TestParamsConfig);
     static TestParamsConfig &GetInstance()
     {
         static TestParamsConfig config;
@@ -54,7 +55,7 @@ public:
     }
     bool CompareTime(int32_t expectTime, int32_t realTme, OHOS::Media::PlayerSeekMode seekMode);
     std::string GetUri();
-    void InitPlayProtocol();
+    void InitMountPath();
 
 private:
     TestParamsConfig();

multimedia/media/media_cpp_test_standard/player/include/TestPlayer.h

@@ -46,7 +46,6 @@ static WindowConfig g_sub_config = {
 class PlayerSignal {
 public:
     PlayerStates state_ = PLAYER_IDLE;
-    int32_t seekPositon_;
     bool seekDoneFlag_;
     bool mutexFlag_ = true;
     std::mutex mutexSeek_;
@@ -71,6 +70,7 @@ public:
     sptr<Window> window_ = nullptr;
     explicit TestPlayer(std::shared_ptr<PlayerSignal> test);
     virtual ~TestPlayer();
+    DISALLOW_COPY_AND_MOVE(TestPlayer);
     bool CreatePlayer();
     int32_t SetSource(const std::string &uri);
     int32_t SetDataSrc(const std::string &uri, bool seekable);
@@ -102,8 +102,9 @@ public:
     PlayerStates state_ = PLAYER_STATE_ERROR;
     explicit TestPlayerCallback(std::shared_ptr<PlayerSignal> test);
     virtual ~TestPlayerCallback();
+    DISALLOW_COPY_AND_MOVE(TestPlayerCallback);
     void OnError(PlayerErrorType errorType, int32_t errorCode);
-    int WaitForSeekDone(int32_t currentPositon);
+    int WaitForSeekDone(int32_t currentPosition);
     void OnInfo(PlayerOnInfoType type, int32_t extra, const Format &infoBody = {});
     int WaitForState(PlayerStates state);
 private: