From 2ed719c427750c63aedc0757df268140a398d5c7 Mon Sep 17 00:00:00 2001
From: "zhaoyuan17@huawei.com" <zhaoyuan17@huawei.com>
Date: Wed, 17 Nov 2021 10:17:13 +0800
Subject: [PATCH] xts

Signed-off-by: zhaoyuan17@huawei.com <zhaoyuan17@huawei.com>
---
 .../formsystemtesthost/FormFuzzTest/Test.json         |  7 -------
 .../formsystemtesthost/getallformsinfo10/Test.json    | 10 ++--------
 .../formsystemtesthost/getallformsinfo201/Test.json   | 11 +++--------
 .../formsystemtesthost/getallformsinfo211/Test.json   | 11 +++--------
 .../formsystemtesthost/getallformsinfo212/Test.json   | 11 +++--------
 5 files changed, 11 insertions(+), 39 deletions(-)

diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/Test.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/Test.json
index 7e05f9f85..578b15c5f 100755
--- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/Test.json
+++ b/aafwk/aafwk_standard/formmanager/formsystemtesthost/FormFuzzTest/Test.json
@@ -21,13 +21,6 @@
                 "mkdir /system/vendor"
             ]
         },
-        {
-            "type": "PushKit",
-            "push": [
-                "FormFuzzTest.hap->/data/FormFuzzTest.hap"
-            ]
-            
-        },
         {
             "type": "ShellKit",
             "run-command": [
diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo10/Test.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo10/Test.json
index 71dbba6d6..8d8bd5105 100644
--- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo10/Test.json
+++ b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo10/Test.json
@@ -9,7 +9,8 @@
     "kits": [
         {
             "test-file-name": [
-                "GetAllFormsInfo10.hap"
+                "GetAllFormsInfo10.hap",
+                "ActsFormSystemTestServiceD"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
@@ -21,13 +22,6 @@
                 "mkdir /system/vendor"
             ]
         },
-        {
-            "type": "PushKit",
-            "push": [
-                "GetAllFormsInfo10.hap->/data/GetAllFormsInfo10.hap"
-            ]
-            
-        },
         {
             "type": "ShellKit",
             "run-command": [
diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo201/Test.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo201/Test.json
index 5ec5cdd14..407118fcf 100644
--- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo201/Test.json
+++ b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo201/Test.json
@@ -9,7 +9,9 @@
     "kits": [
         {
             "test-file-name": [
-                "GetAllFormsInfo201.hap"
+                "GetAllFormsInfo201.hap",
+                "ActsFormSystemTestServiceB",
+                "ActsFormSystemTestServiceD"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
@@ -21,13 +23,6 @@
                 "mkdir /system/vendor"
             ]
         },
-        {
-            "type": "PushKit",
-            "push": [
-                "GetAllFormsInfo201.hap->/data/GetAllFormsInfo201.hap"
-            ]
-            
-        },
         {
             "type": "ShellKit",
             "run-command": [
diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo211/Test.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo211/Test.json
index 7e578c36e..21ea163c0 100644
--- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo211/Test.json
+++ b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo211/Test.json
@@ -9,7 +9,9 @@
     "kits": [
         {
             "test-file-name": [
-                "GetAllFormsInfo211.hap"
+                "GetAllFormsInfo211.hap",
+                "ActsFormSystemTestServiceB",
+                "ActsFormSystemTestServiceC"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
@@ -21,13 +23,6 @@
                 "mkdir /system/vendor"
             ]
         },
-        {
-            "type": "PushKit",
-            "push": [
-                "GetAllFormsInfo211.hap->/data/GetAllFormsInfo211.hap"
-            ]
-            
-        },
         {
             "type": "ShellKit",
             "run-command": [
diff --git a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo212/Test.json b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo212/Test.json
index f06b852ae..458c4620c 100644
--- a/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo212/Test.json
+++ b/aafwk/aafwk_standard/formmanager/formsystemtesthost/getallformsinfo212/Test.json
@@ -9,7 +9,9 @@
     "kits": [
         {
             "test-file-name": [
-                "GetAllFormsInfo212.hap"
+                "GetAllFormsInfo212.hap",
+                "ActsFormSystemTestServiceA",
+                "ActsFormSystemTestServiceB"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true
@@ -21,13 +23,6 @@
                 "mkdir /system/vendor"
             ]
         },
-        {
-            "type": "PushKit",
-            "push": [
-                "GetAllFormsInfo212.hap->/data/GetAllFormsInfo212.hap"
-            ]
-            
-        },
         {
             "type": "ShellKit",
             "run-command": [
-- 
GitLab