Test out fastdeploy test in test mapping am: b5546aa417 am: 5bfe2c14ad am: 24d19e04ce

Original change: https://android-review.googlesource.com/c/platform/packages/modules/adb/+/2522435

Change-Id: Ibc7527e40948e937df7b6802547a5977d2ee881a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4 files changed, 35 insertions, 5 deletions

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 31a17b13..e3e22d7c 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -33,6 +33,12 @@
       "name": "adb_tls_connection_test"
     },
     {
+      "name": "FastDeployTests"
+    },
+    {
+      "name": "FastDeployHostTests"
+    },
+    {
       "name": "MicrodroidHostTestCases"
     }
   ],
diff --git a/fastdeploy/Android.bp b/fastdeploy/Android.bp
index 29d42d3e..84e62c62 100644
--- a/fastdeploy/Android.bp
+++ b/fastdeploy/Android.bp
@@ -77,6 +77,12 @@ android_test {
     optimize: {
         enabled: false,
     },
+
+    test_config: "FastDeployTests.xml",
+
+    test_suites: [
+        "general-tests",
+    ],
 }
 
 java_test_host {
@@ -85,7 +91,6 @@ java_test_host {
         "deployagent/test/com/android/fastdeploy/FastDeployTest.java",
     ],
     data: [
-        ":FastDeployTests",
         "testdata/helloworld5.apk",
         "testdata/helloworld7.apk",
         "testdata/sample.apk",
@@ -99,4 +104,5 @@ java_test_host {
     test_suites: [
         "general-tests",
     ],
+    test_config: "FastDeployHostDrivenTests.xml",
 }
diff --git a/fastdeploy/FastDeployHostDrivenTests.xml b/fastdeploy/FastDeployHostDrivenTests.xml
new file mode 100644
index 00000000..7208230e
--- /dev/null
+++ b/fastdeploy/FastDeployHostDrivenTests.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ 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
+  -->
+<configuration description="Runs Device Tests for FastDeploy.">
+    <option name="test-suite-tag" value="FastDeployTests"/>
+    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+        <option name="jar" value="FastDeployHostTests.jar" />
+    </test>
+</configuration>
diff --git a/fastdeploy/AndroidTest.xml b/fastdeploy/FastDeployTests.xml
index 33a323e2..5eb3999e 100644
--- a/fastdeploy/AndroidTest.xml
+++ b/fastdeploy/FastDeployTests.xml
@@ -32,8 +32,4 @@
         <option name="package" value="com.android.fastdeploytests"/>
         <option name="runner" value="androidx.test.runner.AndroidJUnitRunner"/>
     </test>
-
-    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
-        <option name="jar" value="FastDeployHostTests.jar" />
-    </test>
 </configuration>