Migrate packages/providers/ContactsProvider to androidx.test
See go/jetpack-test-android-migration
Test: make checkbuild
Change-Id: I416cabf849d049a789efe8f8b513bbead4533115
diff --git a/test_common/Android.mk b/test_common/Android.mk
index 2965f8a..d42ef66 100644
--- a/test_common/Android.mk
+++ b/test_common/Android.mk
@@ -21,7 +21,7 @@
LOCAL_JAVA_LIBRARIES := \
android.test.runner \
- android-support-test \
+ androidx.test.rules \
mockito-target-minus-junit4
LOCAL_MODULE_TAGS := optional
diff --git a/tests/Android.mk b/tests/Android.mk
index 02ea81e..87b7ab6 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -6,7 +6,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
ContactsProviderTestUtils \
- android-support-test \
+ androidx.test.rules \
mockito-target-minus-junit4
LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base android.test.mock
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 9d20e76..4d81c5f 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -37,7 +37,7 @@
</application>
<instrumentation
- android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.providers.contacts"
android:label="Contacts Provider Tests">
</instrumentation>
diff --git a/tests/src/com/android/providers/contacts/BaseDatabaseHelperUpgradeTest.java b/tests/src/com/android/providers/contacts/BaseDatabaseHelperUpgradeTest.java
index 8498913..ae12f1b 100644
--- a/tests/src/com/android/providers/contacts/BaseDatabaseHelperUpgradeTest.java
+++ b/tests/src/com/android/providers/contacts/BaseDatabaseHelperUpgradeTest.java
@@ -15,10 +15,8 @@
*/
package com.android.providers.contacts;
-import android.content.Context;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
-import android.support.test.InstrumentationRegistry;
import junit.framework.AssertionFailedError;
diff --git a/tests/src/com/android/providers/contacts/FixedAndroidTestCase.java b/tests/src/com/android/providers/contacts/FixedAndroidTestCase.java
index 5254c5d..5f0bda5 100644
--- a/tests/src/com/android/providers/contacts/FixedAndroidTestCase.java
+++ b/tests/src/com/android/providers/contacts/FixedAndroidTestCase.java
@@ -16,9 +16,10 @@
package com.android.providers.contacts;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
import android.test.AndroidTestCase;
+import androidx.test.InstrumentationRegistry;
+
/**
* {@link FixedAndroidTestCase#getTestContext} isn't set when executed on the support test runner. This
* class works around that.
diff --git a/tests/src/com/android/providers/contacts/PhotoLoadingTestCase.java b/tests/src/com/android/providers/contacts/PhotoLoadingTestCase.java
index 41fe1b0..4b199c6 100644
--- a/tests/src/com/android/providers/contacts/PhotoLoadingTestCase.java
+++ b/tests/src/com/android/providers/contacts/PhotoLoadingTestCase.java
@@ -16,9 +16,7 @@
package com.android.providers.contacts;
-import android.content.Context;
import android.content.res.Resources;
-import android.support.test.InstrumentationRegistry;
import android.test.suitebuilder.annotation.SmallTest;
import com.google.android.collect.Maps;
diff --git a/tests/src/com/android/providers/contacts/TestUtils.java b/tests/src/com/android/providers/contacts/TestUtils.java
index 322e5b4..689ea7c 100644
--- a/tests/src/com/android/providers/contacts/TestUtils.java
+++ b/tests/src/com/android/providers/contacts/TestUtils.java
@@ -20,15 +20,16 @@
import android.content.ContentValues;
import android.content.Context;
import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
import android.os.FileUtils;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Profile;
import android.provider.ContactsContract.RawContacts;
-import android.support.annotation.Nullable;
-import android.database.sqlite.SQLiteDatabase;
-import android.net.Uri;
import android.util.Log;
+import androidx.annotation.Nullable;
+
import com.android.providers.contacts.ContactsDatabaseHelper.Tables;
import junit.framework.Assert;
diff --git a/tests2/Android.mk b/tests2/Android.mk
index 4ba0a12..d590163 100644
--- a/tests2/Android.mk
+++ b/tests2/Android.mk
@@ -21,7 +21,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
ContactsProviderTestUtils \
- android-support-test \
+ androidx.test.rules \
mockito-target-minus-junit4
LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
diff --git a/tests2/AndroidManifest.xml b/tests2/AndroidManifest.xml
index 7678bd2..fc00251 100644
--- a/tests2/AndroidManifest.xml
+++ b/tests2/AndroidManifest.xml
@@ -30,6 +30,6 @@
</application>
<instrumentation
- android:name="android.support.test.runner.AndroidJUnitRunner"
+ android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="com.android.providers.contacts.tests2" />
</manifest>