Migrate aadb tests to CTS_v2
bug:21762834
Change-Id: I486fc9dec939d9d27d1105fb1f3805e3a475de49
diff --git a/hostsidetests/aadb/Android.mk b/hostsidetests/aadb/Android.mk
index b9551d1..c7651ba 100644
--- a/hostsidetests/aadb/Android.mk
+++ b/hostsidetests/aadb/Android.mk
@@ -19,12 +19,16 @@
# Only compile source java files in this apk.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_MODULE := CtsAdbTests
+# Adb test cases, but name 'aadb' ensures adb tests run before all other modules depending on adb
+LOCAL_MODULE := CtsAadbHostTestCases
LOCAL_JAVA_LIBRARIES := cts-tradefed tradefed-prebuilt
LOCAL_CTS_TEST_PACKAGE := android.aadb
+# tag this module as a cts_v2 test artifact
+LOCAL_COMPATIBILITY_SUITE := cts_v2
+
include $(BUILD_CTS_HOST_JAVA_LIBRARY)
# Build the test APKs using their own makefiles
diff --git a/hostsidetests/aadb/AndroidTest.xml b/hostsidetests/aadb/AndroidTest.xml
new file mode 100644
index 0000000..6beed97
--- /dev/null
+++ b/hostsidetests/aadb/AndroidTest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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="Config for the CTS aadb host tests">
+ <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest">
+ <option name="jar" value="CtsAadbHostTestCases.jar" />
+ </test>
+</configuration>
diff --git a/hostsidetests/aadb/src/com/android/cts/aadb/TestDeviceFuncTest.java b/hostsidetests/aadb/src/android/aadb/cts/TestDeviceFuncTest.java
similarity index 99%
rename from hostsidetests/aadb/src/com/android/cts/aadb/TestDeviceFuncTest.java
rename to hostsidetests/aadb/src/android/aadb/cts/TestDeviceFuncTest.java
index a036382..868ba15 100644
--- a/hostsidetests/aadb/src/com/android/cts/aadb/TestDeviceFuncTest.java
+++ b/hostsidetests/aadb/src/android/aadb/cts/TestDeviceFuncTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.cts.aadb;
+package android.aadb.cts;
import com.android.ddmlib.IDevice;
import com.android.ddmlib.Log;
diff --git a/hostsidetests/aadb/src/com/android/cts/aadb/TestDeviceStressTest.java b/hostsidetests/aadb/src/android/aadb/cts/TestDeviceStressTest.java
similarity index 98%
rename from hostsidetests/aadb/src/com/android/cts/aadb/TestDeviceStressTest.java
rename to hostsidetests/aadb/src/android/aadb/cts/TestDeviceStressTest.java
index 2c6fcef..f5872a7 100644
--- a/hostsidetests/aadb/src/com/android/cts/aadb/TestDeviceStressTest.java
+++ b/hostsidetests/aadb/src/android/aadb/cts/TestDeviceStressTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.cts.aadb;
+package android.aadb.cts;
import com.android.ddmlib.IDevice;
import com.android.ddmlib.Log;