From 33ab86f032a49320458c260f71ffcd6da9d31c54 Mon Sep 17 00:00:00 2001
From: jiyong <jiyong@huawei.com>
Date: Fri, 29 Oct 2021 15:36:23 +0800
Subject: [PATCH] jiyong@huawei.com

Signed-off-by: jiyong <jiyong@huawei.com>
---
 .../formsystemtestservicea/BUILD.gn           |  6 ++++-
 .../formsystemtestservicea/Test.json          | 22 -------------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/BUILD.gn b/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/BUILD.gn
index 5ec249183..cf022f965 100644
--- a/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/BUILD.gn
+++ b/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/BUILD.gn
@@ -15,12 +15,16 @@ import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("ActsFormSystemTestServiceA") {
   hap_profile = "./formmodule001/src/main/config.json"
+  hap_name = "ActsFormSystemTestServiceA"
+  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 = "ActsFormSystemTestServiceA"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./formmodule001/src/main/js/default"
diff --git a/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/Test.json b/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/Test.json
index e70d35c9a..7a88763ed 100644
--- a/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/Test.json
+++ b/aafwk/aafwk_standard/formmanager/formsystemtestservice/formsystemtestservicea/Test.json
@@ -1,25 +1,3 @@
 {
     "description": "Configuration for hjunit demo Tests",
-    "driver": {
-        "type": "JSUnitTest",
-        "test-timeout": "60000",
-        "package": "com.form.formsystemtestservicea",
-        "shell-timeout": "60000"
-    },
-    "kits": [
-        {
-            "test-file-name": [
-                "ActsFormSystemTestserviceA.hap"
-            ],
-            "type": "AppInstallKit",
-            "cleanup-apps": true
-        },
-        {
-            "type": "PushKit",
-            "push": [
-                "formsystemtestservicea001.hap->/data/formsystemtestservicea001.hap"
-            ]
-            
-        }        
-    ]
 }
-- 
GitLab