!5012 XTS免安装测试套部件化整改

Merge pull request !5012 from chengxingzhen/master

ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFreeInstallConnectAbilityFaTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFreeInstallConnectAbilityFaTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("actsfreeinstallconnectabilityfatest_ets_assets") {
   source_dir = "./entry/src/main/ets"

ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest.ets

@@ -60,6 +60,13 @@ export default function ConnectAbilityTest() {
             console.info("FreeInstall_FA_ConnectAbility after each called");
             Tempassert = ""
             await sleep(1000);
+            if ("FreeInstall_FA_ConnectAbility_2000" === TAG) {
+                  var cmd14 = "bm uninstall -n com.ohos.hag.famanager";
+                  abilityDelegator.executeShellCommand(cmd14, (err: any, d: any) => {
+                      console.info("executeShellCommand14 : err : " + JSON.stringify(err), " data : " + JSON.stringify(d));
+              })
+           }
+            await sleep(500);
             done();
         });
 

ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/ConnectAbilityTest1.ets

@@ -59,7 +59,14 @@ export default function ConnectAbilityTest1() {
             console.info("FreeInstall_FA_ConnectAbility after each called");
             Tempassert = ""
             await sleep(1000);
-            done();
+            if ("FreeInstall_FA_ConnectAbility_1600" === TAG) {
+            var cmd14 = "bm uninstall -n com.ohos.hag.famanager";
+            abilityDelegator.executeShellCommand(cmd14, (err: any, d: any) => {
+                console.info("executeShellCommand14 : err : " + JSON.stringify(err), " data : " + JSON.stringify(d));
+         })
+       }
+        await sleep(500);
+        done();
         });
 
         function tips(msg) {

ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/MainAbility/test/connectAbilityTest_PA.ets

@@ -143,8 +143,15 @@ export default function connectAbilityTest_PA() {
       console.info("FreeInstall_FA_ConnectAbility_PA after each called");
       dataAssert = ""
       await sleep(1000);
-      done();
-    });
+      if ("FreeInstall_FA_ConnectAbility_PA_1100" === TAG) {
+            var cmd14 = "bm uninstall -n com.ohos.hag.famanager";
+            abilityDelegator.executeShellCommand(cmd14, (err: any, d: any) => {
+                console.info("executeShellCommand14 : err : " + JSON.stringify(err), " data : " + JSON.stringify(d));
+         })
+       }
+        await sleep(500);
+        done();
+        });
 
     /*
     * @tc.number  FreeInstall_FA_ConnectAbility_PA_0100

ability/ability_runtime/freeinstalltest/connectabilityfatest/actsfreeinstallconnectabilityfatest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts

@@ -59,10 +59,8 @@ export default class OpenHarmonyTestRunner implements TestRunner {
             abilityName: testAbilityName,
             onAbilityCreate: onAbilityCreateCallback,
         };
-//        var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.TestAbility'
         var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.MainAbility'
         abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
-//        var cmd = 'aa start -a com.example.myapplication.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName
         var cmd = 'aa start -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
         cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
         console.info('cmd : '+cmd)

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectDifferentApplication") {
+ohos_hap_assist_suite("ConnectDifferentApplication") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ConnectDifferentApplication") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ConnectDifferentApplication"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("connectdifferentapplication_app_profile") {

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectdifferentapplication/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication1/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectFaMyApplication1") {
+ohos_hap_assist_suite("ConnectFaMyApplication1") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":connectfamyapplication1_ets_assets",
@@ -22,6 +22,8 @@ ohos_js_hap_suite("ConnectFaMyApplication1") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ConnectFaMyApplication1"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("connectfamyapplication1_ets_assets") {
   source_dir = "./entry/src/main/ets"

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication1/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication10/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectFaMyApplication10") {
+ohos_hap_assist_suite("ConnectFaMyApplication10") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":connectfamyapplication10_ets_assets",
@@ -22,6 +22,8 @@ ohos_js_hap_suite("ConnectFaMyApplication10") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ConnectFaMyApplication10"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("connectfamyapplication10_ets_assets") {
   source_dir = "./entry/src/main/ets"

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication10/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication11/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectFaMyApplication11") {
+ohos_hap_assist_suite("ConnectFaMyApplication11") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":connectfamyapplication11_ets_assets",
@@ -22,6 +22,8 @@ ohos_js_hap_suite("ConnectFaMyApplication11") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ConnectFaMyApplication11"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("connectfamyapplication11_ets_assets") {
   source_dir = "./entry/src/main/ets"

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication11/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication2/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectFaMyApplication2") {
+ohos_hap_assist_suite("ConnectFaMyApplication2") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":connectfamyapplication2_ets_assets",
@@ -22,6 +22,8 @@ ohos_js_hap_suite("ConnectFaMyApplication2") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ConnectFaMyApplication2"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("connectfamyapplication2_ets_assets") {
   source_dir = "./entry/src/main/ets"

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication2/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication4/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectFaMyApplication4") {
+ohos_hap_assist_suite("ConnectFaMyApplication4") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":connectfamyapplication4_ets_assets",
@@ -22,6 +22,8 @@ ohos_js_hap_suite("ConnectFaMyApplication4") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ConnectFaMyApplication4"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("connectfamyapplication4_ets_assets") {
   source_dir = "./entry/src/main/ets/"

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication4/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication5/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectFaMyApplication5") {
+ohos_hap_assist_suite("ConnectFaMyApplication5") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":connectfamyapplication5_ets_assets",
@@ -22,6 +22,8 @@ ohos_js_hap_suite("ConnectFaMyApplication5") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ConnectFaMyApplication5"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("connectfamyapplication5_ets_assets") {
   source_dir = "./entry/src/main/ets"

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication5/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication6/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectFaMyApplication6") {
+ohos_hap_assist_suite("ConnectFaMyApplication6") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":connectfamyapplication6_ets_assets",
@@ -22,6 +22,8 @@ ohos_js_hap_suite("ConnectFaMyApplication6") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ConnectFaMyApplication6"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("connectfamyapplication6_ets_assets") {
   source_dir = "./entry/src/main/ets"

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication6/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication7/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectFaMyApplication7") {
+ohos_hap_assist_suite("ConnectFaMyApplication7") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":connectfamyapplication7_ets_assets",
@@ -22,6 +22,8 @@ ohos_js_hap_suite("ConnectFaMyApplication7") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ConnectFaMyApplication7"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("connectfamyapplication7_ets_assets") {
   source_dir = "./entry/src/main/ets"

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication7/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication8/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectFaMyApplication8") {
+ohos_hap_assist_suite("ConnectFaMyApplication8") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":connectfamyapplication8_ets_assets",
@@ -22,6 +22,8 @@ ohos_js_hap_suite("ConnectFaMyApplication8") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ConnectFaMyApplication8"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("connectfamyapplication8_ets_assets") {
   source_dir = "./entry/src/main/ets"

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication8/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication9/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectFaMyApplication9") {
+ohos_hap_assist_suite("ConnectFaMyApplication9") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":connectfamyapplication9_ets_assets",
@@ -22,6 +22,8 @@ ohos_js_hap_suite("ConnectFaMyApplication9") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ConnectFaMyApplication9"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("connectfamyapplication9_ets_assets") {
   source_dir = "./entry/src/main/ets"

ability/ability_runtime/freeinstalltest/connectabilityfatest/connectfamyapplication9/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/BUILD.gn

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

ability/ability_runtime/freeinstalltest/connectabilitystagetest/actsfreeinstallconnectabilitystagetest/entry/src/main/ets/test/ConnectAbilityTest_Ext.ets

@@ -127,6 +127,13 @@ export default function ConnectAbilityTest_Ext(abilityContext) {
       console.info("FreeInstall_Stage_ConnectAbility_Ext after each called");
       dataAssert = ""
       await sleep(1000);
+      if ("FreeInstall_Stage_ConnectAbility_Ext_1200" === TAG) {
+        var cmdUninstall = "bm uninstall -n com.ohos.hag.famanager";
+        globalThis.delegator.executeShellCommand(cmdUninstall, (err: any, d: any) => {
+          console.info("executeShellCommandUninstall : err : " + JSON.stringify(err), " data : " + JSON.stringify(d));
+        })
+      }
+      await sleep(500);
       done();
     });
 

ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication0/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectStageMyApplication0") {
+ohos_hap_assist_suite("ConnectStageMyApplication0") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ConnectStageMyApplication0") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ConnectStageMyApplication0"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("connectstagemyapplication0_app_profile") {

ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication0/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication1/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectStageMyApplication1") {
+ohos_hap_assist_suite("ConnectStageMyApplication1") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ConnectStageMyApplication1") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ConnectStageMyApplication1"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("connectstagemyapplication1_app_profile") {

ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication1/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication2/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectStageMyApplication2") {
+ohos_hap_assist_suite("ConnectStageMyApplication2") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ConnectStageMyApplication2") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ConnectStageMyApplication2"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("connectstagemyapplication2_app_profile") {

ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication2/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication3/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectStageMyApplication3") {
+ohos_hap_assist_suite("ConnectStageMyApplication3") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ConnectStageMyApplication3") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ConnectStageMyApplication3"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("connectstagemyapplication3_app_profile") {

ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication3/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication4/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectStageMyApplication4") {
+ohos_hap_assist_suite("ConnectStageMyApplication4") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ConnectStageMyApplication4") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ConnectStageMyApplication4"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("connectstagemyapplication4_app_profile") {

ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication4/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication5/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectStageMyApplication5") {
+ohos_hap_assist_suite("ConnectStageMyApplication5") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ConnectStageMyApplication5") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ConnectStageMyApplication5"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("connectstagemyapplication5_app_profile") {

ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication5/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication6/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectStageMyApplication6") {
+ohos_hap_assist_suite("ConnectStageMyApplication6") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ConnectStageMyApplication6") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ConnectStageMyApplication6"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("connectstagemyapplication6_app_profile") {

ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication6/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication7/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectStageMyApplication7") {
+ohos_hap_assist_suite("ConnectStageMyApplication7") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ConnectStageMyApplication7") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ConnectStageMyApplication7"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("connectstagemyapplication7_app_profile") {

ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication7/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication8/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ConnectStageMyApplication8") {
+ohos_hap_assist_suite("ConnectStageMyApplication8") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("ConnectStageMyApplication8") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "ConnectStageMyApplication8"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("connectstagemyapplication8_app_profile") {

ability/ability_runtime/freeinstalltest/connectabilitystagetest/connectstagemyapplication8/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/mockservice/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("MockService") {
+ohos_hap_assist_suite("MockService") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("MockService") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "MockService"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("mockservice_app_profile") {

ability/ability_runtime/freeinstalltest/mockservice/Test.json

-{
-    "description": "Configuration for hjunit demo Tests" 
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/mockservicetimeout/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("MockServiceTimeout") {
+ohos_hap_assist_suite("MockServiceTimeout") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("MockServiceTimeout") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "MockServiceTimeout"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("mockservicetimeout_app_profile") {

ability/ability_runtime/freeinstalltest/mockservicetimeout/Test.json

-{
-    "description": "Configuration for hjunit demo Tests" 
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/startabilityfatest/actsfreeinstallstartabilityfatest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFreeInstallStartAbilityFaTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFreeInstallStartAbilityFaTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("actsfreeinstallstartabilityfatest_ets_assets") {
   source_dir = "./entry/src/main/ets"

ability/ability_runtime/freeinstalltest/startabilityfatest/actsstartabilitynotargetbundlelistfatest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsStartAbilityNoTargetBundleListFaTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsStartAbilityNoTargetBundleListFaTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("actsstartabilitynotargetbundlelistfatest_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfaentry/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AtomizationFaEntry") {
+ohos_hap_assist_suite("AtomizationFaEntry") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":atomizationfaentry_ets_assets",
@@ -22,6 +22,8 @@ ohos_js_hap_suite("AtomizationFaEntry") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "AtomizationFaEntry"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("atomizationfaentry_ets_assets") {
   source_dir = "./entry/src/main/ets"

ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfaentry/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfahm2/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AtomizationFaHm2") {
+ohos_hap_assist_suite("AtomizationFaHm2") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":atomizationfahm2_ets_assets",
@@ -22,6 +22,8 @@ ohos_js_hap_suite("AtomizationFaHm2") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "AtomizationFaHm2"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("atomizationfahm2_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfahm2/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfahm4/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AtomizationFaHm4") {
+ohos_hap_assist_suite("AtomizationFaHm4") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":atomizationfahm4_ets_assets",
@@ -22,6 +22,8 @@ ohos_js_hap_suite("AtomizationFaHm4") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "AtomizationFaHm4"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("atomizationfahm4_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

ability/ability_runtime/freeinstalltest/startabilityfatest/atomizationfahm4/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/startabilityfatest/famyapplication1/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("FaMyApplication1") {
+ohos_hap_assist_suite("FaMyApplication1") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":famyapplication1_ets_assets",
@@ -22,6 +22,8 @@ ohos_js_hap_suite("FaMyApplication1") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "FaMyApplication1"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("famyapplication1_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

ability/ability_runtime/freeinstalltest/startabilityfatest/famyapplication1/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsfreeinstallstartabilityforresultfatest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsFreeInstallStartAbilityForResultFaTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsFreeInstallStartAbilityForResultFaTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("actsfreeinstallstartabilityforresultfatest_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

ability/ability_runtime/freeinstalltest/startabilityforresultfatest/actsstartabilityforresultnotargetfatest/BUILD.gn

@@ -22,6 +22,8 @@ ohos_js_hap_suite("ActsStartAbilityForResultNoTargetFaTest") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "ActsStartAbilityForResultNoTargetFaTest"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("actsstartabilityforresultnotargetfatest_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresulta/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AtomizationResultA") {
+ohos_hap_assist_suite("AtomizationResultA") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":atomizationresulta_ets_assets",
@@ -22,6 +22,8 @@ ohos_js_hap_suite("AtomizationResultA") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "AtomizationResultA"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("atomizationresulta_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresulta/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfaentry/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AtomizationResultFaEntry") {
+ohos_hap_assist_suite("AtomizationResultFaEntry") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":atomizationresultfaentry_ets_assets",
@@ -22,6 +22,8 @@ ohos_js_hap_suite("AtomizationResultFaEntry") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "AtomizationResultFaEntry"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("atomizationresultfaentry_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfaentry/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfahm1/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AtomizationResultFaHm1") {
+ohos_hap_assist_suite("AtomizationResultFaHm1") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":atomizationresultfahm1_ets_assets",
@@ -22,6 +22,8 @@ ohos_js_hap_suite("AtomizationResultFaHm1") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "AtomizationResultFaHm1"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("atomizationresultfahm1_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfahm1/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfahm2/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AtomizationResultFaHm2") {
+ohos_hap_assist_suite("AtomizationResultFaHm2") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":atomizationresultfahm2_ets_assets",
@@ -22,6 +22,8 @@ ohos_js_hap_suite("AtomizationResultFaHm2") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "AtomizationResultFaHm2"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("atomizationresultfahm2_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

ability/ability_runtime/freeinstalltest/startabilityforresultfatest/atomizationresultfahm2/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/startabilityforresultfatest/faresultmyapplication1/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("FaResultMyApplication1") {
+ohos_hap_assist_suite("FaResultMyApplication1") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":faresultmyapplication1_ets_assets",
@@ -22,6 +22,8 @@ ohos_js_hap_suite("FaResultMyApplication1") {
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
   hap_name = "FaResultMyApplication1"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 ohos_js_assets("faresultmyapplication1_ets_assets") {
   source_dir = "./entry/src/main/ets/MainAbility"

ability/ability_runtime/freeinstalltest/startabilityforresultfatest/faresultmyapplication1/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsfreeinstallstartabilityforresultstagetest/BUILD.gn

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

ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/actsstartabilityforresultnotargetbundleliststagetest/BUILD.gn

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

ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AtomizationResultStageEntry") {
+ohos_hap_assist_suite("AtomizationResultStageEntry") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("AtomizationResultStageEntry") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "AtomizationResultStageEntry"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("atomizationresultstageentry_app_profile") {

ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstageentry/Test.json

-{
-    "description": "Configuration for hjunit demo Tests", 
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AtomizationResultStageHm2") {
+ohos_hap_assist_suite("AtomizationResultStageHm2") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("AtomizationResultStageHm2") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "AtomizationResultStageHm2"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("atomizationresultstagehm2_app_profile") {

ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehm2/Test.json

-{
-    "description": "Configuration for hjunit demo Tests", 
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AtomizationResultStageHnm2") {
+ohos_hap_assist_suite("AtomizationResultStageHnm2") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("AtomizationResultStageHnm2") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "AtomizationResultStageHnm2"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("atomizationresultstagehnm2_app_profile") {

ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/atomizationresultstagehnm2/Test.json

-{
-    "description": "Configuration for hjunit demo Tests", 
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("StageResultMyApplication1") {
+ohos_hap_assist_suite("StageResultMyApplication1") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("StageResultMyApplication1") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "StageResultMyApplication1"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("stageresultmyapplication1_app_profile") {

ability/ability_runtime/freeinstalltest/startabilityforresultstagetest/stageresultmyapplication1/Test.json

-{
-    "description": "Configuration for hjunit demo Tests", 
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/startabilitystagetest/actsfreeinstallstartabilitystagetest/BUILD.gn

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

ability/ability_runtime/freeinstalltest/startabilitystagetest/actsstartabilitynotargetbundleliststagetest/BUILD.gn

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

ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AtomizationStageEntry") {
+ohos_hap_assist_suite("AtomizationStageEntry") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("AtomizationStageEntry") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "AtomizationStageEntry"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("atomizationstageentry_app_profile") {

ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstageentry/Test.json

-{
-    "description": "Configuration for hjunit demo Tests", 
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm2/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AtomizationStageHm2") {
+ohos_hap_assist_suite("AtomizationStageHm2") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("AtomizationStageHm2") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "AtomizationStageHm2"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("atomizationstagehm2_app_profile") {

ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm2/Test.json

-{
-    "description": "Configuration for hjunit demo Tests", 
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm4/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("AtomizationStageHm4") {
+ohos_hap_assist_suite("AtomizationStageHm4") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("AtomizationStageHm4") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "AtomizationStageHm4"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("atomizationstagehm4_app_profile") {

ability/ability_runtime/freeinstalltest/startabilitystagetest/atomizationstagehm4/Test.json

-{
-    "description": "Configuration for hjunit demo Tests", 
-}
\ No newline at end of file

ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/BUILD.gn

@@ -13,7 +13,7 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("StageMyApplication1") {
+ohos_hap_assist_suite("StageMyApplication1") {
   hap_profile = "entry/src/main/module.json"
   js_build_mode = "debug"
   deps = [
@@ -23,6 +23,8 @@ ohos_js_hap_suite("StageMyApplication1") {
   ets2abc = true
   certificate_profile = "signature/openharmony_sx.p7b"
   hap_name = "StageMyApplication1"
+  subsystem_name = "ability"
+  part_name = "ability_runtime"
 }
 
 ohos_app_scope("stagemyapplication1_app_profile") {

ability/ability_runtime/freeinstalltest/startabilitystagetest/stagemyapplication1/Test.json

-{
-    "description": "Configuration for hjunit demo Tests", 
-}
\ No newline at end of file