Merge "Migrate TV Provider tests to cts_v2"
diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index 25d3275..b5a76a4 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -128,7 +128,6 @@
cts_test_packages := \
CtsIcuTestCases \
CtsDeviceVideoPerf \
- CtsDeviceTvProviderPerf \
CtsAccelerationTestCases \
CtsAccountManagerTestCases \
CtsAccessibilityServiceTestCases \
@@ -199,6 +198,7 @@
CtsTextureViewTestCases \
CtsThemeDeviceTestCases \
CtsTransitionTestCases \
+ CtsTvProviderTestCases \
CtsTvTestCases \
CtsUiAutomationTestCases \
CtsUiRenderingTestCases \
diff --git a/suite/cts/deviceTests/tvproviderperf/Android.mk b/tests/tvprovider/Android.mk
similarity index 87%
rename from suite/cts/deviceTests/tvproviderperf/Android.mk
rename to tests/tvprovider/Android.mk
index 8e865fb..acf4bb9 100644
--- a/suite/cts/deviceTests/tvproviderperf/Android.mk
+++ b/tests/tvprovider/Android.mk
@@ -22,7 +22,11 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_PACKAGE_NAME := CtsDeviceTvProviderPerf
+LOCAL_PACKAGE_NAME := CtsTvProviderTestCases
+
+# Tag this module as a cts_v2 test artifact
+LOCAL_COMPATIBILITY_SUITE := cts_v2
+
LOCAL_SDK_VERSION := current
diff --git a/suite/cts/deviceTests/tvproviderperf/AndroidManifest.xml b/tests/tvprovider/AndroidManifest.xml
similarity index 86%
rename from suite/cts/deviceTests/tvproviderperf/AndroidManifest.xml
rename to tests/tvprovider/AndroidManifest.xml
index d345ab2..326d64b 100644
--- a/suite/cts/deviceTests/tvproviderperf/AndroidManifest.xml
+++ b/tests/tvprovider/AndroidManifest.xml
@@ -15,7 +15,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.cts.tvproviderperf">
+ package="android.tvprovider.cts">
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
<uses-permission android:name="com.android.providers.tv.permission.READ_EPG_DATA" />
@@ -26,6 +26,6 @@
</application>
<instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.tvproviderperf"
- android:label="TvProvider performance measurement" />
+ android:targetPackage="android.tvprovider.cts"
+ android:label="CTS tests for TV Provider tests" />
</manifest>
diff --git a/tests/tvprovider/AndroidTest.xml b/tests/tvprovider/AndroidTest.xml
new file mode 100644
index 0000000..f92b37d
--- /dev/null
+++ b/tests/tvprovider/AndroidTest.xml
@@ -0,0 +1,24 @@
+<?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 CTS TV Provider test cases">
+ <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+ <option name="cleanup-apks" value="true" />
+ <option name="test-file-name" value="CtsTvProviderTestCases.apk" />
+ </target_preparer>
+ <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+ <option name="package" value="android.tvprovider.cts" />
+ </test>
+</configuration>
diff --git a/suite/cts/deviceTests/tvproviderperf/src/com/android/cts/tvproviderperf/TvProviderPerfTest.java b/tests/tvprovider/src/android/tvprovider/cts/TvProviderPerfTest.java
similarity index 99%
rename from suite/cts/deviceTests/tvproviderperf/src/com/android/cts/tvproviderperf/TvProviderPerfTest.java
rename to tests/tvprovider/src/android/tvprovider/cts/TvProviderPerfTest.java
index cb56755..dd8b2f9 100644
--- a/suite/cts/deviceTests/tvproviderperf/src/com/android/cts/tvproviderperf/TvProviderPerfTest.java
+++ b/tests/tvprovider/src/android/tvprovider/cts/TvProviderPerfTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.cts.tvproviderperf;
+package android.tvprovider.cts;
import android.content.ComponentName;
import android.content.ContentProviderOperation;