modified FA-JS

Signed-off-by: Njiyong_sd <jiyong@huawei.com>
Change-Id: I526bfe2fe40ebd23472c1c7a6127a7e3bde87150

arkui/ace_standard_video/BUILD.gn

@@ -23,7 +23,9 @@ ohos_js_hap_suite("ActsAceStandardVideoTest") {
   hap_name = "ActsAceStandardVideoTest"
 }
 ohos_js_assets("ace_js_assets") {
-  source_dir = "./src/main/js/default"
+  js2abc = true
+  hap_profile = "./src/main/config.json"
+  source_dir = "./src/main/js"
 }
 ohos_resources("ace_resources") {
   sources = [ "./src/main/resources" ]

arkui/ace_standard_video/Test.json

-{
-    "description": "Configuration for acevideo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "1000000",
-        "package": "com.example.acevideo",
-        "shell-timeout": "30000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsAceStandardVideoTest.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        }
-    ]
-}
+{
+    "description": "Configuration for acevideo Tests",
+    "driver": {
+        "type": "OHJSUnitTest",
+        "test-timeout": "1000000",
+        "shell-timeout": "1000000",
+        "bundle-name": "com.example.acevideo",
+        "package-name": "com.example.acevideo"
+    },
+    "kits": [
+        {
+            "test-file-name": [
+                "ActsAceStandardVideoTest.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        }
+    ]
+}
\ No newline at end of file

arkui/ace_standard_video/src/main/config.json

-{
-  "app": {
-    "bundleName": "com.example.acevideo",
-    "vendor": "example",
-    "version": {
-      "code": 1000000,
-      "name": "1.0.0"
-    },
-    "apiVersion": {
-      "compatible": 4,
-      "target": 8
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.example.acevideo",
-    "name": ".MyApplication",
-    "mainAbility": "com.example.acevideo.MainAbility",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": false
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "name": "com.example.acevideo.MainAbility",
-        "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:entry_MainAbility",
-        "type": "page",
-        "launchType": "standard",
-        "visible": true,
-        "configChanges": ["orientation"]
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index",
-          "pages/routerPush/index",
-          "pages/routerReplace/index",
-          "pages/video/router/index"
-        ],
-        "name": "default",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": true
-        }
-      }
-    ]
-  }
+{
+    "app": {
+        "bundleName": "com.example.acevideo",
+        "vendor": "example",
+        "version": {
+            "code": 1000000,
+            "name": "1.0.0"
+        },
+        "apiVersion": {
+            "compatible": 4,
+            "target": 8
+        }
+    },
+    "deviceConfig": {},
+    "module": {
+        "package": "com.example.acevideo",
+        "name": ".entry",
+        "mainAbility": ".MainAbility",
+        "deviceType": [
+            "phone"
+        ],
+        "distro": {
+            "deliveryWithInstall": true,
+            "moduleName": "entry",
+            "moduleType": "entry",
+            "installationFree": false
+        },
+        "abilities": [
+            {
+                "skills": [
+                    {
+                        "entities": [
+                            "entity.system.home"
+                        ],
+                        "actions": [
+                            "action.system.home"
+                        ]
+                    }
+                ],
+                "orientation": "unspecified",
+                "formsEnabled": false,
+                "name": ".MainAbility",
+                "srcLanguage": "js",
+                "srcPath": "MainAbility",
+                "icon": "$media:icon",
+                "description": "$string:MainAbility_desc",
+                "label": "$string:MainAbility_label",
+                "type": "page",
+                "visible": true,
+                "launchType": "standard"
+            },
+            {
+                "orientation": "unspecified",
+                "formsEnabled": false,
+                "name": ".TestAbility",
+                "srcLanguage": "js",
+                "srcPath": "TestAbility",
+                "icon": "$media:icon",
+                "description": "$string:TestAbility_desc",
+                "label": "$string:TestAbility_label",
+                "type": "page",
+                "visible": true,
+                "launchType": "standard"
+            }
+        ],
+        "js": [
+            {
+                "pages": [
+                    "pages/index/index",
+                    "pages/routerPush/index",
+                    "pages/routerReplace/index",
+                    "pages/video/router/index"
+                ],
+                "name": "default",
+                "window": {
+                    "designWidth": 720,
+                    "autoDesignWidth": true
+                }
+            },
+            {
+                "pages": [
+                    "pages/index/index"
+                ],
+                "name": ".TestAbility",
+                "window": {
+                    "designWidth": 720,
+                    "autoDesignWidth": false
+                }
+            }
+        ],
+        "testRunner": {
+            "name": "OpenHarmonyTestRunner",
+            "srcPath": "TestRunner"
+        },
+        "srcPath": ""
+    }
 }
\ No newline at end of file

arkui/ace_standard_video/src/main/js/MainAbility/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.
+ */
+
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from '@ohos/hypium'
+import testsuite from '../test/List.test'
+
+export default {
+    onCreate() {
+        console.info('TestApplication onCreate')
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        console.info('start run testcase!!!')
+        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+    },
+    onDestroy() {
+        console.info("TestApplication onDestroy");
+    }
+};
+

arkui/ace_standard_video/src/main/js/default/pages/index/index.js → arkui/ace_standard_video/src/main/js/MainAbility/pages/index/index.js

-/**
- * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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'
-
-const injectRef = Object.getPrototypeOf(global) || global
-injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
-
-export default {
-    data: {
-        title: ""
-    },
-    onInit() {
-        console.info('[test page log] index onInit')
-        this.title = this.$t('strings.world');
-        const core = Core.getInstance()
-        const expectExtend = new ExpectExtend({
-            'id': 'extend'
-        })
-        core.addService('expect', expectExtend)
-        core.init()
-        require('../../test/List.test')
-        core.execute()
-    },
-    onShow() {
-        console.info('[test page log] index onShow')
-    },
-    onHide() {
-        console.info('[test page log] index onHide')
-    },
-}
+/**
+ * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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.
+ */
+
+
+const injectRef = Object.getPrototypeOf(global) || global
+injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
+
+export default {
+    data: {
+        title: ""
+    },
+    onInit() {
+        console.info('[test page log] index onInit')
+        this.title = this.$t('strings.world');
+    },
+    onShow() {
+        console.info('[test page log] index onShow')
+    },
+    onHide() {
+        console.info('[test page log] index onHide')
+    },
+}

arkui/ace_standard_video/src/main/js/default/pages/routerPush/index.js → arkui/ace_standard_video/src/main/js/MainAbility/pages/routerPush/index.js

-/**
- * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 {
-    data: {
-        title: "router push test"
-    },
-    onShow() {
-        console.info('[test page log] routerPush onShow');
-    },
-    onHide() {
-        console.info('[test page log] routerPush ohHide');
-    },
-}
+/**
+ * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 {
+    data: {
+        title: "router push test"
+    },
+    onShow() {
+        console.info('[test page log] routerPush onShow');
+    },
+    onHide() {
+        console.info('[test page log] routerPush ohHide');
+    },
+}

arkui/ace_standard_video/src/main/js/default/pages/routerReplace/index.js → arkui/ace_standard_video/src/main/js/MainAbility/pages/routerReplace/index.js

-/**
- * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 {
-    data: {
-        title: "router replace test"
-    },
-    onShow() {
-        console.info('[test page log] routerReplace onShow');
-    },
-    onHide() {
-        console.info('[test page log] routerReplace ohHide');
-    },
-}
+/**
+ * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 {
+    data: {
+        title: "router replace test"
+    },
+    onShow() {
+        console.info('[test page log] routerReplace onShow');
+    },
+    onHide() {
+        console.info('[test page log] routerReplace ohHide');
+    },
+}

arkui/ace_standard_video/src/main/js/default/pages/video/router/index.js → arkui/ace_standard_video/src/main/js/MainAbility/pages/video/router/index.js

-/**
- * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 {
-    data: {
-        event:'',
-        seekingtime:'',
-        timeupdatetime:'',
-        seekedtime:'',
-        isStart: true,
-        isfullscreenchange: false,
-        duration: '',
-    },
-    preparedCallback:function(e){this.event = '视频连接成功'; this.duration = e.duration;},
-    startCallback:function(){this.event = '视频开始播放';},
-    pauseCallback:function(){this.event = '视频暂停播放';},
-    finishCallback:function(){this.event = '视频播放结束';},
-    errorCallback:function(){this.event = '视频播放错误';},
-    seekingCallback:function(e){this.seekingtime = e.currenttime;},
-    timeupdateCallback:function(e){this.timeupdatetime = e.currenttime;},
-    changeStartPause: function() {
-        if(this.isStart) {
-            this.$element('videoId').pause();
-            this.isStart = false;
-        } else {
-            this.$element('videoId').start();
-            this.isStart = true;
-        }
-    },
-    changeFullScreenChange: function() {//全屏
-        if(!this.isfullscreenchange) {
-            this.$element('videoId').requestFullscreen({ screenOrientation : 'default' });
-            this.isfullscreenchange = true;
-        } else {
-            this.$element('videoId').exitFullscreen();
-            this.isfullscreenchange = false;
-        }
-    }
-}
+/**
+ * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development 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 {
+    data: {
+        event:'',
+        seekingtime:'',
+        timeupdatetime:'',
+        seekedtime:'',
+        isStart: true,
+        isfullscreenchange: false,
+        duration: '',
+    },
+    preparedCallback:function(e){this.event = '视频连接成功'; this.duration = e.duration;},
+    startCallback:function(){this.event = '视频开始播放';},
+    pauseCallback:function(){this.event = '视频暂停播放';},
+    finishCallback:function(){this.event = '视频播放结束';},
+    errorCallback:function(){this.event = '视频播放错误';},
+    seekingCallback:function(e){this.seekingtime = e.currenttime;},
+    timeupdateCallback:function(e){this.timeupdatetime = e.currenttime;},
+    changeStartPause: function() {
+        if(this.isStart) {
+            this.$element('videoId').pause();
+            this.isStart = false;
+        } else {
+            this.$element('videoId').start();
+            this.isStart = true;
+        }
+    },
+    changeFullScreenChange: function() {//全屏
+        if(!this.isfullscreenchange) {
+            this.$element('videoId').requestFullscreen({ screenOrientation : 'default' });
+            this.isfullscreenchange = true;
+        } else {
+            this.$element('videoId').exitFullscreen();
+            this.isfullscreenchange = false;
+        }
+    }
+}

arkui/ace_standard_video/src/main/js/default/app.js → arkui/ace_standard_video/src/main/js/TestAbility/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');
-    }
-};
+/*
+ * Copyright (c) 2022 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');
+    }
+};

arkui/ace_standard_video/src/main/js/TestAbility/i18n/en-US.json

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

arkui/ace_standard_video/src/main/js/TestAbility/i18n/zh-CN.json

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

arkui/ace_standard_video/src/main/js/TestAbility/pages/index/index.css

+.container {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    left: 0px;
+    top: 0px;
+    width: 100%;
+    height: 100%;
+}
+
+.title {
+    font-size: 60px;
+    text-align: center;
+    width: 100%;
+    height: 40%;
+    margin: 10px;
+}
+
+@media screen and (device-type: phone) and (orientation: landscape) {
+    .title {
+        font-size: 60px;
+    }
+}
+
+@media screen and (device-type: tablet) and (orientation: landscape) {
+    .title {
+        font-size: 100px;
+    }
+}
\ No newline at end of file

arkui/ace_standard_video/src/main/js/TestAbility/pages/index/index.hml

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

arkui/ace_standard_video/src/main/js/default/test/List.test.js → arkui/ace_standard_video/src/main/js/TestAbility/pages/index/index.js

-/*
- * Copyright (C) 2022 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('./basicabilityapi.test.js')
-require('./mediaquery.test.js')
-require('./commonComponentJsApi.test.js')
+/*
+ * Copyright (c) 2022 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 {
+    data: {
+        title: ""
+    },
+    onInit() {
+        this.title = this.$t('strings.world');
+    }
+}
+
+
+

arkui/ace_standard_video/src/main/js/TestRunner/OpenHarmonyTestRunner.js

+/*
+ * Copyright (c) 2022 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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+
+function translateParamsToString(parameters) {
+    const keySet = new Set([
+        '-s class', '-s notClass', '-s suite', '-s itName',
+        '-s level', '-s testType', '-s size', '-s timeout',
+        '-s package', '-s dryRun'
+    ])
+    let targetParams = '';
+    for (const key in parameters) {
+        if (keySet.has(key)) {
+            targetParams += ' ' + key + ' ' + parameters[key]
+        }
+    }
+    return targetParams.trim()
+}
+
+ export default {
+    onPrepare() {
+        console.info('OpenHarmonyTestRunner OnPrepare')
+    },
+    onRun() {
+        console.log('OpenHarmonyTestRunner onRun run')
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+
+        var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.MainAbility'
+
+        var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters)
+        var debug = abilityDelegatorArguments.parameters["-D"]
+        console.info('debug value : '+debug)
+        if (debug == 'true')
+        {
+            cmd += ' -D'
+        }
+        console.info('cmd : '+cmd)
+        abilityDelegator.executeShellCommand(cmd, (err, data) => {
+            console.info('executeShellCommand : err : ' + JSON.stringify(err));
+            console.info('executeShellCommand : data : ' + data.stdResult);
+            console.info('executeShellCommand : data : ' + data.exitCode);
+        })
+    }
+};

arkui/ace_standard_video/src/main/js/test/List.test.js

+/*
+ * Copyright (C) 2022 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 basicabilityapi from './basicabilityapi.test.js'
+import mediaquery_vioTest from './mediaquery.test.js'
+import aceJsTest from './commonComponentJsApi.test.js'
+export default function testsuite() {
+basicabilityapi()
+mediaquery_vioTest()
+aceJsTest()
+}

arkui/ace_standard_video/src/main/js/default/test/commonComponentJsApi.test.js → arkui/ace_standard_video/src/main/js/test/commonComponentJsApi.test.js

-/*
- * Copyright (C) 2022 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 router from '@system.router';
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index';
-
-
-describe('aceJsTest', function () {
-
-    async function sleep(time) {
-        return new Promise((resolve, reject) => {
-            setTimeout(() => {
-                resolve()
-            }, time)
-        }).then(() => {
-            console.info(`sleep ${time} over...`)
-        })
-    }
-    async function backToIndex() {
-        let backToIndexPromise = new Promise((resolve, reject) => {
-            setTimeout(() => {
-                router.back({
-                    uri: 'pages/index/index'
-                });
-                resolve();
-            }, 500);
-        });
-        let clearPromise = new Promise((resolve, reject) => {
-            setTimeout(() => {
-                router.clear();
-                resolve();
-            }, 500);
-        });
-        await backToIndexPromise.then(() => {
-            return clearPromise;
-        });
-    }
-
-    /**
-    * run after testcase
-    */
-    afterEach(async function () {
-        console.info('[aceJsTest] after each called')
-        await backToIndex();
-        await sleep(5000)
-    });
-
-    /**
-     * @tc.number    SUB_ACE_BASIC_COMPONENT_JS_API_0100
-     * @tc.name      testVideoComponent
-     * @tc.desc      ACE
-     */
-    it('testVideoComponent', 0, async function (done) {
-        let result;
-        let options = {
-            uri: 'pages/video/router/index'
-        }
-        try {
-            result = router.push(options)
-            console.info("push video page success " + JSON.stringify(result));
-        } catch (err) {
-            console.error("push video page error " + JSON.stringify(result));
-        }
-        await sleep(5000)
-        let pages = router.getState();
-        console.info("[router.video] getState" + JSON.stringify(pages));
-        expect("pages/video/router/").assertEqual(pages.path);
-        done();
-    });
-});
+/*
+ * Copyright (C) 2022 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 router from '@system.router';
+import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium';
+
+
+export default function aceJsTest() {
+describe('aceJsTest', function () {
+
+    async function sleep(time) {
+        return new Promise((resolve, reject) => {
+            setTimeout(() => {
+                resolve()
+            }, time)
+        }).then(() => {
+            console.info(`sleep ${time} over...`)
+        })
+    }
+    async function backToIndex() {
+        let backToIndexPromise = new Promise((resolve, reject) => {
+            setTimeout(() => {
+                router.back({
+                    uri: 'pages/index/index'
+                });
+                resolve();
+            }, 500);
+        });
+        let clearPromise = new Promise((resolve, reject) => {
+            setTimeout(() => {
+                router.clear();
+                resolve();
+            }, 500);
+        });
+        await backToIndexPromise.then(() => {
+            return clearPromise;
+        });
+    }
+
+    /**
+    * run after testcase
+    */
+    afterEach(async function () {
+        console.info('[aceJsTest] after each called')
+        await backToIndex();
+        await sleep(5000)
+    });
+
+    /**
+     * @tc.number    SUB_ACE_BASIC_COMPONENT_JS_API_0100
+     * @tc.name      testVideoComponent
+     * @tc.desc      ACE
+     */
+    it('testVideoComponent', 0, async function (done) {
+        let result;
+        let options = {
+            uri: 'pages/video/router/index'
+        }
+        try {
+            result = router.push(options)
+            console.info("push video page success " + JSON.stringify(result));
+        } catch (err) {
+            console.error("push video page error " + JSON.stringify(result));
+        }
+        await sleep(5000)
+        let pages = router.getState();
+        console.info("[router.video] getState" + JSON.stringify(pages));
+        expect("pages/video/router/").assertEqual(pages.path);
+        done();
+    });
+});
+}

arkui/ace_standard_video/src/main/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "entry_MainAbility",
-      "value": "entry_MainAbility"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Empty Ability"
-    }
-  ]
-}
+{
+  "string": [
+    {
+      "name": "entry_MainAbility",
+      "value": "entry_MainAbility"
+    },
+    {
+      "name": "mainability_description",
+      "value": "JS_Empty Ability"
+		},
+	{
+		"name": "MainAbility_desc",
+		"value": "description"
+	},
+		{
+		"name": "MainAbility_label",
+		"value": "label"
+	},
+		{
+		"name": "TestAbility_desc",
+		"value": "description"
+	},
+		{
+		"name": "TestAbility_label",
+		"value": "label"
+	}
+  ]
+}