commit 1bf91b255d450319a4d05570b20cd9602c97845d
author Stuart Scott <stuartscott@google.com> Mon Oct 05 17:37:41 2015 -0700
committer Stuart Scott <stuartscott@google.com> Tue Oct 06 10:55:25 2015 -0700
tree 516ea4349e9319f558da86eaa56ddb14a6568292
parent b90a6aa50898a258ccbf67889fa540dbc075fce5

Remove common-config and switch to AndroidJUnitTest.

bug:21762834
Change-Id: I17e1b44e4429a3fbeb9f110a74038e4ec306af38

tests/accessibility/AndroidTest.xml

diff --git a/tests/accessibility/AndroidTest.xml b/tests/accessibility/AndroidTest.xml
index 248db71..f60e6b1 100644
--- a/tests/accessibility/AndroidTest.xml
+++ b/tests/accessibility/AndroidTest.xml
@@ -13,18 +13,21 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<configuration description="Base config for CTS package preparer">
-    <include name="common-config" />
-    <option name="run-command:run-command" value="settings put secure enabled_accessibility_services android.view.accessibility.services/.SpeakingAccessibilityService:android.view.accessibility.services/.VibratingAccessibilityService" />
-    <option name="run-command:run-command" value="settings put secure touch_exploration_granted_accessibility_services android.view.accessibility.services/.SpeakingAccessibilityService:android.view.accessibility.services/.VibratingAccessibilityService" />
-    <option name="run-command:run-command" value="settings put secure accessibility_enabled 1" />
-    <option name="run-command:teardown-command" value="settings put secure enabled_accessibility_services &quot;&quot;" />
-    <option name="run-command:teardown-command" value="settings put secure touch_exploration_granted_accessibility_services &quot;&quot;" />
-    <option name="run-command:teardown-command" value="settings put secure accessibility_enabled 0" />
-    <option name="apk-installer:test-file-name" value="CtsAccessibilityTestCases.apk" />
-    <option name="apk-installer:test-file-name" value="CtsSomeAccessibilityServices.apk" />
-    <test class="com.android.tradefed.testtype.InstrumentationTest" >
+<configuration description="Config for CTS Accessibility test cases">
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsAccessibilityTestCases.apk" />
+        <option name="test-file-name" value="CtsSomeAccessibilityServices.apk" />
+    </target_preparer>
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer" >
+        <option name="run-command" value="settings put secure enabled_accessibility_services android.view.accessibility.services/.SpeakingAccessibilityService:android.view.accessibility.services/.VibratingAccessibilityService" />
+        <option name="run-command" value="settings put secure touch_exploration_granted_accessibility_services android.view.accessibility.services/.SpeakingAccessibilityService:android.view.accessibility.services/.VibratingAccessibilityService" />
+        <option name="run-command" value="settings put secure accessibility_enabled 1" />
+        <option name="teardown-command" value="settings put secure enabled_accessibility_services &quot;&quot;" />
+        <option name="teardown-command" value="settings put secure touch_exploration_granted_accessibility_services &quot;&quot;" />
+        <option name="teardown-command" value="settings put secure accessibility_enabled 0" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.view.accessibility.cts" />
-        <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
     </test>
-</configuration>
+</configuration>
\ No newline at end of file