update

Signed-off-by: Nxuchenghua09 <xuchenghua09@huawei.com>

ability/ability_runtime/actsappselector/actsappselectorpctest/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAppSelectorPCTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAppSelectorPCTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsappselectorpctest_app_profile") {

ability/ability_runtime/actsappselector/actsappselectorrelyhap/BUILD.gn

@@ -13,16 +13,20 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAppSelectorRelyHap") {
+ohos_hap_assist_suite("ActsAppSelectorRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
+  hap_name = "ActsAppSelectorRelyHap"
+
+  testonly = true
   deps = [
     ":actsappselectorrelyhap_js_assets",
     ":actsappselectorrelyhap_resources",
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
-  hap_name = "ActsAppSelectorRelyHap"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsappselectorrelyhap_app_profile") {

ability/ability_runtime/actsappselector/actsappselectortest/BUILD.gn

@@ -23,6 +23,8 @@ ohos_js_hap_suite("ActsAppSelectorTest") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ActsAppSelectorTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsappselectortest_app_profile") {

ability/ability_runtime/actsappselector/actsimageaentryrelyhap/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsImageAEntryRelyHap") {
+ohos_hap_assist_suite("ActsImageAEntryRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsImageAEntryRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+
   testonly = true
   deps = [
     ":actsimageaentryrelyhap_js_assets",
@@ -26,6 +24,8 @@ ohos_hap("ActsImageAEntryRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsimageaentryrelyhap_app_profile") {

ability/ability_runtime/actsappselector/actsimageafeaturerelyhap/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsImageAFeatureRelyHap") {
+ohos_hap_assist_suite("ActsImageAFeatureRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsImageAFeatureRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+
   testonly = true
   deps = [
     ":actsimageafeaturerelyhap_js_assets",
@@ -26,6 +24,8 @@ ohos_hap("ActsImageAFeatureRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsimageafeaturerelyhap_app_profile") {

ability/ability_runtime/actsappselector/actsimagearelyhap/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("actsimagearelyhap") {
+ohos_hap_assist_suite("actsimagearelyhap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "actsimagearelyhap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+
   testonly = true
   deps = [
     ":actsimagearelyhap_js_assets",
@@ -26,6 +24,8 @@ ohos_hap("actsimagearelyhap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsimagearelyhap_app_profile") {

ability/ability_runtime/actsappselector/actsimagebentryrelyhap/BUILD.gn

@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("ActsImageBEntryRelyHap") {
+ohos_hap_assist_suite("ActsImageBEntryRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsImageBEntryRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsimagebentryrelyhap_js_assets",
@@ -26,6 +24,8 @@ ohos_hap("ActsImageBEntryRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsimagebentryrelyhap_app_profile") {

ability/ability_runtime/actsappselector/actsimagebfeaturerelyhap/BUILD.gn

@@ -16,9 +16,7 @@ ohos_hap("ActsImageBFeatureRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsImageBFeatureRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsimagebfeaturerelyhap_js_assets",
@@ -26,6 +24,8 @@ ohos_hap("ActsImageBFeatureRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsimagebfeaturerelyhap_app_profile") {

ability/ability_runtime/actsappselector/actsimagebrelyhap/BUILD.gn

@@ -16,9 +16,7 @@ ohos_hap("ActsImageBRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsImageBRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsimagebrelyhap_js_assets",
@@ -26,6 +24,8 @@ ohos_hap("ActsImageBRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsimagebrelyhap_app_profile") {

ability/ability_runtime/actsappselector/actsimagecentryrelyhap/BUILD.gn

@@ -16,9 +16,7 @@ ohos_hap("ActsImageCEntryRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsImageCEntryRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsimagecentryrelyhap_js_assets",
@@ -26,6 +24,8 @@ ohos_hap("ActsImageCEntryRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsimagecentryrelyhap_app_profile") {

ability/ability_runtime/actsappselector/actsimagecfeaturerelyhap/BUILD.gn

@@ -16,9 +16,7 @@ ohos_hap("ActsImageCFeatureRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsImageCFeatureRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsimagecfeaturerelyhap_js_assets",
@@ -26,6 +24,8 @@ ohos_hap("ActsImageCFeatureRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsimagecfeaturerelyhap_app_profile") {

ability/ability_runtime/actsappselector/actsimagedrelyhap/BUILD.gn

@@ -16,9 +16,7 @@ ohos_hap("ActsImageDRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsImageDRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsimagedrelyhap_js_assets",
@@ -26,6 +24,8 @@ ohos_hap("ActsImageDRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsimagedrelyhap_app_profile") {

ability/ability_runtime/actsappselector/actsimageerelyhap/BUILD.gn

@@ -16,9 +16,7 @@ ohos_hap("ActsImageERelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsImageERelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsimageerelyhap_js_assets",
@@ -26,6 +24,8 @@ ohos_hap("ActsImageERelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsimageerelyhap_app_profile") {

ability/ability_runtime/actsappselector/actsimagefrelyhap/BUILD.gn

@@ -16,9 +16,7 @@ ohos_hap("ActsImageFRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsImageFRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsimagefrelyhap_js_assets",
@@ -26,6 +24,8 @@ ohos_hap("ActsImageFRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsimagefrelyhap_app_profile") {

ability/ability_runtime/actsappselector/actsimagegrelyhap/BUILD.gn

@@ -16,9 +16,7 @@ ohos_hap("ActsImageGRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsImageGRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+ 
   testonly = true
   deps = [
     ":actsimagegrelyhap_js_assets",
@@ -26,6 +24,8 @@ ohos_hap("ActsImageGRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsimagegrelyhap_app_profile") {

ability/ability_runtime/actsappselector/actsimagehrelyhap/BUILD.gn

@@ -16,9 +16,7 @@ ohos_hap("ActsImageHRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsImageHRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsimagehrelyhap_js_assets",
@@ -26,6 +24,8 @@ ohos_hap("ActsImageHRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsimagehrelyhap_app_profile") {

ability/ability_runtime/actsappselector/actsimageirelyhap/BUILD.gn

@@ -16,9 +16,7 @@ ohos_hap("ActsImageIRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsImageIRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsimageirelyhap_js_assets",
@@ -26,6 +24,8 @@ ohos_hap("ActsImageIRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsimageirelyhap_app_profile") {

ability/ability_runtime/actsappselector/actsimagejrelyhap/BUILD.gn

@@ -16,16 +16,15 @@ ohos_hap("ActsImageJRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsImageJRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
-  testonly = true
+  
   deps = [
     ":actsimagejrelyhap_js_assets",
     ":actsimagejrelyhap_resources",
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsimagejrelyhap_app_profile") {

ability/ability_runtime/actsappselector/actsimagekrelyhap/BUILD.gn

@@ -16,9 +16,7 @@ ohos_hap("ActsImageKRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsImageKRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsimagekrelyhap_js_assets",
@@ -26,6 +24,8 @@ ohos_hap("ActsImageKRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsimagekrelyhap_app_profile") {

ability/ability_runtime/actsappselector/actsserviceabilityarelyhap/BUILD.gn

@@ -16,9 +16,7 @@ ohos_hap("ActsServiceAbilityARelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsServiceAbilityARelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsserviceabilityarelyhap_js_assets",
@@ -26,6 +24,8 @@ ohos_hap("ActsServiceAbilityARelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsserviceabilityarelyhap_app_profile") {

ability/ability_runtime/actsappselector/actsserviceabilitybrelyhap/BUILD.gn

@@ -16,9 +16,7 @@ ohos_hap("ActsServiceAbilityBRelyHap") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   hap_name = "ActsServiceAbilityBRelyHap"
-  subsystem_name = XTS_SUITENAME
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  
   testonly = true
   deps = [
     ":actsserviceabilitybrelyhap_js_assets",
@@ -26,6 +24,8 @@ ohos_hap("ActsServiceAbilityBRelyHap") {
   ]
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("actsserviceabilitybrelyhap_app_profile") {

ability/ability_runtime/actsappselector/actstextarelyhap/BUILD.gn

@@ -10,22 +10,27 @@
 # 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("ActstextARelyHap") {
+ohos_hap_assist_suite("ActstextARelyHap") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
-    ":actstextarelyhap_assets",
-    ":actstextarelyhap_resources",
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActstextARelyHap"
+  js_build_mode = "debug"
+  testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
-ohos_js_assets("actstextarelyhap_assets") {
+ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"
 }
-ohos_resources("actstextarelyhap_resources") {
+ohos_resources("hjs_demo_resources") {
   sources = [ "./entry/src/main/resources" ]
   hap_profile = "./entry/src/main/config.json"
 }

ability/ability_runtime/actsappselector/actstextarelyhap/Test.json

-{
-    "description": "Configuration for aceceshi Tests"
-}
-

ability/ability_runtime/actsappselector/actstextbrelyhap/BUILD.gn

@@ -12,20 +12,24 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActstextBRelyHap") {
+ohos_hap_assist_suite("ActstextBRelyHap") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
-    ":hjs_demo_ets_assets",
-    ":hjs_demo_ets_resources",
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActstextBRelyHap"
+  js_build_mode = "debug"
+  testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
-ohos_js_assets("hjs_demo_ets_assets") {
+ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"
 }
-ohos_resources("hjs_demo_ets_resources") {
+ohos_resources("hjs_demo_resources") {
   sources = [ "./entry/src/main/resources" ]
   hap_profile = "./entry/src/main/config.json"
-}
+}
\ No newline at end of file

ability/ability_runtime/actsappselector/actstextbrelyhap/Test.json

-{
-    "description": "Configuration for aceceshi Tests"
-}

ability/ability_runtime/actsappselector/actstextcrelyhap/BUILD.gn

@@ -12,20 +12,24 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActstextCRelyHap") {
+ohos_hap_assist_suite("ActstextCRelyHap") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
-    ":hjs_demo_ets_assets",
-    ":hjs_demo_ets_resources",
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActstextCRelyHap"
+  js_build_mode = "debug"
+  testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
-ohos_js_assets("hjs_demo_ets_assets") {
+ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"
 }
-ohos_resources("hjs_demo_ets_resources") {
+ohos_resources("hjs_demo_resources") {
   sources = [ "./entry/src/main/resources" ]
   hap_profile = "./entry/src/main/config.json"
-}
+}
\ No newline at end of file

ability/ability_runtime/actsappselector/actstextcrelyhap/Test.json

-{
-    "description": "Configuration for aceceshi Tests"
-}

ability/ability_runtime/actsappselector/actstextdrelyhap/BUILD.gn

@@ -12,20 +12,24 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActstextDRelyHap") {
+ohos_hap_assist_suite("ActstextDRelyHap") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
-    ":hjs_demo_ets_assets",
-    ":hjs_demo_ets_resources",
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActstextDRelyHap"
+  js_build_mode = "debug"
+  testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
-ohos_js_assets("hjs_demo_ets_assets") {
+ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"
 }
-ohos_resources("hjs_demo_ets_resources") {
+ohos_resources("hjs_demo_resources") {
   sources = [ "./entry/src/main/resources" ]
   hap_profile = "./entry/src/main/config.json"
 }

ability/ability_runtime/actsappselector/actstextdrelyhap/Test.json

-{
-    "description": "Configuration for aceceshi Tests"
-}

ability/ability_runtime/actsappselector/actstexterelyhap/BUILD.gn

@@ -12,20 +12,24 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActstextERelyHap") {
+ohos_hap_assist_suite("ActstextERelyHap") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
-    ":hjs_demo_ets_assets",
-    ":hjs_demo_ets_resources",
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActstextERelyHap"
+  js_build_mode = "debug"
+  testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
-ohos_js_assets("hjs_demo_ets_assets") {
+ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"
 }
-ohos_resources("hjs_demo_ets_resources") {
+ohos_resources("hjs_demo_resources") {
   sources = [ "./entry/src/main/resources" ]
   hap_profile = "./entry/src/main/config.json"
 }

ability/ability_runtime/actsappselector/actstexterelyhap/Test.json

-{
-    "description": "Configuration for aceceshi Tests"
-}

ability/ability_runtime/actsappselector/actstextfrelyhap/BUILD.gn

@@ -12,20 +12,24 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActstextFRelyHap") {
+ohos_hap_assist_suite("ActstextFRelyHap") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
-    ":hjs_demo_ets_assets",
-    ":hjs_demo_ets_resources",
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActstextFRelyHap"
+  js_build_mode = "debug"
+  testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
-ohos_js_assets("hjs_demo_ets_assets") {
+ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"
 }
-ohos_resources("hjs_demo_ets_resources") {
+ohos_resources("hjs_demo_resources") {
   sources = [ "./entry/src/main/resources" ]
   hap_profile = "./entry/src/main/config.json"
 }

ability/ability_runtime/actsappselector/actstextfrelyhap/Test.json

-{
-    "description": "Configuration for aceceshi Tests"
-}

ability/ability_runtime/actsappselector/actstextgrelyhap/BUILD.gn

@@ -12,20 +12,24 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActstextGRelyHap") {
+ohos_hap_assist_suite("ActstextGRelyHap") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
-    ":hjs_demo_ets_assets",
-    ":hjs_demo_ets_resources",
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActstextGRelyHap"
+  js_build_mode = "debug"
+  testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
-ohos_js_assets("hjs_demo_ets_assets") {
+ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"
 }
-ohos_resources("hjs_demo_ets_resources") {
+ohos_resources("hjs_demo_resources") {
   sources = [ "./entry/src/main/resources" ]
   hap_profile = "./entry/src/main/config.json"
 }

ability/ability_runtime/actsappselector/actstextgrelyhap/Test.json

-{
-    "description": "Configuration for aceceshi Tests"
-}

ability/ability_runtime/actsappselector/actstexthrelyhap/BUILD.gn

@@ -12,20 +12,25 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActstextHRelyHap") {
+ohos_hap_assist_suite("ActstextHRelyHap") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
-    ":hjs_demo_ets_assets",
-    ":hjs_demo_ets_resources",
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActstextHRelyHap"
+  js_build_mode = "debug"
+  testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
-ohos_js_assets("hjs_demo_ets_assets") {
+ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"
 }
-ohos_resources("hjs_demo_ets_resources") {
+ohos_resources("hjs_demo_resources") {
   sources = [ "./entry/src/main/resources" ]
   hap_profile = "./entry/src/main/config.json"
 }
+

ability/ability_runtime/actsappselector/actstexthrelyhap/Test.json

-{
-    "description": "Configuration for aceceshi Tests"
-}

ability/ability_runtime/actsappselector/actstextirelyhap/BUILD.gn

@@ -12,20 +12,25 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActstextIRelyHap") {
+ohos_hap_assist_suite("ActstextIRelyHap") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
-    ":hjs_demo_ets_assets",
-    ":hjs_demo_ets_resources",
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActstextIRelyHap"
+  js_build_mode = "debug"
+  testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
-ohos_js_assets("hjs_demo_ets_assets") {
+ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"
 }
-ohos_resources("hjs_demo_ets_resources") {
+ohos_resources("hjs_demo_resources") {
   sources = [ "./entry/src/main/resources" ]
   hap_profile = "./entry/src/main/config.json"
 }
+

ability/ability_runtime/actsappselector/actstextirelyhap/Test.json

-{
-    "description": "Configuration for aceceshi Tests"
-}

ability/ability_runtime/actsappselector/actstextjrelyhap/BUILD.gn

@@ -12,20 +12,24 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActstextJRelyHap") {
+ohos_hap_assist_suite("ActstextJRelyHap") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
-    ":hjs_demo_ets_assets",
-    ":hjs_demo_ets_resources",
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActstextJRelyHap"
+  js_build_mode = "debug"
+  testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
-ohos_js_assets("hjs_demo_ets_assets") {
+ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"
 }
-ohos_resources("hjs_demo_ets_resources") {
+ohos_resources("hjs_demo_resources") {
   sources = [ "./entry/src/main/resources" ]
   hap_profile = "./entry/src/main/config.json"
 }

ability/ability_runtime/actsappselector/actstextjrelyhap/Test.json

-{
-    "description": "Configuration for aceceshi Tests"
-}

ability/ability_runtime/actsappselector/actstextkrelyhap/BUILD.gn

@@ -12,20 +12,25 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActstextKRelyHap") {
+ohos_hap_assist_suite("ActstextKRelyHap") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
-    ":hjs_demo_ets_assets",
-    ":hjs_demo_ets_resources",
+    ":hjs_demo_js_assets",
+    ":hjs_demo_resources",
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActstextKRelyHap"
+  js_build_mode = "debug"
+  testonly = true
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
-ohos_js_assets("hjs_demo_ets_assets") {
+ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"
 }
-ohos_resources("hjs_demo_ets_resources") {
+ohos_resources("hjs_demo_resources") {
   sources = [ "./entry/src/main/resources" ]
   hap_profile = "./entry/src/main/config.json"
 }
+

ability/ability_runtime/actsappselector/actstextkrelyhap/Test.json

-{
-    "description": "Configuration for aceceshi Tests"
-}