commit c020083ba64a56f8cfed68bea4e48e377b7691f2
author Jeff Sharkey <jsharkey@android.com> Wed Aug 28 10:51:22 2019 -0600
committer Jeff Sharkey <jsharkey@android.com> Wed Aug 28 16:04:06 2019 -0600
tree d5be2648d880b697b632258f5078ea1e83d3ee1c
parent 2e8621eedf4a324d43cb546843a9fcceb29b6dc6

Sprinkle in some TEST_MAPPING.

Bug: 139358215
Test: atest --test-mapping packages/providers/CalendarProvider
Change-Id: I14cbe66a654da2d15ef70081a05c8c5d2d4a43f3

tests/AndroidTest.xml

diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index 0b63420..e7d5d1a 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -20,9 +20,9 @@
 
     <option name="test-suite-tag" value="apct" />
     <option name="test-tag" value="CalendarProviderTests" />
-    <test class="com.android.tradefed.testtype.InstrumentationTest" >
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.providers.calendar.tests" />
-        <option name="runner" value="android.test.InstrumentationTestRunner" />
+        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
         <option name="hidden-api-checks" value="false"/>
     </test>
 </configuration>