!1406 Modify xts test gn

Merge pull request !1406 from blackleon/master_1221_new

aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/BUILD.gn

@@ -13,14 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsMissionSnapshotTestSingleton") {
+ohos_hap("ActsAmsMissionSnapshotTestSingleton") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "ActsAmsMissionSnapshotTestSingleton"
+  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 = "ActsAmsMissionSnapshotTestSingleton"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingleton/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-}

aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/BUILD.gn

@@ -13,14 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsMissionSnapshotTestSingletonS") {
+ohos_hap("ActsAmsMissionSnapshotTestSingletonS") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "ActsAmsMissionSnapshotTestSingletonS"
+  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 = "ActsAmsMissionSnapshotTestSingletonS"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/amsabilitymanager/amsMissionSnapshotTestSingletonS/Test.json

-{
-    "description": "Configuration for hjunit demo Tests",
-}

aafwk/aafwk_standard/amsmultiapp/MultiAppPageConnect_Service/BUILD.gn

@@ -9,18 +9,22 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsMultiAppPageConnectService") {
+ohos_hap("ActsAmsMultiAppPageConnectService") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "ActsAmsMultiAppPageConnectService"
+  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 = "ActsAmsMultiAppPageConnectService"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/amsmultiapp/MultiAppPageConnect_Service/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}

aafwk/aafwk_standard/amsmultiapp/MultiAppPagePermission_Page/BUILD.gn

@@ -13,14 +13,18 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsMultiAppPagePermission") {
+ohos_hap("ActsAmsMultiAppPagePermission") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "ActsAmsMultiAppPagePermission"
+  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 = "ActsAmsMultiAppPagePermission"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/amsmultiapp/MultiAppPagePermission_Page/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}

aafwk/aafwk_standard/amsmultiapp/MultiAppPage_Page/BUILD.gn

@@ -9,18 +9,22 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsMultiAppPage") {
+ohos_hap("ActsAmsMultiAppPage") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "ActsAmsMultiAppPage"
+  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 = "ActsAmsMultiAppPage"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/amsmultiapp/MultiAppPage_Page/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}

aafwk/aafwk_standard/amsmultiapp/MultiAppPage_Service/BUILD.gn

@@ -9,18 +9,22 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsMultiAppPageService") {
+ohos_hap("ActsAmsMultiAppPageService") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "ActsAmsMultiAppPageService"
+  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 = "ActsAmsMultiAppPageService"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/amsmultiapp/MultiAppPage_Service/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}

aafwk/aafwk_standard/amsmultiapp/MultiAppSimultaneousOnline_test/BUILD.gn

@@ -9,18 +9,22 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsMultiAppPageClone") {
+ohos_hap("ActsAmsMultiAppPageClone") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "ActsAmsMultiAppPageClone"
+  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 = "ActsAmsMultiAppPageClone"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/amsmultiapp/MultiAppSimultaneousOnline_test/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}

aafwk/aafwk_standard/amsmultiapp/MultiAppTermination_test/BUILD.gn

@@ -9,18 +9,22 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAmsMultiAppPageCloneTermination") {
+ohos_hap("ActsAmsMultiAppPageCloneTermination") {
   hap_profile = "./entry/src/main/config.json"
+  hap_name = "ActsAmsMultiAppPageCloneTermination"
+  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 = "ActsAmsMultiAppPageCloneTermination"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

aafwk/aafwk_standard/amsmultiapp/MultiAppTermination_test/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}

aafwk/aafwk_standard/amsmultiapp/amsmultiapppageexecutor/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}

aafwk/aafwk_standard/amsmultiapp/amsmultiappserviceexecutor/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}

aafwk/aafwk_standard/amsmultiapp/amsmultiappservicestarter/Test.json

-{
-    "description": "Configuration for hjunit demo Tests"
-}