!4523 Adapt to the new framework_PART30

Merge pull request !4523 from jiyong/local-20220723-0006

global/i18n_standard/intljs/BUILD.gn

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

global/i18n_standard/intljs/Test.json

 {
     "description": "Configuration for intljs Tests",
     "driver": {
-        "type": "JSUnitTest",
+        "type": "OHJSUnitTest",
         "test-timeout": "300000",
-        "package": "ohos.intl.test",
-        "shell-timeout": "60000"
+        "shell-timeout": "300000",
+        "bundle-name": "ohos.intl.test",
+        "package-name": "ohos.intl.test"
     },
     "kits": [
         {

global/i18n_standard/intljs/src/main/config.json

@@ -14,7 +14,7 @@
     "deviceConfig": {},
     "module": {
         "package": "ohos.intl.test",
-    "name": ".MyApplication",
+        "name": ".entry",
         "deviceType": [
             "phone"
         ],
@@ -25,7 +25,6 @@
         },
         "abilities": [
             {
-        "visible": true,
                 "skills": [
                     {
                         "entities": [
@@ -36,22 +35,40 @@
                         ]
                     }
                 ],
-        "name": "ohos.intl.test.MainAbility",
+                "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:mainability_description",
-        "label": "MyApplication",
+                "description": "$string:TestAbility_desc",
+                "label": "$string:TestAbility_label",
                 "type": "page",
+                "visible": true,
                 "launchType": "standard"
             }
         ],
         "reqPermissions": [
             {
-        "name":"ohos.permission.GET_BUNDLE_INFO",
-        "reason":"need use ohos.permission.GET_BUNDLE_INFO"
+                "name": "ohos.permission.GET_BUNDLE_INFO",
+                "reason": "need use ohos.permission.GET_BUNDLE_INFO"
             },
             {
-        "name":"ohos.permission.UPDATE_CONFIGURATION",
-        "reason":"need use ohos.permission.UPDATE_CONFIGURATION"
+                "name": "ohos.permission.UPDATE_CONFIGURATION",
+                "reason": "need use ohos.permission.UPDATE_CONFIGURATION"
             }
         ],
         "js": [
@@ -64,7 +81,23 @@
                     "designWidth": 720,
                     "autoDesignWidth": false
                 }
+            },
+            {
+                "pages": [
+                    "pages/index/index"
+                ],
+                "name": ".TestAbility",
+                "window": {
+                    "designWidth": 720,
+                    "autoDesignWidth": false
+                }
             }
-    ]
+        ],
+        "testRunner": {
+            "name": "OpenHarmonyTestRunner",
+            "srcPath": "TestRunner"
+        },
+        "mainAbility": ".MainAbility",
+        "srcPath": ""
     }
 }
\ No newline at end of file

global/i18n_standard/intljs/src/main/js/default/pages/index/index.js → global/i18n_standard/intljs/src/main/js/MainAbility/pages/index/index.js

@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-import {Core, ExpectExtend} from 'deccjsunit/index'
 
 export default {
     data: {
@@ -24,19 +23,6 @@ export default {
     },
     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() {
     },

global/i18n_standard/intljs/src/main/js/TestAbility/app.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'
+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");
+    }
+};

global/i18n_standard/intljs/src/main/js/TestAbility/i18n/en-US.json

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

global/i18n_standard/intljs/src/main/js/TestAbility/i18n/zh-CN.json

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

global/i18n_standard/intljs/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

global/i18n_standard/intljs/src/main/js/TestAbility/pages/index/index.hml

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

global/i18n_standard/intljs/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.
+ */
+
+export default {
+    data: {
+        title: ""
+    },
+    onInit() {
+        this.title = this.$t('strings.world');
+    }
+}
+
+
+

global/i18n_standard/intljs/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'] + '.TestAbility'
+
+        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);
+        })
+    }
+};

global/i18n_standard/intljs/src/main/js/default/test/I18n.test.js → global/i18n_standard/intljs/src/main/js/test/I18n.test.js

@@ -14,8 +14,9 @@
  */
 import I18n from '@ohos.i18n'
 import intl from '@ohos.intl'
-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 I18nTest() {
 describe('I18nTest', function () {
     console.log('*************start I18NTest*************');
 
@@ -2112,4 +2113,4 @@ describe('I18nTest', function () {
     })
 
     console.log('*************end I18NTest*************');
-})
\ No newline at end of file
+})}

global/i18n_standard/intljs/src/main/js/default/test/Intl.test.js → global/i18n_standard/intljs/src/main/js/test/Intl.test.js

@@ -15,8 +15,9 @@
 
 import I18n from '@ohos.i18n'
 import Intl from '@ohos.intl'
-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 intlTest() {
 describe('intlTest', function () {
     console.log('*************start IntlTest*************');
 
@@ -1602,4 +1603,4 @@ describe('intlTest', function () {
     })
 
     console.log('*************end IntlTest*************');
-})
\ No newline at end of file
+})}

global/i18n_standard/intljs/src/main/js/default/test/Lang.test.js → global/i18n_standard/intljs/src/main/js/test/Lang.test.js

@@ -14,8 +14,9 @@
  */
 import I18n from '@ohos.i18n'
 import Intl from '@ohos.intl'
-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 LangTest() {
 describe('LangTest', function () {
     console.log('*************start LangTest*************');
 
@@ -665,4 +666,4 @@ describe('LangTest', function () {
     })
 
     console.log('*************end LangTest*************');
-})
\ No newline at end of file
+})}

global/i18n_standard/intljs/src/main/js/default/test/List.test.js → global/i18n_standard/intljs/src/main/js/test/List.test.js

@@ -12,6 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-require('./I18n.test.js')
-require('./Intl.test.js')
-require('./Lang.test.js')
\ No newline at end of file
+import I18nTest from './I18n.test.js'
+import intlTest from './Intl.test.js'
+import LangTest from './Lang.test.js'
+export default function testsuite() {
+I18nTest()
+intlTest()
+LangTest()
+}

global/i18n_standard/intljs/src/main/resources/base/element/string.json

@@ -7,6 +7,22 @@
     {
       "name": "mainability_description",
       "value": "JS_Phone_Empty Feature Ability"
+		},
+	{
+		"name": "MainAbility_desc",
+		"value": "description"
+	},
+		{
+		"name": "MainAbility_label",
+		"value": "label"
+	},
+		{
+		"name": "TestAbility_desc",
+		"value": "description"
+	},
+		{
+		"name": "TestAbility_label",
+		"value": "label"
 	}
   ]
 }
\ No newline at end of file