!712 提交录制测试代码

Merge pull request !712 from sharpshooter/hxl

multimedia/BUILD.gn

@@ -16,11 +16,12 @@ import("//test/xts/tools/build/suite.gni")
 group("multimedia") {
   testonly = true
   if (is_standard_system) {
-    deps = [ 
+    deps = [
+      "audio/audio_js_standard/audioManager:audio_manager_js_hap",
       "audio/audio_js_standard/audioPlayer:audio_player_js_hap",
       "audio/audio_js_standard/audioPlayer_API:audio_player_api_js_hap",
-      "audio/audio_js_standard/audioManager:audio_manager_js_hap",
-      "media/media_cpp_test_standard:ActsMediaCppStandardTest"
+      "audio/audio_js_standard/audioRecorder:audio_recorder_js_hap",
+      "media/media_cpp_test_standard:ActsMediaCppStandardTest",
     ]
   } else {
     deps = [

multimedia/audio/audio_js_standard/audioRecorder/BUILD.gn

+# Copyright (C) 2021 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//test/xts/tools/build/suite.gni")
+ohos_js_hap_suite("audio_recorder_js_hap") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":audio_recorder_js_assets",
+    ":audio_recorder_resources",
+  ]
+
+  #  shared_libraries = [
+  #    "//third_party/giflib:libgif",
+  #    "//third_party/libpng:libpng",
+  #  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "AudioRecorderJsTest"
+
+  #  part_name = "prebuilt_hap"
+  #  subsystem_name = "xts"
+}
+ohos_js_assets("audio_recorder_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("audio_recorder_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}

multimedia/audio/audio_js_standard/audioRecorder/Test.json

+{
+    "description": "Configuration for audio manager Tests",
+    "driver": {
+        "type": "JSUnitTest",
+        "test-timeout": "60000",
+        "package": "ohos.acts.multimedia.audio.function",
+        "shell-timeout": "60000"
+    },
+    "kits": [
+        {
+            "test-file-name": [
+                "AudioRecorderJsTest.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        }
+    ]
+}
\ No newline at end of file

multimedia/audio/audio_js_standard/audioRecorder/src/main/config.json

+{
+  "app": {
+    "bundleName": "ohos.acts.multimedia.audio.function",
+    "vendor": "acts",
+    "version": {
+      "code": 1000000,
+      "name": "1.0.0"
+    },
+    "apiVersion": {
+      "compatible": 4,
+      "target": 5
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "ohos.acts.multimedia.audio.function",
+    "name": ".MyApplication",
+    "deviceType": [
+      "phone"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry",
+      "moduleType": "entry"
+    },
+    "abilities": [
+      {
+        "visible": true,
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "name": "ohos.acts.multimedia.audio.function.MainAbility",
+        "icon": "$media:icon",
+        "description": "$string:mainability_description",
+        "label": "$string:app_name",
+        "type": "page",
+        "launchType": "standard"
+      }
+    ],
+    "js": [
+      {
+        "pages": [
+          "pages/index/index"
+        ],
+        "name": "default",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      }
+    ]
+  }
+}

multimedia/media/media_cpp_test_standard/player/include/common.h → multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/app.js

-/*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef DISABLE_COMMON_TEST_H
-#define DISABLE_COMMON_TEST_H
-#endif
\ No newline at end of file
+/*
+ * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import device from '@system.device';
+
+export default {
+    onCreate() {
+        console.info('AceApplication onCreate');
+    },
+    onDestroy() {
+        console.info('AceApplication onDestroy');
+    }
+};

multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/i18n/en-US.json

+{
+  "strings": {
+    "hello": "Hello",
+    "world": "World"
+  }
+}
\ No newline at end of file

multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/i18n/zn-CN.json

+{
+  "strings": {
+    "hello": "您好",
+    "world": "世界"
+  }
+}
\ No newline at end of file

multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/pages/index/index.css

+.container {
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+}
+
+.title {
+    font-size: 100px;
+}

multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/pages/index/index.hml

+<div class="container">
+    <text class="title">
+        {{ $t('strings.hello') }} {{ title }}
+    </text>
+</div>

multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/pages/index/index.js

+/*
+ * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import app from '@system.app'
+import {Core, ExpectExtend} from 'deccjsunit/index'
+
+const injectRef = Object.getPrototypeOf(global) || global
+injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
+
+export default {
+    data: {
+        title: ""
+    },
+    onInit() {
+        this.title = this.$t('strings.world');
+    },
+    onShow() {
+        console.info('onShow finish')
+        const core = Core.getInstance()
+        const expectExtend = new ExpectExtend({
+            'id': 'extend'
+        })
+        core.addService('expect', expectExtend)
+        core.init()
+        const configService = core.getDefaultService('config')
+        configService.setConfig(this)
+
+        require('../../test/List.test')
+        core.execute()
+    },
+    onReady() {
+    },
+}
\ No newline at end of file

multimedia/media/media_cpp_test_standard/player/include/Testplayer.h → multimedia/audio/audio_js_standard/audioRecorder/src/main/js/default/test/List.test.js

-/*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef DISABLE_PLAYER_TEST_H
-#define DISABLE_PLAYER_TEST_H
-#endif
\ No newline at end of file
+/*
+ * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require('./RecorderLocalTestAudioFUNC.test.js')
+require('./RecorderLocalTestAudioAPI.test.js')
\ No newline at end of file

multimedia/audio/audio_js_standard/audioRecorder/src/main/resources/base/element/string.json

+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "MyApplication"
+    },
+    {
+      "name": "mainability_description",
+      "value": "JS_Phone_Empty Feature Ability"
+    }
+  ]
+}
\ No newline at end of file

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

-/*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef PLAYER_TEST_H
-#define PLAYER_TEST_H
-
-#include "securec.h"
-#include "TestParamsConfig.h"
-#include "window_manager.h"
-#include "surface_type.h"
-#include "display_type.h"
-
-namespace OHOS {
-namespace Media {
-static const std::string SURFACE_STRIDE_ALIGNMENT = "SURFACE_STRIDE_ALIGNMENT";
-static const std::string SURFACE_FORMAT = "SURFACE_FORMAT";
-static WindowConfig g_config = {
-    1920,
-    1080,
-    PIXEL_FMT_RGBA_8888,
-    0,
-    0,
-    WINDOW_TYPE_NORMAL
-};
-static WindowConfig g_sub_config = {
-    720,
-    480,
-    PIXEL_FMT_YCRCB_420_SP,
-    0,
-    0,
-    WINDOW_TYPE_VIDEO,
-};
-
-class PlayerSignal {
-public:
-    PlayerStates state_ = PLAYER_IDLE;
-    int32_t seekPositon_;
-    bool seekDoneFlag_;
-    bool mutexFlag_ = true;
-    std::mutex mutexSeek_;
-    std::mutex mutexReset_;
-    std::mutex mutexPrepare_;
-    std::mutex mutexPlay_;
-    std::mutex mutexPause_;
-    std::mutex mutexStop_;
-    std::condition_variable condVarSeek_;
-    std::condition_variable condVarReset_;
-    std::condition_variable condVarPrepare_;
-    std::condition_variable condVarPlay_;
-    std::condition_variable condVarPause_;
-    std::condition_variable condVarStop_;
-
-    void SetState(PlayerStates state);
-    void SetSeekResult(bool seekDoneFlag);
-};
-class TestPlayer {
-public:
-    std::shared_ptr<Player> player_ = nullptr;
-    sptr<Window> window_ = nullptr;
-    explicit TestPlayer(std::shared_ptr<PlayerSignal> test);
-    virtual ~TestPlayer();
-    bool CreatePlayer();
-    int32_t SetSource(const std::string &uri);
-    int32_t SetDataSrc(const std::string &uri, bool seekable);
-    int32_t Play();
-    int32_t Prepare();
-    int32_t PrepareAsync();
-    int32_t Pause();
-    int32_t Stop();
-    int32_t Reset();
-    int32_t Release();
-    int32_t SetVolume(float leftVolume, float rightVolume);
-    int32_t Seek(int32_t mseconds, PlayerSeekMode mode);
-    int32_t GetCurrentTime(int32_t &currentTime);
-    int32_t GetDuration(int32_t &duration);
-    int32_t SetPlaybackSpeed(PlaybackRateMode mode);
-    int32_t GetPlaybackSpeed(PlaybackRateMode &mode);
-    sptr<Surface> GetVideoSurface(WindowConfig g_sub_config);
-    int32_t SetVideoSurface(sptr<Surface> surface);
-    bool IsPlaying();
-    bool IsLooping();
-    int32_t SetLooping(bool loop);
-    int32_t SetPlayerCallback(const std::shared_ptr<PlayerCallback> &callback);
-private:
-    std::shared_ptr<PlayerSignal> test_;
-};
-class TestPlayerCallback : public PlayerCallback {
-public:
-    int errorNum_ = 0;
-    PlayerStates state_ = PLAYER_STATE_ERROR;
-    explicit TestPlayerCallback(std::shared_ptr<PlayerSignal> test);
-    virtual ~TestPlayerCallback();
-    void OnError(PlayerErrorType errorType, int32_t errorCode);
-    int WaitForSeekDone(int32_t currentPositon);
-    void OnInfo(PlayerOnInfoType type, int32_t extra, const Format &infoBody = {});
-    int WaitForState(PlayerStates state);
-private:
-    void PrintState(PlayerStates state);
-
-    PlayerErrorType errorType_ = PLAYER_ERROR_UNKNOWN;
-    int32_t errorCode_ = -1;
-    bool seekDoneFlag_ = false;
-    int32_t postion_ = 0;
-    std::shared_ptr<PlayerSignal> test_;
-};
-}
-}
+/*
+ * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef PLAYER_TEST_H
+#define PLAYER_TEST_H
+
+#include "securec.h"
+#include "TestParamsConfig.h"
+#include "window_manager.h"
+#include "surface_type.h"
+#include "display_type.h"
+
+namespace OHOS {
+namespace Media {
+static const std::string SURFACE_STRIDE_ALIGNMENT = "SURFACE_STRIDE_ALIGNMENT";
+static const std::string SURFACE_FORMAT = "SURFACE_FORMAT";
+static WindowConfig g_config = {
+    1920,
+    1080,
+    PIXEL_FMT_RGBA_8888,
+    0,
+    0,
+    WINDOW_TYPE_NORMAL
+};
+static WindowConfig g_sub_config = {
+    720,
+    480,
+    PIXEL_FMT_YCRCB_420_SP,
+    0,
+    0,
+    WINDOW_TYPE_VIDEO,
+};
+
+class PlayerSignal {
+public:
+    PlayerStates state_ = PLAYER_IDLE;
+    int32_t seekPositon_;
+    bool seekDoneFlag_;
+    bool mutexFlag_ = true;
+    std::mutex mutexSeek_;
+    std::mutex mutexReset_;
+    std::mutex mutexPrepare_;
+    std::mutex mutexPlay_;
+    std::mutex mutexPause_;
+    std::mutex mutexStop_;
+    std::condition_variable condVarSeek_;
+    std::condition_variable condVarReset_;
+    std::condition_variable condVarPrepare_;
+    std::condition_variable condVarPlay_;
+    std::condition_variable condVarPause_;
+    std::condition_variable condVarStop_;
+
+    void SetState(PlayerStates state);
+    void SetSeekResult(bool seekDoneFlag);
+};
+class TestPlayer {
+public:
+    std::shared_ptr<Player> player_ = nullptr;
+    sptr<Window> window_ = nullptr;
+    explicit TestPlayer(std::shared_ptr<PlayerSignal> test);
+    virtual ~TestPlayer();
+    bool CreatePlayer();
+    int32_t SetSource(const std::string &uri);
+    int32_t SetDataSrc(const std::string &uri, bool seekable);
+    int32_t Play();
+    int32_t Prepare();
+    int32_t PrepareAsync();
+    int32_t Pause();
+    int32_t Stop();
+    int32_t Reset();
+    int32_t Release();
+    int32_t SetVolume(float leftVolume, float rightVolume);
+    int32_t Seek(int32_t mseconds, PlayerSeekMode mode);
+    int32_t GetCurrentTime(int32_t &currentTime);
+    int32_t GetDuration(int32_t &duration);
+    int32_t SetPlaybackSpeed(PlaybackRateMode mode);
+    int32_t GetPlaybackSpeed(PlaybackRateMode &mode);
+    sptr<Surface> GetVideoSurface(WindowConfig g_sub_config);
+    int32_t SetVideoSurface(sptr<Surface> surface);
+    bool IsPlaying();
+    bool IsLooping();
+    int32_t SetLooping(bool loop);
+    int32_t SetPlayerCallback(const std::shared_ptr<PlayerCallback> &callback);
+private:
+    std::shared_ptr<PlayerSignal> test_;
+};
+class TestPlayerCallback : public PlayerCallback {
+public:
+    int errorNum_ = 0;
+    PlayerStates state_ = PLAYER_STATE_ERROR;
+    explicit TestPlayerCallback(std::shared_ptr<PlayerSignal> test);
+    virtual ~TestPlayerCallback();
+    void OnError(PlayerErrorType errorType, int32_t errorCode);
+    int WaitForSeekDone(int32_t currentPositon);
+    void OnInfo(PlayerOnInfoType type, int32_t extra, const Format &infoBody = {});
+    int WaitForState(PlayerStates state);
+private:
+    void PrintState(PlayerStates state);
+
+    PlayerErrorType errorType_ = PLAYER_ERROR_UNKNOWN;
+    int32_t errorCode_ = -1;
+    bool seekDoneFlag_ = false;
+    int32_t postion_ = 0;
+    std::shared_ptr<PlayerSignal> test_;
+};
+}
+}
 #endif
\ No newline at end of file