From 4bb1705c6ff489866d6746a371cfeed1aa3ebdbc Mon Sep 17 00:00:00 2001 From: jiyong_sd Date: Wed, 20 Jul 2022 18:01:24 +0800 Subject: [PATCH] Adapt to the new framework Signed-off-by: jiyong_sd Change-Id: I77b78bf5fa8f5cd2b04b50016469c06a1a45b57c --- compileruntime/atomics_lib_standard/BUILD.gn | 6 +- compileruntime/atomics_lib_standard/Test.json | 35 +- .../atomics_lib_standard/src/main/config.json | 157 ++++--- .../src/main/js/MainAbility/app.js | 22 + .../src/main/js/MainAbility}/i18n/en-US.json | 20 +- .../{default => MainAbility}/i18n/zh-CN.json | 20 +- .../js/MainAbility}/pages/index/index.css | 78 ++-- .../js/MainAbility}/pages/index/index.hml | 42 +- .../main/js/MainAbility}/pages/index/index.js | 93 ++-- .../workers/worker010.js | 48 +- .../workers/worker011.js | 60 +-- .../workers/worker012.js | 46 +- .../workers/worker020.js | 50 +- .../workers/worker030.js | 50 +- .../workers/worker031.js | 50 +- .../src/main/js/TestAbility}/app.js | 46 +- .../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 | 50 ++ .../main/js/TestAbility/pages/index/index.hml | 21 + .../main/js/TestAbility/pages/index/index.js | 26 ++ .../js/TestRunner/OpenHarmonyTestRunner.js | 59 +++ .../src/main/js/test/Atomics.test.js | 441 +++++++++--------- .../src/main/js/test/List.test.js | 35 +- .../main/resources/base/element/string.json | 38 +- .../src/main/js/MainAbility/app.js | 44 +- .../src/main/js/MainAbility/i18n/en-US.json | 10 +- .../src/main/js/MainAbility/i18n/zh-CN.json | 10 +- .../main/js/MainAbility/pages/index/index.css | 118 ++--- .../main/js/MainAbility/pages/index/index.hml | 40 +- compileruntime/worker_lib_standard/BUILD.gn | 6 +- compileruntime/worker_lib_standard/Test.json | 35 +- .../worker_lib_standard/src/main/config.json | 157 ++++--- .../src/main/js/MainAbility}/app.js | 46 +- .../src/main/js/MainAbility}/i18n/en-US.json | 20 +- .../{default => MainAbility}/i18n/zh-CN.json | 20 +- .../js/MainAbility}/pages/index/index.css | 78 ++-- .../js/MainAbility}/pages/index/index.hml | 42 +- .../main/js/MainAbility}/pages/index/index.js | 94 ++-- .../workers/worker.js | 0 .../workers/worker_002.js | 0 .../workers/worker_003.js | 0 .../workers/worker_004.js | 0 .../workers/worker_005.js | 0 .../workers/worker_006.js | 0 .../workers/worker_007.js | 0 .../workers/worker_008.js | 0 .../workers/worker_009.js | 88 ++-- .../workers/worker_0091.js | 40 +- .../workers/worker_010.js | 98 ++-- .../workers/worker_0101.js | 42 +- .../workers/worker_011.js | 98 ++-- .../workers/worker_0111.js | 42 +- .../workers/worker_012.js | 98 ++-- .../workers/worker_0121.js | 70 +-- .../workers/worker_0122.js | 48 +- .../workers/worker_013.js | 98 ++-- .../workers/worker_0131.js | 42 +- .../workers/worker_014.js | 98 ++-- .../workers/worker_0141.js | 44 +- .../workers/worker_015.js | 90 ++-- .../workers/worker_0151.js | 88 ++-- .../workers/worker_0152.js | 42 +- .../src/main/js/TestAbility/app.js | 23 + .../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 | 50 ++ .../main/js/TestAbility/pages/index/index.hml | 21 + .../main/js/TestAbility/pages/index/index.js | 26 ++ .../js/TestRunner/OpenHarmonyTestRunner.js | 59 +++ .../src/main/js/test/List.test.js | 5 +- .../src/main/js/test/Worker.test.js | 7 +- .../main/resources/base/element/string.json | 38 +- 73 files changed, 2048 insertions(+), 1552 deletions(-) create mode 100644 compileruntime/atomics_lib_standard/src/main/js/MainAbility/app.js rename compileruntime/{worker_lib_standard/src/main/js/default => atomics_lib_standard/src/main/js/MainAbility}/i18n/en-US.json (93%) rename compileruntime/atomics_lib_standard/src/main/js/{default => MainAbility}/i18n/zh-CN.json (93%) rename compileruntime/{worker_lib_standard/src/main/js/default => atomics_lib_standard/src/main/js/MainAbility}/pages/index/index.css (96%) rename compileruntime/{worker_lib_standard/src/main/js/default => atomics_lib_standard/src/main/js/MainAbility}/pages/index/index.hml (97%) rename compileruntime/{worker_lib_standard/src/main/js/default => atomics_lib_standard/src/main/js/MainAbility}/pages/index/index.js (67%) rename compileruntime/atomics_lib_standard/src/main/js/{default => MainAbility}/workers/worker010.js (97%) rename compileruntime/atomics_lib_standard/src/main/js/{default => MainAbility}/workers/worker011.js (97%) rename compileruntime/atomics_lib_standard/src/main/js/{default => MainAbility}/workers/worker012.js (97%) rename compileruntime/atomics_lib_standard/src/main/js/{default => MainAbility}/workers/worker020.js (97%) rename compileruntime/atomics_lib_standard/src/main/js/{default => MainAbility}/workers/worker030.js (97%) rename compileruntime/atomics_lib_standard/src/main/js/{default => MainAbility}/workers/worker031.js (97%) rename compileruntime/{worker_lib_standard/src/main/js/default => atomics_lib_standard/src/main/js/TestAbility}/app.js (91%) create mode 100644 compileruntime/atomics_lib_standard/src/main/js/TestAbility/i18n/en-US.json create mode 100644 compileruntime/atomics_lib_standard/src/main/js/TestAbility/i18n/zh-CN.json create mode 100644 compileruntime/atomics_lib_standard/src/main/js/TestAbility/pages/index/index.css create mode 100644 compileruntime/atomics_lib_standard/src/main/js/TestAbility/pages/index/index.hml create mode 100644 compileruntime/atomics_lib_standard/src/main/js/TestAbility/pages/index/index.js create mode 100644 compileruntime/atomics_lib_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js rename compileruntime/{atomics_lib_standard/src/main/js/default => worker_lib_standard/src/main/js/MainAbility}/app.js (97%) rename compileruntime/{atomics_lib_standard/src/main/js/default => worker_lib_standard/src/main/js/MainAbility}/i18n/en-US.json (93%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/i18n/zh-CN.json (93%) rename compileruntime/{atomics_lib_standard/src/main/js/default => worker_lib_standard/src/main/js/MainAbility}/pages/index/index.css (96%) rename compileruntime/{atomics_lib_standard/src/main/js/default => worker_lib_standard/src/main/js/MainAbility}/pages/index/index.hml (97%) rename compileruntime/{atomics_lib_standard/src/main/js/default => worker_lib_standard/src/main/js/MainAbility}/pages/index/index.js (67%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker.js (100%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_002.js (100%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_003.js (100%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_004.js (100%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_005.js (100%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_006.js (100%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_007.js (100%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_008.js (100%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_009.js (96%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_0091.js (97%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_010.js (96%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_0101.js (97%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_011.js (96%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_0111.js (97%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_012.js (96%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_0121.js (96%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_0122.js (97%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_013.js (96%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_0131.js (97%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_014.js (96%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_0141.js (97%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_015.js (96%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_0151.js (96%) rename compileruntime/worker_lib_standard/src/main/js/{default => MainAbility}/workers/worker_0152.js (97%) create mode 100644 compileruntime/worker_lib_standard/src/main/js/TestAbility/app.js create mode 100644 compileruntime/worker_lib_standard/src/main/js/TestAbility/i18n/en-US.json create mode 100644 compileruntime/worker_lib_standard/src/main/js/TestAbility/i18n/zh-CN.json create mode 100644 compileruntime/worker_lib_standard/src/main/js/TestAbility/pages/index/index.css create mode 100644 compileruntime/worker_lib_standard/src/main/js/TestAbility/pages/index/index.hml create mode 100644 compileruntime/worker_lib_standard/src/main/js/TestAbility/pages/index/index.js create mode 100644 compileruntime/worker_lib_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js diff --git a/compileruntime/atomics_lib_standard/BUILD.gn b/compileruntime/atomics_lib_standard/BUILD.gn index f4e9ce450..0ee9aefa7 100644 --- a/compileruntime/atomics_lib_standard/BUILD.gn +++ b/compileruntime/atomics_lib_standard/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -23,7 +23,9 @@ ohos_js_hap_suite("atomics_js_hap") { hap_name = "ActsAtomicsJSTest" } ohos_js_assets("atomics_js_assets") { - source_dir = "./src/main/js/default" + js2abc = true + hap_profile = "./src/main/config.json" + source_dir = "./src/main/js" } ohos_resources("atomics_resources") { sources = [ "./src/main/resources" ] diff --git a/compileruntime/atomics_lib_standard/Test.json b/compileruntime/atomics_lib_standard/Test.json index 6b0efdbd1..7843c8280 100644 --- a/compileruntime/atomics_lib_standard/Test.json +++ b/compileruntime/atomics_lib_standard/Test.json @@ -1,18 +1,19 @@ -{ - "description": "Configuration for startup atomics js api Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "800000", - "package": "com.example.atomicsxts", - "shell-timeout": "90000" - }, - "kits": [ - { - "test-file-name": [ - "ActsAtomicsJSTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] +{ + "description": "Configuration for startup atomics js api Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "800000", + "bundle-name": "com.example.atomicsxts", + "package-name": "com.example.atomicsxts", + "shell-timeout": "800000" + }, + "kits": [ + { + "test-file-name": [ + "ActsAtomicsJSTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] } \ No newline at end of file diff --git a/compileruntime/atomics_lib_standard/src/main/config.json b/compileruntime/atomics_lib_standard/src/main/config.json index c56190b1c..90b72b8ab 100644 --- a/compileruntime/atomics_lib_standard/src/main/config.json +++ b/compileruntime/atomics_lib_standard/src/main/config.json @@ -1,65 +1,94 @@ -{ - "app": { - "bundleName": "com.example.atomicsxts", - "vendor": "example", - "version": { - "code": 1000000, - "name": "1.0.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5 - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.atomicsxts", - "name": ".MyApplication", - "mainAbility": "com.example.atomicsxts.MainAbility", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry", - "installationFree": false - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "visible": true, - "orientation": "unspecified", - "name": "com.example.atomicsxts.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "formsEnabled": false, - "label": "$string:entry_MainAbility", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index", - "pages/second/second" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } +{ + "app": { + "bundleName": "com.example.atomicsxts", + "vendor": "example", + "version": { + "code": 1000000, + "name": "1.0.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5 + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.atomicsxts", + "name": ".entry", + "mainAbility": ".MainAbility", + "srcPath":"", + "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" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + }, + { + "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/atomics_lib_standard/src/main/js/MainAbility/app.js b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/app.js new file mode 100644 index 000000000..c1f1f0dc7 --- /dev/null +++ b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/app.js @@ -0,0 +1,22 @@ +/* + * 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('TestApplication onCreate') + }, + onDestroy() { + console.info("TestApplication onDestroy"); + } +}; diff --git a/compileruntime/worker_lib_standard/src/main/js/default/i18n/en-US.json b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/i18n/en-US.json similarity index 93% rename from compileruntime/worker_lib_standard/src/main/js/default/i18n/en-US.json rename to compileruntime/atomics_lib_standard/src/main/js/MainAbility/i18n/en-US.json index 08e34eac9..8feb71993 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/i18n/en-US.json +++ b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/i18n/en-US.json @@ -1,11 +1,11 @@ -{ - "strings": { - "hello": "Hello", - "world": "World", - "page": "Second Page", - "next": "Next Page", - "back": "Back" - }, - "Files": { - } +{ + "strings": { + "hello": "Hello", + "world": "World", + "page": "Second Page", + "next": "Next Page", + "back": "Back" + }, + "Files": { + } } \ No newline at end of file diff --git a/compileruntime/atomics_lib_standard/src/main/js/default/i18n/zh-CN.json b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/i18n/zh-CN.json similarity index 93% rename from compileruntime/atomics_lib_standard/src/main/js/default/i18n/zh-CN.json rename to compileruntime/atomics_lib_standard/src/main/js/MainAbility/i18n/zh-CN.json index 3dd53b3a8..6551d1608 100644 --- a/compileruntime/atomics_lib_standard/src/main/js/default/i18n/zh-CN.json +++ b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/i18n/zh-CN.json @@ -1,11 +1,11 @@ -{ - "strings": { - "hello": "您好", - "world": "世界", - "page": "第二页", - "next": "下一页", - "back": "返回" - }, - "Files": { - } +{ + "strings": { + "hello": "您好", + "world": "世界", + "page": "第二页", + "next": "下一页", + "back": "返回" + }, + "Files": { + } } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/js/default/pages/index/index.css b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/pages/index/index.css similarity index 96% rename from compileruntime/worker_lib_standard/src/main/js/default/pages/index/index.css rename to compileruntime/atomics_lib_standard/src/main/js/MainAbility/pages/index/index.css index db2b048d6..93e9ced7c 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/pages/index/index.css +++ b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/pages/index/index.css @@ -1,39 +1,39 @@ -/* - * 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. - */ - -.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; -} - -.btn { - width: 50%; - height: 100px; - font-size: 40px; -} +/* + * 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. + */ + +.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; +} + +.btn { + width: 50%; + height: 100px; + font-size: 40px; +} diff --git a/compileruntime/worker_lib_standard/src/main/js/default/pages/index/index.hml b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/pages/index/index.hml similarity index 97% rename from compileruntime/worker_lib_standard/src/main/js/default/pages/index/index.hml rename to compileruntime/atomics_lib_standard/src/main/js/MainAbility/pages/index/index.hml index 8590b3287..497461afd 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/pages/index/index.hml +++ b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/pages/index/index.hml @@ -1,21 +1,21 @@ - - -
- - {{ $t('strings.hello') }} {{ title }} - - -
+ + +
+ + {{ $t('strings.hello') }} {{ title }} + + +
diff --git a/compileruntime/worker_lib_standard/src/main/js/default/pages/index/index.js b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/pages/index/index.js similarity index 67% rename from compileruntime/worker_lib_standard/src/main/js/default/pages/index/index.js rename to compileruntime/atomics_lib_standard/src/main/js/MainAbility/pages/index/index.js index 0f185cf96..803fc5ce6 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/pages/index/index.js +++ b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/pages/index/index.js @@ -1,46 +1,47 @@ -/* - * 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 app from '@system.app' -import device from '@system.device' -import router from '@system.router' -import {Core, Constant, ExpectExtend, ReportExtend, InstrumentLog} from 'deccjsunit/index' - - -export default { - data: { - title: '' - }, - onInit() { - this.title = this.$t('strings.world'); - }, - onShow() { - console.info('onShow finish') - const core = Core.getInstance() - core.init() - require('../../../test/List.test') - core.execute() - }, - touchMove(e) { - if (e.direction === 'right') { - this.appExit(); - } - }, - appExit() { - app.terminate() - } -} - - +/* + * 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' +import app from '@system.app' +import device from '@system.device' +import router from '@system.router' + + +export default { + data: { + title: '' + }, + onInit() { + this.title = this.$t('strings.world'); + }, + onShow() { + console.info('onShow finish') + var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + }, + touchMove(e) { + if (e.direction === 'right') { + this.appExit(); + } + }, + appExit() { + app.terminate() + } +} + + diff --git a/compileruntime/atomics_lib_standard/src/main/js/default/workers/worker010.js b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/workers/worker010.js similarity index 97% rename from compileruntime/atomics_lib_standard/src/main/js/default/workers/worker010.js rename to compileruntime/atomics_lib_standard/src/main/js/MainAbility/workers/worker010.js index a2581590a..afae6db5e 100644 --- a/compileruntime/atomics_lib_standard/src/main/js/default/workers/worker010.js +++ b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/workers/worker010.js @@ -1,24 +1,24 @@ -/* - * 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 worker from '@ohos.worker'; -const parentPort = worker.parentPort; - -parentPort.onmessage = function(e) { - var int32 = e.data - parentPort.postMessage("success") - console.info("wait expect 'ok': " + Atomics.wait(int32, 0, 0)); - parentPort.postMessage("end") -} +/* + * 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 worker from '@ohos.worker'; +const parentPort = worker.parentPort; + +parentPort.onmessage = function(e) { + var int32 = e.data + parentPort.postMessage("success") + console.info("wait expect 'ok': " + Atomics.wait(int32, 0, 0)); + parentPort.postMessage("end") +} diff --git a/compileruntime/atomics_lib_standard/src/main/js/default/workers/worker011.js b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/workers/worker011.js similarity index 97% rename from compileruntime/atomics_lib_standard/src/main/js/default/workers/worker011.js rename to compileruntime/atomics_lib_standard/src/main/js/MainAbility/workers/worker011.js index 1e2b73b1b..1bc9845bf 100644 --- a/compileruntime/atomics_lib_standard/src/main/js/default/workers/worker011.js +++ b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/workers/worker011.js @@ -1,30 +1,30 @@ -/* - * 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 worker from '@ohos.worker'; -const parentPort = worker.parentPort; - -parentPort.onmessage = function(e) { - let begTime = new Date().getTime(); - var int32 = e.data - parentPort.postMessage("success") - console.info("wait expect 'timed-out' : " + Atomics.wait(int32, 1, 0, 3000)); - let endTime = new Date().getTime(); - if(endTime - begTime < 3000) { - parentPort.postMessage("end1") - } else { - parentPort.postMessage("end2") - } -} +/* + * 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 worker from '@ohos.worker'; +const parentPort = worker.parentPort; + +parentPort.onmessage = function(e) { + let begTime = new Date().getTime(); + var int32 = e.data + parentPort.postMessage("success") + console.info("wait expect 'timed-out' : " + Atomics.wait(int32, 1, 0, 3000)); + let endTime = new Date().getTime(); + if(endTime - begTime < 3000) { + parentPort.postMessage("end1") + } else { + parentPort.postMessage("end2") + } +} diff --git a/compileruntime/atomics_lib_standard/src/main/js/default/workers/worker012.js b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/workers/worker012.js similarity index 97% rename from compileruntime/atomics_lib_standard/src/main/js/default/workers/worker012.js rename to compileruntime/atomics_lib_standard/src/main/js/MainAbility/workers/worker012.js index ccc00ed30..22224f434 100644 --- a/compileruntime/atomics_lib_standard/src/main/js/default/workers/worker012.js +++ b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/workers/worker012.js @@ -1,24 +1,24 @@ -/* - * 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 worker from '@ohos.worker'; -const parentPort = worker.parentPort; - -parentPort.onmessage = function(e) { - var int32 = e.data - parentPort.postMessage("success") - console.info("wait expect 'not-equal': " + Atomics.wait(int32, 2, 2)); - parentPort.postMessage("end") +/* + * 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 worker from '@ohos.worker'; +const parentPort = worker.parentPort; + +parentPort.onmessage = function(e) { + var int32 = e.data + parentPort.postMessage("success") + console.info("wait expect 'not-equal': " + Atomics.wait(int32, 2, 2)); + parentPort.postMessage("end") } \ No newline at end of file diff --git a/compileruntime/atomics_lib_standard/src/main/js/default/workers/worker020.js b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/workers/worker020.js similarity index 97% rename from compileruntime/atomics_lib_standard/src/main/js/default/workers/worker020.js rename to compileruntime/atomics_lib_standard/src/main/js/MainAbility/workers/worker020.js index d87c7e74c..4a5801c72 100644 --- a/compileruntime/atomics_lib_standard/src/main/js/default/workers/worker020.js +++ b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/workers/worker020.js @@ -1,26 +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. - */ - -import worker from '@ohos.worker'; -const parentPort = worker.parentPort; - -parentPort.onmessage = function(e) { - var int32 = e.data - parentPort.postMessage("wait") - Atomics.wait(int32, 0, 0); - Atomics.add(int32, 0 ,1); - Atomics.load(int32, 0); - parentPort.postMessage(int32[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 worker from '@ohos.worker'; +const parentPort = worker.parentPort; + +parentPort.onmessage = function(e) { + var int32 = e.data + parentPort.postMessage("wait") + Atomics.wait(int32, 0, 0); + Atomics.add(int32, 0 ,1); + Atomics.load(int32, 0); + parentPort.postMessage(int32[0]) } \ No newline at end of file diff --git a/compileruntime/atomics_lib_standard/src/main/js/default/workers/worker030.js b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/workers/worker030.js similarity index 97% rename from compileruntime/atomics_lib_standard/src/main/js/default/workers/worker030.js rename to compileruntime/atomics_lib_standard/src/main/js/MainAbility/workers/worker030.js index 8561ad8f8..463d7315c 100644 --- a/compileruntime/atomics_lib_standard/src/main/js/default/workers/worker030.js +++ b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/workers/worker030.js @@ -1,25 +1,25 @@ -/* - * 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 worker from '@ohos.worker'; -const parentPort = worker.parentPort; - -parentPort.onmessage = function(e) { - const int32 = new Uint32Array(e.data); - for (let i = 0; i < 10; ++i) { - Atomics.add(int32, 0, 1); - } - parentPort.postMessage("03") -} +/* + * 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 worker from '@ohos.worker'; +const parentPort = worker.parentPort; + +parentPort.onmessage = function(e) { + const int32 = new Uint32Array(e.data); + for (let i = 0; i < 10; ++i) { + Atomics.add(int32, 0, 1); + } + parentPort.postMessage("03") +} diff --git a/compileruntime/atomics_lib_standard/src/main/js/default/workers/worker031.js b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/workers/worker031.js similarity index 97% rename from compileruntime/atomics_lib_standard/src/main/js/default/workers/worker031.js rename to compileruntime/atomics_lib_standard/src/main/js/MainAbility/workers/worker031.js index 73285c42a..37b2e13e8 100644 --- a/compileruntime/atomics_lib_standard/src/main/js/default/workers/worker031.js +++ b/compileruntime/atomics_lib_standard/src/main/js/MainAbility/workers/worker031.js @@ -1,25 +1,25 @@ -/* - * 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 worker from '@ohos.worker'; -const parentPort = worker.parentPort; - -parentPort.onmessage = function(e) { - const int32 = new Uint32Array(e.data); - for (let i = 0; i < 10; ++i) { - Atomics.add(int32, 0, 1); - } - parentPort.postMessage("031") -} +/* + * 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 worker from '@ohos.worker'; +const parentPort = worker.parentPort; + +parentPort.onmessage = function(e) { + const int32 = new Uint32Array(e.data); + for (let i = 0; i < 10; ++i) { + Atomics.add(int32, 0, 1); + } + parentPort.postMessage("031") +} diff --git a/compileruntime/worker_lib_standard/src/main/js/default/app.js b/compileruntime/atomics_lib_standard/src/main/js/TestAbility/app.js similarity index 91% rename from compileruntime/worker_lib_standard/src/main/js/default/app.js rename to compileruntime/atomics_lib_standard/src/main/js/TestAbility/app.js index 5cdca0218..06175ef50 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/app.js +++ b/compileruntime/atomics_lib_standard/src/main/js/TestAbility/app.js @@ -1,23 +1,23 @@ -/* - * 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("Application onCreate"); - }, - onDestroy() { - console.info("Application 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("Application onCreate"); + }, + onDestroy() { + console.info("Application onDestroy"); + } +}; + diff --git a/compileruntime/atomics_lib_standard/src/main/js/TestAbility/i18n/en-US.json b/compileruntime/atomics_lib_standard/src/main/js/TestAbility/i18n/en-US.json new file mode 100644 index 000000000..3cb24b374 --- /dev/null +++ b/compileruntime/atomics_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/atomics_lib_standard/src/main/js/TestAbility/i18n/zh-CN.json b/compileruntime/atomics_lib_standard/src/main/js/TestAbility/i18n/zh-CN.json new file mode 100644 index 000000000..c804e32c0 --- /dev/null +++ b/compileruntime/atomics_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/atomics_lib_standard/src/main/js/TestAbility/pages/index/index.css b/compileruntime/atomics_lib_standard/src/main/js/TestAbility/pages/index/index.css new file mode 100644 index 000000000..2b45eb97c --- /dev/null +++ b/compileruntime/atomics_lib_standard/src/main/js/TestAbility/pages/index/index.css @@ -0,0 +1,50 @@ +/* + * 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. + */ + +.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; +} +.btn { + width: 50%; + height: 100px; + font-size: 40px; +} + +@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/atomics_lib_standard/src/main/js/TestAbility/pages/index/index.hml b/compileruntime/atomics_lib_standard/src/main/js/TestAbility/pages/index/index.hml new file mode 100644 index 000000000..61ea59d93 --- /dev/null +++ b/compileruntime/atomics_lib_standard/src/main/js/TestAbility/pages/index/index.hml @@ -0,0 +1,21 @@ + + +
+ + {{ $t('strings.hello') }} {{title}} + + +
diff --git a/compileruntime/atomics_lib_standard/src/main/js/TestAbility/pages/index/index.js b/compileruntime/atomics_lib_standard/src/main/js/TestAbility/pages/index/index.js new file mode 100644 index 000000000..88b083a7f --- /dev/null +++ b/compileruntime/atomics_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/atomics_lib_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js b/compileruntime/atomics_lib_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js new file mode 100644 index 000000000..05ba57825 --- /dev/null +++ b/compileruntime/atomics_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'] + '.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); + }) + } +}; diff --git a/compileruntime/atomics_lib_standard/src/main/js/test/Atomics.test.js b/compileruntime/atomics_lib_standard/src/main/js/test/Atomics.test.js index 94d953c75..77af995a2 100644 --- a/compileruntime/atomics_lib_standard/src/main/js/test/Atomics.test.js +++ b/compileruntime/atomics_lib_standard/src/main/js/test/Atomics.test.js @@ -1,220 +1,221 @@ -/* - * 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. - */ - -// @ts-nocheck -import app from '@system.app' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' -import worker from "@ohos.worker" - -describe('WaitTest', function () { - - afterAll(function () { - console.info('total case over') - }) - - function promiseCase() { - let p = new Promise(function (resolve, reject) { - setTimeout(function () { - resolve() - }, 50) - }).then(undefined, (error) => { - }) - return p - } - - /** - * @tc.name: testNotify001 - * @tc.desc: returns a string which is either "ok", "not-equal", or "timed-out". - * @tc.author: jiangkai - */ - it('testNotify001', 0, async function (done) { - var sab = new SharedArrayBuffer(20); - var int32 = new Int32Array(sab); - var flag = false - var res = 0; - var res1 = 0; - let ss = new worker.Worker("workers/worker010.js") - let tt = new worker.Worker("workers/worker011.js") - let uu = new worker.Worker("workers/worker012.js") - - ss.onmessage = function (e) { - if(e.data == "end") { - res++ - } - flag = true - } - tt.onmessage = function (e) { - if(e.data == "end1") { - res1++ - } - if(e.data == "end2") - { - res1 += 5; - } - flag = true - } - uu.onmessage = function (e) { - if(e.data == end) { - flag = true - } - } - - ss.onexit = function() { - flag = true - } - tt.onexit = function() { - flag = true - } - uu.onexit = function() { - flag = true - } - - ss.postMessage(int32); - while(!flag) { - await promiseCase() - } - flag = false - tt.postMessage(int32); - while(!flag) { - await promiseCase() - } - flag = false - uu.postMessage(int32); - while(!flag) { - await promiseCase() - } - - Atomics.notify(int32, 0, 1) - Atomics.notify(int32, 2, 1) - while(res == 0 || res1 == 0){ - await promiseCase(); - } - - flag = false - ss.terminate() - while(!flag){ - await promiseCase(); - } - flag = false - tt.terminate() - while(!flag){ - await promiseCase(); - } - flag = false - uu.terminate() - while(!flag){ - await promiseCase(); - } - - expect(res).assertEqual(1) - expect(res1).assertEqual(5) - done() - }) - - /** - * @tc.name: testWait001 - * @tc.desc: returns a string which is either "ok", "not-equal", or "timed-out". - * @tc.author: jiangkai - */ - it('testWait001', 0, async function (done) { - var sab = new SharedArrayBuffer(20); - var flag = false; - var int32 = new Int32Array(sab); - var res = 0; - const ss = new worker.Worker("workers/worker020.js") - - ss.onmessage = function(e){ - if (e.data != 'wait'){ - res = e.data - } - flag = true - } - - ss.onexit = function() { - flag = true - } - - ss.postMessage(int32); - while(!flag){ - await promiseCase(); - } - - flag = false - Atomics.store(int32, 0, 2); - Atomics.load(int32, 0); - Atomics.notify(int32, 0, 1) - while(!flag){ - await promiseCase(); - } - - flag = false - ss.terminate() - while(!flag){ - await promiseCase(); - } - - expect(res).assertEqual(3) - done() - }) - - /** - * @tc.name: testAdd001 - * @tc.desc: returns a string which is either "ok", "not-equal", or "timed-out". - * @tc.author: jiangkai - */ - it('testAdd001', 0, async function (done) { - var sab = new SharedArrayBuffer(20); - var int32 = new Uint32Array(sab); - int32[0] = 1 - var flag = false - var count = 0 - let ss = new worker.Worker("workers/worker030.js") - let tt = new worker.Worker("workers/worker031.js") - - ss.onmessage = function() { - count += 1 - } - tt.onmessage = function() { - count += 1 - } - - ss.onexit = function() { - flag = true - } - tt.onexit = function() { - flag = true - } - - ss.postMessage(sab); - tt.postMessage(sab); - while(count != 2) { - await promiseCase(); - } - - flag = false - ss.terminate() - while(!flag){ - await promiseCase(); - } - flag = false - tt.terminate() - while(!flag){ - await promiseCase(); - } - - expect(int32[0]).assertEqual(21) - done() - }) -}) \ No newline at end of file +/* + * 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. + */ + +// @ts-nocheck +import app from '@system.app' +import worker from "@ohos.worker" +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' +export default function WaitTest() { +describe('WaitTest', function () { + + afterAll(function () { + console.info('total case over') + }) + + function promiseCase() { + let p = new Promise(function (resolve, reject) { + setTimeout(function () { + resolve() + }, 50) + }).then(undefined, (error) => { + }) + return p + } + + /** + * @tc.name: testNotify001 + * @tc.desc: returns a string which is either "ok", "not-equal", or "timed-out". + * @tc.author: jiangkai + */ + it('testNotify001', 0, async function (done) { + var sab = new SharedArrayBuffer(20); + var int32 = new Int32Array(sab); + var flag = false + var res = 0; + var res1 = 0; + let ss = new worker.Worker("workers/worker010.js") + let tt = new worker.Worker("workers/worker011.js") + let uu = new worker.Worker("workers/worker012.js") + + ss.onmessage = function (e) { + if(e.data == "end") { + res++ + } + flag = true + } + tt.onmessage = function (e) { + if(e.data == "end1") { + res1++ + } + if(e.data == "end2") + { + res1 += 5; + } + flag = true + } + uu.onmessage = function (e) { + if(e.data == end) { + flag = true + } + } + + ss.onexit = function() { + flag = true + } + tt.onexit = function() { + flag = true + } + uu.onexit = function() { + flag = true + } + + ss.postMessage(int32); + while(!flag) { + await promiseCase() + } + flag = false + tt.postMessage(int32); + while(!flag) { + await promiseCase() + } + flag = false + uu.postMessage(int32); + while(!flag) { + await promiseCase() + } + + Atomics.notify(int32, 0, 1) + Atomics.notify(int32, 2, 1) + while(res == 0 || res1 == 0){ + await promiseCase(); + } + + flag = false + ss.terminate() + while(!flag){ + await promiseCase(); + } + flag = false + tt.terminate() + while(!flag){ + await promiseCase(); + } + flag = false + uu.terminate() + while(!flag){ + await promiseCase(); + } + + expect(res).assertEqual(1) + expect(res1).assertEqual(5) + done() + }) + + /** + * @tc.name: testWait001 + * @tc.desc: returns a string which is either "ok", "not-equal", or "timed-out". + * @tc.author: jiangkai + */ + it('testWait001', 0, async function (done) { + var sab = new SharedArrayBuffer(20); + var flag = false; + var int32 = new Int32Array(sab); + var res = 0; + const ss = new worker.Worker("workers/worker020.js") + + ss.onmessage = function(e){ + if (e.data != 'wait'){ + res = e.data + } + flag = true + } + + ss.onexit = function() { + flag = true + } + + ss.postMessage(int32); + while(!flag){ + await promiseCase(); + } + + flag = false + Atomics.store(int32, 0, 2); + Atomics.load(int32, 0); + Atomics.notify(int32, 0, 1) + while(!flag){ + await promiseCase(); + } + + flag = false + ss.terminate() + while(!flag){ + await promiseCase(); + } + + expect(res).assertEqual(3) + done() + }) + + /** + * @tc.name: testAdd001 + * @tc.desc: returns a string which is either "ok", "not-equal", or "timed-out". + * @tc.author: jiangkai + */ + it('testAdd001', 0, async function (done) { + var sab = new SharedArrayBuffer(20); + var int32 = new Uint32Array(sab); + int32[0] = 1 + var flag = false + var count = 0 + let ss = new worker.Worker("workers/worker030.js") + let tt = new worker.Worker("workers/worker031.js") + + ss.onmessage = function() { + count += 1 + } + tt.onmessage = function() { + count += 1 + } + + ss.onexit = function() { + flag = true + } + tt.onexit = function() { + flag = true + } + + ss.postMessage(sab); + tt.postMessage(sab); + while(count != 2) { + await promiseCase(); + } + + flag = false + ss.terminate() + while(!flag){ + await promiseCase(); + } + flag = false + tt.terminate() + while(!flag){ + await promiseCase(); + } + + expect(int32[0]).assertEqual(21) + done() + }) +}) +} \ No newline at end of file diff --git a/compileruntime/atomics_lib_standard/src/main/js/test/List.test.js b/compileruntime/atomics_lib_standard/src/main/js/test/List.test.js index f1c60aad4..16eb6a912 100644 --- a/compileruntime/atomics_lib_standard/src/main/js/test/List.test.js +++ b/compileruntime/atomics_lib_standard/src/main/js/test/List.test.js @@ -1,16 +1,19 @@ -/* - * 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('./Atomics.test.js') \ No newline at end of file +/* + * 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 WaitTest from './Atomics.test.js' + +export default function testsuite() { + WaitTest() +} \ No newline at end of file diff --git a/compileruntime/atomics_lib_standard/src/main/resources/base/element/string.json b/compileruntime/atomics_lib_standard/src/main/resources/base/element/string.json index 0bae6bd40..8ffbe6522 100644 --- a/compileruntime/atomics_lib_standard/src/main/resources/base/element/string.json +++ b/compileruntime/atomics_lib_standard/src/main/resources/base/element/string.json @@ -1,12 +1,28 @@ -{ - "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" + } + ] } \ No newline at end of file diff --git a/compileruntime/url_lib_standard/src/main/js/MainAbility/app.js b/compileruntime/url_lib_standard/src/main/js/MainAbility/app.js index ff2c11965..abc0616eb 100644 --- a/compileruntime/url_lib_standard/src/main/js/MainAbility/app.js +++ b/compileruntime/url_lib_standard/src/main/js/MainAbility/app.js @@ -1,22 +1,22 @@ -/* - * 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'); - } -}; +/* + * 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'); + } +}; diff --git a/compileruntime/url_lib_standard/src/main/js/MainAbility/i18n/en-US.json b/compileruntime/url_lib_standard/src/main/js/MainAbility/i18n/en-US.json index e63c70d97..a4c13dcbd 100644 --- a/compileruntime/url_lib_standard/src/main/js/MainAbility/i18n/en-US.json +++ b/compileruntime/url_lib_standard/src/main/js/MainAbility/i18n/en-US.json @@ -1,6 +1,6 @@ -{ - "strings": { - "hello": "Hello", - "world": "World" - } +{ + "strings": { + "hello": "Hello", + "world": "World" + } } \ No newline at end of file diff --git a/compileruntime/url_lib_standard/src/main/js/MainAbility/i18n/zh-CN.json b/compileruntime/url_lib_standard/src/main/js/MainAbility/i18n/zh-CN.json index de6ee5748..b1c02368f 100644 --- a/compileruntime/url_lib_standard/src/main/js/MainAbility/i18n/zh-CN.json +++ b/compileruntime/url_lib_standard/src/main/js/MainAbility/i18n/zh-CN.json @@ -1,6 +1,6 @@ -{ - "strings": { - "hello": "您好", - "world": "世界" - } +{ + "strings": { + "hello": "您好", + "world": "世界" + } } \ No newline at end of file diff --git a/compileruntime/url_lib_standard/src/main/js/MainAbility/pages/index/index.css b/compileruntime/url_lib_standard/src/main/js/MainAbility/pages/index/index.css index 5bcfb2e8b..273d2a4b0 100644 --- a/compileruntime/url_lib_standard/src/main/js/MainAbility/pages/index/index.css +++ b/compileruntime/url_lib_standard/src/main/js/MainAbility/pages/index/index.css @@ -1,59 +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. - */ - -.container { - flex-direction: column; - justify-content: center; - align-items: center; -} - -.title { - font-size: 40px; - color: #000000; - opacity: 0.9; -} - -@media screen and (device-type: tablet) and (orientation: landscape) { - .title { - font-size: 100px; - } -} - -@media screen and (device-type: wearable) { - .title { - font-size: 28px; - color: #FFFFFF; - } -} - -@media screen and (device-type: tv) { - .container { - background-image: url("../../common/images/Wallpaper.png"); - background-size: cover; - background-repeat: no-repeat; - background-position: center; - } - - .title { - font-size: 100px; - color: #FFFFFF; - } -} - -@media screen and (device-type: phone) and (orientation: landscape) { - .title { - font-size: 60px; - } -} +/* + * 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. + */ + +.container { + flex-direction: column; + justify-content: center; + align-items: center; +} + +.title { + font-size: 40px; + color: #000000; + opacity: 0.9; +} + +@media screen and (device-type: tablet) and (orientation: landscape) { + .title { + font-size: 100px; + } +} + +@media screen and (device-type: wearable) { + .title { + font-size: 28px; + color: #FFFFFF; + } +} + +@media screen and (device-type: tv) { + .container { + background-image: url("../../common/images/Wallpaper.png"); + background-size: cover; + background-repeat: no-repeat; + background-position: center; + } + + .title { + font-size: 100px; + color: #FFFFFF; + } +} + +@media screen and (device-type: phone) and (orientation: landscape) { + .title { + font-size: 60px; + } +} diff --git a/compileruntime/url_lib_standard/src/main/js/MainAbility/pages/index/index.hml b/compileruntime/url_lib_standard/src/main/js/MainAbility/pages/index/index.hml index a2614561b..b15f3317d 100644 --- a/compileruntime/url_lib_standard/src/main/js/MainAbility/pages/index/index.hml +++ b/compileruntime/url_lib_standard/src/main/js/MainAbility/pages/index/index.hml @@ -1,20 +1,20 @@ - - -
- - {{ $t('strings.hello') }} {{ title }} - -
+ + +
+ + {{ $t('strings.hello') }} {{ title }} + +
diff --git a/compileruntime/worker_lib_standard/BUILD.gn b/compileruntime/worker_lib_standard/BUILD.gn index 534a78db8..147365435 100644 --- a/compileruntime/worker_lib_standard/BUILD.gn +++ b/compileruntime/worker_lib_standard/BUILD.gn @@ -9,7 +9,7 @@ # 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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") @@ -23,7 +23,9 @@ ohos_js_hap_suite("worker_js_hap") { hap_name = "ActsWorkerJSTest" } ohos_js_assets("worker_js_assets") { - source_dir = "./src/main/js/default" + js2abc = true + hap_profile = "./src/main/config.json" + source_dir = "./src/main/js" } ohos_resources("worker_resources") { sources = [ "./src/main/resources" ] diff --git a/compileruntime/worker_lib_standard/Test.json b/compileruntime/worker_lib_standard/Test.json index b1ff162f3..4a8621156 100644 --- a/compileruntime/worker_lib_standard/Test.json +++ b/compileruntime/worker_lib_standard/Test.json @@ -1,18 +1,19 @@ -{ - "description": "Configuration for startup worker js api Tests", - "driver": { - "type": "JSUnitTest", - "test-timeout": "800000", - "package": "com.example.workerxts", - "shell-timeout": "90000" - }, - "kits": [ - { - "test-file-name": [ - "ActsWorkerJSTest.hap" - ], - "type": "AppInstallKit", - "cleanup-apps": true - } - ] +{ + "description": "Configuration for startup worker js api Tests", + "driver": { + "type": "OHJSUnitTest", + "test-timeout": "800000", + "bundle-name": "com.example.workerxts", + "package-name": "com.example.workerxts", + "shell-timeout": "800000" + }, + "kits": [ + { + "test-file-name": [ + "ActsWorkerJSTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/config.json b/compileruntime/worker_lib_standard/src/main/config.json index fab848438..04e8086d7 100644 --- a/compileruntime/worker_lib_standard/src/main/config.json +++ b/compileruntime/worker_lib_standard/src/main/config.json @@ -1,65 +1,94 @@ -{ - "app": { - "bundleName": "com.example.workerxts", - "vendor": "example", - "version": { - "code": 1000000, - "name": "1.0.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5 - } - }, - "deviceConfig": {}, - "module": { - "package": "com.example.workerxts", - "name": ".MyApplication", - "mainAbility": "com.example.workerxts.MainAbility", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "entry", - "moduleType": "entry", - "installationFree": false - }, - "abilities": [ - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "visible": true, - "orientation": "unspecified", - "name": "com.example.workerxts.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "formsEnabled": false, - "label": "$string:entry_MainAbility", - "type": "page", - "launchType": "standard" - } - ], - "js": [ - { - "pages": [ - "pages/index/index", - "pages/second/second" - ], - "name": "default", - "window": { - "designWidth": 720, - "autoDesignWidth": false - } - } - ] - } +{ + "app": { + "bundleName": "com.example.workerxts", + "vendor": "example", + "version": { + "code": 1000000, + "name": "1.0.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5 + } + }, + "deviceConfig": {}, + "module": { + "package": "com.example.workerxts", + "name": ".entry", + "mainAbility": ".MainAbility", + "srcPath":"", + "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" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + }, + { + "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/atomics_lib_standard/src/main/js/default/app.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/app.js similarity index 97% rename from compileruntime/atomics_lib_standard/src/main/js/default/app.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/app.js index 5cdca0218..284fe981c 100644 --- a/compileruntime/atomics_lib_standard/src/main/js/default/app.js +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/app.js @@ -1,23 +1,23 @@ -/* - * 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("Application onCreate"); - }, - onDestroy() { - console.info("Application 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("Application onCreate"); + }, + onDestroy() { + console.info("Application onDestroy"); + } +}; diff --git a/compileruntime/atomics_lib_standard/src/main/js/default/i18n/en-US.json b/compileruntime/worker_lib_standard/src/main/js/MainAbility/i18n/en-US.json similarity index 93% rename from compileruntime/atomics_lib_standard/src/main/js/default/i18n/en-US.json rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/i18n/en-US.json index 08e34eac9..8feb71993 100644 --- a/compileruntime/atomics_lib_standard/src/main/js/default/i18n/en-US.json +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/i18n/en-US.json @@ -1,11 +1,11 @@ -{ - "strings": { - "hello": "Hello", - "world": "World", - "page": "Second Page", - "next": "Next Page", - "back": "Back" - }, - "Files": { - } +{ + "strings": { + "hello": "Hello", + "world": "World", + "page": "Second Page", + "next": "Next Page", + "back": "Back" + }, + "Files": { + } } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/js/default/i18n/zh-CN.json b/compileruntime/worker_lib_standard/src/main/js/MainAbility/i18n/zh-CN.json similarity index 93% rename from compileruntime/worker_lib_standard/src/main/js/default/i18n/zh-CN.json rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/i18n/zh-CN.json index 3dd53b3a8..6551d1608 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/i18n/zh-CN.json +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/i18n/zh-CN.json @@ -1,11 +1,11 @@ -{ - "strings": { - "hello": "您好", - "world": "世界", - "page": "第二页", - "next": "下一页", - "back": "返回" - }, - "Files": { - } +{ + "strings": { + "hello": "您好", + "world": "世界", + "page": "第二页", + "next": "下一页", + "back": "返回" + }, + "Files": { + } } \ No newline at end of file diff --git a/compileruntime/atomics_lib_standard/src/main/js/default/pages/index/index.css b/compileruntime/worker_lib_standard/src/main/js/MainAbility/pages/index/index.css similarity index 96% rename from compileruntime/atomics_lib_standard/src/main/js/default/pages/index/index.css rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/pages/index/index.css index db2b048d6..93e9ced7c 100644 --- a/compileruntime/atomics_lib_standard/src/main/js/default/pages/index/index.css +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/pages/index/index.css @@ -1,39 +1,39 @@ -/* - * 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. - */ - -.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; -} - -.btn { - width: 50%; - height: 100px; - font-size: 40px; -} +/* + * 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. + */ + +.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; +} + +.btn { + width: 50%; + height: 100px; + font-size: 40px; +} diff --git a/compileruntime/atomics_lib_standard/src/main/js/default/pages/index/index.hml b/compileruntime/worker_lib_standard/src/main/js/MainAbility/pages/index/index.hml similarity index 97% rename from compileruntime/atomics_lib_standard/src/main/js/default/pages/index/index.hml rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/pages/index/index.hml index 8590b3287..497461afd 100644 --- a/compileruntime/atomics_lib_standard/src/main/js/default/pages/index/index.hml +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/pages/index/index.hml @@ -1,21 +1,21 @@ - - -
- - {{ $t('strings.hello') }} {{ title }} - - -
+ + +
+ + {{ $t('strings.hello') }} {{ title }} + + +
diff --git a/compileruntime/atomics_lib_standard/src/main/js/default/pages/index/index.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/pages/index/index.js similarity index 67% rename from compileruntime/atomics_lib_standard/src/main/js/default/pages/index/index.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/pages/index/index.js index 0f185cf96..fbba13973 100644 --- a/compileruntime/atomics_lib_standard/src/main/js/default/pages/index/index.js +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/pages/index/index.js @@ -1,46 +1,48 @@ -/* - * 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 app from '@system.app' -import device from '@system.device' -import router from '@system.router' -import {Core, Constant, ExpectExtend, ReportExtend, InstrumentLog} from 'deccjsunit/index' - - -export default { - data: { - title: '' - }, - onInit() { - this.title = this.$t('strings.world'); - }, - onShow() { - console.info('onShow finish') - const core = Core.getInstance() - core.init() - require('../../../test/List.test') - core.execute() - }, - touchMove(e) { - if (e.direction === 'right') { - this.appExit(); - } - }, - appExit() { - app.terminate() - } -} - - +/* + * 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 app from '@system.app' +import device from '@system.device' +import router from '@system.router' +import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' +import { Hypium } from '@ohos/hypium' +import testsuite from '../../../test/List.test' + + +export default { + data: { + title: '' + }, + onInit() { + this.title = this.$t('strings.world'); + }, + onShow() { + console.info('onShow finish') + var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator() + var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() + console.info('start run testcase!!!') + Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) + }, + touchMove(e) { + if (e.direction === 'right') { + this.appExit(); + } + }, + appExit() { + app.terminate() + } +} + + diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker.js similarity index 100% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker.js diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_002.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_002.js similarity index 100% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_002.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_002.js diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_003.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_003.js similarity index 100% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_003.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_003.js diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_004.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_004.js similarity index 100% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_004.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_004.js diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_005.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_005.js similarity index 100% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_005.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_005.js diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_006.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_006.js similarity index 100% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_006.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_006.js diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_007.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_007.js similarity index 100% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_007.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_007.js diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_008.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_008.js similarity index 100% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_008.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_008.js diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_009.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_009.js similarity index 96% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_009.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_009.js index 59ce1ef2b..905ec28ab 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_009.js +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_009.js @@ -1,45 +1,45 @@ -/* - * 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 worker from "@ohos.worker" - -const parentPort = worker.parentPort; - -var ss = undefined; -var flag = false; - -parentPort.onmessage = function(e) { - let data = e.data; - switch(data.type) { - case "new": - ss = new worker.Worker("workers/worker_0091.js"); - console.log("worker:: workerxx "); - ss.onexit = function() { - flag = true; - } - parentPort.postMessage(ss != null); - break; - case "wait": - if (flag) { - parentPort.postMessage("terminate"); - } - break; - case "terminate": - flag = false; - ss.terminate(); - break; - default: - break; - } +/* + * 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 worker from "@ohos.worker" + +const parentPort = worker.parentPort; + +var ss = undefined; +var flag = false; + +parentPort.onmessage = function(e) { + let data = e.data; + switch(data.type) { + case "new": + ss = new worker.Worker("workers/worker_0091.js"); + console.log("worker:: workerxx "); + ss.onexit = function() { + flag = true; + } + parentPort.postMessage(ss != null); + break; + case "wait": + if (flag) { + parentPort.postMessage("terminate"); + } + break; + case "terminate": + flag = false; + ss.terminate(); + break; + default: + break; + } } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0091.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0091.js similarity index 97% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0091.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0091.js index a7a1ff89c..940815ae3 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0091.js +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0091.js @@ -1,21 +1,21 @@ -/* - * 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 worker from "@ohos.worker" - -const parentPort = worker.parentPort; - -parentPort.onmessage = function(e) { - console.log("worker:: onmessage"); +/* + * 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 worker from "@ohos.worker" + +const parentPort = worker.parentPort; + +parentPort.onmessage = function(e) { + console.log("worker:: onmessage"); } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_010.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_010.js similarity index 96% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_010.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_010.js index 748325ec6..73663f6cb 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_010.js +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_010.js @@ -1,50 +1,50 @@ -/* - * 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 worker from "@ohos.worker" - -const parentPort = worker.parentPort; - -var ss = undefined; -var backValue = undefined; -var flag = false; - -parentPort.onmessage = function(e) { - let data = e.data; - switch(data.type) { - case "new": - ss = new worker.Worker("workers/worker_0101.js"); - ss.onmessage = function(ee) { - backValue = ee.data; - flag = true; - } - ss.onexit = function() { - backValue = "terminate"; - flag = true; - } - ss.postMessage(data.value); - break; - case "wait": - if (flag) { - parentPort.postMessage(backValue); - } - break; - case "terminate": - flag = false; - ss.terminate(); - break; - default: - break; - } +/* + * 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 worker from "@ohos.worker" + +const parentPort = worker.parentPort; + +var ss = undefined; +var backValue = undefined; +var flag = false; + +parentPort.onmessage = function(e) { + let data = e.data; + switch(data.type) { + case "new": + ss = new worker.Worker("workers/worker_0101.js"); + ss.onmessage = function(ee) { + backValue = ee.data; + flag = true; + } + ss.onexit = function() { + backValue = "terminate"; + flag = true; + } + ss.postMessage(data.value); + break; + case "wait": + if (flag) { + parentPort.postMessage(backValue); + } + break; + case "terminate": + flag = false; + ss.terminate(); + break; + default: + break; + } } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0101.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0101.js similarity index 97% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0101.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0101.js index 9cc4eaeed..41f5e9940 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0101.js +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0101.js @@ -1,22 +1,22 @@ -/* - * 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 worker from "@ohos.worker" - -const parentPort = worker.parentPort; - -parentPort.onmessage = function(e) { - let data = e.data; // 12 - parentPort.postMessage(data * 2 + 1); // 25 +/* + * 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 worker from "@ohos.worker" + +const parentPort = worker.parentPort; + +parentPort.onmessage = function(e) { + let data = e.data; // 12 + parentPort.postMessage(data * 2 + 1); // 25 } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_011.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_011.js similarity index 96% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_011.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_011.js index 1a0ddd93b..89d05c4a8 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_011.js +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_011.js @@ -1,50 +1,50 @@ -/* - * 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 worker from "@ohos.worker" - -const parentPort = worker.parentPort; - -var ss = undefined; -var backValue = undefined; -var flag = false; - -parentPort.onmessage = function(e) { - let data = e.data; - switch(data.type) { - case "new": - ss = new worker.Worker("workers/worker_0111.js"); - ss.onmessage = function(ee) { - backValue = ee.data; - flag = true; - } - ss.onexit = function(code) { - backValue = "terminate"; - flag = true; - } - ss.postMessage(data.value); - break; - case "wait": - if (flag) { - parentPort.postMessage(backValue); - } - break; - case "terminate": - flag = false; - ss.terminate(); - break; - default: - break; - } +/* + * 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 worker from "@ohos.worker" + +const parentPort = worker.parentPort; + +var ss = undefined; +var backValue = undefined; +var flag = false; + +parentPort.onmessage = function(e) { + let data = e.data; + switch(data.type) { + case "new": + ss = new worker.Worker("workers/worker_0111.js"); + ss.onmessage = function(ee) { + backValue = ee.data; + flag = true; + } + ss.onexit = function(code) { + backValue = "terminate"; + flag = true; + } + ss.postMessage(data.value); + break; + case "wait": + if (flag) { + parentPort.postMessage(backValue); + } + break; + case "terminate": + flag = false; + ss.terminate(); + break; + default: + break; + } } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0111.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0111.js similarity index 97% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0111.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0111.js index d06da03b8..b105de7ec 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0111.js +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0111.js @@ -1,22 +1,22 @@ -/* - * 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 worker from "@ohos.worker" - -const parentPort = worker.parentPort; - -parentPort.onmessage = function(e) { - console.log("worker:: onmessage") - parentPort.postMessage("terminate"); +/* + * 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 worker from "@ohos.worker" + +const parentPort = worker.parentPort; + +parentPort.onmessage = function(e) { + console.log("worker:: onmessage") + parentPort.postMessage("terminate"); } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_012.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_012.js similarity index 96% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_012.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_012.js index 7767338e5..d58f06088 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_012.js +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_012.js @@ -1,50 +1,50 @@ -/* - * 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 worker from "@ohos.worker" - -const parentPort = worker.parentPort; - -var ss = undefined; -var backValue = undefined; -var flag = false; - -parentPort.onmessage = function(e) { - let data = e.data; - switch(data.type) { - case "new": - ss = new worker.Worker("workers/worker_0121.js"); - ss.onmessage = function(ee) { - backValue = ee.data; - flag = true; - } - ss.onexit = function() { - backValue = "terminate"; - flag = true; - } - ss.postMessage({type: "new"}); - break; - case "wait": - if (flag) { - parentPort.postMessage(backValue); - } - break; - case "terminate": - flag = false; - ss.terminate(); - break; - default: - break; - } +/* + * 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 worker from "@ohos.worker" + +const parentPort = worker.parentPort; + +var ss = undefined; +var backValue = undefined; +var flag = false; + +parentPort.onmessage = function(e) { + let data = e.data; + switch(data.type) { + case "new": + ss = new worker.Worker("workers/worker_0121.js"); + ss.onmessage = function(ee) { + backValue = ee.data; + flag = true; + } + ss.onexit = function() { + backValue = "terminate"; + flag = true; + } + ss.postMessage({type: "new"}); + break; + case "wait": + if (flag) { + parentPort.postMessage(backValue); + } + break; + case "terminate": + flag = false; + ss.terminate(); + break; + default: + break; + } } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0121.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0121.js similarity index 96% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0121.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0121.js index 862eafab6..8cb3c2c63 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0121.js +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0121.js @@ -1,36 +1,36 @@ -/* - * 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 worker from "@ohos.worker" - -const parentPort = worker.parentPort; - -var ss = undefined; -var backValue = undefined; -var flag = false; - -parentPort.onmessage = function(e) { - let data = e.data; - switch(data.type) { - case "new": - ss = new worker.Worker("workers/worker_0122.js"); - ss.terminate(); - ss.onexit = function() { - parentPort.postMessage(ss != null); - } - break; - default: - break; - } +/* + * 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 worker from "@ohos.worker" + +const parentPort = worker.parentPort; + +var ss = undefined; +var backValue = undefined; +var flag = false; + +parentPort.onmessage = function(e) { + let data = e.data; + switch(data.type) { + case "new": + ss = new worker.Worker("workers/worker_0122.js"); + ss.terminate(); + ss.onexit = function() { + parentPort.postMessage(ss != null); + } + break; + default: + break; + } } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0122.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0122.js similarity index 97% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0122.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0122.js index e875140b6..48bc6bedd 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0122.js +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0122.js @@ -1,25 +1,25 @@ -/* - * 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 worker from "@ohos.worker" - -const parentPort = worker.parentPort; - -var ss = undefined; -var backValue = undefined; -var flag = false; - -parentPort.onmessage = function(e) { - console.info("worker:: thrid worker onmessage") +/* + * 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 worker from "@ohos.worker" + +const parentPort = worker.parentPort; + +var ss = undefined; +var backValue = undefined; +var flag = false; + +parentPort.onmessage = function(e) { + console.info("worker:: thrid worker onmessage") } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_013.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_013.js similarity index 96% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_013.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_013.js index b924e13d7..319081fcd 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_013.js +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_013.js @@ -1,50 +1,50 @@ -/* - * 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 worker from "@ohos.worker" - -const parentPort = worker.parentPort; - -var ss = undefined; -var backValue = undefined; -var flag = false; - -parentPort.onmessage = function(e) { - var data = e.data; - switch(data.type) { - case "new": - ss = new worker.Worker("workers/worker_0131.js"); - ss.onmessage = function(ee) { - backValue = ee.data; - flag = true; - } - ss.onexit = function() { - backValue = "terminate"; - flag = true; - } - ss.postMessage(data.value); - break; - case "wait": - if (flag) { - parentPort.postMessage(backValue); - } - break; - case "terminate": - flag = false; - ss.terminate(); - break; - default: - break; - } +/* + * 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 worker from "@ohos.worker" + +const parentPort = worker.parentPort; + +var ss = undefined; +var backValue = undefined; +var flag = false; + +parentPort.onmessage = function(e) { + var data = e.data; + switch(data.type) { + case "new": + ss = new worker.Worker("workers/worker_0131.js"); + ss.onmessage = function(ee) { + backValue = ee.data; + flag = true; + } + ss.onexit = function() { + backValue = "terminate"; + flag = true; + } + ss.postMessage(data.value); + break; + case "wait": + if (flag) { + parentPort.postMessage(backValue); + } + break; + case "terminate": + flag = false; + ss.terminate(); + break; + default: + break; + } } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0131.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0131.js similarity index 97% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0131.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0131.js index 0004da328..9236f010c 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0131.js +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0131.js @@ -1,22 +1,22 @@ -/* - * 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 worker from "@ohos.worker" - -const parentPort = worker.parentPort; - -parentPort.onmessage = function(e) { - let data = e.data; // hello world - parentPort.postMessage(data + " worker"); // hello world worker +/* + * 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 worker from "@ohos.worker" + +const parentPort = worker.parentPort; + +parentPort.onmessage = function(e) { + let data = e.data; // hello world + parentPort.postMessage(data + " worker"); // hello world worker } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_014.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_014.js similarity index 96% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_014.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_014.js index d635460be..cf79c83ab 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_014.js +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_014.js @@ -1,50 +1,50 @@ -/* - * 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 worker from "@ohos.worker" - -const parentPort = worker.parentPort; - -var ss = undefined; -var backValue = undefined; -var flag = false; - -parentPort.onmessage = function(e) { - let data = e.data; - switch(data.type) { - case "new": - ss = new worker.Worker("workers/worker_0141.js"); - ss.onmessage = function(ee) { - backValue = ee.data; - flag = true; - } - ss.onexit = function() { - backValue = "terminate"; - flag = true; - } - ss.postMessage(data.value); - break; - case "wait": - if (flag) { - parentPort.postMessage(backValue); - } - break; - case "terminate": - flag = false; - ss.terminate(); - break; - default: - break; - } +/* + * 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 worker from "@ohos.worker" + +const parentPort = worker.parentPort; + +var ss = undefined; +var backValue = undefined; +var flag = false; + +parentPort.onmessage = function(e) { + let data = e.data; + switch(data.type) { + case "new": + ss = new worker.Worker("workers/worker_0141.js"); + ss.onmessage = function(ee) { + backValue = ee.data; + flag = true; + } + ss.onexit = function() { + backValue = "terminate"; + flag = true; + } + ss.postMessage(data.value); + break; + case "wait": + if (flag) { + parentPort.postMessage(backValue); + } + break; + case "terminate": + flag = false; + ss.terminate(); + break; + default: + break; + } } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0141.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0141.js similarity index 97% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0141.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0141.js index c8d5b7d7b..ba9cbdba0 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0141.js +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0141.js @@ -1,23 +1,23 @@ -/* - * 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 worker from "@ohos.worker" - -const parentPort = worker.parentPort; - -parentPort.onmessage = function(e) { - let data = e.data; - data[0] += 1 - parentPort.postMessage(data); // [2, 2] +/* + * 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 worker from "@ohos.worker" + +const parentPort = worker.parentPort; + +parentPort.onmessage = function(e) { + let data = e.data; + data[0] += 1 + parentPort.postMessage(data); // [2, 2] } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_015.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_015.js similarity index 96% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_015.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_015.js index 6f30a0be4..74bd55530 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_015.js +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_015.js @@ -1,46 +1,46 @@ -/* - * 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 worker from "@ohos.worker" - -const parentPort = worker.parentPort; - -var ss = undefined; -var backValue = undefined; -var flag = false; - -parentPort.onmessage = function(e) { - var data = e.data; - switch(data.type) { - case "new": - ss = new worker.Worker("workers/worker_0151.js"); - ss.onexit = function() { - parentPort.postMessage(backValue); // 16 - } - ss.onmessage = function(ee) { - backValue = ee.data; // 16 - flag = true; - } - ss.postMessage({type: "new", value: data.value + 1}); // 11 - break; - case "wait": - ss.postMessage({type: "wait"}); - if (flag) { - ss.terminate(); - } - break; - default: - break; - } +/* + * 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 worker from "@ohos.worker" + +const parentPort = worker.parentPort; + +var ss = undefined; +var backValue = undefined; +var flag = false; + +parentPort.onmessage = function(e) { + var data = e.data; + switch(data.type) { + case "new": + ss = new worker.Worker("workers/worker_0151.js"); + ss.onexit = function() { + parentPort.postMessage(backValue); // 16 + } + ss.onmessage = function(ee) { + backValue = ee.data; // 16 + flag = true; + } + ss.postMessage({type: "new", value: data.value + 1}); // 11 + break; + case "wait": + ss.postMessage({type: "wait"}); + if (flag) { + ss.terminate(); + } + break; + default: + break; + } } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0151.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0151.js similarity index 96% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0151.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0151.js index 1b29a2949..eb827e0a5 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0151.js +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0151.js @@ -1,45 +1,45 @@ -/* - * 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 worker from "@ohos.worker" - -const parentPort = worker.parentPort; - -var ss = undefined; -var backValue = undefined; -var flag = false; - -parentPort.onmessage = function(e) { - let data = e.data; - switch(data.type) { - case "new": - ss = new worker.Worker("workers/worker_0152.js"); - ss.onexit = function() { - parentPort.postMessage(backValue); // 16 - } - ss.onmessage = function(ee) { - backValue = ee.data; - flag = true; - } - ss.postMessage(data.value + 2); // 13 - break; - case "wait": - if (flag) { - ss.terminate(); - } - break; - default: - break; - } +/* + * 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 worker from "@ohos.worker" + +const parentPort = worker.parentPort; + +var ss = undefined; +var backValue = undefined; +var flag = false; + +parentPort.onmessage = function(e) { + let data = e.data; + switch(data.type) { + case "new": + ss = new worker.Worker("workers/worker_0152.js"); + ss.onexit = function() { + parentPort.postMessage(backValue); // 16 + } + ss.onmessage = function(ee) { + backValue = ee.data; + flag = true; + } + ss.postMessage(data.value + 2); // 13 + break; + case "wait": + if (flag) { + ss.terminate(); + } + break; + default: + break; + } } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0152.js b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0152.js similarity index 97% rename from compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0152.js rename to compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0152.js index ea073a604..57b52d0f1 100644 --- a/compileruntime/worker_lib_standard/src/main/js/default/workers/worker_0152.js +++ b/compileruntime/worker_lib_standard/src/main/js/MainAbility/workers/worker_0152.js @@ -1,22 +1,22 @@ -/* - * 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 worker from "@ohos.worker" - -const parentPort = worker.parentPort; - -parentPort.onmessage = function(e) { - let data = e.data; - parentPort.postMessage(data + 3); // 16 +/* + * 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 worker from "@ohos.worker" + +const parentPort = worker.parentPort; + +parentPort.onmessage = function(e) { + let data = e.data; + parentPort.postMessage(data + 3); // 16 } \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/js/TestAbility/app.js b/compileruntime/worker_lib_standard/src/main/js/TestAbility/app.js new file mode 100644 index 000000000..cbdada4ad --- /dev/null +++ b/compileruntime/worker_lib_standard/src/main/js/TestAbility/app.js @@ -0,0 +1,23 @@ +/* + * 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('TestApplication onCreate') + + }, + onDestroy() { + console.info("TestApplication onDestroy"); + } +}; diff --git a/compileruntime/worker_lib_standard/src/main/js/TestAbility/i18n/en-US.json b/compileruntime/worker_lib_standard/src/main/js/TestAbility/i18n/en-US.json new file mode 100644 index 000000000..3cb24b374 --- /dev/null +++ b/compileruntime/worker_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/worker_lib_standard/src/main/js/TestAbility/i18n/zh-CN.json b/compileruntime/worker_lib_standard/src/main/js/TestAbility/i18n/zh-CN.json new file mode 100644 index 000000000..c804e32c0 --- /dev/null +++ b/compileruntime/worker_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/worker_lib_standard/src/main/js/TestAbility/pages/index/index.css b/compileruntime/worker_lib_standard/src/main/js/TestAbility/pages/index/index.css new file mode 100644 index 000000000..2b45eb97c --- /dev/null +++ b/compileruntime/worker_lib_standard/src/main/js/TestAbility/pages/index/index.css @@ -0,0 +1,50 @@ +/* + * 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. + */ + +.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; +} +.btn { + width: 50%; + height: 100px; + font-size: 40px; +} + +@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/worker_lib_standard/src/main/js/TestAbility/pages/index/index.hml b/compileruntime/worker_lib_standard/src/main/js/TestAbility/pages/index/index.hml new file mode 100644 index 000000000..61ea59d93 --- /dev/null +++ b/compileruntime/worker_lib_standard/src/main/js/TestAbility/pages/index/index.hml @@ -0,0 +1,21 @@ + + +
+ + {{ $t('strings.hello') }} {{title}} + + +
diff --git a/compileruntime/worker_lib_standard/src/main/js/TestAbility/pages/index/index.js b/compileruntime/worker_lib_standard/src/main/js/TestAbility/pages/index/index.js new file mode 100644 index 000000000..88b083a7f --- /dev/null +++ b/compileruntime/worker_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/worker_lib_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js b/compileruntime/worker_lib_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js new file mode 100644 index 000000000..05ba57825 --- /dev/null +++ b/compileruntime/worker_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'] + '.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); + }) + } +}; diff --git a/compileruntime/worker_lib_standard/src/main/js/test/List.test.js b/compileruntime/worker_lib_standard/src/main/js/test/List.test.js index 65bc76621..8243bb5ed 100644 --- a/compileruntime/worker_lib_standard/src/main/js/test/List.test.js +++ b/compileruntime/worker_lib_standard/src/main/js/test/List.test.js @@ -12,5 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import workerTest from './Worker.test.js' -require('./Worker.test.js') \ No newline at end of file +export default function testsuite() { + workerTest() +} \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/js/test/Worker.test.js b/compileruntime/worker_lib_standard/src/main/js/test/Worker.test.js index 78fdec7d1..d50000f17 100644 --- a/compileruntime/worker_lib_standard/src/main/js/test/Worker.test.js +++ b/compileruntime/worker_lib_standard/src/main/js/test/Worker.test.js @@ -15,9 +15,9 @@ // @ts-nocheck import app from '@system.app' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' import worker from "@ohos.worker" - +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium' +export default function workerTest() { describe('workerTest', function () { afterAll(function () { @@ -1348,4 +1348,5 @@ describe('workerTest', function () { expect(res).assertEqual("terminate") done() }) -}) \ No newline at end of file +}) +} \ No newline at end of file diff --git a/compileruntime/worker_lib_standard/src/main/resources/base/element/string.json b/compileruntime/worker_lib_standard/src/main/resources/base/element/string.json index 0bae6bd40..8ffbe6522 100644 --- a/compileruntime/worker_lib_standard/src/main/resources/base/element/string.json +++ b/compileruntime/worker_lib_standard/src/main/resources/base/element/string.json @@ -1,12 +1,28 @@ -{ - "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" + } + ] } \ No newline at end of file -- GitLab