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

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

@@ -12,12 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export default {
-    onCreate() {
-        console.info('TestApplication onCreate')
+import AbilityStage from "@ohos.app.ability.AbilityStage"
 
-    },
-    onDestroy() {
-        console.info("TestApplication onDestroy");
+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.
+ * 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
@@ -12,39 +12,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import Ability from '@ohos.app.ability.UIAbility';
 
-.container {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    left: 0px;
-    top: 0px;
-    width: 100%;
-    height: 100%;
-}
+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')
 
-.title {
-    font-size: 60px;
-    text-align: center;
-    width: 100%;
-    height: 40%;
-    margin: 10px;
-}
-.btn {
-    width: 50%;
-    height: 100px;
-    font-size: 40px;
-}
+        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')
+    }
 
-@media screen and (device-type: phone) and (orientation: landscape) {
-    .title {
-        font-size: 60px;
+    onForeground() {
+        console.info(printLog + 'onForeground')
     }
-}
 
-@media screen and (device-type: tablet) and (orientation: landscape) {
-    .title {
-        font-size: 100px;
+    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.
+ * 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
@@ -12,37 +12,35 @@
  * 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 router from '@ohos.router';
 import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 import { Hypium } from '@ohos/hypium'
-import testsuite from '../../../test/List.test'
+import testsuite from '../../test/List.test'
 
+@Entry
+@Component
+struct Index {
+  @State message: string = 'MainAbility Worker'
 
-export default {
-    data: {
-        title: ''
-    },
-    onInit() {
-        this.title = this.$t('strings.world');
-    },
-    onShow() {
-        console.info('onShow finish')
-        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
-        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+  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)
-    },
-    touchMove(e) {
-        if (e.direction === 'right') {
-            this.appExit();
   }
-    },
-    appExit() {
-        app.terminate()
+
+  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.
+ * 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
@@ -12,12 +12,38 @@
  * 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')
+    }
 
-export default {
-    onCreate() {
-        console.info("Application onCreate");
-    },
     onDestroy() {
-        console.info("Application 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

@@ -12,48 +12,67 @@
  * 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 itName',
+        '-s class', '-s notClass', '-s suite', '-s it',
         '-s level', '-s testType', '-s size', '-s timeout',
-        '-s package', '-s dryRun'
+        '-s dryRun'
     ])
     let targetParams = '';
     for (const key in parameters) {
         if (keySet.has(key)) {
-            targetParams += ' ' + key + ' ' + parameters[key]
+            targetParams = `${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()
+async function onAbilityCreateCallback() {
+    console.log("onAbilityCreateCallback");
+}
+
+async function addAbilityMonitorCallback(err: any) {
+    console.info("addAbilityMonitorCallback : " + JSON.stringify(err))
+}
+
+export default class OpenHarmonyTestRunner implements TestRunner {
+    constructor() {
+    }
 
-        var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.MainAbility'
+    onPrepare() {
+        console.info("OpenHarmonyTestRunner OnPrepare ")
+    }
 
-        var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
-        cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters)
+    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"]
-        console.info('debug value : '+debug)
         if (debug == 'true')
         {
             cmd += ' -D'
         }
         console.info('cmd : '+cmd)
-        abilityDelegator.executeShellCommand(cmd, (err, data) => {
+        abilityDelegator.executeShellCommand(cmd,
+            (err: any, d: any) => {
                 console.info('executeShellCommand : err : ' + JSON.stringify(err));
-            console.info('executeShellCommand : data : ' + data.stdResult);
-            console.info('executeShellCommand : data : ' + data.exitCode);
+                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

@@ -13,14 +13,10 @@
  * limitations under the License.
  */
 
-export default {
-    data: {
-        title: ""
-    },
-    onInit() {
-        this.title = this.$t('strings.world');
-    }
-}
-
-
+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_009.js → commonlibrary/ets_utils/worker_lib_standard/entry/src/main/ets/workers/worker_009.js

@@ -23,8 +23,8 @@ 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 = new worker.Worker("entry/ets/workers/worker_0091.js");
+      console.log("worker:: workerxx");
       ss.onexit = function() {
         flag = true;
       }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

commonlibrary/ets_utils/worker_lib_standard/entry/src/main/resources/base/element/color.json

+{
+  "color": [
+    {
+      "name": "white",
+      "value": "#FFFFFF"
+    }
+  ]
+}
\ No newline at end of file

commonlibrary/ets_utils/worker_lib_standard/entry/src/main/resources/base/element/string.json

+{
+  "string": [
+    {
+      "name": "entry_desc",
+      "value": "description"
+    },
+    {
+      "name": "MainAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "MainAbility_label",
+      "value": "label"
+    },
+    {
+      "name": "form_FormAbility_desc",
+      "value": "form_description"
+    },
+    {
+      "name": "form_FormAbility_label",
+      "value": "form_label"
+    }
+  ]
+}
\ No newline at end of file

commonlibrary/ets_utils/worker_lib_standard/entry/src/main/resources/base/profile/main_pages.json

+{
+  "src": [
+    "MainAbility/pages/index"
+  ]
+}

commonlibrary/ets_utils/worker_lib_standard/src/main/config.json

-{
-  "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": [
-      "tablet",
-      "default",
-      "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

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/i18n/en-US.json

-{
-  "strings": {
-    "hello": "Hello",
-    "world": "World",
-    "page": "Second Page",
-    "next": "Next Page",
-    "back": "Back"
-  },
-  "Files": {
-  }
-}
\ No newline at end of file

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/i18n/zh-CN.json

-{
-  "strings": {
-    "hello": "您好",
-    "world": "世界",
-    "page": "第二页",
-    "next": "下一页",
-    "back": "返回"
-  },
-  "Files": {
-  }
-}
\ No newline at end of file

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/pages/index/index.css

-/*
- * 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;
-}

commonlibrary/ets_utils/worker_lib_standard/src/main/js/MainAbility/pages/index/index.hml

-<!--
-    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.
--->
-
-<div class="container" onswipe="touchMove">
-    <text class="title">
-        {{ $t('strings.hello') }} {{ title }}
-    </text>
-    <input class="btn" type="button" value="{{ $t('strings.next') }}" onclick="onclick"></input>
-</div>

commonlibrary/ets_utils/worker_lib_standard/src/main/js/TestAbility/i18n/en-US.json

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

commonlibrary/ets_utils/worker_lib_standard/src/main/js/TestAbility/i18n/zh-CN.json

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

commonlibrary/ets_utils/worker_lib_standard/src/main/js/TestAbility/pages/index/index.hml

-<!--
-  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.
--->
-
-<div class="container" onswipe="touchMove">
-    <text class="title">
-        {{ $t('strings.hello') }} {{title}}
-    </text>
-    <input class="btn" type="button" value="{{ $t('strings.next') }}" onclick="onclick"></input>
-</div>

commonlibrary/ets_utils/worker_lib_standard/src/main/js/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.
- */
-import workerTest from './Worker.test.js'
-import threadWorkerTest from './ThreadWorker.test.js'
-
-export default function testsuite() {
-    workerTest()
-    threadWorkerTest()
-}
\ No newline at end of file

commonlibrary/ets_utils/worker_lib_standard/src/main/resources/base/element/string.json

-{
-  "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