Merge branch 'master' of gitee.com:huyunhui1/xts_acts

Signed-off-by: Nhuyunhui1 <huyunhui1@huawei.com>

arkcompiler/BUILD.gn

-# Copyright (C) 2023 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("//build/ohos_var.gni")
-
-group("arkcompiler") {
-  testonly = true
-  if (is_standard_system) {
-    deps = [ "esmodule:esmodule" ]
-  }
-}
\ No newline at end of file
+# Copyright (C) 2023 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("//build/ohos_var.gni")
+
+group("arkcompiler") {
+  testonly = true
+  if (is_standard_system) {
+    deps = [ "esmodule:esmodule" ]
+  }
+}

arkcompiler/esmodule/BUILD.gn

-# Copyright (C) 2023 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
+# Copyright (C) 2023 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("//build/ohos_var.gni")
-
-group("esmodule") {
-  testonly = true
-  if (is_standard_system) {
-    deps = [
-      "esmodule_entry:ActsEsmoduleEntryTest",
-      "esmodule_ohostest:ActsEsmoduleOhostestTest"
-    ]
-  }
-}
\ No newline at end of file
+
+import("//build/ohos_var.gni")
+
+group("esmodule") {
+  testonly = true
+  if (is_standard_system) {
+    deps = [
+      "esmodule_entry:ActsEsmoduleEntryTest",
+      "esmodule_ohostest:ActsEsmoduleOhostestTest",
+    ]
+  }
+}

arkcompiler/esmodule/esmodule_entry/BUILD.gn

-# Copyright (C) 2023 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
+# Copyright (C) 2023 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("//test/xts/tools/build/suite.gni")
-
-ohos_js_app_suite("ActsEsmoduleEntryTest") {
-  hap_name = "ActsEsmoduleEntryTest"
-  testonly = true
-  part_name = "ets_frontend"
-  subsystem_name = "arkcompiler"
-  certificate_profile = "./signature/auto_ohos_default_esmodule_entry_com.esmodule.acts.p7b"
-}
\ No newline at end of file
+
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_app_suite("ActsEsmoduleEntryTest") {
+  hap_name = "ActsEsmoduleEntryTest"
+  testonly = true
+  part_name = "ets_frontend"
+  subsystem_name = "arkcompiler"
+  certificate_profile =
+      "./signature/auto_ohos_default_esmodule_entry_com.esmodule.acts.p7b"
+}

arkcompiler/esmodule/esmodule_entry/entry/src/main/ets/workers/workerImportNapi.ts

@@ -18,9 +18,9 @@ import worker from '@ohos.worker';
 const ADDEND_FIRST = 2;
 const ADDEND_SECOND = 3;
 const SUM = 5;
-var workerPort = worker.workerPort;
+let workerPort = worker.workerPort;
 workerPort.onmessage = function(): void {
-  if (add(ADDEND_FIRST, ADD_SECOND) === SUM) {
+  if (add(ADDEND_FIRST, ADDEND_SECOND) === SUM) {
     workerPort.postMessage('ModuleTest receive data from main thread');
   }
 };
\ No newline at end of file

arkcompiler/esmodule/esmodule_entry/entry/src/main/ets/workers/workerImportRelative.ts

@@ -20,7 +20,7 @@ const ADDEND_SECOND = 3;
 const SUM = 5;
 let workerPort = worker.workerPort;
 workerPort.onmessage = function(): void {
-  if (add(ADDEND_FIRST, ADD_SECOND) === SUM) {
+  if (add(ADDEND_FIRST, ADDEND_SECOND) === SUM) {
     workerPort.postMessage('ModuleTest receive data from main thread');
   }
 };
\ No newline at end of file

arkcompiler/esmodule/esmodule_ohostest/BUILD.gn

-# Copyright (C) 2023 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
+# Copyright (C) 2023 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("//test/xts/tools/build/suite.gni")
-
-ohos_js_app_suite("ActsEsmoduleOhostestTest") {
-  hap_name = "ActsEsmoduleOhostestTest"
-  test_hap = true
-  testonly = true
-  part_name = "ets_frontend"
-  subsystem_name = "arkcompiler"
-  certificate_profile = "./signature/auto_ohos_default_esmodule_ohosTest_com.esmodule.acts.p7b"
-}
\ No newline at end of file
+
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_app_suite("ActsEsmoduleOhostestTest") {
+  hap_name = "ActsEsmoduleOhostestTest"
+  test_hap = true
+  testonly = true
+  part_name = "ets_frontend"
+  subsystem_name = "arkcompiler"
+  certificate_profile =
+      "./signature/auto_ohos_default_esmodule_ohosTest_com.esmodule.acts.p7b"
+}