diff --git a/compileruntime/atomics_lib_standard/BUILD.gn b/compileruntime/atomics_lib_standard/BUILD.gn
index f4e9ce4501320b4598df638f932e80906a85af7f..0ee9aefa7b51a28bff8c5dcf10df58e644a2453f 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 6b0efdbd16e18d0a65119fcd9b99f3c8414f3355..7843c8280fd7e455425e26cf6e3855379507b21a 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 c56190b1c59e965f1a478bad82b88a3eca83b8b9..90b72b8abdb7122f9dc172d1d7668c5bd891e647 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 0000000000000000000000000000000000000000..c1f1f0dc7747d02dcdc47265784a82217a9bec78
--- /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 08e34eac912bf2651eefc20e26aa479b5e4e7ec2..8feb7199333a82bab6f9e29341246e466c7dfd55 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 3dd53b3a8b808aec9396fa663cb00ef22ba61e0a..6551d160806d9089707897124655bcba11a83932 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 db2b048d654812f46761f4af2caad2818e70d505..93e9ced7caf21c3c07a7aef6a93acde8739faa1e 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 8590b3287297d0dd5968fd47d2324c3e4151c498..497461afd4ec48cae842b73631e95578b4de465a 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 0f185cf96ace03efce6fc6d0687fef58b0deff7e..803fc5ce6106e758e5cdd07b4e48b37702ddf199 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 a2581590aa48d5cdb372c60a27e4bfc683a183ed..afae6db5e98d80bee229b8a7d7825e6111c9ac57 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 1e2b73b1bb17b4e2e6be80b4f79812e8a61af575..1bc9845bf9f56154ed7c2d7203a624fad1b23004 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 ccc00ed30ad73a78e32baa72c7b422a44d6c4a8c..22224f4346472016dd3dff62919633367b6cfc5a 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 d87c7e74cd8fc5534317e2f6ae41c94fe361001c..4a5801c729b834fe0b90427073a4abc2a9bbc440 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 8561ad8f860e654995277972bf32eed61acd453c..463d7315cf98945d64500c11393631fda2024cb3 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 73285c42ac88baf7d5ac107a59965fb3da3521a5..37b2e13e8efebcd9d06573b6549be5dcce058448 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 5cdca0218254017a127aa38111a179debf319fb1..06175ef50b6e624a4fd362a197d944e9ea657213 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 0000000000000000000000000000000000000000..3cb24b374b1d919ca8eac0638f361692b603a900
--- /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 0000000000000000000000000000000000000000..c804e32c0c3103929baca5617cdac70be11fdba1
--- /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 0000000000000000000000000000000000000000..2b45eb97c17e67ef5d63436aad8998113aa95d6d
--- /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 0000000000000000000000000000000000000000..61ea59d936e5a2971f1ea3d179c44a7f3f596c54
--- /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 0000000000000000000000000000000000000000..88b083a7f6b979019d6a2c5ad20b19c5fd43286b
--- /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 0000000000000000000000000000000000000000..05ba5782592890d16fe15add4421c6187bae9511
--- /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 94d953c75a07c001d856fe865dfec7775ed25721..77af995a24ae02ae876cd35ed28e0e35696eb4e0 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 f1c60aad40d2b3f610caec2e078b43738c67a7f9..16eb6a91225ada177d76ffa3dc6f68d8a68caa39 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 0bae6bd40f7360d5d818998221b199d3ec0f69c0..8ffbe652242502d6a9bfab162894cdab6d709a59 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 ff2c11965e08dd2df603562158980963c00e7a25..abc0616eb709ecfbfa01b961ce1de1ee8b87c940 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 e63c70d978a3a53be988388c87182f81785e170c..a4c13dcbdc39c537073f638393d7726ac9a5cdc4 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 de6ee5748322f44942c1b003319d8e66c837675f..b1c02368f72f929e4375a43170444de95dcc5984 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 5bcfb2e8b6d4da7f7cdefb090c3eeaccd70009c9..273d2a4b0abe82050908791a66299236f5fc1445 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 a2614561bc83cc43a7a01c1f8f2c20ec0af9418b..b15f3317d46f99ac17955a948ff508699b2a4112 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 534a78db86305aab446020a20b392a858efb2134..14736543511ad05ef44f5e3cfc2c2720de381c4b 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 b1ff162f3e175eeef4293e5d070ced0dc6725b14..4a86211562703c2546bab133ecb7d26e6436c57f 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 fab84843869b034d31143b40d5de695393fbca7f..04e8086d703ac6705a387daebd69d395ea02f081 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 5cdca0218254017a127aa38111a179debf319fb1..284fe981cb05c789f03a2ca95e7750f89e4b7071 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 08e34eac912bf2651eefc20e26aa479b5e4e7ec2..8feb7199333a82bab6f9e29341246e466c7dfd55 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 3dd53b3a8b808aec9396fa663cb00ef22ba61e0a..6551d160806d9089707897124655bcba11a83932 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 db2b048d654812f46761f4af2caad2818e70d505..93e9ced7caf21c3c07a7aef6a93acde8739faa1e 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 8590b3287297d0dd5968fd47d2324c3e4151c498..497461afd4ec48cae842b73631e95578b4de465a 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 0f185cf96ace03efce6fc6d0687fef58b0deff7e..fbba13973cb9d995567bd6dcfcd8b6fafcd901f5 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 59ce1ef2b5af7c8332c8a18ca882c695b0685747..905ec28abca8bbbeed709264cf5a983404907f4c 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 a7a1ff89c812ef1b6ae8767448ecf0d36c26e92c..940815ae395c87f5448acd71e45a986f411a6887 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 748325ec6ceaf42ac90884f977a5130e2d875f38..73663f6cbe209615f0c6bfbb91973c8b3e5fc4f8 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 9cc4eaeed94f47e864cb6b5da227a1815d7a7ce1..41f5e9940a41296ee307a188f795232dde19a0c4 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 1a0ddd93b4a6cf645757f9310462bc6e69033fb0..89d05c4a801d56f95621cd0f4a0d44f3ad08190e 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 d06da03b8e27636752521d43109fa737900938a9..b105de7ec902f58f5ba3d50290998a3608008770 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 7767338e55559db65720083a62c88fb60f589b8c..d58f060882f9eff18a9cb60f913f3dab8c7043aa 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 862eafab6fb8008fe6923b2ff20bf522f67c606c..8cb3c2c635a776a7fb53c68777019c06c65b269f 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 e875140b66f4b3663add4bde7864fa9537508338..48bc6beddc935464f6206937101bef3ea3454f11 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 b924e13d7cf802a84ced82ac5d19e36f435135bd..319081fcd1c6036401975acef0120c93dbfadef4 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 0004da32865620e764cb51dc427f0c29694059f6..9236f010c04f7e6ff5a6e3f901f34f4a9cee900d 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 d635460be9f6d1a4d148089c7101391d543a21f3..cf79c83ab32e19b5525c1d6e97e9010fe4abaa07 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 c8d5b7d7b63cdc61f31e4c622fd67355d20cfe6a..ba9cbdba08b7c83942a170f8a8e75cf5f0c47ded 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 6f30a0be40b06801fb69a08f1d1f4ea9f9376ade..74bd5553076812ec4897d59cc5b09e87b821b663 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 1b29a29498c2bc3afb9068bf65bcff9b88a2bf6e..eb827e0a511e479e20faedd92e8e47f6e79fa52b 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 ea073a6040b65d3bab5367ea9022d147bb42e559..57b52d0f1c491758cd26feb87850d1ef920b7550 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 0000000000000000000000000000000000000000..cbdada4ad53923773b13255d8520b8b993f636ac
--- /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 0000000000000000000000000000000000000000..3cb24b374b1d919ca8eac0638f361692b603a900
--- /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 0000000000000000000000000000000000000000..c804e32c0c3103929baca5617cdac70be11fdba1
--- /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 0000000000000000000000000000000000000000..2b45eb97c17e67ef5d63436aad8998113aa95d6d
--- /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 0000000000000000000000000000000000000000..61ea59d936e5a2971f1ea3d179c44a7f3f596c54
--- /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 0000000000000000000000000000000000000000..88b083a7f6b979019d6a2c5ad20b19c5fd43286b
--- /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 0000000000000000000000000000000000000000..05ba5782592890d16fe15add4421c6187bae9511
--- /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 65bc7662112f3e656959d461db4805dad5ea247f..8243bb5ed3e2de14ddb7a2061b995de141edc03e 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 78fdec7d17eaaa40314fa6c823b141ac7b9b51da..d50000f176e8a58687c1a53d26f039db9abff9b1 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 0bae6bd40f7360d5d818998221b199d3ec0f69c0..8ffbe652242502d6a9bfab162894cdab6d709a59 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