From 773c78b312a8db81ff2273570473817c1f4957d3 Mon Sep 17 00:00:00 2001
From: inter515 <ry.renyi@huawei.com>
Date: Wed, 3 Aug 2022 10:27:48 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=BE=85=E5=8A=A9demo=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: inter515 <ry.renyi@huawei.com>
---
 .../bundlemanager/sceneProject/bmsaccesstokenfive/BUILD.gn    | 4 +---
 .../bundlemanager/sceneProject/bmsaccesstokenfour/BUILD.gn    | 4 +---
 .../bundlemanager/sceneProject/bmsaccesstokenone/BUILD.gn     | 4 +---
 .../bundlemanager/sceneProject/bmsaccesstokenthree/BUILD.gn   | 4 +---
 .../bundlemanager/sceneProject/bmsaccesstokentwo/BUILD.gn     | 4 +---
 .../bundlemanager/sceneProject/bmsfirstright/BUILD.gn         | 4 +---
 .../bundlemanager/sceneProject/bmsgetinfosfifthscene/BUILD.gn | 4 +---
 .../bundlemanager/sceneProject/bmsgetinfosfirstscene/BUILD.gn | 4 +---
 .../sceneProject/bmsgetinfosfirstsceneupdate/BUILD.gn         | 4 +---
 .../sceneProject/bmsgetinfosfourthscene/BUILD.gn              | 4 +---
 .../bundlemanager/sceneProject/bmsgetinfoshapc/BUILD.gn       | 4 +---
 .../bundlemanager/sceneProject/bmsgetinfosjsscene/BUILD.gn    | 4 +---
 .../sceneProject/bmsgetinfosscenesystem/BUILD.gn              | 4 +---
 .../sceneProject/bmsgetinfosscenesystemtwo/BUILD.gn           | 4 +---
 .../sceneProject/bmsgetinfosscenevendor/BUILD.gn              | 4 +---
 .../sceneProject/bmsgetinfossecondscene/BUILD.gn              | 4 +---
 .../sceneProject/bmsgetinfosseventhscene/BUILD.gn             | 4 +---
 .../bundlemanager/sceneProject/bmsgetinfossixthscene/BUILD.gn | 4 +---
 .../bundlemanager/sceneProject/bmsgetinfosthirdscene/BUILD.gn | 4 +---
 .../sceneProject/bmsmainabilityfirstscene/BUILD.gn            | 4 +---
 .../sceneProject/bmsmainabilitysecondscene/BUILD.gn           | 4 +---
 .../bundlemanager/sceneProject/bmsmodulenameone/BUILD.gn      | 4 +---
 .../bundlemanager/sceneProject/bmsmodulenametwo/BUILD.gn      | 4 +---
 .../bundlemanager/sceneProject/bmsscenefive/BUILD.gn          | 4 +---
 .../bundlemanager/sceneProject/bmsscenefour/BUILD.gn          | 4 +---
 .../bundlemanager/sceneProject/bmssceneone/BUILD.gn           | 4 +---
 .../bundlemanager/sceneProject/bmsscenesix/BUILD.gn           | 4 +---
 .../bundlemanager/sceneProject/bmsscenethree/BUILD.gn         | 4 +---
 .../bundlemanager/sceneProject/bmsscenetwo/BUILD.gn           | 4 +---
 .../bundlemanager/sceneProject/bmssecondright/BUILD.gn        | 4 +---
 .../bundlemanager/sceneProject/bmsstagedemoone/BUILD.gn       | 4 +---
 .../bundlemanager/sceneProject/bmsstagedemotwo/BUILD.gn       | 4 +---
 32 files changed, 32 insertions(+), 96 deletions(-)

diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfive/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfive/BUILD.gn
index 86c001527..6813fd7b4 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfive/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfive/BUILD.gn
@@ -12,11 +12,9 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsAccessTokenTest5") {
+ohos_hap_assist_suite("bmsAccessTokenTest5") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsAccessTokenTest5"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfour/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfour/BUILD.gn
index 000092124..444af82d4 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfour/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenfour/BUILD.gn
@@ -12,11 +12,9 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsAccessTokenTest4") {
+ohos_hap_assist_suite("bmsAccessTokenTest4") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsAccessTokenTest4"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenone/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenone/BUILD.gn
index 70fbe4c35..4cd14cbc0 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenone/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenone/BUILD.gn
@@ -12,11 +12,9 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsAccessTokenTest1") {
+ohos_hap_assist_suite("bmsAccessTokenTest1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsAccessTokenTest1"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenthree/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenthree/BUILD.gn
index 4c4992f3b..3c1170c6d 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenthree/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokenthree/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsAccessTokenTest3") {
+ohos_hap_assist_suite("bmsAccessTokenTest3") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsAccessTokenTest3"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokentwo/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokentwo/BUILD.gn
index 573fb8fec..c96705121 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokentwo/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsaccesstokentwo/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsAccessTokenTest2") {
+ohos_hap_assist_suite("bmsAccessTokenTest2") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsAccessTokenTest2"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsfirstright/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsfirstright/BUILD.gn
index fe1ad362f..c5c42c3d5 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsfirstright/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsfirstright/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("first_right") {
+ohos_hap_assist_suite("first_right") {
   hap_profile = "./src/main/config.json"
   hap_name = "first_right"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfifthscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfifthscene/BUILD.gn
index fbf1f9ab2..15e688f0f 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfifthscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfifthscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest5") {
+ohos_hap_assist_suite("bmsThirdBundleTest5") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest5"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstscene/BUILD.gn
index 6be28a629..2d87dd479 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest1") {
+ohos_hap_assist_suite("bmsThirdBundleTest1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstsceneupdate/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstsceneupdate/BUILD.gn
index a162a7a4f..2412a52c6 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstsceneupdate/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfirstsceneupdate/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTestA1") {
+ohos_hap_assist_suite("bmsThirdBundleTestA1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTestA1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfourthscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfourthscene/BUILD.gn
index dd1898f07..24da625df 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfourthscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfourthscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest4") {
+ohos_hap_assist_suite("bmsThirdBundleTest4") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest4"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfoshapc/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfoshapc/BUILD.gn
index 480b522a8..69f257927 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfoshapc/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfoshapc/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleC") {
+ohos_hap_assist_suite("bmsThirdBundleC") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleC"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosjsscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosjsscene/BUILD.gn
index 822d2041f..4f1dc92c3 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosjsscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosjsscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleJs") {
+ohos_hap_assist_suite("bmsThirdBundleJs") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleJs"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystem/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystem/BUILD.gn
index 88f38f7a9..30940ae89 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystem/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystem/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsSystemBundleTest1") {
+ohos_hap_assist_suite("bmsSystemBundleTest1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsSystemBundleTest1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystemtwo/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystemtwo/BUILD.gn
index b77bb1112..0251cfdc3 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystemtwo/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenesystemtwo/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsSystemBundleTest2") {
+ohos_hap_assist_suite("bmsSystemBundleTest2") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsSystemBundleTest2"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenevendor/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenevendor/BUILD.gn
index 87057b684..c858988bb 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenevendor/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosscenevendor/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsVendorBundleTest1") {
+ohos_hap_assist_suite("bmsVendorBundleTest1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsVendorBundleTest1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossecondscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossecondscene/BUILD.gn
index 79c7d9cbf..15fc2b28f 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossecondscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossecondscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest2") {
+ohos_hap_assist_suite("bmsThirdBundleTest2") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest2"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosseventhscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosseventhscene/BUILD.gn
index d6cfa6987..50ba08928 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosseventhscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosseventhscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest7") {
+ohos_hap_assist_suite("bmsThirdBundleTest7") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest7"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossixthscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossixthscene/BUILD.gn
index 41e7d3f2b..2acc7f074 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossixthscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfossixthscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest6") {
+ohos_hap_assist_suite("bmsThirdBundleTest6") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest6"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosthirdscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosthirdscene/BUILD.gn
index f6b4e8791..402bdacca 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosthirdscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsgetinfosthirdscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsThirdBundleTest3") {
+ohos_hap_assist_suite("bmsThirdBundleTest3") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsThirdBundleTest3"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilityfirstscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilityfirstscene/BUILD.gn
index 4100f8cfa..3806b01cc 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilityfirstscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilityfirstscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsMainAbilityFirstScene") {
+ohos_hap_assist_suite("bmsMainAbilityFirstScene") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsMainAbilityFirstScene"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilitysecondscene/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilitysecondscene/BUILD.gn
index 6d7b5976c..ec38af8b0 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilitysecondscene/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmainabilitysecondscene/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsMainAbilitySecondScene") {
+ohos_hap_assist_suite("bmsMainAbilitySecondScene") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsMainAbilitySecondScene"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmodulenameone/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmodulenameone/BUILD.gn
index 83f293617..ad74bec98 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmodulenameone/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmodulenameone/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsModuleNameTest1") {
+ohos_hap_assist_suite("bmsModuleNameTest1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsModuleNameTest1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmodulenametwo/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmodulenametwo/BUILD.gn
index 54e31892f..3ac75613e 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmodulenametwo/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsmodulenametwo/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsModuleNameTest2") {
+ohos_hap_assist_suite("bmsModuleNameTest2") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsModuleNameTest2"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn
index a16ff01bb..fbb79ca44 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenefive/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsJstest5") {
+ohos_hap_assist_suite("bmsJstest5") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest5"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn
index f80086913..6e4f10d06 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenefour/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsJstest4") {
+ohos_hap_assist_suite("bmsJstest4") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest4"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn
index 66f5061f7..187ca2fdd 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmssceneone/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsJstest1") {
+ohos_hap_assist_suite("bmsJstest1") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn
index d3c08b3de..1f9e1d258 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenesix/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsJstest6") {
+ohos_hap_assist_suite("bmsJstest6") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest6"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn
index 2909d5499..fb0492e51 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenethree/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsJstest3") {
+ohos_hap_assist_suite("bmsJstest3") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest3"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn
index dcb1048c5..0a629ef17 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsscenetwo/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsJstest2") {
+ohos_hap_assist_suite("bmsJstest2") {
   hap_profile = "./src/main/config.json"
   hap_name = "bmsJstest2"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmssecondright/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmssecondright/BUILD.gn
index 30411786f..9c5146c94 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmssecondright/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmssecondright/BUILD.gn
@@ -12,13 +12,11 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("second_right") {
+ohos_hap_assist_suite("second_right") {
   hap_profile = "./src/main/config.json"
   hap_name = "second_right"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/BUILD.gn
index 5f43c6181..3e617eee5 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemoone/BUILD.gn
@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsStageDemo1") {
+ohos_hap_assist_suite("bmsStageDemo1") {
   hap_profile = "entry/src/main/module.json"
   hap_name = "bmsStageDemo1"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
diff --git a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/BUILD.gn b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/BUILD.gn
index 627e0cd0c..c211090c2 100644
--- a/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/BUILD.gn
+++ b/bundlemanager/bundle_standard/bundlemanager/sceneProject/bmsstagedemotwo/BUILD.gn
@@ -13,13 +13,11 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_hap("bmsStageDemo2") {
+ohos_hap_assist_suite("bmsStageDemo2") {
   hap_profile = "entry/src/main/module.json"
   hap_name = "bmsStageDemo2"
   subsystem_name = "bundlemanager"
   part_name = "bundle_framework"
-  final_hap_path =
-      "${SUITES_OUTPUT_ROOT}/${XTS_SUITENAME}/testcases/${hap_name}.hap"
   testonly = true
   deps = [
     ":hjs_demo_js_assets",
-- 
GitLab