commit 25a4cf6f93fb04b47fef5c4990cd3f4b1d97b53b
author Steven Timotius <stimo@google.com> Tue Aug 29 10:21:28 2017 -0700
committer Steven Timotius <stimo@google.com> Fri Sep 08 10:59:30 2017 -0700
tree bdd6cc9e6dbe8ba11a19f4792133d39d09274068
parent 15b59e6f936a5a5521767d3bc5468194f08773af

Convert Activity and WindowManager Tests to Device Side

Next CL will move the tests to the correct folder

Bug: 64807080
Test: cts-tradefed run commandAndExit cts-dev --module CtsWindowManagerDeviceTestCases
Test: cts-tradefed run commandAndExit cts-dev --module CtsServicesDeviceTestCases

Change-Id: Idab862b76a9a8fa913abff6a44a01bdd59167f70

hostsidetests/services/activityandwindowmanager/windowmanager/AndroidTest.xml

diff --git a/hostsidetests/services/activityandwindowmanager/windowmanager/AndroidTest.xml b/hostsidetests/services/activityandwindowmanager/windowmanager/AndroidTest.xml
index 82f0099..16832ff 100644
--- a/hostsidetests/services/activityandwindowmanager/windowmanager/AndroidTest.xml
+++ b/hostsidetests/services/activityandwindowmanager/windowmanager/AndroidTest.xml
@@ -13,19 +13,22 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Config for CTS window manager host test cases">
-    <option name="config-descriptor:metadata" key="component" value="framework" />
+<configuration description="Config for CTS WindowManager test cases">
+    <option name="config-descriptor:metadata" key="component" value="framework"/>
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.LocationCheck"/>
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
-        <option name="cleanup-apks" value="true" />
-        <option name="test-file-name" value="CtsDragAndDropSourceApp.apk" />
-        <option name="test-file-name" value="CtsDragAndDropTargetApp.apk" />
-        <option name="test-file-name" value="CtsDragAndDropTargetAppSdk23.apk" />
-        <option name="test-file-name" value="CtsDeviceWindowFramesTestApp.apk" />
-        <option name="test-file-name" value="CtsDeviceAlertWindowTestApp.apk" />
-        <option name="test-file-name" value="CtsDeviceAlertWindowTestAppSdk25.apk" />
+        <option name="cleanup-apks" value="true"/>
+        <option name="test-file-name" value="CtsWindowManagerDeviceTestCases.apk"/>
+        <option name="test-file-name" value="CtsDragAndDropSourceApp.apk"/>
+        <option name="test-file-name" value="CtsDragAndDropTargetApp.apk"/>
+        <option name="test-file-name" value="CtsDragAndDropTargetAppSdk23.apk"/>
+        <option name="test-file-name" value="CtsDeviceWindowFramesTestApp.apk"/>
+        <option name="test-file-name" value="CtsDeviceAlertWindowTestApp.apk"/>
+        <option name="test-file-name" value="CtsDeviceAlertWindowTestAppSdk25.apk"/>
     </target_preparer>
-    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
-        <option name="jar" value="CtsWindowManagerHostTestCases.jar" />
-        <option name="runtime-hint" value="20m40s" />
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest">
+        <option name="package" value="android.server.cts.wm"/>
+        <option name="runtime-hint" value="8m"/>
     </test>
+
 </configuration>