jiyong@huawei.com

Signed-off-by: Njiyong <jiyong@huawei.com>

aafwk/aafwk_standard/abilitymanager/BUILD.gn

@@ -17,16 +17,16 @@ group("actsabilitymanagertest") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      "actsamscallbackfifthscene:ActsAmsCallBackFifthScene",
-      "actsamscallbackfirstscene:ActsAmsCallBackFirstScene",
-      "actsamscallbackfourthscene:ActsAmsCallBackFourthScene",
-      "actsamscallbacksecondscene:ActsAmsCallBackSecondScene",
-      "actsamscallbackthirdscene:ActsAmsCallBackThirdScene",
-      "actsamstestfifthscene:ActsAmsTestFifthScene",
-      "actsamstestfirstscene:ActsAmsTestFirstScene",
-      "actsamstestfourthscene:ActsAmsTestFourthScene",
-      "actsamstestsecondscene:ActsAmsTestSecondScene",
-      "actsamstestthirdscene:ActsAmsTestThirdScene",
+      "actsamscallbackfifthscene:ActsAmsCallBackFifthSceneTest",
+      "actsamscallbackfirstscene:ActsAmsCallBackFirstSceneTest",
+      "actsamscallbackfourthscene:ActsAmsCallBackFourthSceneTest",
+      "actsamscallbacksecondscene:ActsAmsCallBackSecondSceneTest",
+      "actsamscallbackthirdscene:ActsAmsCallBackThirdSceneTest",
+      "actsamstestfifthscene:ActsAmsTestFifthSceneTest",
+      "actsamstestfirstscene:ActsAmsTestFirstSceneTest",
+      "actsamstestfourthscene:ActsAmsTestFourthSceneTest",
+      "actsamstestsecondscene:ActsAmsTestSecondSceneTest",
+      "actsamstestthirdscene:ActsAmsTestThirdSceneTest",
       "sceneProject/simulateFAbilityFir:simulateFAbilityFir",
       "sceneProject/simulateEAbility:simulateEAbility",
       "sceneProject/simulateFAbilitySed:simulateFAbilitySed",

aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsCallBackFifthScene") {
+ohos_js_hap_suite("ActsAmsCallBackFifthSceneTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAmsCallBackFifthScene"
+  hap_name = "ActsAmsCallBackFifthSceneTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/abilitymanager/actsamscallbackfifthscene/Test.json

@@ -2,14 +2,14 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "120000",
         "package": "com.example.actsamscallbackfifthscene",
         "shell-timeout": "60000"
     },
     "kits": [
         {
             "test-file-name": [
-                "ActsAmsCallBackFifthScene.hap",
+                "ActsAmsCallBackFifthSceneTest.hap",
                 "simulateFAbilityFir.hap",
                 "simulateFAbilitySed.hap",
                 "verifyIAbility.hap"

aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsCallBackFirstScene") {
+ohos_js_hap_suite("ActsAmsCallBackFirstSceneTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAmsCallBackFirstScene"
+  hap_name = "ActsAmsCallBackFirstSceneTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/Test.json

@@ -2,14 +2,14 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "120000",
         "package": "com.example.actsamscallbackfirstscene",
         "shell-timeout": "60000"
     },
     "kits": [
         {
             "test-file-name": [
-                "ActsAmsCallBackFirstScene.hap",
+                "ActsAmsCallBackFirstSceneTest.hap",
                 "simulateFAbilityFir.hap"
             ],
             "type": "AppInstallKit",

aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsCallBackFourthScene") {
+ohos_js_hap_suite("ActsAmsCallBackFourthSceneTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAmsCallBackFourthScene"
+  hap_name = "ActsAmsCallBackFourthSceneTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/Test.json

@@ -2,14 +2,14 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "120000",
         "package": "com.example.actsamscallbackfourthscene",
         "shell-timeout": "60000"
     },
     "kits": [
         {
             "test-file-name": [
-                "ActsAmsCallBackFourthScene.hap",
+                "ActsAmsCallBackFourthSceneTest.hap",
                 "simulateFAbilityFir.hap",
                 "verifyAAbility.hap",
                 "verifyIAbility.hap",

aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsCallBackSecondScene") {
+ohos_js_hap_suite("ActsAmsCallBackSecondSceneTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAmsCallBackSecondScene"
+  hap_name = "ActsAmsCallBackSecondSceneTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/Test.json

@@ -2,14 +2,14 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "120000",
         "package": "com.example.actsamscallbacksecondscene",
         "shell-timeout": "60000"
     },
     "kits": [
         {
             "test-file-name": [
-                "ActsAmsCallBackSecondScene.hap",
+                "ActsAmsCallBackSecondSceneTest.hap",
                 "verifyIAbility.hap",
                 "simulateFAbilityFir.hap"
             ],

aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsCallBackThirdScene") {
+ohos_js_hap_suite("ActsAmsCallBackThirdSceneTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAmsCallBackThirdScene"
+  hap_name = "ActsAmsCallBackThirdSceneTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/Test.json

@@ -2,14 +2,14 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "120000",
         "package": "com.example.actsamscallbackthirdscene",
         "shell-timeout": "60000"
     },
     "kits": [
         {
             "test-file-name": [
-                "ActsAmsCallBackThirdScene.hap",
+                "ActsAmsCallBackThirdSceneTest.hap",
                 "simulateFAbilityFir.hap",
                 "verifyIAbility.hap"
             ],

aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/BUILD.gn

@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsTestFifthScene") {
+ohos_js_hap_suite("ActsAmsTestFifthSceneTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAmsTestFifthScene"
+  hap_name = "ActsAmsTestFifthSceneTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/Test.json

@@ -2,14 +2,14 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "120000",
         "package": "com.example.actsamstestfifthscene",
         "shell-timeout": "60000"
     },
     "kits": [
         {
             "test-file-name": [
-                "ActsAmsTestFifthScene.hap",
+                "ActsAmsTestFifthSceneTest.hap",
                 "simulateFAbilitySed.hap",
                 "verifyIAbility.hap"
             ],

aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/BUILD.gn

@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsTestFirstScene") {
+ohos_js_hap_suite("ActsAmsTestFirstSceneTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAmsTestFirstScene"
+  hap_name = "ActsAmsTestFirstSceneTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/Test.json

@@ -2,14 +2,14 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "120000",
         "package": "com.example.actsamstestfirstscene",
         "shell-timeout": "60000"
     },
     "kits": [
         {
             "test-file-name": [
-                "ActsAmsTestFirstScene.hap",
+                "ActsAmsTestFirstSceneTest.hap",
                 "simulateFAbilityFir.hap"
             ],
             "type": "AppInstallKit",

aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/BUILD.gn

@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsTestFourthScene") {
+ohos_js_hap_suite("ActsAmsTestFourthSceneTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAmsTestFourthScene"
+  hap_name = "ActsAmsTestFourthSceneTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/Test.json

@@ -2,14 +2,14 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "120000",
         "package": "com.example.actsamstestfourthscene",
         "shell-timeout": "60000"
     },
     "kits": [
         {
             "test-file-name": [
-                "ActsAmsTestFourthScene.hap",
+                "ActsAmsTestFourthSceneTest.hap",
                 "simulateFAbilityFir.hap",
                 "simulateEAbility.hap",
                 "verifyAAbility.hap",

aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/BUILD.gn

@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsTestSecondScene") {
+ohos_js_hap_suite("ActsAmsTestSecondSceneTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAmsTestSecondScene"
+  hap_name = "ActsAmsTestSecondSceneTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/Test.json

@@ -2,14 +2,14 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "120000",
         "package": "com.example.actsamstestsecondscene",
         "shell-timeout": "60000"
     },
     "kits": [
         {
             "test-file-name": [
-                "ActsAmsTestSecondScene.hap",
+                "ActsAmsTestSecondSceneTest.hap",
                 "simulateFAbilityFir.hap",
                 "verifyIAbility.hap"
             ],

aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/BUILD.gn

@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsTestThirdScene") {
+ohos_js_hap_suite("ActsAmsTestThirdSceneTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAmsTestThirdScene"
+  hap_name = "ActsAmsTestThirdSceneTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/Test.json

@@ -2,14 +2,14 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "120000",
         "package": "com.example.actsamstestthirdscene",
         "shell-timeout": "60000"
     },
     "kits": [
         {
             "test-file-name": [
-                "ActsAmsTestThirdScene.hap",
+                "ActsAmsTestThirdSceneTest.hap",
                 "simulateFAbilityFir.hap",
                 "verifyIAbility.hap"
             ],

aafwk/aafwk_standard/abilitymanager/sceneProject/simulateEAbility/BUILD.gn

@@ -12,14 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("simulateEAbility") {
+ohos_hap("simulateEAbility") {
   hap_profile = "./src/main/config.json"
+  hap_name = "simulateEAbility"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "simulateEAbility"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilityFir/BUILD.gn

@@ -12,14 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("simulateFAbilityFir") {
+ohos_hap("simulateFAbilityFir") {
   hap_profile = "./src/main/config.json"
+  hap_name = "simulateFAbilityFir"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "simulateFAbilityFir"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

aafwk/aafwk_standard/abilitymanager/sceneProject/simulateFAbilitySed/BUILD.gn

@@ -12,14 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("simulateFAbilitySed") {
+ohos_hap("simulateFAbilitySed") {
   hap_profile = "./src/main/config.json"
+  hap_name = "simulateFAbilitySed"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "simulateFAbilitySed"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

aafwk/aafwk_standard/abilitymanager/sceneProject/verifyAAbility/BUILD.gn

@@ -12,14 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("verifyAAbility") {
+ohos_hap("verifyAAbility") {
   hap_profile = "./src/main/config.json"
+  hap_name = "verifyAAbility"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "verifyAAbility"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

aafwk/aafwk_standard/abilitymanager/sceneProject/verifyIAbility/BUILD.gn

@@ -12,14 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("verifyIAbility") {
+ohos_hap("verifyIAbility") {
   hap_profile = "./src/main/config.json"
+  hap_name = "verifyIAbility"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "verifyIAbility"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

aafwk/aafwk_standard/context/actscontexttest/Test.json

@@ -2,7 +2,7 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "500000",
         "package": "com.example.actscontext",
         "shell-timeout": "60000"
     },

aafwk/aafwk_standard/context/scene/defpermission/BUILD.gn

@@ -12,14 +12,17 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("Defpermission") {
+ohos_hap("Defpermission") {
   hap_profile = "./src/main/config.json"
+  hap_name = "Defpermission"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "Defpermission"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

aafwk/aafwk_standard/featureability/sceneproject/finishwithresultemptytest/BUILD.gn

@@ -12,14 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("FinishWithResultEmptyTest") {
+ohos_hap("FinishWithResultEmptyTest") {
   hap_profile = "./src/main/config.json"
+  hap_name = "FinishWithResultEmptyTest"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "FinishWithResultEmptyTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

aafwk/aafwk_standard/featureability/sceneproject/finishwithresultpromiseparameterstest/BUILD.gn

@@ -12,14 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("FinishWithResultPromiseParametersTest") {
+ohos_hap("FinishWithResultPromiseParametersTest") {
   hap_profile = "./src/main/config.json"
+  hap_name = "FinishWithResultPromiseParametersTest"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "FinishWithResultPromiseParametersTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

aafwk/aafwk_standard/featureability/sceneproject/finishwithresulttest/BUILD.gn

@@ -12,14 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("FinishWithResultTest") {
+ohos_hap("FinishWithResultTest") {
   hap_profile = "./src/main/config.json"
+  hap_name = "FinishWithResultTest"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "FinishWithResultTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

aafwk/aafwk_standard/featureability/sceneproject/getcallingbundletest/BUILD.gn

@@ -12,14 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("GetCallingBundlePromiseTest") {
+ohos_hap("GetCallingBundlePromiseTest") {
   hap_profile = "./src/main/config.json"
+  hap_name = "GetCallingBundlePromiseTest"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "GetCallingBundlePromiseTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

aafwk/aafwk_standard/featureability/sceneproject/startability/BUILD.gn

@@ -12,14 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("StartAbility") {
+ohos_hap("StartAbility") {
   hap_profile = "./src/main/config.json"
+  hap_name = "StartAbility"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "StartAbility"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

aafwk/aafwk_standard/featureability/sceneproject/startabilityforresult/BUILD.gn

@@ -12,14 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("StartAbilityForResult") {
+ohos_hap("StartAbilityForResult") {
   hap_profile = "./src/main/config.json"
+  hap_name = "StartAbilityForResult"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "StartAbilityForResult"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

aafwk/aafwk_standard/featureability/sceneproject/terminateabilitytest/BUILD.gn

@@ -12,14 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("TerminateAbilityTest") {
+ohos_hap("TerminateAbilityTest") {
   hap_profile = "./src/main/config.json"
+  hap_name = "TerminateAbilityTest"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "TerminateAbilityTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

aafwk/aafwk_standard/want/actssetwanttest/Test.json

@@ -2,7 +2,7 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "40000",
         "package": "com.example.actssetwanttest",
         "shell-timeout": "60000"
     },

aafwk/aafwk_standard/want/sceneProject/actsgetwantalltesthap/BUILD.gn

@@ -12,14 +12,18 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsGetWantAllTestHap") {
+ohos_hap("ActsGetWantAllTestHap") {
   hap_profile = "./src/main/config.json"
+  hap_name = "ActsGetWantAllTestHap"
+  subsystem_name = XTS_SUITENAME
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsGetWantAllTestHap"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneeight/BUILD.gn

@@ -16,7 +16,8 @@ ohos_hap("bmsJstest8") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest8"
   subsystem_name = XTS_SUITENAME
-  final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn

@@ -16,7 +16,8 @@ ohos_hap("bmsJstest5") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest5"
   subsystem_name = XTS_SUITENAME
-  final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn

@@ -16,7 +16,8 @@ ohos_hap("bmsJstest4") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest4"
   subsystem_name = XTS_SUITENAME
-  final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenenine/BUILD.gn

@@ -16,7 +16,8 @@ ohos_hap("bmsJstest9") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest9"
   subsystem_name = XTS_SUITENAME
-  final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn

@@ -16,7 +16,8 @@ ohos_hap("bmsJstest1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest1"
   subsystem_name = XTS_SUITENAME
-  final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmssceneseven/BUILD.gn

@@ -16,7 +16,8 @@ ohos_hap("bmsJstest7") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest7"
   subsystem_name = XTS_SUITENAME
-  final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn

@@ -16,7 +16,8 @@ ohos_hap("bmsJstest6") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest6"
   subsystem_name = XTS_SUITENAME
-  final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn

@@ -16,7 +16,8 @@ ohos_hap("bmsJstest3") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest3"
   subsystem_name = XTS_SUITENAME
-  final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn

@@ -16,7 +16,8 @@ ohos_hap("bmsJstest2") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest2"
   subsystem_name = XTS_SUITENAME
-  final_hap_path = "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
+  final_hap_path = 
+     "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",

notification/ans_standard/cancel_test/MyApplicationCancelAll/Test.json

@@ -2,7 +2,7 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "300000",
         "package": "com.example.myapplication",
         "shell-timeout": "60000"
     },

notification/ans_standard/publish_test/notification-ContentType-All/Test.json

@@ -2,7 +2,7 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "300000",
         "package": "com.example.test",
         "shell-timeout": "60000"
     },

notification/ces_standard/subscribeandpublish/actssubscriberunordertest/Test.json

@@ -2,7 +2,7 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "500000",
         "package": "com.example.actssubscribertestunorder",
         "shell-timeout": "60000"
     },