From b5546aa4176312e68ab2050733a8be656641a2d5 Mon Sep 17 00:00:00 2001
From: Julien Desprez <jdesprez@google.com>
Date: Tue, 4 Apr 2023 10:24:09 -0700
Subject: Test out fastdeploy test in test mapping

Test: presubmit
Bug: 128993828
Change-Id: Icf0721af0d52202cf4ff0be16f5764f8c3b66788
---
 TEST_MAPPING                             |  6 +++++
 fastdeploy/Android.bp                    |  8 ++++++-
 fastdeploy/AndroidTest.xml               | 39 --------------------------------
 fastdeploy/FastDeployHostDrivenTests.xml | 22 ++++++++++++++++++
 fastdeploy/FastDeployTests.xml           | 35 ++++++++++++++++++++++++++++
 5 files changed, 70 insertions(+), 40 deletions(-)
 delete mode 100644 fastdeploy/AndroidTest.xml
 create mode 100644 fastdeploy/FastDeployHostDrivenTests.xml
 create mode 100644 fastdeploy/FastDeployTests.xml

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 31a17b13..e3e22d7c 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -32,6 +32,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/AndroidTest.xml b/fastdeploy/AndroidTest.xml
deleted file mode 100644
index 33a323e2..00000000
--- a/fastdeploy/AndroidTest.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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"/>
-
-    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
-        <option name="cleanup-apks" value="true"/>
-        <option name="install-arg" value="-t"/>
-        <option name="test-file-name" value="FastDeployTests.apk"/>
-    </target_preparer>
-
-    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
-        <option name="push-file" key="sample.apk" value="/data/local/tmp/FastDeployTests/sample.apk" />
-        <option name="push-file" key="sample.cd" value="/data/local/tmp/FastDeployTests/sample.cd" />
-    </target_preparer>
-
-    <test class="com.android.tradefed.testtype.AndroidJUnitTest">
-        <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>
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/FastDeployTests.xml b/fastdeploy/FastDeployTests.xml
new file mode 100644
index 00000000..5eb3999e
--- /dev/null
+++ b/fastdeploy/FastDeployTests.xml
@@ -0,0 +1,35 @@
+<?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"/>
+
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true"/>
+        <option name="install-arg" value="-t"/>
+        <option name="test-file-name" value="FastDeployTests.apk"/>
+    </target_preparer>
+
+    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
+        <option name="push-file" key="sample.apk" value="/data/local/tmp/FastDeployTests/sample.apk" />
+        <option name="push-file" key="sample.cd" value="/data/local/tmp/FastDeployTests/sample.cd" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest">
+        <option name="package" value="com.android.fastdeploytests"/>
+        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner"/>
+    </test>
+</configuration>
-- 
cgit v1.2.3