Modify the worker test case module

issue: https://gitee.com/openharmony/xts_acts/issues/I68FR8Signed-off-by: Nyqhan <hanyuqing2@huawei.com>

commonlibrary/ets_utils/worker_lib_standard/AppScope/app.json

+{
+    "app": {
+        "bundleName": "com.example.workertest",
+        "vendor": "huawei",
+        "versionCode": 1000000,
+        "versionName": "1.0.0",
+        "icon": "$media:icon",
+        "label": "$string:app_name",
+        "distributedNotificationEnabled": true,
+        "debug": false,
+        "description": "$string:app_name",
+        "keepAlive": true,
+        "singleUser": true,
+        "minAPIVersion": 9,
+        "targetAPIVersion": 9,
+        "car": {
+            "apiCompatibleVersion": 9,
+            "singleUser": false
+        }
+    }
+}

commonlibrary/ets_utils/worker_lib_standard/AppScope/resources/base/element/string.json

+{
+ "string":[
+    {
+      "name":"app_name",
+      "value":"WorkerTest"
+    }
+  ]
+}      
\ No newline at end of file

commonlibrary/ets_utils/worker_lib_standard/BUILD.gn

-# Copyright (C) 2022 Huawei Device Co., Ltd.
+# Copyright (c) 2022 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -14,23 +14,30 @@
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("worker_js_hap") {
-  hap_profile = "./src/main/config.json"
+  hap_profile = "entry/src/main/module.json"
+  js_build_mode = "debug"
   deps = [
-    ":worker_js_assets",
-    ":worker_resources",
+    ":workertest_js_assets",
+    ":workertest_resources",
   ]
-  certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsWorkerJSTest"
-
+  ets2abc = true
+  certificate_profile = "signature/openharmony_sx.p7b"
+  hap_name = "ActsWorkerJsTest"
   subsystem_name = "commonlibrary"
   part_name = "ets_utils"
 }
-ohos_js_assets("worker_js_assets") {
-  js2abc = true
-  hap_profile = "./src/main/config.json"
-  source_dir = "./src/main/js"
+
+ohos_app_scope("workertest_app_profile") {
+  app_profile = "AppScope/app.json"
+  sources = [ "AppScope/resources" ]
 }
-ohos_resources("worker_resources") {
-  sources = [ "./src/main/resources" ]
-  hap_profile = "./src/main/config.json"
+
+ohos_js_assets("workertest_js_assets") {
+  source_dir = "entry/src/main/ets"
+}
+
+ohos_resources("workertest_resources") {
+  sources = [ "entry/src/main/resources" ]
+  deps = [ ":workertest_app_profile" ]
+  hap_profile = "entry/src/main/module.json"
 }

commonlibrary/ets_utils/worker_lib_standard/Test.json

 {
-    "description": "Configuration for startup worker js api Tests",
+    "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "OHJSUnitTest",
         "test-timeout": "800000",
-        "bundle-name": "com.example.workerxts",
-        "package-name": "com.example.workerxts",
+        "bundle-name": "com.example.workertest",
+        "module-name": "entry",
         "shell-timeout": "800000"
     },
     "kits": [
         {
             "test-file-name": [
-                "ActsWorkerJSTest.hap"
+                "ActsWorkerJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
         }
-    ]
-}
+    ] 
+}
\ No newline at end of file

commonlibrary/ets_utils/worker_lib_standard/src/main/js/TestAbility/app.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/Application/AbilityStage.ts

-/*
- * 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");
-    }
-};
+/*
+ * 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 AbilityStage from "@ohos.app.ability.AbilityStage"
+
+var printLog0 = 'Worker:AbilityStage:'
+export default class MyAbilityStage extends AbilityStage {
+    onCreate() {
+        console.info(printLog0 + "onCreate")
+    }
+}
\ No newline at end of file

commonlibrary/ets_utils/worker_lib_standard/src/main/js/TestAbility/pages/index/index.css → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/MainAbility/MainAbility.ts

-/*
- * 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;
-    }
-}
+/*
+ * 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 Ability from '@ohos.app.ability.UIAbility';
+
+var printLog = 'Worker:MainAbility:'
+export default class MainAbility extends Ability {
+    onCreate(want, launchParam) {
+        console.info(printLog + 'onCreate')
+    }
+
+    onDestroy() {
+        console.info(printLog + 'onDestroy')
+    }
+
+    onWindowStageCreate(windowStage) {
+        // Main window is created, set main page for this ability
+        console.info(printLog + 'onWindowStageCreate')
+
+        windowStage.loadContent("MainAbility/pages/index", (err, data) => {
+            if (err.code) {
+                console.error('Failed to load the content. Cause:' + JSON.stringify(err));
+                return;
+            }
+            console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data))
+        });
+    }
+
+    onWindowStageDestroy() {
+        console.info(printLog + 'onWindowStageDestroy')
+    }
+
+    onForeground() {
+        console.info(printLog + 'onForeground')
+    }
+
+    onBackground() {
+        console.info(printLog + 'onBackground')
+    }
\ No newline at end of file
+};

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/pages/index/index.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/MainAbility/pages/index.ets

-/*
- * 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()
-    }
-}
-
+/*
+ * 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 router from '@ohos.router';
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from '@ohos/hypium'
+import testsuite from '../../test/List.test'
+
+@Entry
+@Component
+struct Index {
+  @State message: string = 'MainAbility Worker'
+
+  aboutToAppear() {
+    console.info("start run testcase!!!!")
+        var abilityDelegator: any
+        abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var abilityDelegatorArguments: any
+        abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        console.info('start run testcase!!!')
+        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+  }
+
+  build() {
+    Row() {
+      Column() {
+        Text(this.message)
+          .fontSize(50)
+          .fontWeight(FontWeight.Bold)
+      }
+      .width('100%')
+    }
+    .height('100%')
+  }
+}
\ No newline at end of file
-

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/app.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/TestAbility/TestAbility.ts

-/*
- * 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.
+ */
+import Ability from '@ohos.app.ability.UIAbility'
+
+export default class TestAbility extends Ability {
+    onCreate(want, launchParam) {
+        console.log('TestAbility onCreate')
+    }
+
+    onDestroy() {
+        console.log('TestAbility onDestroy')
+    }
+
+    onWindowStageCreate(windowStage) {
+        console.log('TestAbility onWindowStageCreate')
+        windowStage.loadContent("TestAbility/pages/index", (err, data) => {
+            if (err.code) {
+                console.error('Failed to load the content. Cause:' + JSON.stringify(err));
+                return;
+            }
+            console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data))
+        });
+
+    }
+
+    onWindowStageDestroy() {
+        console.log('TestAbility onWindowStageDestroy')
+    }
+
+    onForeground() {
+        console.log('TestAbility onForeground')
+    }
+
+    onBackground() {
+        console.log('TestAbility onBackground')
+    }
+};
\ No newline at end of file

commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/TestAbility/pages/index.ets

+/*
+ * 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 router from '@ohos.router';
+
+@Entry
+@Component
+struct Index {
+  aboutToAppear() {
+    console.info('TestAbility index aboutToAppear')
+  }
+ @State message: string = 'Hello World'
+   build() {
+         Row() {
+           Column() {
+             Text(this.message)
+               .fontSize(50)
+               .fontWeight(FontWeight.Bold)
+             Button() {
+               Text('next page')
+                 .fontSize(20)
+                 .fontWeight(FontWeight.Bold)
+             }.type(ButtonType.Capsule)
+             .margin({
+               top: 20
+             })
+             .backgroundColor('#0D9FFB')
+             .width('35%')
+             .height('5%')
+             .onClick(()=>{
+             })
+           }
+             .width('100%')
+         }
+             .height('100%')
+   }
+ }
\ No newline at end of file

commonlibrary/ets_utils/worker_lib_standard/src/main/js/TestRunner/OpenHarmonyTestRunner.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts

-/*
- * 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);
-        })
-    }
-};
+/*
+ * 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 TestRunner from '@ohos.application.testRunner'
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+
+var abilityDelegator = undefined
+var abilityDelegatorArguments = undefined
+
+function translateParamsToString(parameters) {
+    const keySet = new Set([
+        '-s class', '-s notClass', '-s suite', '-s it',
+        '-s level', '-s testType', '-s size', '-s timeout',
+        '-s dryRun'
+    ])
+    let targetParams = '';
+    for (const key in parameters) {
+        if (keySet.has(key)) {
+            targetParams = `${targetParams} ${key} ${parameters[key]}`
+        }
+    }
+    return targetParams.trim()
+}
+
+async function onAbilityCreateCallback() {
+    console.log("onAbilityCreateCallback");
+}
+
+async function addAbilityMonitorCallback(err: any) {
+    console.info("addAbilityMonitorCallback : " + JSON.stringify(err))
+}
+
+export default class OpenHarmonyTestRunner implements TestRunner {
+    constructor() {
+    }
+
+    onPrepare() {
+        console.info("OpenHarmonyTestRunner OnPrepare ")
+    }
+
+    async onRun() {
+        console.log('OpenHarmonyTestRunner onRun run')
+        abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility'
+        let lMonitor = {
+            abilityName: testAbilityName,
+            onAbilityCreate: onAbilityCreateCallback,
+        };
+        abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
+        var cmd = 'aa start -d 0 -a com.example.workertest.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
+        var debug = abilityDelegatorArguments.parameters["-D"]
+        if (debug == 'true')
+        {
+            cmd += ' -D'
+        }
+        console.info('cmd : '+cmd)
+        abilityDelegator.executeShellCommand(cmd,
+            (err: any, d: any) => {
+                console.info('executeShellCommand : err : ' + JSON.stringify(err));
+                console.info('executeShellCommand : data : ' + d.stdResult);
+                console.info('executeShellCommand : data : ' + d.exitCode);
+            })
+        console.info('OpenHarmonyTestRunner onRun end')
+    }
+};
\ No newline at end of file

commonlibrary/ets_utils/worker_lib_standard/src/main/js/TestAbility/pages/index/index.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/test/List.test.js

-/*
- * Copyright (c) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export default {
-    data: {
-        title: ""
-    },
-    onInit() {
-        this.title = this.$t('strings.world');
-    }
-}
+/*
+ * 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 WorkerTest from './WorkerTest.test.js'
+import threadWorkerTest from './ThreadWorker.test.js'
+
+export default function List() {
+  WorkerTest()
+  threadWorkerTest()
+}
\ No newline at end of file
-
-
-

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/newworker_009.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_009.js

@@ -23,7 +23,7 @@ parentPort.onmessage = function(e) {
   let data = e.data;
   switch(data.type) {
     case "new":
-      ss = new worker.ThreadWorker("workers/newworker_0091.js");
+      ss = new worker.ThreadWorker("entry/ets/workers/newworker_0091.js");
       console.log("worker:: workerxx ");
       ss.onexit = function() {
         flag = true;

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/newworker_010.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_010.js

@@ -24,7 +24,7 @@ parentPort.onmessage = function(e) {
   let data = e.data;
   switch(data.type) {
     case "new":
-      ss = new worker.ThreadWorker("workers/newworker_0101.js");
+      ss = new worker.ThreadWorker("entry/ets/workers/newworker_0101.js");
       ss.onmessage = function(ee) {
         backValue = ee.data;
         flag = true;

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/newworker_011.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_011.js

@@ -24,7 +24,7 @@ parentPort.onmessage = function(e) {
   let data = e.data;
   switch(data.type) {
     case "new":
-      ss = new worker.ThreadWorker("workers/newworker_0111.js");
+      ss = new worker.ThreadWorker("entry/ets/workers/newworker_0111.js");
       ss.onmessage = function(ee) {
         backValue = ee.data;
         flag = true;

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/newworker_012.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_012.js

@@ -24,7 +24,7 @@ parentPort.onmessage = function(e) {
   let data = e.data;
   switch(data.type) {
     case "new":
-      ss = new worker.ThreadWorker("workers/newworker_0121.js");
+      ss = new worker.ThreadWorker("entry/ets/workers/newworker_0121.js");
       ss.onmessage = function(ee) {
         backValue = ee.data;
         flag = true;

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/newworker_0121.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0121.js

@@ -24,7 +24,7 @@ parentPort.onmessage = function(e) {
   let data = e.data;
   switch(data.type) {
     case "new":
-      ss = new worker.ThreadWorker("workers/newworker_0122.js");
+      ss = new worker.ThreadWorker("entry/ets/workers/newworker_0122.js");
       ss.terminate();
       ss.onexit = function() {
         parentPort.postMessage(ss != null);

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/newworker_013.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_013.js

@@ -24,7 +24,7 @@ parentPort.onmessage = function(e) {
   var data = e.data;
   switch(data.type) {
     case "new":
-      ss = new worker.ThreadWorker("workers/newworker_0131.js");
+      ss = new worker.ThreadWorker("entry/ets/workers/newworker_0131.js");
       ss.onmessage = function(ee) {
         backValue = ee.data;
         flag = true;

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/newworker_014.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_014.js

@@ -24,7 +24,7 @@ parentPort.onmessage = function(e) {
   let data = e.data;
   switch(data.type) {
     case "new":
-      ss = new worker.ThreadWorker("workers/newworker_0141.js");
+      ss = new worker.ThreadWorker("entry/ets/workers/newworker_0141.js");
       ss.onmessage = function(ee) {
         backValue = ee.data;
         flag = true;

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/newworker_015.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_015.js

@@ -24,7 +24,7 @@ parentPort.onmessage = function(e) {
   var data = e.data;
   switch(data.type) {
     case "new":
-      ss = new worker.ThreadWorker("workers/newworker_0151.js");
+      ss = new worker.ThreadWorker("entry/ets/workers/newworker_0151.js");
       ss.onexit = function() {
         parentPort.postMessage(backValue); // 16
       }

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/newworker_0151.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/newworker_0151.js

@@ -24,7 +24,7 @@ parentPort.onmessage = function(e) {
   let data = e.data;
   switch(data.type) {
     case "new":
-      ss = new worker.ThreadWorker("workers/newworker_0152.js");
+      ss = new worker.ThreadWorker("entry/ets/workers/newworker_0152.js");
       ss.onexit = function() {
         parentPort.postMessage(backValue); // 16
       }

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/worker.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/worker.js

-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import worker from '@ohos.worker';
-const parentPort = worker.parentPort;
-
-console.info("worker:: new version")
-
-parentPort.onclose = function() {
-    console.info("worker::worker.js onclose");
-}
-
-parentPort.onmessage = function(e) {
-    let data = e.data;
-    console.info("worker:: worker thread worker data is " + data.data);
-    switch(data.type) {
-        case "normal":
-            console.info("worker:: worker thread receive data " + data.data);
-            parentPort.postMessage(data);
-            console.info("worker:: worker thread post back");
-            break;
-        case "error":
-            throw new Error("123");
-        case "buffer":
-            console.info("worker:: worker.js receive buffer length is  " + data.data.byteLength);
-            parentPort.postMessage(data, [data.data]);
-            console.info("worker:: worker.js post buffer length is  " + data.data.byteLength);
-            break;
-        default:
-            console.info("worker:: worker.js receive unknow type");
-            break
-    }
-}
-
-// Deserialization error
-parentPort.onmessageerror = function() {
-    console.info("worker:: worker.js onmessageerror");
-}
-
-// js execution error
-parentPort.onerror = function(data) {
-    console.info("worker:: worker.js onerror " + data.lineno + ", msg = " + data.message + ", filename = " + data.filename + ", colno = " + data.colno);
+/*
+ * 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;
+
+console.info("worker:: new version")
+
+parentPort.onclose = function() {
+    console.info("worker::worker.js onclose");
+}
+
+parentPort.onmessage = function(e) {
+    let data = e.data;
+    console.info("worker:: worker thread worker data is " + data.data);
+    switch(data.type) {
+        case "normal":
+            console.info("worker:: worker thread receive data " + data.data);
+            parentPort.postMessage(data);
+            console.info("worker:: worker thread post back");
+            break;
+        case "error":
+            throw new Error("123");
+        case "buffer":
+            console.info("worker:: worker.js receive buffer length is  " + data.data.byteLength);
+            parentPort.postMessage(data, [data.data]);
+            console.info("worker:: worker.js post buffer length is  " + data.data.byteLength);
+            break;
+        default:
+            console.info("worker:: worker.js receive unknow type");
+            break
+    }
+}
+
+// Deserialization error
+parentPort.onmessageerror = function() {
+    console.info("worker:: worker.js onmessageerror");
+}
+
+// js execution error
+parentPort.onerror = function(data) {
+    console.info("worker:: worker.js onerror " + data.lineno + ", msg = " + data.message + ", filename = " + data.filename + ", colno = " + data.colno);
 }
\ No newline at end of file

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/worker_002.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/worker_002.js

-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import worker from '@ohos.worker';
-const parentPort = worker.parentPort;
-
-parentPort.onmessage = function(e) {
-    console.log("worker:: worker receive data " + e.data);
-    let data = e.data + " worker";
-    parentPort.postMessage(data)
+/*
+ * 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:: worker receive data " + e.data);
+    let data = e.data + " worker";
+    parentPort.postMessage(data)
 }
\ No newline at end of file

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/worker_003.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/worker_003.js

-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import worker from '@ohos.worker';
-const parentPort = worker.parentPort;
-
-parentPort.onmessage = function(e) {
-    let data = e.data * 2 + 1
-    parentPort.postMessage(data)
+/*
+ * 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 * 2 + 1
+    parentPort.postMessage(data)
 }
\ No newline at end of file

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/worker_004.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/worker_004.js

-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import worker from '@ohos.worker';
-const parentPort = worker.parentPort;
-
-parentPort.onmessage = function(e) {
-    let data = e.data;
-    data.message = "hello world " + "worker"
-    parentPort.postMessage(data)
+/*
+ * 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.message = "hello world " + "worker"
+    parentPort.postMessage(data)
 }
\ No newline at end of file

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/worker_005.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/worker_005.js

-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import worker from '@ohos.worker';
-const parentPort = worker.parentPort;
-
-parentPort.onmessage = function(e) {
-    parentPort.postMessage(name)
+/*
+ * 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) {
+    parentPort.postMessage(name)
 }
\ No newline at end of file

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/worker_006.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/worker_006.js

-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import worker from '@ohos.worker';
-const parentPort = worker.parentPort;
-
-parentPort.onmessage = function(e) {
-    parentPort.postMessage("hello world")
+/*
+ * 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) {
+    parentPort.postMessage("hello world")
 }
\ No newline at end of file

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/worker_007.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/worker_007.js

-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import worker from '@ohos.worker';
-const parentPort = worker.parentPort;
-
-parentPort.onmessage = function(e) {
-    throw new Error(123)
+/*
+ * 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) {
+    throw new Error(123)
 }
\ No newline at end of file

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/worker_008.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/worker_008.js

-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import worker from '@ohos.worker';
-const parentPort = worker.parentPort;
-
-console.info("worker::" + typeof parentPort.self)
-parentPort.onmessage = function(e) {
-    parentPort.close()
-}
+/*
+ * 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;
+
+console.info("worker::" + typeof parentPort.self)
+parentPort.onmessage = function(e) {
+    parentPort.close()
+}

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/worker_009.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/worker_009.js

-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import 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("entry/ets/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

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/worker_0091.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/worker_0091.js

-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import 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

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/worker_010.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/worker_010.js

-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import 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("entry/ets/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

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/worker_0101.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/worker_0101.js

-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import 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

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/workers/worker_011.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/worker_011.js

-/*
- * Copyright (C) 2022 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import 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("entry/ets/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

commonlibrary/ets_utils/worker_lib_standard/entry/src/main/module.json

+{
+  "module": {
+    "name": "entry",
+    "type": "entry",
+    "srcEntrance": "./ets/Application/AbilityStage.ts",
+    "description": "$string:entry_desc",
+    "mainElement": "MainAbility",
+    "deviceTypes": [
+        "default",
+        "tablet"
+    ],
+    "deliveryWithInstall": true,
+    "installationFree": false,
+    "pages": "$profile:main_pages",
+    "uiSyntax": "ets",
+    "abilities": [
+      {
+        "name": "com.example.workertest.MainAbility",
+        "srcEntrance": "./ets/MainAbility/MainAbility.ts",
+        "description": "$string:MainAbility_desc",
+        "icon": "$media:icon",
+        "label": "$string:MainAbility_label",
+        "startWindowIcon": "$media:icon",
+        "startWindowBackground": "$color:white",
+        "visible": true,
+        "orientation": "portrait",
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ]
+      }
+    ]
+  }
+}
\ No newline at end of file