jiyong@huawei.com

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

appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/Test.json

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

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

@@ -12,14 +12,17 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("bmsJstest8") {
+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"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "bmsJstest8"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

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

@@ -12,14 +12,17 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("bmsJstest5") {
+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"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "bmsJstest5"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

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

@@ -12,14 +12,17 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("bmsJstest4") {
+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"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "bmsJstest4"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

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

@@ -12,14 +12,17 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("bmsJstest9") {
+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"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "bmsJstest9"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

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

@@ -12,14 +12,17 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("bmsJstest1") {
+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"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "bmsJstest1"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

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

@@ -12,14 +12,17 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("bmsJstest7") {
+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"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "bmsJstest7"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

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

@@ -12,14 +12,17 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("bmsJstest6") {
+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"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "bmsJstest6"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

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

@@ -12,14 +12,17 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("bmsJstest3") {
+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"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "bmsJstest3"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"

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

@@ -12,14 +12,17 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("bmsJstest2") {
+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"
+  testonly = true
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "bmsJstest2"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./src/main/js/default"