!9872 修改test.json使validator支持通过xdevice的命令拉起

Merge pull request !9872 from 田文哲/master

testtools/config/validator.json

+{
+    "description": "Config for acts test suites",
+    "kits": [
+       
+    ]
+}
\ No newline at end of file

validator/acts_validator/BUILD.gn

@@ -22,7 +22,7 @@ ohos_js_hap_suite("acts_validator_test") {
   ]
   ets2abc = true
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsValidatorTest"
+  hap_name = "validator"
 }
 ohos_app_scope("acts_validator_app_profile") {
   app_profile = "./AppScope/app.json"

validator/acts_validator/Test.json

 {
     "description": "Configuration for hjunit demo Tests",
     "driver": {
-        "type": "OHJSUnitTest",
-        "test-timeout": "300000",
-        "testcase-timeout": "300000",
-        "shell-timeout": "300000",
+        "type": "ValidatorTest",
         "bundle-name": "com.example.actsvalidator",
-        "package-name": "com.example.actsvalidator"
+        "package-name": "com.example.actsvalidator",
+        "xml_path": "/data/app/el2/100/base/com.example.actsvalidator/haps/entry/files/Test.xml"
     },
     "kits": [
         {
             "test-file-name": [
-                "ActsValidatorTest.hap"
+                "validator.hap"
             ],
             "type": "AppInstallKit",
-            "cleanup-apps": true
+            "cleanup-apps": false
         },
         {
             "type": "ShellKit",
             "run-command": [
                 "hilog -Q pidoff"
             ]
+        },
+        {
+            "type": "CommandKit",
+            "shell": [
+                {
+                    "name": "shell",
+                    "value": "SP_daemon"
+                },
+                {
+                    "name": "shell",
+                    "value": "mkdir /storage/media/100/local/files/Audios/ValidatorData"
+                },
+                {
+                    "name": "shell",
+                    "value": "mkdir /storage/media/100/local/files/Videos/ValidatorData"
+                },
+                {
+                    "name": "push",
+                    "value": "picture->/storage/media/100/local/files/Pictures"
+                }
+                
+            ]
+        },
+        {
+            "type": "PushKit",
+            "push": [
+                "AAC160001.aac->/storage/media/100/local/files/Audios/ValidatorData/AAC160001.aac",
+                "AAC48000321.aac->/storage/media/100/local/files/Audios/ValidatorData/AAC48000321.aac",
+                "FLAC48000321.flac->/storage/media/100/local/files/Audios/ValidatorData/FLAC48000321.flac",
+                "MP348000321.mp3->/storage/media/100/local/files/Audios/ValidatorData/MP348000321.mp3",
+                "MPEG448000321.m4a->/storage/media/100/local/files/Audios/ValidatorData/MPEG448000321.m4a",
+                "OGG480001.ogg->/storage/media/100/local/files/Audios/ValidatorData/OGG480001.ogg",
+                "vorbis48000321.wav->/storage/media/100/local/files/Audios/ValidatorData/vorbis48000321.wav",
+                "h263Mp3.mkv->/storage/media/100/local/files/Videos/ValidatorData/h263Mp3.mkv",
+                "h263Mp3.mp4->/storage/media/100/local/files/Videos/ValidatorData/h263Mp3.mp4",
+                "h263Mp3.ts->/storage/media/100/local/files/Videos/ValidatorData/h263Mp3.ts",
+                "h264Mp3.mkv->/storage/media/100/local/files/Videos/ValidatorData/h264Mp3.mkv",
+                "h264Mp3.mp4->/storage/media/100/local/files/Videos/ValidatorData/h264Mp3.mp4",
+                "mpeg2AAC.mp4->/storage/media/100/local/files/Videos/ValidatorData/mpeg2AAC.mp4",
+                "mpeg2AAC.ts->/storage/media/100/local/files/Videos/ValidatorData/mpeg2AAC.ts",
+                "mpeg2Mp3.mkv->/storage/media/100/local/files/Videos/ValidatorData/mpeg2Mp3.mkv",
+                "mpeg4AAC.mkv->/storage/media/100/local/files/Videos/ValidatorData/mpeg4AAC.mkv",
+                "mpeg4AAC.ts->/storage/media/100/local/files/Videos/ValidatorData/mpeg4AAC.ts",
+                "VP8VORBIS.webm->/storage/media/100/local/files/Videos/ValidatorData/VP8VORBIS.webm"
+            ],
+            "uninstall": false
+        },
+        {
+            "type": "ShellKit",
+            "run-command": [
+                "scanner"
+            ]
         }
     ]
 }
\ No newline at end of file