CTS_v2 migration for voicesettings tests
Change-Id: I1de231be3d8304340955e4f7f0ef5bc8708b95ef
diff --git a/tests/tests/voicesettings/Android.mk b/tests/tests/voicesettings/Android.mk
index 71fead6..91d013d 100644
--- a/tests/tests/voicesettings/Android.mk
+++ b/tests/tests/voicesettings/Android.mk
@@ -27,6 +27,11 @@
LOCAL_PACKAGE_NAME := CtsVoiceSettingsTestCases
+# Tag this module as a cts_v2 test artifact
+LOCAL_COMPATIBILITY_SUITE := cts_v2
+
+LOCAL_CTS_MODULE_CONFIG := $(LOCAL_PATH)/Old$(CTS_MODULE_TEST_CONFIG)
+
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/voicesettings/AndroidTest.xml b/tests/tests/voicesettings/AndroidTest.xml
index e3be691..1435b27 100644
--- a/tests/tests/voicesettings/AndroidTest.xml
+++ b/tests/tests/voicesettings/AndroidTest.xml
@@ -1,3 +1,4 @@
+<?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");
@@ -12,10 +13,14 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<configuration description="Test module config for VoiceInteraction">
+<configuration description="Configuration for Voice Settings Tests">
<include name="common-config" />
- <option name="cts-apk-installer:test-file-name" value="CtsVoiceSettingsService.apk" />
<option name="run-command:run-command"
value="settings put secure voice_interaction_service android.voicesettings.service/.MainInteractionService" />
- <option name="cts-apk-installer:test-file-name" value="CtsVoiceSettingsTestCases.apk" />
+ <option name="apk-installer:test-file-name" value="CtsVoiceSettingsService.apk" />
+ <option name="apk-installer:test-file-name" value="CtsVoiceSettingsTestCases.apk" />
+ <test class="com.android.tradefed.testtype.InstrumentationTest" >
+ <option name="package" value="android.voicesettings.cts" />
+ <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+ </test>
</configuration>
diff --git a/tests/tests/voicesettings/OldAndroidTest.xml b/tests/tests/voicesettings/OldAndroidTest.xml
new file mode 100644
index 0000000..246bf06
--- /dev/null
+++ b/tests/tests/voicesettings/OldAndroidTest.xml
@@ -0,0 +1,20 @@
+<!-- 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="Test module config for VoiceSettings">
+ <include name="common-config" />
+ <option name="cts-apk-installer:test-file-name" value="CtsVoiceSettingsService.apk" />
+ <option name="run-command:run-command"
+ value="settings put secure voice_interaction_service android.voicesettings.service/.MainInteractionService" />
+</configuration>
diff --git a/tests/tests/voicesettings/service/Android.mk b/tests/tests/voicesettings/service/Android.mk
index 97866d5..f23a136 100644
--- a/tests/tests/voicesettings/service/Android.mk
+++ b/tests/tests/voicesettings/service/Android.mk
@@ -27,6 +27,9 @@
LOCAL_PACKAGE_NAME := CtsVoiceSettingsService
+# Tag this module as a cts_v2 test artifact
+LOCAL_COMPATIBILITY_SUITE := cts_v2
+
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_SUPPORT_PACKAGE)
