From 1e49414614a14a79c201458f091ad98245b34f0d Mon Sep 17 00:00:00 2001 From: jiyong_sd Date: Sat, 16 Jul 2022 16:31:22 +0800 Subject: [PATCH] modified FA-JS Signed-off-by: jiyong_sd --- communication/bluetooth_standard/BUILD.gn | 4 +- communication/bluetooth_standard/Test.json | 9 +- .../bluetooth_standard/src/main/config.json | 231 ++++++++++-------- .../main/js/{default => MainAbility}/app.js | 46 ++-- .../{default => MainAbility}/i18n/en-US.json | 0 .../{default => MainAbility}/i18n/zh-CN.json | 0 .../pages/index/index.css | 0 .../pages/index/index.hml | 0 .../main/js/MainAbility/pages/index/index.js | 33 +++ .../src/main/js/TestAbility/app.js | 31 +++ .../src/main/js/TestAbility/i18n/en-US.json | 8 + .../src/main/js/TestAbility/i18n/zh-CN.json | 8 + .../main/js/TestAbility/pages/index/index.css | 30 +++ .../main/js/TestAbility/pages/index/index.hml | 5 + .../main/js/TestAbility/pages/index/index.js | 26 ++ .../js/TestRunner/OpenHarmonyTestRunner.js | 59 +++++ .../src/main/js/default/pages/index/index.js | 49 ---- .../js/{default => }/test/Bluetooth.test.js | 4 +- .../main/js/{default => }/test/List.test.js | 35 +-- .../main/resources/base/element/string.json | 18 +- .../convertxml_lib_standard/BUILD.gn | 4 +- .../convertxml_lib_standard/Test.json | 7 +- .../src/main/config.json | 144 ++++++----- .../main/js/{default => MainAbility}/app.js | 0 .../{default => MainAbility}/i18n/en-US.json | 0 .../{default => MainAbility}/i18n/zh-CN.json | 0 .../pages/index/index.css | 0 .../pages/index/index.hml | 0 .../pages/index/index.js | 5 - .../src/main/js/TestAbility/app.js | 31 +++ .../src/main/js/TestAbility/i18n/en-US.json | 8 + .../src/main/js/TestAbility/i18n/zh-CN.json | 8 + .../main/js/TestAbility/pages/index/index.css | 30 +++ .../main/js/TestAbility/pages/index/index.hml | 5 + .../main/js/TestAbility/pages/index/index.js | 26 ++ .../js/TestRunner/OpenHarmonyTestRunner.js | 59 +++++ .../src/main/js/test/List.test.js | 6 +- .../src/main/js/test/convertxml.test.js | 5 +- .../main/resources/base/element/string.json | 16 ++ 39 files changed, 686 insertions(+), 264 deletions(-) rename communication/bluetooth_standard/src/main/js/{default => MainAbility}/app.js (97%) rename communication/bluetooth_standard/src/main/js/{default => MainAbility}/i18n/en-US.json (100%) rename communication/bluetooth_standard/src/main/js/{default => MainAbility}/i18n/zh-CN.json (100%) rename communication/bluetooth_standard/src/main/js/{default => MainAbility}/pages/index/index.css (100%) rename communication/bluetooth_standard/src/main/js/{default => MainAbility}/pages/index/index.hml (100%) create mode 100644 communication/bluetooth_standard/src/main/js/MainAbility/pages/index/index.js create mode 100644 communication/bluetooth_standard/src/main/js/TestAbility/app.js create mode 100644 communication/bluetooth_standard/src/main/js/TestAbility/i18n/en-US.json create mode 100644 communication/bluetooth_standard/src/main/js/TestAbility/i18n/zh-CN.json create mode 100644 communication/bluetooth_standard/src/main/js/TestAbility/pages/index/index.css create mode 100644 communication/bluetooth_standard/src/main/js/TestAbility/pages/index/index.hml create mode 100644 communication/bluetooth_standard/src/main/js/TestAbility/pages/index/index.js create mode 100644 communication/bluetooth_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js delete mode 100644 communication/bluetooth_standard/src/main/js/default/pages/index/index.js rename communication/bluetooth_standard/src/main/js/{default => }/test/Bluetooth.test.js (99%) rename communication/bluetooth_standard/src/main/js/{default => }/test/List.test.js (84%) rename compileruntime/convertxml_lib_standard/src/main/js/{default => MainAbility}/app.js (100%) rename compileruntime/convertxml_lib_standard/src/main/js/{default => MainAbility}/i18n/en-US.json (100%) rename compileruntime/convertxml_lib_standard/src/main/js/{default => MainAbility}/i18n/zh-CN.json (100%) rename compileruntime/convertxml_lib_standard/src/main/js/{default => MainAbility}/pages/index/index.css (100%) rename compileruntime/convertxml_lib_standard/src/main/js/{default => MainAbility}/pages/index/index.hml (100%) rename compileruntime/convertxml_lib_standard/src/main/js/{default => MainAbility}/pages/index/index.js (84%) create mode 100644 compileruntime/convertxml_lib_standard/src/main/js/TestAbility/app.js create mode 100644 compileruntime/convertxml_lib_standard/src/main/js/TestAbility/i18n/en-US.json create mode 100644 compileruntime/convertxml_lib_standard/src/main/js/TestAbility/i18n/zh-CN.json create mode 100644 compileruntime/convertxml_lib_standard/src/main/js/TestAbility/pages/index/index.css create mode 100644 compileruntime/convertxml_lib_standard/src/main/js/TestAbility/pages/index/index.hml create mode 100644 compileruntime/convertxml_lib_standard/src/main/js/TestAbility/pages/index/index.js create mode 100644 compileruntime/convertxml_lib_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js diff --git a/communication/bluetooth_standard/BUILD.gn b/communication/bluetooth_standard/BUILD.gn index b644cc980..16ee0ff60 100644 --- a/communication/bluetooth_standard/BUILD.gn +++ b/communication/bluetooth_standard/BUILD.gn @@ -23,7 +23,9 @@ ohos_js_hap_suite("ActsBluetoothJsTest") { hap_name = "ActsBluetoothHapTest" } ohos_js_assets("bluetooth_js_assets") { - source_dir = "./src/main/js/default" + js2abc = true + hap_profile = "./src/main/config.json" + source_dir = "./src/main/js" } ohos_resources("bluetooth_resources") { sources = [ "./src/main/resources" ] diff --git a/communication/bluetooth_standard/Test.json b/communication/bluetooth_standard/Test.json index 285d5297e..5767ef8dc 100644 --- a/communication/bluetooth_standard/Test.json +++ b/communication/bluetooth_standard/Test.json @@ -1,10 +1,11 @@ { "description": "Configuration for bluetooth js api Tests", "driver": { - "type": "JSUnitTest", + "type": "OHJSUnitTest", "test-timeout": "600000", - "package": "ohos.acts.communication.bluetooth.bluetoothhost", - "shell-timeout": "60000" + "shell-timeout": "600000", + "bundle-name": "ohos.acts.communication.bluetooth.bluetoothhost", + "package-name": "ohos.acts.communication.bluetooth.bluetoothhost" }, "kits": [ { @@ -15,4 +16,4 @@ "cleanup-apps": true } ] -} +} \ No newline at end of file diff --git a/communication/bluetooth_standard/src/main/config.json b/communication/bluetooth_standard/src/main/config.json index b56e3760b..9175146c5 100644 --- a/communication/bluetooth_standard/src/main/config.json +++ b/communication/bluetooth_standard/src/main/config.json @@ -1,104 +1,135 @@ { - "app": { - "bundleName": "ohos.acts.communication.bluetooth.bluetoothhost", - "vendor": "acts", - "version": { - "code": 1000000, - "name": "1.0.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5 - } - }, - "deviceConfig": {}, - "module": { - "package": "ohos.acts.communication.bluetooth.bluetoothhost", - "name": ".MyApplication", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry" + "app": { + "bundleName": "ohos.acts.communication.bluetooth.bluetoothhost", + "vendor": "acts", + "version": { + "code": 1000000, + "name": "1.0.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5 + } }, - "abilities": [ - { - "visible": true, - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } + "deviceConfig": {}, + "module": { + "package": "ohos.acts.communication.bluetooth.bluetoothhost", + "name": ".entry", + "deviceType": [ + "phone" ], - "name": "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:app_name", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry" + }, + "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" + } ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ], - "reqPermissions": [ - { - "name": "ohos.permission.USE_BLUETOOTH", - "reason": "", - "usedScene": { - "ability": [ - "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" - ], - "when": "inuse" - } - }, - { - "name": "ohos.permission.MANAGE_BLUETOOTH", - "reason": "", - "usedScene": { - "ability": [ - "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" - ], - "when": "inuse" - } - }, - { - "name": "ohos.permission.DISCOVER_BLUETOOTH", - "reason": "", - "usedScene": { - "ability": [ - "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" - ], - "when": "inuse" - } - }, - { - "name": "ohos.permission.LOCATION", - "reason": "", - "usedScene": { - "ability": [ - "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" - ], - "when": "inuse" - } - } - ] - - } -} - + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + }, + { + "pages": [ + "pages/index/index" + ], + "name": ".TestAbility", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ], + "reqPermissions": [ + { + "name": "ohos.permission.USE_BLUETOOTH", + "reason": "", + "usedScene": { + "ability": [ + "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" + ], + "when": "inuse" + } + }, + { + "name": "ohos.permission.MANAGE_BLUETOOTH", + "reason": "", + "usedScene": { + "ability": [ + "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" + ], + "when": "inuse" + } + }, + { + "name": "ohos.permission.DISCOVER_BLUETOOTH", + "reason": "", + "usedScene": { + "ability": [ + "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" + ], + "when": "inuse" + } + }, + { + "name": "ohos.permission.LOCATION", + "reason": "", + "usedScene": { + "ability": [ + "ohos.acts.communication.bluetooth.bluetoothhost.MainAbility" + ], + "when": "inuse" + } + } + ], + "testRunner": { + "name": "OpenHarmonyTestRunner", + "srcPath": "TestRunner" + }, + "mainAbility": ".MainAbility", + "srcPath": "" + } +} \ No newline at end of file diff --git a/communication/bluetooth_standard/src/main/js/default/app.js b/communication/bluetooth_standard/src/main/js/MainAbility/app.js similarity index 97% rename from communication/bluetooth_standard/src/main/js/default/app.js rename to communication/bluetooth_standard/src/main/js/MainAbility/app.js index 363f2555b..e423f4bce 100644 --- a/communication/bluetooth_standard/src/main/js/default/app.js +++ b/communication/bluetooth_standard/src/main/js/MainAbility/app.js @@ -1,23 +1,23 @@ -/* - * 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) 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'); + } +}; diff --git a/communication/bluetooth_standard/src/main/js/default/i18n/en-US.json b/communication/bluetooth_standard/src/main/js/MainAbility/i18n/en-US.json similarity index 100% rename from communication/bluetooth_standard/src/main/js/default/i18n/en-US.json rename to communication/bluetooth_standard/src/main/js/MainAbility/i18n/en-US.json diff --git a/communication/bluetooth_standard/src/main/js/default/i18n/zh-CN.json b/communication/bluetooth_standard/src/main/js/MainAbility/i18n/zh-CN.json similarity index 100% rename from communication/bluetooth_standard/src/main/js/default/i18n/zh-CN.json rename to communication/bluetooth_standard/src/main/js/MainAbility/i18n/zh-CN.json diff --git a/communication/bluetooth_standard/src/main/js/default/pages/index/index.css b/communication/bluetooth_standard/src/main/js/MainAbility/pages/index/index.css similarity index 100% rename from communication/bluetooth_standard/src/main/js/default/pages/index/index.css rename to communication/bluetooth_standard/src/main/js/MainAbility/pages/index/index.css diff --git a/communication/bluetooth_standard/src/main/js/default/pages/index/index.hml b/communication/bluetooth_standard/src/main/js/MainAbility/pages/index/index.hml similarity index 100% rename from communication/bluetooth_standard/src/main/js/default/pages/index/index.hml rename to communication/bluetooth_standard/src/main/js/MainAbility/pages/index/index.hml diff --git a/communication/bluetooth_standard/src/main/js/MainAbility/pages/index/index.js b/communication/bluetooth_standard/src/main/js/MainAbility/pages/index/index.js new file mode 100644 index 000000000..59b0ad1de --- /dev/null +++ b/communication/bluetooth_standard/src/main/js/MainAbility/pages/index/index.js @@ -0,0 +1,33 @@ +/* + * 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: "", + myTimeout:75000 + }, + onInit() { + this.title = this.$t('strings.world'); + }, + onShow() { + console.info('onShow finish') + }, + onReady() { + console.info('onReady finish') + }, +} + diff --git a/communication/bluetooth_standard/src/main/js/TestAbility/app.js b/communication/bluetooth_standard/src/main/js/TestAbility/app.js new file mode 100644 index 000000000..d5ee271df --- /dev/null +++ b/communication/bluetooth_standard/src/main/js/TestAbility/app.js @@ -0,0 +1,31 @@ +/* + * 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"); + } +}; diff --git a/communication/bluetooth_standard/src/main/js/TestAbility/i18n/en-US.json b/communication/bluetooth_standard/src/main/js/TestAbility/i18n/en-US.json new file mode 100644 index 000000000..55561b837 --- /dev/null +++ b/communication/bluetooth_standard/src/main/js/TestAbility/i18n/en-US.json @@ -0,0 +1,8 @@ +{ + "strings": { + "hello": "Hello", + "world": "World" + }, + "Files": { + } +} \ No newline at end of file diff --git a/communication/bluetooth_standard/src/main/js/TestAbility/i18n/zh-CN.json b/communication/bluetooth_standard/src/main/js/TestAbility/i18n/zh-CN.json new file mode 100644 index 000000000..cce1af067 --- /dev/null +++ b/communication/bluetooth_standard/src/main/js/TestAbility/i18n/zh-CN.json @@ -0,0 +1,8 @@ +{ + "strings": { + "hello": "您好", + "world": "世界" + }, + "Files": { + } +} \ No newline at end of file diff --git a/communication/bluetooth_standard/src/main/js/TestAbility/pages/index/index.css b/communication/bluetooth_standard/src/main/js/TestAbility/pages/index/index.css new file mode 100644 index 000000000..b21c92c62 --- /dev/null +++ b/communication/bluetooth_standard/src/main/js/TestAbility/pages/index/index.css @@ -0,0 +1,30 @@ +.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 diff --git a/communication/bluetooth_standard/src/main/js/TestAbility/pages/index/index.hml b/communication/bluetooth_standard/src/main/js/TestAbility/pages/index/index.hml new file mode 100644 index 000000000..f64b040a5 --- /dev/null +++ b/communication/bluetooth_standard/src/main/js/TestAbility/pages/index/index.hml @@ -0,0 +1,5 @@ +
+ + {{ $t('strings.hello') }} {{ title }} + +
diff --git a/communication/bluetooth_standard/src/main/js/TestAbility/pages/index/index.js b/communication/bluetooth_standard/src/main/js/TestAbility/pages/index/index.js new file mode 100644 index 000000000..d94b75c08 --- /dev/null +++ b/communication/bluetooth_standard/src/main/js/TestAbility/pages/index/index.js @@ -0,0 +1,26 @@ +/* + * 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'); + } +} + + + diff --git a/communication/bluetooth_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js b/communication/bluetooth_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js new file mode 100644 index 000000000..b9e78ce7c --- /dev/null +++ b/communication/bluetooth_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js @@ -0,0 +1,59 @@ +/* + * 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); + }) + } +}; diff --git a/communication/bluetooth_standard/src/main/js/default/pages/index/index.js b/communication/bluetooth_standard/src/main/js/default/pages/index/index.js deleted file mode 100644 index 062ae450f..000000000 --- a/communication/bluetooth_standard/src/main/js/default/pages/index/index.js +++ /dev/null @@ -1,49 +0,0 @@ -/* - * 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 {Core, ExpectExtend} from 'deccjsunit/index' - -export default { - data: { - title: "", - myTimeout:75000 - }, - 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 = this.myTimeout - configService.setConfig(this) - - require('../../test/List.test') - core.execute() - - - }, - onReady() { - console.info('onReady finish') - }, -} - diff --git a/communication/bluetooth_standard/src/main/js/default/test/Bluetooth.test.js b/communication/bluetooth_standard/src/main/js/test/Bluetooth.test.js similarity index 99% rename from communication/bluetooth_standard/src/main/js/default/test/Bluetooth.test.js rename to communication/bluetooth_standard/src/main/js/test/Bluetooth.test.js index 849b0a82f..129cd97d5 100644 --- a/communication/bluetooth_standard/src/main/js/default/test/Bluetooth.test.js +++ b/communication/bluetooth_standard/src/main/js/test/Bluetooth.test.js @@ -14,7 +14,7 @@ */ import bluetooth from '@ohos.bluetooth'; -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' +import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '@ohos/hypium' let Btname = { @@ -38,6 +38,7 @@ let Btname = { +'345678901234567890123456789012345678901234567890123456789012367890123456789012345568' } +export default function bluetoothhostTest() { describe('bluetoothhostTest', function() { beforeAll(function () { @@ -714,3 +715,4 @@ describe('bluetoothhostTest', function() { }) +} diff --git a/communication/bluetooth_standard/src/main/js/default/test/List.test.js b/communication/bluetooth_standard/src/main/js/test/List.test.js similarity index 84% rename from communication/bluetooth_standard/src/main/js/default/test/List.test.js rename to communication/bluetooth_standard/src/main/js/test/List.test.js index 165f88d4c..cba7e0d47 100644 --- a/communication/bluetooth_standard/src/main/js/default/test/List.test.js +++ b/communication/bluetooth_standard/src/main/js/test/List.test.js @@ -1,16 +1,19 @@ -/* - * 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('./Bluetooth.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. + */ + +import bluetoothhostTest from './Bluetooth.test.js' +export default function testsuite() { +bluetoothhostTest() +} diff --git a/communication/bluetooth_standard/src/main/resources/base/element/string.json b/communication/bluetooth_standard/src/main/resources/base/element/string.json index 14f9c3a92..d4b2a0a05 100644 --- a/communication/bluetooth_standard/src/main/resources/base/element/string.json +++ b/communication/bluetooth_standard/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 diff --git a/compileruntime/convertxml_lib_standard/BUILD.gn b/compileruntime/convertxml_lib_standard/BUILD.gn index 52f9b4b6d..81bedc972 100644 --- a/compileruntime/convertxml_lib_standard/BUILD.gn +++ b/compileruntime/convertxml_lib_standard/BUILD.gn @@ -31,7 +31,9 @@ ohos_js_hap_suite("convertxml_js_test") { # subsystem_name = "xts" } ohos_js_assets("convertxml_js_assets") { - source_dir = "./src/main/js/default" + js2abc = true + hap_profile = "./src/main/config.json" + source_dir = "./src/main/js" } ohos_resources("convertxml_resources") { sources = [ "./src/main/resources" ] diff --git a/compileruntime/convertxml_lib_standard/Test.json b/compileruntime/convertxml_lib_standard/Test.json index d7c7d9abd..bae038d32 100644 --- a/compileruntime/convertxml_lib_standard/Test.json +++ b/compileruntime/convertxml_lib_standard/Test.json @@ -1,10 +1,11 @@ { "description": "Configuration for startup convertxml js api Tests", "driver": { - "type": "JSUnitTest", + "type": "OHJSUnitTest", "test-timeout": "800000", - "package": "com.example.convertxml", - "shell-timeout": "90000" + "shell-timeout": "800000", + "bundle-name": "com.example.convertxml", + "package-name": "com.example.convertxml" }, "kits": [ { diff --git a/compileruntime/convertxml_lib_standard/src/main/config.json b/compileruntime/convertxml_lib_standard/src/main/config.json index b564ba18a..e8b53b4a5 100644 --- a/compileruntime/convertxml_lib_standard/src/main/config.json +++ b/compileruntime/convertxml_lib_standard/src/main/config.json @@ -1,62 +1,94 @@ { - "app": { - "bundleName": "com.example.convertxml", - "vendor": "example", - "version": { - "code": 1000000, - "name": "1.0.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5 - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.convertxml", - "name": ".MyApplication", - "mainAbility": "com.example.convertxml.MainAbility", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry", - "installationFree": false + "app": { + "bundleName": "com.example.convertxml", + "vendor": "example", + "version": { + "code": 1000000, + "name": "1.0.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5 + } }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } + "deviceConfig": {}, + "module": { + "package": "com.example.convertxml", + "name": ".entry", + "srcPath": "", + "mainAbility": ".MainAbility", + "deviceType": [ + "phone" ], - "visible": true, - "name": "com.example.convertxml.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "$string:entry_MainAbility", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index" + "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" + } ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": true + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": true + } + }, + { + "pages": [ + "pages/index/index" + ], + "name": ".TestAbility", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ], + "testRunner": { + "name": "OpenHarmonyTestRunner", + "srcPath": "TestRunner" } - } - ] - } + } } \ No newline at end of file diff --git a/compileruntime/convertxml_lib_standard/src/main/js/default/app.js b/compileruntime/convertxml_lib_standard/src/main/js/MainAbility/app.js similarity index 100% rename from compileruntime/convertxml_lib_standard/src/main/js/default/app.js rename to compileruntime/convertxml_lib_standard/src/main/js/MainAbility/app.js diff --git a/compileruntime/convertxml_lib_standard/src/main/js/default/i18n/en-US.json b/compileruntime/convertxml_lib_standard/src/main/js/MainAbility/i18n/en-US.json similarity index 100% rename from compileruntime/convertxml_lib_standard/src/main/js/default/i18n/en-US.json rename to compileruntime/convertxml_lib_standard/src/main/js/MainAbility/i18n/en-US.json diff --git a/compileruntime/convertxml_lib_standard/src/main/js/default/i18n/zh-CN.json b/compileruntime/convertxml_lib_standard/src/main/js/MainAbility/i18n/zh-CN.json similarity index 100% rename from compileruntime/convertxml_lib_standard/src/main/js/default/i18n/zh-CN.json rename to compileruntime/convertxml_lib_standard/src/main/js/MainAbility/i18n/zh-CN.json diff --git a/compileruntime/convertxml_lib_standard/src/main/js/default/pages/index/index.css b/compileruntime/convertxml_lib_standard/src/main/js/MainAbility/pages/index/index.css similarity index 100% rename from compileruntime/convertxml_lib_standard/src/main/js/default/pages/index/index.css rename to compileruntime/convertxml_lib_standard/src/main/js/MainAbility/pages/index/index.css diff --git a/compileruntime/convertxml_lib_standard/src/main/js/default/pages/index/index.hml b/compileruntime/convertxml_lib_standard/src/main/js/MainAbility/pages/index/index.hml similarity index 100% rename from compileruntime/convertxml_lib_standard/src/main/js/default/pages/index/index.hml rename to compileruntime/convertxml_lib_standard/src/main/js/MainAbility/pages/index/index.hml diff --git a/compileruntime/convertxml_lib_standard/src/main/js/default/pages/index/index.js b/compileruntime/convertxml_lib_standard/src/main/js/MainAbility/pages/index/index.js similarity index 84% rename from compileruntime/convertxml_lib_standard/src/main/js/default/pages/index/index.js rename to compileruntime/convertxml_lib_standard/src/main/js/MainAbility/pages/index/index.js index e104eaf7a..5b51de777 100644 --- a/compileruntime/convertxml_lib_standard/src/main/js/default/pages/index/index.js +++ b/compileruntime/convertxml_lib_standard/src/main/js/MainAbility/pages/index/index.js @@ -16,7 +16,6 @@ import app from '@system.app' import device from '@system.device' import router from '@system.router' -import {Core} from 'deccjsunit/index' export default { data: { @@ -27,10 +26,6 @@ export default { }, onShow() { console.info('onShow finish') - const core = Core.getInstance() - core.init() - require('../../../test/List.test') - core.execute() }, onReady() { }, diff --git a/compileruntime/convertxml_lib_standard/src/main/js/TestAbility/app.js b/compileruntime/convertxml_lib_standard/src/main/js/TestAbility/app.js new file mode 100644 index 000000000..d5ee271df --- /dev/null +++ b/compileruntime/convertxml_lib_standard/src/main/js/TestAbility/app.js @@ -0,0 +1,31 @@ +/* + * 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"); + } +}; diff --git a/compileruntime/convertxml_lib_standard/src/main/js/TestAbility/i18n/en-US.json b/compileruntime/convertxml_lib_standard/src/main/js/TestAbility/i18n/en-US.json new file mode 100644 index 000000000..55561b837 --- /dev/null +++ b/compileruntime/convertxml_lib_standard/src/main/js/TestAbility/i18n/en-US.json @@ -0,0 +1,8 @@ +{ + "strings": { + "hello": "Hello", + "world": "World" + }, + "Files": { + } +} \ No newline at end of file diff --git a/compileruntime/convertxml_lib_standard/src/main/js/TestAbility/i18n/zh-CN.json b/compileruntime/convertxml_lib_standard/src/main/js/TestAbility/i18n/zh-CN.json new file mode 100644 index 000000000..cce1af067 --- /dev/null +++ b/compileruntime/convertxml_lib_standard/src/main/js/TestAbility/i18n/zh-CN.json @@ -0,0 +1,8 @@ +{ + "strings": { + "hello": "您好", + "world": "世界" + }, + "Files": { + } +} \ No newline at end of file diff --git a/compileruntime/convertxml_lib_standard/src/main/js/TestAbility/pages/index/index.css b/compileruntime/convertxml_lib_standard/src/main/js/TestAbility/pages/index/index.css new file mode 100644 index 000000000..b21c92c62 --- /dev/null +++ b/compileruntime/convertxml_lib_standard/src/main/js/TestAbility/pages/index/index.css @@ -0,0 +1,30 @@ +.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 diff --git a/compileruntime/convertxml_lib_standard/src/main/js/TestAbility/pages/index/index.hml b/compileruntime/convertxml_lib_standard/src/main/js/TestAbility/pages/index/index.hml new file mode 100644 index 000000000..f64b040a5 --- /dev/null +++ b/compileruntime/convertxml_lib_standard/src/main/js/TestAbility/pages/index/index.hml @@ -0,0 +1,5 @@ +
+ + {{ $t('strings.hello') }} {{ title }} + +
diff --git a/compileruntime/convertxml_lib_standard/src/main/js/TestAbility/pages/index/index.js b/compileruntime/convertxml_lib_standard/src/main/js/TestAbility/pages/index/index.js new file mode 100644 index 000000000..d94b75c08 --- /dev/null +++ b/compileruntime/convertxml_lib_standard/src/main/js/TestAbility/pages/index/index.js @@ -0,0 +1,26 @@ +/* + * 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'); + } +} + + + diff --git a/compileruntime/convertxml_lib_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js b/compileruntime/convertxml_lib_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js new file mode 100644 index 000000000..b9e78ce7c --- /dev/null +++ b/compileruntime/convertxml_lib_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js @@ -0,0 +1,59 @@ +/* + * 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); + }) + } +}; diff --git a/compileruntime/convertxml_lib_standard/src/main/js/test/List.test.js b/compileruntime/convertxml_lib_standard/src/main/js/test/List.test.js index 2c6b69153..294e1b123 100644 --- a/compileruntime/convertxml_lib_standard/src/main/js/test/List.test.js +++ b/compileruntime/convertxml_lib_standard/src/main/js/test/List.test.js @@ -12,5 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -require('./convertxml.test.js') \ No newline at end of file +import XmlTest from './convertxml.test.js' +export default function testsuite() { +XmlTest() +} diff --git a/compileruntime/convertxml_lib_standard/src/main/js/test/convertxml.test.js b/compileruntime/convertxml_lib_standard/src/main/js/test/convertxml.test.js index 9310a7571..24477d2bc 100644 --- a/compileruntime/convertxml_lib_standard/src/main/js/test/convertxml.test.js +++ b/compileruntime/convertxml_lib_standard/src/main/js/test/convertxml.test.js @@ -12,8 +12,9 @@ * See the License for the specific language governing permissions and * 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 convertxml from '@ohos.convertxml' +export default function XmlTest() { describe('XmlTest', function () { /** @@ -1280,4 +1281,4 @@ describe('XmlTest', function () { '"_text":"Play"}]}]}]}' expect(result).assertEqual(str1); }) -}) \ No newline at end of file +})} diff --git a/compileruntime/convertxml_lib_standard/src/main/resources/base/element/string.json b/compileruntime/convertxml_lib_standard/src/main/resources/base/element/string.json index 0bae6bd40..d6ab4eb2a 100644 --- a/compileruntime/convertxml_lib_standard/src/main/resources/base/element/string.json +++ b/compileruntime/convertxml_lib_standard/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" } ] } \ No newline at end of file -- GitLab