!1449 media JS 测试用例目录位置调整

Merge pull request !1449 from NOBUGGERS/update1228

multimedia/BUILD.gn

@@ -18,9 +18,8 @@ group("multimedia") {
   if (is_standard_system) {
     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/audioRecorder:audio_recorder_js_hap",
+      "media/media_js_standard/audioPlayer:audio_player_js_hap",
+      "media/media_js_standard/audioRecorder:audio_recorder_js_hap",
     ]
   } else {
     deps = [

multimedia/audio/audio_js_standard/audioPlayer_API/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_player_api_js_hap") {
-  hap_profile = "./src/main/config.json"
-  deps = [
-    ":audio_player_api_js_assets",
-    ":audio_player_api_resources",
-  ]
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAudioPlayerApiJsTest"
-}
-ohos_js_assets("audio_player_api_js_assets") {
-  source_dir = "./src/main/js/default"
-}
-ohos_resources("audio_player_api_resources") {
-  sources = [ "./src/main/resources" ]
-  hap_profile = "./src/main/config.json"
-}

multimedia/audio/audio_js_standard/audioPlayer_API/Test.json

-{
-    "description": "Configuration for audioPlayerApi Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "2000000",
-        "package": "ohos.acts.multimedia.audio.audioplayerapi",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "type": "PushKit",
-            "pre-push": [
-            ],
-            "push": [
-                "./resource/audio/01.mp3 ->/data/media/",
-                "./resource/audio/02.mp3 ->/data/media/",
-                "./resource/audio/03.mp3 ->/data/media/",
-                "./resource/audio/04.mp3 ->/data/media/",
-                "./resource/audio/47.mp4 ->/data/media/",
-                "./resource/audio/49.mp4 ->/data/media/",
-                "./resource/audio/50.mp4 ->/data/media/",
-                "./resource/audio/51.mp4 ->/data/media/",
-                "./resource/audio/54.mp4 ->/data/media/",
-                "./resource/audio/55.m4a ->/data/media/",
-                "./resource/audio/57.m4a ->/data/media/",
-                "./resource/audio/58.m4a ->/data/media/",
-                "./resource/audio/59.m4a ->/data/media/",
-                "./resource/audio/62.m4a ->/data/media/",
-                "./resource/audio/64.mp4 ->/data/media/",
-                "./resource/audio/65.mp4 ->/data/media/",
-                "./resource/audio/66.mp4 ->/data/media/",
-                "./resource/audio/67.mp4 ->/data/media/",
-                "./resource/audio/92.mp4 ->/data/media/",
-                "./resource/audio/93.mp4 ->/data/media/",
-                "./resource/audio/94.mp4 ->/data/media/",
-                "./resource/audio/96.mp4 ->/data/media/",
-                "./resource/audio/97.mp4 ->/data/media/",
-                "./resource/audio/98.mp4 ->/data/media/"
-            ]
-        },
-        {
-            "type": "ShellKit",
-            "run-command": [
-                "chmod -R 666 /data/media/*",
-                "setenforce 0"
-            ],
-            "teardown-command":[
-                "setenforce 1"
-            ]
-        },
-        {
-            "test-file-name": [
-                "ActsAudioPlayerApiJsTest.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
-}
\ No newline at end of file

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

-{
-    "app": {
-        "apiVersion": {
-            "compatible": 6,
-            "releaseType": "Beta1",
-            "target": 7
-        },
-        "vendor": "acts",
-        "bundleName": "ohos.acts.multimedia.audio.audioplayerapi",
-        "version": {
-            "code": 1000000,
-            "name": "1.0.0"
-        }
-    },
-    "deviceConfig": {
-        "default": {
-            "debug": true
-        }
-    },
-    "module": {
-        "abilities": [
-            {
-                "iconId": 16777218,
-                "skills": [
-                    {
-                        "entities": [
-                            "entity.system.home"
-                        ],
-                        "actions": [
-                            "action.system.home"
-                        ]
-                    }
-                ],
-                "descriptionId": 16777217,
-                "visible": true,
-                "labelId": 16777216,
-                "icon": "$media:icon",
-                "name": "ohos.acts.multimedia.audio.audioplayerapi.MainAbility",
-                "description": "$string:mainability_description",
-                "label": "$string:entry_MainAbility",
-                "type": "page",
-                "homeAbility": true,
-                "launchType": "standard"
-            }
-        ],
-        "deviceType": [
-            "phone",
-            "tablet",
-            "tv",
-            "wearable"
-        ],
-        "mainAbility": "ohos.acts.multimedia.audio.audioplayerapi.MainAbility",
-        "distro": {
-            "moduleType": "entry",
-            "installationFree": false,
-            "deliveryWithInstall": true,
-            "moduleName": "entry"
-        },
-        "package": "ohos.acts.multimedia.audio.audioplayerapi",
-        "name": ".MyApplication",
-        "js": [
-            {
-                "pages": [
-                    "pages/index/index"
-                ],
-                "name": "default",
-                "window": {
-                    "designWidth": 720,
-                    "autoDesignWidth": true
-                }
-            }
-        ]
-    }
-}
\ No newline at end of file

multimedia/audio/audio_js_standard/audioPlayer_API/src/main/java/ohos/acts/multimedia/audio/audioplayerapi/MainAbility.java

-/*
- * 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.
- */
- 
- package ohos.acts.multimedia.audio.audioplayerapi;
-
- import ohos.ace.ability.AceAbility;
- import ohos.aafwk.content.Intent;
-
-/*
- * java MainAbility
- */
-
- public class MainAbility extends AceAbility {
-    @Override
-    public void onStart(Intent intent) {
-        super.onStart(intent);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-    }
- }

multimedia/audio/audio_js_standard/audioPlayer_API/src/main/java/ohos/acts/multimedia/audio/audioplayerapi/MyApplication.java

-/*
- * 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.
- */
-
- package ohos.acts.multimedia.audio.audioplayerapi;
-
- import ohos.aafwk.ability.AbilityPackage;
-
-/*
- * java MyApplication
- */
-
- public class MyApplication extends AbilityPackage {
-    @Override
-    public void onInitialize() {
-        super.onInitialize();
-    }
- }

multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/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.
- */
-
-require('./PlayerLocalTestAudioAPI.test.js')
\ No newline at end of file

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.
- */
-
-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/zh-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;
-    width: 100%;
-    height: 100%;
-}
-
-.title {
-    font-size: 40px;
-    color: #000000;
-    opacity: 0.9;
-}
-
-@media screen and (device-type: tablet) and (orientation: landscape) {
-    .title {
-        font-size: 100px;
-    }
-}
-
-@media screen and (device-type: wearable) {
-    .title {
-        font-size: 28px;
-        color: #FFFFFF;
-    }
-}
-
-@media screen and (device-type: tv) {
-    .container {
-        background-image: url("/common/images/Wallpaper.png");
-        background-size: cover;
-        background-repeat: no-repeat;
-        background-position: center;
-    }
-
-    .title {
-        font-size: 100px;
-        color: #FFFFFF;
-    }
-}
-
-@media screen and (device-type: phone) and (orientation: landscape) {
-    .title {
-        font-size: 60px;
-    }
-}

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 {Core, ExpectExtend} from 'deccjsunit/index'
-
-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')
-        this.timeout = 60000
-        configService.setConfig(this)
-        require('../../../test/List.test')
-        core.execute()
-    },
-    onReady() {
-    },
-}
\ No newline at end of file

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

-{
-  "string": [
-    {
-      "name": "entry_MainAbility",
-      "value": "entry_MainAbility"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Empty Ability"
-    }
-  ]
-}
\ No newline at end of file

multimedia/audio/audio_js_standard/audioPlayer/src/main/js/test/List.test.js → multimedia/media/media_js_standard/audioPlayer/src/main/js/test/List.test.js

@@ -14,4 +14,5 @@
  */
 
 require('./PlayerLocalTestAudioFUNC.test.js')
-require('./PlayerLocalTestAudioFormat.test.js')
\ No newline at end of file
+require('./PlayerLocalTestAudioFormat.test.js')
+require('./PlayerLocalTestAudioAPI.test.js')
\ No newline at end of file