!786 process util url worker xts testcase modify configure

Merge pull request !786 from clearme777/OpenHarmony-3.0-LTS

compileruntime/BUILD.gn

@@ -10,13 +10,16 @@
 # 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")
 
-group("jsapi") {
+group("compileruntime") {
   testonly = true
-  deps = [
-    "StartupProcessJSApiTest:startup_process_js_test",
-    "StartupUrlJSApiTest:startup_url_js_test",
-    "StartupUtilJSApiTest:startup_util_js_test",
-    "StartupWorkerJSApiTest:startup_worker_js_test",
-  ]
+  if (is_standard_system) {
+    deps = [
+      "process_lib_standard:process_js_test",
+      "url_lib_standard:url_js_test",
+      "util_lib_standard:util_js_test",
+      "worker_lib_standard:worker_js_hap",
+    ]
+  }
 }

compileruntime/process_lib_standard/BUILD.gn

@@ -10,9 +10,29 @@
 # 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_hap_suite("process_js_test") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":process_js_assets",
+    ":process_resources",
+  ]
+
+  #  shared_libraries = [
+  #    "//third_party/giflib:libgif",
+  #    "//third_party/libpng:libpng",
+  #  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "ProcessJSApiTest"
 
-ohos_js_hap_suite("startup_process_js_test") {
-  test_hap_name = "StartupProcessJSApiTest"
-  hap_source_path = "hap/entry-debug-rich-unsigned.hap"
+  #  part_name = "prebuilt_hap"
+  #  subsystem_name = "xts"
+}
+ohos_js_assets("process_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("process_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
 }

compileruntime/process_lib_standard/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "StartupProcessJSApiTest.hap"
+                "ProcessJSApiTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

compileruntime/process_lib_standard/project/entry/package.json

-{}

compileruntime/util_lib_standard/project/entry/src/main/config.json → compileruntime/process_lib_standard/src/main/config.json

-{
-  "app": {
-    "bundleName": "com.example.childprocess",
-    "vendor": "example",
-    "version": {
-      "code": 1000000,
-      "name": "1.0.0"
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.example.childprocess",
-    "name": ".MyApplication",
-    "mainAbility": "com.example.childprocess.MainAbility",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": false
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "name": "com.example.childprocess.MainAbility",
-        "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:entry_MainAbility",
-        "type": "page",
-        "launchType": "standard"
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index"
-        ],
-        "name": "default",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": true
-        }
-      }
-    ]
-  }
+{
+  "app": {
+    "bundleName": "com.example.childprocess",
+    "vendor": "example",
+    "version": {
+      "code": 1000000,
+      "name": "1.0.0"
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "com.example.childprocess",
+    "name": ".MyApplication",
+    "mainAbility": "com.example.childprocess.MainAbility",
+    "deviceType": [
+      "phone"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry",
+      "moduleType": "entry",
+      "installationFree": false
+    },
+    "abilities": [
+      {
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "name": "com.example.childprocess.MainAbility",
+        "icon": "$media:icon",
+        "description": "$string:mainability_description",
+        "label": "$string:entry_MainAbility",
+        "type": "page",
+        "launchType": "standard"
+      }
+    ],
+    "js": [
+      {
+        "pages": [
+          "pages/index/index"
+        ],
+        "name": "default",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": true
+        }
+      }
+    ]
+  }
 }
\ No newline at end of file

compileruntime/util_lib_standard/project/entry/src/main/java/com/example/childprocess/MainAbility.java → compileruntime/process_lib_standard/src/main/java/com/example/childprocess/MainAbility.java

-/*
- * 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.
- */
-
-package com.example.childprocess;
-
-import ohos.ace.ability.AceAbility;
-import ohos.aafwk.content.Intent;
-
-public class MainAbility extends AceAbility {
-    @Override
-    public void onStart(Intent intent) {
-        super.onStart(intent);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-    }
-}
+/*
+ * 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.
+ */
+
+package com.example.childprocess;
+
+import ohos.ace.ability.AceAbility;
+import ohos.aafwk.content.Intent;
+
+public class MainAbility extends AceAbility {
+    @Override
+    public void onStart(Intent intent) {
+        super.onStart(intent);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+    }
+}

compileruntime/util_lib_standard/project/entry/src/main/java/com/example/childprocess/MyApplication.java → compileruntime/process_lib_standard/src/main/java/com/example/childprocess/MyApplication.java

-/*
- * 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.
- */
-
-package com.example.childprocess;
-
-import ohos.aafwk.ability.AbilityPackage;
-
-public class MyApplication extends AbilityPackage {
-    @Override
-    public void onInitialize() {
-        super.onInitialize();
-    }
-}
+/*
+ * 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.
+ */
+
+package com.example.childprocess;
+
+import ohos.aafwk.ability.AbilityPackage;
+
+public class MyApplication extends AbilityPackage {
+    @Override
+    public void onInitialize() {
+        super.onInitialize();
+    }
+}

compileruntime/process_lib_standard/project/entry/src/main/js/test/List.test.js → compileruntime/process_lib_standard/src/main/js/test/List.test.js

-/*
- * 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.
- */
-
-require('./ExampleJsunit.test.js')
+/*
+ * 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.
+ */
+
+require('./ExampleJsunit.test.js')
 require('./Process.test.js')
\ No newline at end of file

compileruntime/util_lib_standard/project/entry/src/main/resources/base/element/string.json → compileruntime/process_lib_standard/src/main/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "entry_MainAbility",
-      "value": "entry_MainAbility"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Empty Ability"
-    }
-  ]
+{
+  "string": [
+    {
+      "name": "entry_MainAbility",
+      "value": "entry_MainAbility"
+    },
+    {
+      "name": "mainability_description",
+      "value": "JS_Empty Ability"
+    }
+  ]
 }
\ No newline at end of file

compileruntime/url_lib_standard/project/entry/src/ohosTest/js/test/List.test.js → compileruntime/process_lib_standard/src/ohosTest/js/test/List.test.js

-/*
- * 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.
- */
-
+/*
+ * 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.
+ */
+
 require('./ExampleJsunit.test.js')
\ No newline at end of file

compileruntime/process_lib_standard/project/entry/src/ohosTest/resources/base/element/string.json → compileruntime/process_lib_standard/src/ohosTest/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "app_name",
-      "value": "childprocess"
-    },
-    {
-      "name": "mainability_description",
-      "value": "hap sample empty page"
-    }
-  ]
+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "childprocess"
+    },
+    {
+      "name": "mainability_description",
+      "value": "hap sample empty page"
+    }
+  ]
 }
\ No newline at end of file

compileruntime/url_lib_standard/BUILD.gn

@@ -10,9 +10,29 @@
 # 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_hap_suite("url_js_test") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":url_js_assets",
+    ":url_resources",
+  ]
+
+  #  shared_libraries = [
+  #    "//third_party/giflib:libgif",
+  #    "//third_party/libpng:libpng",
+  #  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "UrlJsTest"
 
-ohos_js_hap_suite("startup_url_js_test") {
-  test_hap_name = "StartupUrlJSApiTest"
-  hap_source_path = "hap/entry-debug-rich-unsigned.hap"
+  #  part_name = "prebuilt_hap"
+  #  subsystem_name = "xts"
+}
+ohos_js_assets("url_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("url_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
 }

compileruntime/url_lib_standard/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "startup_url_js_test.hap"
+                "UrlJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

compileruntime/url_lib_standard/project/entry/package.json

-{}

compileruntime/url_lib_standard/project/entry/src/main/config.json → compileruntime/url_lib_standard/src/main/config.json

-{
-  "app": {
-    "bundleName": "com.example.url",
-    "vendor": "example",
-    "version": {
-      "code": 1000000,
-      "name": "1.0.0"
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.example.url",
-    "name": ".MyApplication",
-    "mainAbility": "com.example.url.MainAbility",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": false
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "name": "com.example.url.MainAbility",
-        "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:entry_MainAbility",
-        "type": "page",
-        "launchType": "standard"
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index"
-        ],
-        "name": "default",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": true
-        }
-      }
-    ]
-  }
+{
+  "app": {
+    "bundleName": "com.example.url",
+    "vendor": "example",
+    "version": {
+      "code": 1000000,
+      "name": "1.0.0"
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "com.example.url",
+    "name": ".MyApplication",
+    "mainAbility": "com.example.url.MainAbility",
+    "deviceType": [
+      "phone"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry",
+      "moduleType": "entry",
+      "installationFree": false
+    },
+    "abilities": [
+      {
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "name": "com.example.url.MainAbility",
+        "icon": "$media:icon",
+        "description": "$string:mainability_description",
+        "label": "$string:entry_MainAbility",
+        "type": "page",
+        "launchType": "standard"
+      }
+    ],
+    "js": [
+      {
+        "pages": [
+          "pages/index/index"
+        ],
+        "name": "default",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": true
+        }
+      }
+    ]
+  }
 }
\ No newline at end of file

compileruntime/url_lib_standard/project/entry/src/main/java/com/example/url/MainAbility.java → compileruntime/url_lib_standard/src/main/java/com/example/url/MainAbility.java

-/*
- * 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.
- */
-package com.example.url;
-
-import ohos.ace.ability.AceAbility;
-import ohos.aafwk.content.Intent;
-
-public class MainAbility extends AceAbility {
-    @Override
-    public void onStart(Intent intent) {
-        super.onStart(intent);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-    }
-}
+/*
+ * 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.
+ */
+package com.example.url;
+
+import ohos.ace.ability.AceAbility;
+import ohos.aafwk.content.Intent;
+
+public class MainAbility extends AceAbility {
+    @Override
+    public void onStart(Intent intent) {
+        super.onStart(intent);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+    }
+}

compileruntime/util_lib_standard/project/entry/src/main/java/com/example/url/MyApplication.java → compileruntime/url_lib_standard/src/main/java/com/example/url/MyApplication.java

-/*
- * 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.
- */
-package com.example.url;
-
-import ohos.aafwk.ability.AbilityPackage;
-
-public class MyApplication extends AbilityPackage {
-    @Override
-    public void onInitialize() {
-        super.onInitialize();
-    }
-}
+/*
+ * 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.
+ */
+package com.example.url;
+
+import ohos.aafwk.ability.AbilityPackage;
+
+public class MyApplication extends AbilityPackage {
+    @Override
+    public void onInitialize() {
+        super.onInitialize();
+    }
+}

compileruntime/url_lib_standard/project/entry/src/main/js/test/List.test.js → compileruntime/url_lib_standard/src/main/js/test/List.test.js

-/*
- * 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.
- */
-require('./url.test.js')
-require('./ExampleJsunit.test.js')
+/*
+ * 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.
+ */
+require('./url.test.js')
+require('./ExampleJsunit.test.js')

compileruntime/url_lib_standard/project/entry/src/main/resources/base/element/string.json → compileruntime/url_lib_standard/src/main/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "entry_MainAbility",
-      "value": "entry_MainAbility"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Empty Ability"
-    }
-  ]
+{
+  "string": [
+    {
+      "name": "entry_MainAbility",
+      "value": "entry_MainAbility"
+    },
+    {
+      "name": "mainability_description",
+      "value": "JS_Empty Ability"
+    }
+  ]
 }
\ No newline at end of file

compileruntime/util_lib_standard/project/entry/src/ohosTest/js/test/List.test.js → compileruntime/url_lib_standard/src/ohosTest/js/test/List.test.js

-/*
- * 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.
- */
-
+/*
+ * 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.
+ */
+
 require('./ExampleJsunit.test.js')
\ No newline at end of file

compileruntime/url_lib_standard/project/entry/src/ohosTest/resources/base/element/string.json → compileruntime/url_lib_standard/src/ohosTest/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "app_name",
-      "value": "URL"
-    },
-    {
-      "name": "mainability_description",
-      "value": "hap sample empty page"
-    }
-  ]
-}
+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "URL"
+    },
+    {
+      "name": "mainability_description",
+      "value": "hap sample empty page"
+    }
+  ]
+}

compileruntime/util_lib_standard/BUILD.gn

@@ -10,9 +10,29 @@
 # 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_hap_suite("util_js_test") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":util_js_assets",
+    ":util_resources",
+  ]
+
+  #  shared_libraries = [
+  #    "//third_party/giflib:libgif",
+  #    "//third_party/libpng:libpng",
+  #  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "UtilJsTest"
 
-ohos_js_hap_suite("startup_util_js_test") {
-  test_hap_name = "StartupUtilJSApiTest"
-  hap_source_path = "hap/entry-debug-rich-unsigned.hap"
+  #  part_name = "prebuilt_hap"
+  #  subsystem_name = "xts"
+}
+ohos_js_assets("util_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("util_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
 }

compileruntime/util_lib_standard/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "startup_util_js_test.hap"
+                "UtilJsTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

compileruntime/util_lib_standard/project/entry/package.json

-{}

compileruntime/process_lib_standard/project/entry/src/main/config.json → compileruntime/util_lib_standard/src/main/config.json

-{
-  "app": {
-    "bundleName": "com.example.childprocess",
-    "vendor": "example",
-    "version": {
-      "code": 1000000,
-      "name": "1.0.0"
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.example.childprocess",
-    "name": ".MyApplication",
-    "mainAbility": "com.example.childprocess.MainAbility",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": false
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "name": "com.example.childprocess.MainAbility",
-        "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:entry_MainAbility",
-        "type": "page",
-        "launchType": "standard"
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index"
-        ],
-        "name": "default",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": true
-        }
-      }
-    ]
-  }
+{
+  "app": {
+    "bundleName": "com.example.childprocess",
+    "vendor": "example",
+    "version": {
+      "code": 1000000,
+      "name": "1.0.0"
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "com.example.childprocess",
+    "name": ".MyApplication",
+    "mainAbility": "com.example.childprocess.MainAbility",
+    "deviceType": [
+      "phone"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry",
+      "moduleType": "entry",
+      "installationFree": false
+    },
+    "abilities": [
+      {
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "name": "com.example.childprocess.MainAbility",
+        "icon": "$media:icon",
+        "description": "$string:mainability_description",
+        "label": "$string:entry_MainAbility",
+        "type": "page",
+        "launchType": "standard"
+      }
+    ],
+    "js": [
+      {
+        "pages": [
+          "pages/index/index"
+        ],
+        "name": "default",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": true
+        }
+      }
+    ]
+  }
 }
\ No newline at end of file

compileruntime/process_lib_standard/project/entry/src/main/java/com/example/childprocess/MainAbility.java → compileruntime/util_lib_standard/src/main/java/com/example/childprocess/MainAbility.java

-/*
- * 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.
- */
-
-package com.example.childprocess;
-
-import ohos.ace.ability.AceAbility;
-import ohos.aafwk.content.Intent;
-
-public class MainAbility extends AceAbility {
-    @Override
-    public void onStart(Intent intent) {
-        super.onStart(intent);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-    }
-}
+/*
+ * 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.
+ */
+
+package com.example.childprocess;
+
+import ohos.ace.ability.AceAbility;
+import ohos.aafwk.content.Intent;
+
+public class MainAbility extends AceAbility {
+    @Override
+    public void onStart(Intent intent) {
+        super.onStart(intent);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+    }
+}

compileruntime/process_lib_standard/project/entry/src/main/java/com/example/childprocess/MyApplication.java → compileruntime/util_lib_standard/src/main/java/com/example/childprocess/MyApplication.java

-/*
- * 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.
- */
-
-package com.example.childprocess;
-
-import ohos.aafwk.ability.AbilityPackage;
-
-public class MyApplication extends AbilityPackage {
-    @Override
-    public void onInitialize() {
-        super.onInitialize();
-    }
-}
+/*
+ * 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.
+ */
+
+package com.example.childprocess;
+
+import ohos.aafwk.ability.AbilityPackage;
+
+public class MyApplication extends AbilityPackage {
+    @Override
+    public void onInitialize() {
+        super.onInitialize();
+    }
+}

compileruntime/util_lib_standard/project/entry/src/main/java/com/example/url/MainAbility.java → compileruntime/util_lib_standard/src/main/java/com/example/url/MainAbility.java

-/*
- * 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.
- */
-package com.example.url;
-
-import ohos.ace.ability.AceAbility;
-import ohos.aafwk.content.Intent;
-
-public class MainAbility extends AceAbility {
-    @Override
-    public void onStart(Intent intent) {
-        super.onStart(intent);
-    }
-
-    @Override
-    public void onStop() {
-        super.onStop();
-    }
-}
+/*
+ * 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.
+ */
+package com.example.url;
+
+import ohos.ace.ability.AceAbility;
+import ohos.aafwk.content.Intent;
+
+public class MainAbility extends AceAbility {
+    @Override
+    public void onStart(Intent intent) {
+        super.onStart(intent);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+    }
+}

compileruntime/url_lib_standard/project/entry/src/main/java/com/example/url/MyApplication.java → compileruntime/util_lib_standard/src/main/java/com/example/url/MyApplication.java

-/*
- * 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.
- */
-package com.example.url;
-
-import ohos.aafwk.ability.AbilityPackage;
-
-public class MyApplication extends AbilityPackage {
-    @Override
-    public void onInitialize() {
-        super.onInitialize();
-    }
-}
+/*
+ * 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.
+ */
+package com.example.url;
+
+import ohos.aafwk.ability.AbilityPackage;
+
+public class MyApplication extends AbilityPackage {
+    @Override
+    public void onInitialize() {
+        super.onInitialize();
+    }
+}

compileruntime/util_lib_standard/project/entry/src/main/js/test/List.test.js → compileruntime/util_lib_standard/src/main/js/test/List.test.js

-/*
- * 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.
- */
-
-require('./ExampleJsunit.test.js')
+/*
+ * 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.
+ */
+
+require('./ExampleJsunit.test.js')
 require('./TextCodr.test.js')
\ No newline at end of file

compileruntime/process_lib_standard/project/entry/src/main/resources/base/element/string.json → compileruntime/util_lib_standard/src/main/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "entry_MainAbility",
-      "value": "entry_MainAbility"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Empty Ability"
-    }
-  ]
+{
+  "string": [
+    {
+      "name": "entry_MainAbility",
+      "value": "entry_MainAbility"
+    },
+    {
+      "name": "mainability_description",
+      "value": "JS_Empty Ability"
+    }
+  ]
 }
\ No newline at end of file

compileruntime/process_lib_standard/project/entry/src/ohosTest/js/test/List.test.js → compileruntime/util_lib_standard/src/ohosTest/js/test/List.test.js

-/*
- * 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.
- */
-
+/*
+ * 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.
+ */
+
 require('./ExampleJsunit.test.js')
\ No newline at end of file

compileruntime/util_lib_standard/project/entry/src/ohosTest/resources/base/element/string.json → compileruntime/util_lib_standard/src/ohosTest/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "app_name",
-      "value": "childprocess"
-    },
-    {
-      "name": "mainability_description",
-      "value": "hap sample empty page"
-    }
-  ]
-}
+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "childprocess"
+    },
+    {
+      "name": "mainability_description",
+      "value": "hap sample empty page"
+    }
+  ]
+}

compileruntime/worker_lib_standard/BUILD.gn

@@ -10,9 +10,29 @@
 # 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_hap_suite("worker_js_hap") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":worker_js_assets",
+    ":worker_resources",
+  ]
+
+  #  shared_libraries = [
+  #    "//third_party/giflib:libgif",
+  #    "//third_party/libpng:libpng",
+  #  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "WorkerJSTest"
 
-ohos_js_hap_suite("startup_worker_js_test") {
-  test_hap_name = "StartupWorkerJSApiTest"
-  hap_source_path = "hap/entry-debug-standard-unsigned.hap"
+  #  part_name = "prebuilt_hap"
+  #  subsystem_name = "xts"
+}
+ohos_js_assets("worker_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("worker_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
 }

compileruntime/worker_lib_standard/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "startup_worker_js_test.hap"
+                "WorkerJSTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

compileruntime/worker_lib_standard/project/entry/package.json

-{}

compileruntime/worker_lib_standard/project/entry/src/main/config.json → compileruntime/worker_lib_standard/src/main/config.json

-{
-  "app": {
-    "bundleName": "com.example.workerxts",
-    "vendor": "example",
-    "version": {
-      "code": 1000000,
-      "name": "1.0.0"
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.example.workerxts",
-    "name": ".MyApplication",
-    "mainAbility": "com.example.workerxts.MainAbility",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": false
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "orientation": "unspecified",
-        "name": "com.example.workerxts.MainAbility",
-        "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "formsEnabled": false,
-        "label": "$string:entry_MainAbility",
-        "type": "page",
-        "launchType": "standard"
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index",
-          "pages/second/second"
-        ],
-        "name": "default",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": false
-        }
-      }
-    ]
-  }
+{
+  "app": {
+    "bundleName": "com.example.workerxts",
+    "vendor": "example",
+    "version": {
+      "code": 1000000,
+      "name": "1.0.0"
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "com.example.workerxts",
+    "name": ".MyApplication",
+    "mainAbility": "com.example.workerxts.MainAbility",
+    "deviceType": [
+      "phone"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry",
+      "moduleType": "entry",
+      "installationFree": false
+    },
+    "abilities": [
+      {
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "orientation": "unspecified",
+        "name": "com.example.workerxts.MainAbility",
+        "icon": "$media:icon",
+        "description": "$string:mainability_description",
+        "formsEnabled": false,
+        "label": "$string:entry_MainAbility",
+        "type": "page",
+        "launchType": "standard"
+      }
+    ],
+    "js": [
+      {
+        "pages": [
+          "pages/index/index",
+          "pages/second/second"
+        ],
+        "name": "default",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      }
+    ]
+  }
 }
\ No newline at end of file