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",
+        "type": "OHJSUnitTest",
         "test-timeout": "1000000",
-        "package": "com.example.acevideo",
-        "shell-timeout": "30000"
+        "shell-timeout": "1000000",
+        "bundle-name": "com.example.acevideo",
+        "package-name": "com.example.acevideo"
     },
     "kits": [
         {

arkui/ace_standard_video/src/main/config.json

@@ -14,8 +14,8 @@
     "deviceConfig": {},
     "module": {
         "package": "com.example.acevideo",
-    "name": ".MyApplication",
-    "mainAbility": "com.example.acevideo.MainAbility",
+        "name": ".entry",
+        "mainAbility": ".MainAbility",
         "deviceType": [
             "phone"
         ],
@@ -37,14 +37,30 @@
                         ]
                     }
                 ],
-        "name": "com.example.acevideo.MainAbility",
+                "orientation": "unspecified",
+                "formsEnabled": false,
+                "name": ".MainAbility",
+                "srcLanguage": "js",
+                "srcPath": "MainAbility",
                 "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:entry_MainAbility",
+                "description": "$string:MainAbility_desc",
+                "label": "$string:MainAbility_label",
                 "type": "page",
-        "launchType": "standard",
                 "visible": true,
-        "configChanges": ["orientation"]
+                "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": [
@@ -60,7 +76,22 @@
                     "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

@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-import {Core, ExpectExtend} from 'deccjsunit/index'
 
 const injectRef = Object.getPrototypeOf(global) || global
 injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
@@ -25,14 +24,6 @@ export default {
     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')

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.
+ * 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
@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 export default {
     onCreate() {
         console.info('AceApplication onCreate');

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.
+ * 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
@@ -13,6 +13,14 @@
  * limitations under the License.
  */
 
-require('./basicabilityapi.test.js')
-require('./mediaquery.test.js')
-require('./commonComponentJsApi.test.js')
+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/basicabilityapi.test.js → arkui/ace_standard_video/src/main/js/test/basicabilityapi.test.js

@@ -16,8 +16,9 @@
 import configuration from '@system.configuration';
 import prompt from '@system.prompt';
 import router from '@system.router';
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index';
+import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium';
 
+export default function basicabilityapi() {
 describe('basicabilityapi', function () {
     let testResult;
     let testResultFail;
@@ -476,3 +477,4 @@ describe('basicabilityapi', function () {
         }, 1000);
     });
 });
+}

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

@@ -14,9 +14,10 @@
  */
 
 import router from '@system.router';
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index';
+import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium';
 
 
+export default function aceJsTest() {
 describe('aceJsTest', function () {
 
     async function sleep(time) {
@@ -80,3 +81,4 @@ describe('aceJsTest', function () {
         done();
     });
 });
+}

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

@@ -13,10 +13,11 @@
  * limitations under the License.
  */
 
-import {describe,beforeAll,beforeEach,afterEach,afterAll,it,expect}from 'deccjsunit/index'
+import {describe,beforeAll,beforeEach,afterEach,afterAll,it,expect}from '@ohos/hypium'
 import mediaquery from '@system.mediaquery';
 
-describe('mediaquery', function() {
+export default function mediaquery_vioTest() {
+describe('mediaquery_vioTest', function() {
     let testResult;
     let test;
     beforeAll(function() {
@@ -269,4 +270,4 @@ describe('mediaquery', function() {
         mMediaQueryList.addListener(logicOrMatch)
         console.info('MediaQuery logic>= end')
     })
-});
+});}
\ No newline at end of file

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

@@ -7,6 +7,22 @@
     {
       "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"
 	}
   ]
 }