diff options
author | Brett Chabot <brettchabot@google.com> | 2018-12-13 19:06:22 -0800 |
---|---|---|
committer | Brett Chabot <brettchabot@google.com> | 2018-12-13 19:06:22 -0800 |
commit | bebf2dd305c3df3ee5b9bc9873128d8e98c2bcc3 (patch) | |
tree | f2406549f94b332c7871921ff19257dc1b3c6eb7 | |
parent | 27ad64ee1c20c9b08aa41a982b9d0eaa5d3516e6 (diff) | |
download | Contacts-bebf2dd305c3df3ee5b9bc9873128d8e98c2bcc3.tar.gz |
Migrate packages/apps/Contacts to androidx.test
See go/jetpack-test-android-migration
Test: make checkbuild
Change-Id: I0abad7618ac496561f6fb07da2590c79f82a2024
13 files changed, 53 insertions, 42 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index dfea84366..ce4e6ad27 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -18,7 +18,7 @@ LOCAL_SDK_VERSION := current LOCAL_MIN_SDK_VERSION := 21 LOCAL_STATIC_JAVA_LIBRARIES += \ - android-support-test \ + androidx.test.rules \ hamcrest-library \ mockito-target-minus-junit4 \ ub-uiautomator diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index e3d9820d1..9f3d5d5ac 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -90,7 +90,7 @@ <service android:name=".PhoneNumberTestService" /> </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.contacts" android:label="Contacts app tests"> </instrumentation> diff --git a/tests/src/com/android/contacts/DynamicShortcutsTests.java b/tests/src/com/android/contacts/DynamicShortcutsTests.java index 3074efba2..199e2c9f0 100644 --- a/tests/src/com/android/contacts/DynamicShortcutsTests.java +++ b/tests/src/com/android/contacts/DynamicShortcutsTests.java @@ -15,6 +15,14 @@ */ package com.android.contacts; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.mockito.Matchers.anyString; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import android.annotation.TargetApi; import android.app.job.JobScheduler; import android.content.ContentProvider; @@ -28,11 +36,12 @@ import android.net.Uri; import android.os.Build; import android.provider.ContactsContract; import android.provider.ContactsContract.Contacts; -import android.support.test.filters.SdkSuppress; import android.test.AndroidTestCase; import android.test.mock.MockContentResolver; import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.filters.SdkSuppress; + import com.android.contacts.test.mocks.MockContentProvider; import org.hamcrest.BaseMatcher; @@ -46,14 +55,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - @TargetApi(Build.VERSION_CODES.N_MR1) @SdkSuppress(minSdkVersion = Build.VERSION_CODES.N_MR1) @SmallTest diff --git a/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java b/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java index be545a906..b8eccd702 100644 --- a/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java +++ b/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java @@ -8,15 +8,16 @@ import android.Manifest; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.MediumTest; -import android.support.test.filters.Suppress; -import android.support.test.runner.AndroidJUnit4; import android.support.test.uiautomator.By; import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.UiObject2; import android.support.test.uiautomator.Until; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.MediumTest; +import androidx.test.filters.Suppress; +import androidx.test.runner.AndroidJUnit4; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -34,7 +35,7 @@ import org.junit.runner.RunWith; * $ adb shell pm revoke com.android.contacts android.permission.READ_CALL_LOG * $ adb shell pm revoke com.android.contacts android.permission.CALL_PHONE * $ adb shell am instrument -w \ - * com.google.android.contacts.tests/android.support.test.runner.AndroidJUnitRunner \ + * com.google.android.contacts.tests/androidx.test.runner.AndroidJUnitRunner \ * -e class com.android.contacts.NoPermissionsLaunchSmokeTest */ @MediumTest diff --git a/tests/src/com/android/contacts/RunMethodInstrumentation.java b/tests/src/com/android/contacts/RunMethodInstrumentation.java index 1e4bcf5f9..462098905 100644 --- a/tests/src/com/android/contacts/RunMethodInstrumentation.java +++ b/tests/src/com/android/contacts/RunMethodInstrumentation.java @@ -20,9 +20,10 @@ import android.app.Instrumentation; import android.content.Context; import android.os.Bundle; import android.os.Debug; -import android.support.test.InstrumentationRegistry; import android.util.Log; +import androidx.test.InstrumentationRegistry; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/tests/src/com/android/contacts/activities/SimImportActivityTest.java b/tests/src/com/android/contacts/activities/SimImportActivityTest.java index e738dd1b0..9c90426e6 100644 --- a/tests/src/com/android/contacts/activities/SimImportActivityTest.java +++ b/tests/src/com/android/contacts/activities/SimImportActivityTest.java @@ -18,6 +18,7 @@ package com.android.contacts.activities; import static com.android.contacts.tests.ContactsMatchers.DataCursor.hasMimeType; import static com.android.contacts.tests.ContactsMatchers.hasRowMatching; import static com.android.contacts.tests.ContactsMatchers.hasValueForColumn; + import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.allOf; import static org.junit.Assert.assertTrue; @@ -39,17 +40,18 @@ import android.os.Build; import android.provider.ContactsContract; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.Data; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.filters.SdkSuppress; -import android.support.test.runner.AndroidJUnit4; import android.support.test.uiautomator.By; import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.Until; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.telephony.TelephonyManager; import android.test.mock.MockContentResolver; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.filters.SdkSuppress; +import androidx.test.runner.AndroidJUnit4; + import com.android.contacts.SimImportService; import com.android.contacts.database.SimContactDao; import com.android.contacts.database.SimContactDaoImpl; @@ -62,6 +64,7 @@ import com.android.contacts.tests.AccountsTestHelper; import com.android.contacts.tests.ContactsMatchers; import com.android.contacts.tests.FakeSimContactDao; import com.android.contacts.tests.StringableCursor; + import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.util.concurrent.ListenableFuture; diff --git a/tests/src/com/android/contacts/database/SimContactDaoTests.java b/tests/src/com/android/contacts/database/SimContactDaoTests.java index e9e55d498..0b5b37f8d 100644 --- a/tests/src/com/android/contacts/database/SimContactDaoTests.java +++ b/tests/src/com/android/contacts/database/SimContactDaoTests.java @@ -45,16 +45,17 @@ import android.provider.ContactsContract.CommonDataKinds.Email; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.CommonDataKinds.StructuredName; import android.provider.ContactsContract.Data; -import androidx.annotation.RequiresApi; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.LargeTest; -import android.support.test.filters.SdkSuppress; -import android.support.test.filters.SmallTest; -import android.support.test.filters.Suppress; -import android.support.test.runner.AndroidJUnit4; import android.test.mock.MockContentResolver; import android.test.mock.MockContext; +import androidx.annotation.RequiresApi; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; +import androidx.test.filters.SdkSuppress; +import androidx.test.filters.SmallTest; +import androidx.test.filters.Suppress; +import androidx.test.runner.AndroidJUnit4; + import com.android.contacts.model.SimCard; import com.android.contacts.model.SimContact; import com.android.contacts.model.account.AccountWithDataSet; diff --git a/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java b/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java index a7d5c208d..7ffecc1a9 100644 --- a/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java +++ b/tests/src/com/android/contacts/editor/ContactEditorUtilsTest.java @@ -19,11 +19,12 @@ package com.android.contacts.editor; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNull; + import static org.junit.Assert.assertTrue; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.contacts.model.account.AccountType; import com.android.contacts.model.account.AccountWithDataSet; @@ -33,7 +34,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/tests/src/com/android/contacts/model/SimContactTests.java b/tests/src/com/android/contacts/model/SimContactTests.java index d234e42d7..dc47d03a5 100644 --- a/tests/src/com/android/contacts/model/SimContactTests.java +++ b/tests/src/com/android/contacts/model/SimContactTests.java @@ -19,8 +19,9 @@ import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; import android.os.Parcel; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/src/com/android/contacts/preference/ContactsPreferencesTest.java b/tests/src/com/android/contacts/preference/ContactsPreferencesTest.java index bea8d147a..998f38587 100644 --- a/tests/src/com/android/contacts/preference/ContactsPreferencesTest.java +++ b/tests/src/com/android/contacts/preference/ContactsPreferencesTest.java @@ -19,10 +19,11 @@ package com.android.contacts.preference; import android.content.Context; import android.content.SharedPreferences; import android.content.res.Resources; -import android.support.test.InstrumentationRegistry; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.InstrumentationRegistry; + import com.android.contacts.model.account.AccountWithDataSet; import junit.framework.Assert; diff --git a/tests/src/com/android/contacts/tests/AccountsTestHelper.java b/tests/src/com/android/contacts/tests/AccountsTestHelper.java index b65ba6778..e0e19d2f1 100644 --- a/tests/src/com/android/contacts/tests/AccountsTestHelper.java +++ b/tests/src/com/android/contacts/tests/AccountsTestHelper.java @@ -15,7 +15,6 @@ */ package com.android.contacts.tests; -import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertTrue; import android.accounts.Account; @@ -24,9 +23,10 @@ import android.content.ContentResolver; import android.content.Context; import android.os.Build; import android.provider.ContactsContract.RawContacts; + import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; -import android.support.test.InstrumentationRegistry; +import androidx.test.InstrumentationRegistry; import com.android.contacts.model.account.AccountWithDataSet; diff --git a/tests/src/com/android/contacts/tests/AdbHelpers.java b/tests/src/com/android/contacts/tests/AdbHelpers.java index b98133114..28a22f3b4 100644 --- a/tests/src/com/android/contacts/tests/AdbHelpers.java +++ b/tests/src/com/android/contacts/tests/AdbHelpers.java @@ -20,10 +20,11 @@ import android.content.OperationApplicationException; import android.os.Build; import android.os.Bundle; import android.os.RemoteException; -import androidx.annotation.RequiresApi; -import android.support.test.InstrumentationRegistry; import android.util.Log; +import androidx.annotation.RequiresApi; +import androidx.test.InstrumentationRegistry; + import com.android.contacts.model.account.AccountWithDataSet; import com.android.contacts.preference.ContactsPreferences; import com.android.contacts.util.SharedPreferenceUtil; diff --git a/tests/src/com/android/contacts/tests/SimContactsTestHelper.java b/tests/src/com/android/contacts/tests/SimContactsTestHelper.java index 061e270df..740d0132d 100644 --- a/tests/src/com/android/contacts/tests/SimContactsTestHelper.java +++ b/tests/src/com/android/contacts/tests/SimContactsTestHelper.java @@ -28,10 +28,11 @@ import android.content.OperationApplicationException; import android.database.Cursor; import android.net.Uri; import android.os.RemoteException; -import androidx.annotation.NonNull; -import android.support.test.InstrumentationRegistry; import android.telephony.TelephonyManager; +import androidx.annotation.NonNull; +import androidx.test.InstrumentationRegistry; + import com.android.contacts.database.SimContactDao; import com.android.contacts.database.SimContactDaoImpl; import com.android.contacts.model.SimCard; |