Move to androidx.test for tests.
We have been using jetified version of android.support.test. Move to
androidx.test that have started shipping to external devs.
Test: ran all appcompat tests and they all pass.
Change-Id: I58a5fac20e2d0728caa334981909a3e372c9032a
Merged-In: I58a5fac20e2d0728caa334981909a3e372c9032a
diff --git a/app-toolkit/core-testing/src/androidTest/java/androidx/arch/core/executor/testing/CountingTaskExecutorRuleTest.java b/app-toolkit/core-testing/src/androidTest/java/androidx/arch/core/executor/testing/CountingTaskExecutorRuleTest.java
index 200e64f..6f4e56e 100644
--- a/app-toolkit/core-testing/src/androidTest/java/androidx/arch/core/executor/testing/CountingTaskExecutorRuleTest.java
+++ b/app-toolkit/core-testing/src/androidTest/java/androidx/arch/core/executor/testing/CountingTaskExecutorRuleTest.java
@@ -19,8 +19,8 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.arch.core.executor.ArchTaskExecutor;
diff --git a/appcompat/build.gradle b/appcompat/build.gradle
index b04bee6..accc597 100644
--- a/appcompat/build.gradle
+++ b/appcompat/build.gradle
@@ -17,8 +17,9 @@
api(project(":vectordrawable"))
api(project(":vectordrawable-animated"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':internal-testutils'), {
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/AlertDialogCursorTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/AlertDialogCursorTest.java
index f88d5b0..2786c50 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/AlertDialogCursorTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/AlertDialogCursorTest.java
@@ -15,16 +15,16 @@
*/
package androidx.appcompat.app;
-import static android.support.test.espresso.Espresso.onData;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.RootMatchers.isDialog;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onData;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.RootMatchers.isDialog;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.core.AllOf.allOf;
@@ -43,11 +43,6 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteCursor;
import android.database.sqlite.SQLiteDatabase;
-import android.support.test.espresso.DataInteraction;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.widget.Button;
import android.widget.CheckedTextView;
@@ -56,6 +51,11 @@
import androidx.appcompat.test.R;
import androidx.appcompat.testutils.TestUtilsMatchers;
+import androidx.test.espresso.DataInteraction;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.hamcrest.Matcher;
import org.junit.After;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/AlertDialogTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/AlertDialogTest.java
index bd33ec37..c6572a9 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/AlertDialogTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/AlertDialogTest.java
@@ -15,21 +15,21 @@
*/
package androidx.appcompat.app;
-import static android.support.test.espresso.Espresso.onData;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.PositionAssertions.isBelow;
-import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.LayoutMatchers.hasEllipsizedText;
-import static android.support.test.espresso.matcher.RootMatchers.isDialog;
-import static android.support.test.espresso.matcher.ViewMatchers.hasSibling;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import static android.support.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onData;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.PositionAssertions.isBelow;
+import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.LayoutMatchers.hasEllipsizedText;
+import static androidx.test.espresso.matcher.RootMatchers.isDialog;
+import static androidx.test.espresso.matcher.ViewMatchers.hasSibling;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.not;
@@ -52,13 +52,6 @@
import android.graphics.drawable.ColorDrawable;
import android.os.Handler;
import android.os.Message;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.espresso.Espresso;
-import android.support.test.espresso.ViewInteraction;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
import android.text.TextUtils;
import android.util.TypedValue;
import android.view.LayoutInflater;
@@ -74,6 +67,13 @@
import androidx.annotation.StringRes;
import androidx.appcompat.test.R;
import androidx.appcompat.testutils.TestUtilsMatchers;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.espresso.Espresso;
+import androidx.test.espresso.ViewInteraction;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
import org.hamcrest.Matcher;
import org.junit.After;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterBadClassNameTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterBadClassNameTest.java
index b015da7..09684b8 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterBadClassNameTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterBadClassNameTest.java
@@ -15,7 +15,7 @@
*/
package androidx.appcompat.app;
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
/**
* Testing the default view inflation where appcompat views are used for specific
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterCustomTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterCustomTest.java
index 40e74a8..68ef62d 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterCustomTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterCustomTest.java
@@ -17,8 +17,6 @@
import static org.junit.Assert.assertEquals;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
import android.view.ViewGroup;
import android.widget.ScrollView;
@@ -28,6 +26,8 @@
import androidx.appcompat.widget.AppCompatRadioButton;
import androidx.appcompat.widget.AppCompatSpinner;
import androidx.appcompat.widget.AppCompatTextView;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
import org.junit.Before;
import org.junit.Rule;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterDefaultTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterDefaultTest.java
index 70a4a93..6d1cd64 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterDefaultTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterDefaultTest.java
@@ -15,7 +15,7 @@
*/
package androidx.appcompat.app;
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
/**
* Testing the default view inflation where appcompat views are used for specific
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterNullTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterNullTest.java
index 95368fb..63b5a64 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterNullTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterNullTest.java
@@ -15,7 +15,7 @@
*/
package androidx.appcompat.app;
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
/**
* Testing the default view inflation where appcompat views are used for specific
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterPassTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterPassTest.java
index 854c9c8c..a6b96f7 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterPassTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatInflaterPassTest.java
@@ -17,9 +17,6 @@
import static org.junit.Assert.assertEquals;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.ViewGroup;
import android.widget.ScrollView;
import android.widget.ToggleButton;
@@ -31,6 +28,9 @@
import androidx.appcompat.widget.AppCompatRadioButton;
import androidx.appcompat.widget.AppCompatSpinner;
import androidx.appcompat.widget.AppCompatTextView;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatMenuItemIconTintingTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatMenuItemIconTintingTest.java
index 8802928..360f6ce 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatMenuItemIconTintingTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatMenuItemIconTintingTest.java
@@ -25,10 +25,6 @@
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.Menu;
import android.view.MenuItem;
@@ -39,6 +35,10 @@
import androidx.core.content.res.ResourcesCompat;
import androidx.core.graphics.ColorUtils;
import androidx.core.view.MenuItemCompat;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatMenuItemShortcutsTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatMenuItemShortcutsTest.java
index 6e7234a..9df4413 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatMenuItemShortcutsTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatMenuItemShortcutsTest.java
@@ -21,12 +21,12 @@
import android.os.Build;
import android.os.SystemClock;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.KeyEvent;
import androidx.appcompat.test.R;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatVectorDrawableIntegrationTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatVectorDrawableIntegrationTest.java
index 369d2c4..0aebb2d 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatVectorDrawableIntegrationTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/AppCompatVectorDrawableIntegrationTest.java
@@ -23,14 +23,14 @@
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.os.Build;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.widget.ImageView;
import androidx.appcompat.test.R;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/BaseBasicsTestCase.java b/appcompat/src/androidTest/java/androidx/appcompat/app/BaseBasicsTestCase.java
index bb16941..be1e04b 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/BaseBasicsTestCase.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/BaseBasicsTestCase.java
@@ -16,10 +16,9 @@
package androidx.appcompat.app;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
import static androidx.appcompat.testutils.TestUtilsActions.setSystemUiVisibility;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -39,11 +38,6 @@
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.pm.PackageManager;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.Menu;
import android.view.View;
import android.view.WindowInsets;
@@ -53,6 +47,11 @@
import androidx.appcompat.test.R;
import androidx.appcompat.testutils.BaseTestActivity;
import androidx.appcompat.view.ActionMode;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/BaseKeyEventsTestCase.java b/appcompat/src/androidTest/java/androidx/appcompat/app/BaseKeyEventsTestCase.java
index 0c8ff54..7c07c9e 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/BaseKeyEventsTestCase.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/BaseKeyEventsTestCase.java
@@ -16,14 +16,14 @@
package androidx.appcompat.app;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
-import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
+import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -31,11 +31,6 @@
import static org.junit.Assert.assertTrue;
import android.app.Instrumentation;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
@@ -44,6 +39,11 @@
import androidx.appcompat.testutils.BaseTestActivity;
import androidx.appcompat.view.ActionMode;
import androidx.core.view.MenuItemCompat;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.hamcrest.Matchers;
import org.junit.Before;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/BaseKeyboardShortcutsTestCase.java b/appcompat/src/androidTest/java/androidx/appcompat/app/BaseKeyboardShortcutsTestCase.java
index a10bef4..0e4b490 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/BaseKeyboardShortcutsTestCase.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/BaseKeyboardShortcutsTestCase.java
@@ -21,16 +21,16 @@
import android.app.Instrumentation;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.KeyCharacterMap;
import android.view.KeyEvent;
import android.view.MenuItem;
import androidx.appcompat.test.R;
import androidx.appcompat.testutils.BaseTestActivity;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/BasicsTestCaseWithToolbar.java b/appcompat/src/androidTest/java/androidx/appcompat/app/BasicsTestCaseWithToolbar.java
index b13c85d..9e7d206 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/BasicsTestCaseWithToolbar.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/BasicsTestCaseWithToolbar.java
@@ -16,8 +16,8 @@
package androidx.appcompat.app;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
import org.junit.Test;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/BasicsTestCaseWithWindowDecor.java b/appcompat/src/androidTest/java/androidx/appcompat/app/BasicsTestCaseWithWindowDecor.java
index eaa09d7..9187f57 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/BasicsTestCaseWithWindowDecor.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/BasicsTestCaseWithWindowDecor.java
@@ -16,8 +16,8 @@
package androidx.appcompat.app;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
import org.junit.Test;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/DialogTestCase.java b/appcompat/src/androidTest/java/androidx/appcompat/app/DialogTestCase.java
index 391ab1df..dd95a16 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/DialogTestCase.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/DialogTestCase.java
@@ -21,10 +21,11 @@
import android.app.Dialog;
import android.os.Bundle;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerDynamicLayoutTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerDynamicLayoutTest.java
index c825291..00d71d2 100755
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerDynamicLayoutTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerDynamicLayoutTest.java
@@ -15,26 +15,26 @@
*/
package androidx.appcompat.app;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.hamcrest.CoreMatchers.allOf;
import static org.mockito.Mockito.mock;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.view.ViewStub;
import androidx.annotation.LayoutRes;
import androidx.appcompat.test.R;
import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerInteractionTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerInteractionTest.java
index d12f6a5..f3fbe52 100755
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerInteractionTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerInteractionTest.java
@@ -16,10 +16,9 @@
package androidx.appcompat.app;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-
import static androidx.appcompat.testutils.DrawerLayoutActions.openDrawer;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
@@ -27,10 +26,6 @@
import android.app.Activity;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.Gravity;
import android.view.InputDevice;
import android.view.MotionEvent;
@@ -39,6 +34,10 @@
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerLayoutDoubleTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerLayoutDoubleTest.java
index ad78cc0..f74b10a 100755
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerLayoutDoubleTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerLayoutDoubleTest.java
@@ -15,28 +15,27 @@
*/
package androidx.appcompat.app;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
import static androidx.appcompat.testutils.DrawerLayoutActions.closeDrawer;
import static androidx.appcompat.testutils.DrawerLayoutActions.openDrawer;
import static androidx.appcompat.testutils.DrawerLayoutActions.setDrawerLockMode;
import static androidx.appcompat.testutils.TestUtilsActions.setLayoutDirection;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import androidx.appcompat.custom.CustomDrawerLayout;
import androidx.appcompat.test.R;
import androidx.core.view.ViewCompat;
import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerLayoutTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerLayoutTest.java
index 4c44d6f..0be3dc9 100755
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerLayoutTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/DrawerLayoutTest.java
@@ -16,9 +16,6 @@
package androidx.appcompat.app;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
import static androidx.appcompat.testutils.DrawerLayoutActions.closeDrawer;
import static androidx.appcompat.testutils.DrawerLayoutActions.openDrawer;
import static androidx.appcompat.testutils.DrawerLayoutActions.setDrawerLockMode;
@@ -26,6 +23,8 @@
import static androidx.appcompat.testutils.TestUtilsMatchers.inAscendingOrder;
import static androidx.appcompat.testutils.TestUtilsMatchers.inDescendingOrder;
import static androidx.appcompat.testutils.TestUtilsMatchers.inRange;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertEquals;
@@ -42,22 +41,22 @@
import static org.mockito.Mockito.verify;
import android.os.Build;
-import android.support.test.espresso.action.GeneralLocation;
-import android.support.test.espresso.action.GeneralSwipeAction;
-import android.support.test.espresso.action.Press;
-import android.support.test.espresso.action.Swipe;
-import android.support.test.filters.FlakyTest;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.Suppress;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import androidx.appcompat.custom.CustomDrawerLayout;
import androidx.appcompat.test.R;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.test.espresso.action.GeneralLocation;
+import androidx.test.espresso.action.GeneralSwipeAction;
+import androidx.test.espresso.action.Press;
+import androidx.test.espresso.action.Swipe;
+import androidx.test.filters.FlakyTest;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.Suppress;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/FragmentContentIdTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/FragmentContentIdTest.java
index 541436e..7ea806c 100755
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/FragmentContentIdTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/FragmentContentIdTest.java
@@ -16,17 +16,16 @@
package androidx.appcompat.app;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import androidx.appcompat.test.R;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/KeyEventsTestCaseWithToolbar.java b/appcompat/src/androidTest/java/androidx/appcompat/app/KeyEventsTestCaseWithToolbar.java
index a1db30d..aae8cac 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/KeyEventsTestCaseWithToolbar.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/KeyEventsTestCaseWithToolbar.java
@@ -19,12 +19,12 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
import android.view.KeyEvent;
import android.view.Window;
import androidx.appcompat.widget.Toolbar;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
import org.junit.Test;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/KeyEventsTestCaseWithWindowDecor.java b/appcompat/src/androidTest/java/androidx/appcompat/app/KeyEventsTestCaseWithWindowDecor.java
index 313d4f0..e122523 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/KeyEventsTestCaseWithWindowDecor.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/KeyEventsTestCaseWithWindowDecor.java
@@ -21,14 +21,14 @@
import android.app.Instrumentation;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
import android.view.KeyEvent;
import android.view.View;
import android.view.ViewGroup;
import androidx.appcompat.test.R;
import androidx.core.view.ViewCompat;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
import org.junit.Test;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/KeyboardShortcutsTestCaseWithToolbar.java b/appcompat/src/androidTest/java/androidx/appcompat/app/KeyboardShortcutsTestCaseWithToolbar.java
index 15c9862..3a2b2ec 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/KeyboardShortcutsTestCaseWithToolbar.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/KeyboardShortcutsTestCaseWithToolbar.java
@@ -22,10 +22,6 @@
import android.os.Build;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.KeyEvent;
import android.view.MenuItem;
import android.view.View;
@@ -33,6 +29,10 @@
import androidx.appcompat.testutils.BaseTestActivity;
import androidx.appcompat.widget.Toolbar;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/LayoutInflaterFactoryTestCase.java b/appcompat/src/androidTest/java/androidx/appcompat/app/LayoutInflaterFactoryTestCase.java
index 5bae3ef..df2b9e3 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/LayoutInflaterFactoryTestCase.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/LayoutInflaterFactoryTestCase.java
@@ -22,10 +22,6 @@
import android.content.Context;
import android.content.res.Resources;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.util.TypedValue;
import android.view.ContextThemeWrapper;
import android.view.LayoutInflater;
@@ -44,6 +40,10 @@
import androidx.appcompat.widget.AppCompatRadioButton;
import androidx.appcompat.widget.AppCompatRatingBar;
import androidx.appcompat.widget.AppCompatSpinner;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/MenuBuilderTest.java b/appcompat/src/androidTest/java/androidx/appcompat/app/MenuBuilderTest.java
index e454a96..b4f230d 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/MenuBuilderTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/MenuBuilderTest.java
@@ -19,10 +19,9 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.appcompat.view.menu.MenuBuilder;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/app/NightModeTestCase.java b/appcompat/src/androidTest/java/androidx/appcompat/app/NightModeTestCase.java
index cad499e..401b455 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/app/NightModeTestCase.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/app/NightModeTestCase.java
@@ -16,24 +16,23 @@
package androidx.appcompat.app;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
import static androidx.appcompat.app.NightModeActivity.TOP_ACTIVITY;
import static androidx.appcompat.testutils.TestUtilsMatchers.isBackground;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.junit.Assert.assertTrue;
import android.app.Instrumentation;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.appcompat.test.R;
import androidx.core.content.ContextCompat;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.testutils.AppCompatActivityUtils;
import androidx.testutils.RecreatedAppCompatActivity;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompatTest.java b/appcompat/src/androidTest/java/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompatTest.java
index 42f2e1d..8e1a9a3 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompatTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/graphics/drawable/AnimatedStateListDrawableCompatTest.java
@@ -30,12 +30,12 @@
import android.graphics.ColorFilter;
import android.graphics.drawable.Animatable;
import android.graphics.drawable.Drawable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.util.StateSet;
import androidx.appcompat.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.vectordrawable.graphics.drawable.Animatable2Compat;
import org.junit.Before;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/res/content/AppCompatResourcesTestCase.java b/appcompat/src/androidTest/java/androidx/appcompat/res/content/AppCompatResourcesTestCase.java
index 24ba7c6..02266c0 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/res/content/AppCompatResourcesTestCase.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/res/content/AppCompatResourcesTestCase.java
@@ -21,13 +21,13 @@
import android.app.Activity;
import android.content.res.ColorStateList;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.appcompat.test.R;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/testutils/AppCompatTintableViewActions.java b/appcompat/src/androidTest/java/androidx/appcompat/testutils/AppCompatTintableViewActions.java
index 272c485..0f29c4c 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/testutils/AppCompatTintableViewActions.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/testutils/AppCompatTintableViewActions.java
@@ -16,8 +16,8 @@
package androidx.appcompat.testutils;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
import static org.hamcrest.core.AllOf.allOf;
import static org.hamcrest.core.AnyOf.anyOf;
@@ -25,14 +25,14 @@
import android.content.res.ColorStateList;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
import android.view.View;
import android.widget.ImageView;
import androidx.annotation.DrawableRes;
import androidx.core.view.ViewCompat;
import androidx.core.widget.ImageViewCompat;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
import org.hamcrest.Matcher;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/testutils/DrawerLayoutActions.java b/appcompat/src/androidTest/java/androidx/appcompat/testutils/DrawerLayoutActions.java
index 4c3d48c..495491c 100755
--- a/appcompat/src/androidTest/java/androidx/appcompat/testutils/DrawerLayoutActions.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/testutils/DrawerLayoutActions.java
@@ -16,16 +16,16 @@
package androidx.appcompat.testutils;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import android.support.test.espresso.Espresso;
-import android.support.test.espresso.IdlingResource;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
import android.view.View;
import androidx.annotation.Nullable;
import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.test.espresso.Espresso;
+import androidx.test.espresso.IdlingResource;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
import org.hamcrest.Matcher;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/testutils/TestUtilsActions.java b/appcompat/src/androidTest/java/androidx/appcompat/testutils/TestUtilsActions.java
index 8260c80..78b05c7 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/testutils/TestUtilsActions.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/testutils/TestUtilsActions.java
@@ -16,20 +16,20 @@
package androidx.appcompat.testutils;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
import static org.hamcrest.core.AllOf.allOf;
import android.content.res.ColorStateList;
import android.graphics.PorterDuff;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
import android.view.View;
import android.widget.TextView;
import androidx.core.view.ViewCompat;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
import org.hamcrest.Matcher;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/testutils/TestUtilsMatchers.java b/appcompat/src/androidTest/java/androidx/appcompat/testutils/TestUtilsMatchers.java
index d7f9023..8fef4f1 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/testutils/TestUtilsMatchers.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/testutils/TestUtilsMatchers.java
@@ -19,7 +19,6 @@
import android.database.sqlite.SQLiteCursor;
import android.graphics.Bitmap;
import android.graphics.drawable.Drawable;
-import android.support.test.espresso.matcher.BoundedMatcher;
import android.text.TextUtils;
import android.view.View;
import android.view.ViewGroup;
@@ -28,6 +27,7 @@
import androidx.annotation.ColorInt;
import androidx.core.view.TintableBackgroundView;
+import androidx.test.espresso.matcher.BoundedMatcher;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/view/ContextThemeWrapperTest.java b/appcompat/src/androidTest/java/androidx/appcompat/view/ContextThemeWrapperTest.java
index 62c84ef..9754b67 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/view/ContextThemeWrapperTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/view/ContextThemeWrapperTest.java
@@ -27,11 +27,11 @@
import android.content.res.Resources.Theme;
import android.content.res.TypedArray;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.appcompat.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/view/SupportMenuInflaterTest.java b/appcompat/src/androidTest/java/androidx/appcompat/view/SupportMenuInflaterTest.java
index c78da70..e3140c9 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/view/SupportMenuInflaterTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/view/SupportMenuInflaterTest.java
@@ -17,9 +17,6 @@
import static org.junit.Assert.assertEquals;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuInflater;
@@ -27,6 +24,9 @@
import androidx.appcompat.test.R;
import androidx.appcompat.widget.PopupMenu;
import androidx.core.internal.view.SupportMenuItem;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseAutoSizeTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseAutoSizeTest.java
index 19e81ea..e3bbbd3 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseAutoSizeTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseAutoSizeTest.java
@@ -27,11 +27,6 @@
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
import android.text.TextUtils;
import android.text.method.TransformationMethod;
import android.util.DisplayMetrics;
@@ -47,6 +42,11 @@
import androidx.core.content.res.ResourcesCompat;
import androidx.core.widget.AutoSizeableTextView;
import androidx.core.widget.TextViewCompat;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
import org.junit.Before;
import org.junit.Rule;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseImageViewTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseImageViewTest.java
index 62ebd5f..ba2fc74 100755
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseImageViewTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseImageViewTest.java
@@ -16,16 +16,14 @@
package androidx.appcompat.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
import static androidx.appcompat.testutils.TestUtilsActions.setEnabled;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import android.content.res.ColorStateList;
import android.content.res.Resources;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
-import android.support.test.filters.SmallTest;
import android.widget.ImageView;
import androidx.annotation.ColorInt;
@@ -37,6 +35,7 @@
import androidx.appcompat.testutils.TestUtils;
import androidx.core.content.res.ResourcesCompat;
import androidx.core.graphics.ColorUtils;
+import androidx.test.filters.SmallTest;
import org.junit.Test;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseViewTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseViewTest.java
index f070812..681291f 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseViewTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatBaseViewTest.java
@@ -15,10 +15,6 @@
*/
package androidx.appcompat.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
import static androidx.appcompat.testutils.AppCompatTintableViewActions.setBackgroundResource;
import static androidx.appcompat.testutils.AppCompatTintableViewActions.setBackgroundTintList;
import static androidx.appcompat.testutils.AppCompatTintableViewActions.setBackgroundTintMode;
@@ -26,6 +22,9 @@
import static androidx.appcompat.testutils.TestUtilsActions.setBackgroundTintModeViewCompat;
import static androidx.appcompat.testutils.TestUtilsActions.setEnabled;
import static androidx.appcompat.testutils.TestUtilsMatchers.isBackground;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.junit.Assert.assertNull;
@@ -33,9 +32,6 @@
import android.content.res.Resources;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.view.ViewGroup;
@@ -48,6 +44,9 @@
import androidx.appcompat.testutils.TestUtils;
import androidx.core.content.res.ResourcesCompat;
import androidx.core.graphics.ColorUtils;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatButtonAutoSizeTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatButtonAutoSizeTest.java
index 9567ec1..5b4be0b 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatButtonAutoSizeTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatButtonAutoSizeTest.java
@@ -16,8 +16,8 @@
package androidx.appcompat.widget;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.runner.RunWith;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatButtonTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatButtonTest.java
index 9248e12..9da53cd 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatButtonTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatButtonTest.java
@@ -15,18 +15,17 @@
*/
package androidx.appcompat.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
import static androidx.appcompat.testutils.TestUtilsActions.setTextAppearance;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.junit.Assert.assertEquals;
import android.graphics.Typeface;
-import android.support.test.filters.SmallTest;
import androidx.appcompat.test.R;
import androidx.core.content.res.ResourcesCompat;
+import androidx.test.filters.SmallTest;
import org.junit.Test;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatEditTextTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatEditTextTest.java
index 788538c..fcce906 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatEditTextTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatEditTextTest.java
@@ -17,13 +17,13 @@
package androidx.appcompat.widget;
import android.content.Context;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.text.Editable;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatImageViewTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatImageViewTest.java
index e87a681..ec701131 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatImageViewTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatImageViewTest.java
@@ -15,15 +15,14 @@
*/
package androidx.appcompat.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
-import android.support.test.espresso.ViewInteraction;
-import android.support.test.filters.SmallTest;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import androidx.appcompat.test.R;
import androidx.appcompat.testutils.TestUtilsMatchers;
+import androidx.test.espresso.ViewInteraction;
+import androidx.test.filters.SmallTest;
import org.junit.Test;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatRadioButtonTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatRadioButtonTest.java
index 53de3d6..38ba54a 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatRadioButtonTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatRadioButtonTest.java
@@ -18,13 +18,13 @@
import static org.junit.Assert.assertEquals;
import android.graphics.Typeface;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.ViewGroup;
import androidx.appcompat.test.R;
import androidx.core.content.res.ResourcesCompat;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatSpinnerTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatSpinnerTest.java
index 08333f0..717c680 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatSpinnerTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatSpinnerTest.java
@@ -15,19 +15,16 @@
*/
package androidx.appcompat.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.RootMatchers.isPlatformPopup;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
import static androidx.appcompat.testutils.TestUtilsMatchers.hasChild;
import static androidx.appcompat.testutils.TestUtilsMatchers.isCombinedBackground;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.RootMatchers.isPlatformPopup;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
import android.content.res.Resources;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SmallTest;
import androidx.annotation.ColorInt;
import androidx.annotation.ColorRes;
@@ -35,6 +32,8 @@
import androidx.appcompat.test.R;
import androidx.core.content.ContextCompat;
import androidx.core.content.res.ResourcesCompat;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SmallTest;
import org.hamcrest.Matcher;
import org.junit.Test;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatTextViewAutoSizeTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatTextViewAutoSizeTest.java
index c055eee..588b8eec 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatTextViewAutoSizeTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatTextViewAutoSizeTest.java
@@ -20,8 +20,6 @@
import android.content.Context;
import android.os.Build;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.method.SingleLineTransformationMethod;
import android.util.AttributeSet;
import android.widget.LinearLayout;
@@ -29,6 +27,8 @@
import androidx.annotation.Nullable;
import androidx.appcompat.test.R;
import androidx.core.widget.TextViewCompat;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatTextViewTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatTextViewTest.java
index 6cb929d..6862e03 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatTextViewTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/AppCompatTextViewTest.java
@@ -15,13 +15,12 @@
*/
package androidx.appcompat.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
import static androidx.appcompat.testutils.TestUtilsActions.setEnabled;
import static androidx.appcompat.testutils.TestUtilsActions.setTextAppearance;
import static androidx.appcompat.testutils.TestUtilsMatchers.isBackground;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
@@ -34,10 +33,6 @@
import android.graphics.Color;
import android.graphics.Typeface;
import android.os.Build;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
import android.text.PrecomputedText;
import android.view.View;
import android.widget.TextView;
@@ -50,6 +45,10 @@
import androidx.core.text.PrecomputedTextCompat;
import androidx.core.view.ViewCompat;
import androidx.core.widget.TextViewCompat;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
import org.junit.Test;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/ListPopupWindowTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/ListPopupWindowTest.java
index e5f9a6e..c5a72c0 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/ListPopupWindowTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/ListPopupWindowTest.java
@@ -15,13 +15,13 @@
*/
package androidx.appcompat.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.RootMatchers.withDecorView;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.RootMatchers.withDecorView;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsNot.not;
@@ -43,12 +43,6 @@
import android.content.Context;
import android.graphics.Rect;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.FlakyTest;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
@@ -61,6 +55,12 @@
import android.widget.TextView;
import androidx.appcompat.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.FlakyTest;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/PopupMenuTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/PopupMenuTest.java
index 13ef9f5..974284e 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/PopupMenuTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/PopupMenuTest.java
@@ -15,17 +15,17 @@
*/
package androidx.appcompat.widget;
-import static android.support.test.espresso.Espresso.onData;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.RootMatchers.isPlatformPopup;
-import static android.support.test.espresso.matcher.RootMatchers.withDecorView;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withClassName;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onData;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.RootMatchers.isPlatformPopup;
+import static androidx.test.espresso.matcher.RootMatchers.withDecorView;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.anything;
@@ -46,16 +46,6 @@
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.Root;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.filters.FlakyTest;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.text.TextUtils;
import android.view.InputDevice;
import android.view.MenuInflater;
@@ -69,6 +59,16 @@
import androidx.appcompat.test.R;
import androidx.core.view.MenuItemCompat;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.espresso.Root;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.filters.FlakyTest;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.testutils.PollingCheck;
import org.hamcrest.Description;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/SearchViewTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/SearchViewTest.java
index a0ad240..5d6247a 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/SearchViewTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/SearchViewTest.java
@@ -30,16 +30,16 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.res.Resources;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.text.InputType;
import android.text.TextUtils;
import android.view.inputmethod.EditorInfo;
import androidx.appcompat.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/SearchView_CursorTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/SearchView_CursorTest.java
index 3359278..533f425 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/SearchView_CursorTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/SearchView_CursorTest.java
@@ -31,11 +31,6 @@
import android.database.Cursor;
import android.database.MatrixCursor;
import android.provider.BaseColumns;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.text.TextUtils;
import android.view.View;
import android.widget.AutoCompleteTextView;
@@ -44,6 +39,11 @@
import androidx.appcompat.testutils.TestUtils;
import androidx.cursoradapter.widget.CursorAdapter;
import androidx.cursoradapter.widget.SimpleCursorAdapter;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.testutils.PollingCheck;
import org.junit.Before;
diff --git a/appcompat/src/androidTest/java/androidx/appcompat/widget/TintResourcesTest.java b/appcompat/src/androidTest/java/androidx/appcompat/widget/TintResourcesTest.java
index 0d83568..4413a52 100644
--- a/appcompat/src/androidTest/java/androidx/appcompat/widget/TintResourcesTest.java
+++ b/appcompat/src/androidTest/java/androidx/appcompat/widget/TintResourcesTest.java
@@ -21,11 +21,11 @@
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/benchmark/src/androidTest/java/androidx/benchmark/BenchmarkStateTest.kt b/benchmark/src/androidTest/java/androidx/benchmark/BenchmarkStateTest.kt
index fc9f4a5..85d6e32 100644
--- a/benchmark/src/androidTest/java/androidx/benchmark/BenchmarkStateTest.kt
+++ b/benchmark/src/androidTest/java/androidx/benchmark/BenchmarkStateTest.kt
@@ -16,7 +16,7 @@
package androidx.benchmark
-import android.support.test.filters.SmallTest
+import androidx.test.filters.SmallTest
import org.junit.Assert.assertTrue
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/benchmark/src/androidTest/java/androidx/benchmark/StatsTest.kt b/benchmark/src/androidTest/java/androidx/benchmark/StatsTest.kt
index 5880a36..296fdc7 100644
--- a/benchmark/src/androidTest/java/androidx/benchmark/StatsTest.kt
+++ b/benchmark/src/androidTest/java/androidx/benchmark/StatsTest.kt
@@ -16,7 +16,7 @@
package androidx.benchmark
-import android.support.test.filters.SmallTest
+import androidx.test.filters.SmallTest
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Test
diff --git a/benchmark/src/androidTest/java/androidx/benchmark/TrivialBenchmark.kt b/benchmark/src/androidTest/java/androidx/benchmark/TrivialBenchmark.kt
index a888a82..a3cfb3f 100644
--- a/benchmark/src/androidTest/java/androidx/benchmark/TrivialBenchmark.kt
+++ b/benchmark/src/androidTest/java/androidx/benchmark/TrivialBenchmark.kt
@@ -16,7 +16,7 @@
package androidx.benchmark
-import android.support.test.filters.LargeTest
+import androidx.test.filters.LargeTest
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/benchmark/src/main/java/androidx/benchmark/BenchmarkState.java b/benchmark/src/main/java/androidx/benchmark/BenchmarkState.java
index f6ac275..e932d94 100644
--- a/benchmark/src/main/java/androidx/benchmark/BenchmarkState.java
+++ b/benchmark/src/main/java/androidx/benchmark/BenchmarkState.java
@@ -21,7 +21,7 @@
import android.os.Build;
import android.os.Bundle;
import android.os.Debug;
-import android.support.test.InstrumentationRegistry;
+import androidx.test.InstrumentationRegistry;
import android.util.Log;
import androidx.annotation.NonNull;
diff --git a/benchmark/src/main/java/androidx/benchmark/PerfStatusReporter.java b/benchmark/src/main/java/androidx/benchmark/PerfStatusReporter.java
index d508d00..157c04bc 100644
--- a/benchmark/src/main/java/androidx/benchmark/PerfStatusReporter.java
+++ b/benchmark/src/main/java/androidx/benchmark/PerfStatusReporter.java
@@ -19,7 +19,7 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import android.support.test.InstrumentationRegistry;
+import androidx.test.InstrumentationRegistry;
import android.util.Log;
import androidx.annotation.NonNull;
diff --git a/browser/build.gradle b/browser/build.gradle
index 4cc89d9..ec2f1dc 100644
--- a/browser/build.gradle
+++ b/browser/build.gradle
@@ -13,8 +13,9 @@
api(project(":collection"))
api(project(":legacy-support-core-ui"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(project(":internal-testutils"))
}
diff --git a/browser/src/androidTest/java/androidx/browser/browseractions/BrowserActionsFallbackMenuUiTest.java b/browser/src/androidTest/java/androidx/browser/browseractions/BrowserActionsFallbackMenuUiTest.java
index 0a993d4..2355209 100644
--- a/browser/src/androidTest/java/androidx/browser/browseractions/BrowserActionsFallbackMenuUiTest.java
+++ b/browser/src/androidTest/java/androidx/browser/browseractions/BrowserActionsFallbackMenuUiTest.java
@@ -22,15 +22,15 @@
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.widget.ListView;
import android.widget.TextView;
import androidx.browser.R;
import androidx.browser.customtabs.TestActivity;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/browser/src/androidTest/java/androidx/browser/browseractions/BrowserActionsIntentTest.java b/browser/src/androidTest/java/androidx/browser/browseractions/BrowserActionsIntentTest.java
index 49622b0..3bd0273 100644
--- a/browser/src/androidTest/java/androidx/browser/browseractions/BrowserActionsIntentTest.java
+++ b/browser/src/androidTest/java/androidx/browser/browseractions/BrowserActionsIntentTest.java
@@ -26,9 +26,10 @@
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
-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 org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/browser/src/androidTest/java/androidx/browser/customtabs/CustomTabsIntentTest.java b/browser/src/androidTest/java/androidx/browser/customtabs/CustomTabsIntentTest.java
index 330b8a8..3852598 100644
--- a/browser/src/androidTest/java/androidx/browser/customtabs/CustomTabsIntentTest.java
+++ b/browser/src/androidTest/java/androidx/browser/customtabs/CustomTabsIntentTest.java
@@ -25,11 +25,11 @@
import android.content.Intent;
import android.graphics.Color;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.ColorRes;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/browser/src/androidTest/java/androidx/browser/customtabs/PostMessageServiceConnectionTest.java b/browser/src/androidTest/java/androidx/browser/customtabs/PostMessageServiceConnectionTest.java
index 7b576c1..1e0c4ce 100644
--- a/browser/src/androidTest/java/androidx/browser/customtabs/PostMessageServiceConnectionTest.java
+++ b/browser/src/androidTest/java/androidx/browser/customtabs/PostMessageServiceConnectionTest.java
@@ -22,11 +22,11 @@
import android.content.Context;
import android.content.Intent;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.rule.ServiceTestRule;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.rule.ServiceTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.testutils.PollingCheck;
import org.junit.Before;
diff --git a/browser/src/androidTest/java/androidx/browser/customtabs/PostMessageTest.java b/browser/src/androidTest/java/androidx/browser/customtabs/PostMessageTest.java
index 9a9f6ba..d7d8c55 100644
--- a/browser/src/androidTest/java/androidx/browser/customtabs/PostMessageTest.java
+++ b/browser/src/androidTest/java/androidx/browser/customtabs/PostMessageTest.java
@@ -25,11 +25,11 @@
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.rule.ServiceTestRule;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.rule.ServiceTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.testutils.PollingCheck;
import org.junit.Before;
diff --git a/browser/src/androidTest/java/androidx/browser/customtabs/TrustedWebUtilsTest.java b/browser/src/androidTest/java/androidx/browser/customtabs/TrustedWebUtilsTest.java
index f83b298..e63a926 100644
--- a/browser/src/androidTest/java/androidx/browser/customtabs/TrustedWebUtilsTest.java
+++ b/browser/src/androidTest/java/androidx/browser/customtabs/TrustedWebUtilsTest.java
@@ -23,11 +23,11 @@
import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.net.Uri;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.core.app.BundleCompat;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/buildSrc/dependencies.gradle b/buildSrc/dependencies.gradle
index f7928eb..9ddae11 100644
--- a/buildSrc/dependencies.gradle
+++ b/buildSrc/dependencies.gradle
@@ -47,6 +47,10 @@
exclude group: 'androidx.appcompat'
exclude group: 'androidx.recyclerview'
exclude group: 'androidx.legacy'
+ exclude group: 'androidx.cardview'
+ exclude group: 'androidx.fragment'
+ exclude group: 'com.google.android.material'
+ exclude group: 'androidx.core'
}
libs.support_exclude_config = {
diff --git a/buildSrc/src/main/kotlin/androidx/build/SupportConfig.kt b/buildSrc/src/main/kotlin/androidx/build/SupportConfig.kt
index b40f1d4..3979b4b 100644
--- a/buildSrc/src/main/kotlin/androidx/build/SupportConfig.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/SupportConfig.kt
@@ -22,7 +22,7 @@
object SupportConfig {
const val DEFAULT_MIN_SDK_VERSION = 14
- const val INSTRUMENTATION_RUNNER = "android.support.test.runner.AndroidJUnitRunner"
+ const val INSTRUMENTATION_RUNNER = "androidx.test.runner.AndroidJUnitRunner"
const val BUILD_TOOLS_VERSION = "27.0.3"
const val CURRENT_SDK_VERSION = 28
diff --git a/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt b/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt
index a5b729b..7d5766b 100644
--- a/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/dependencies/Dependencies.kt
@@ -21,8 +21,8 @@
const val APACHE_COMMONS_CODEC = "commons-codec:commons-codec:1.10"
const val CONSTRAINT_LAYOUT = "androidx.constraintlayout:constraintlayout:1.1.0@aar"
const val DEXMAKER_MOCKITO = "com.linkedin.dexmaker:dexmaker-mockito:2.19.0"
-const val ESPRESSO_CONTRIB = "com.android.support.test.espresso:espresso-contrib:3.0.1"
-const val ESPRESSO_CORE = "com.android.support.test.espresso:espresso-core:3.0.1"
+const val ESPRESSO_CONTRIB = "androidx.test.espresso:espresso-contrib:3.1.0-alpha3"
+const val ESPRESSO_CORE = "androidx.test.espresso:espresso-core:3.1.0-alpha3"
const val FINDBUGS = "com.google.code.findbugs:jsr305:2.0.1"
const val FIREBASE_JOBDISPATCHER = "com.firebase:firebase-jobdispatcher:0.8.5"
const val GOOGLE_COMPILE_TESTING = "com.google.testing.compile:compile-testing:0.11"
@@ -42,8 +42,8 @@
const val PLAY_SERVICES = "com.google.android.gms:play-services-base:11.6.0"
const val REACTIVE_STREAMS = "org.reactivestreams:reactive-streams:1.0.0"
const val RX_JAVA = "io.reactivex.rxjava2:rxjava:2.0.6"
-const val TEST_RUNNER = "com.android.support.test:runner:1.0.1"
-const val TEST_RULES = "com.android.support.test:rules:1.0.1"
+const val TEST_RUNNER = "androidx.test:runner:1.1.0-alpha3"
+const val TEST_RULES = "androidx.test:rules:1.1.0-alpha3"
const val TRUTH = "com.google.truth:truth:0.34"
/**
* this Xerial version is newer than we want but we need it to fix
@@ -54,11 +54,6 @@
const val XPP3 = "xpp3:xpp3:1.1.4c"
const val XMLPULL = "xmlpull:xmlpull:1.1.3.1"
-const val ESPRESSO_CONTRIB_TMP = "com.android.temp.support.test.espresso:espresso-contrib:3.0.1"
-const val ESPRESSO_CORE_TMP = "com.android.temp.support.test.espresso:espresso-core:3.0.1"
-const val TEST_RUNNER_TMP = "com.android.temp.support.test:runner:1.0.1"
-const val TEST_RULES_TMP = "com.android.temp.support.test:rules:1.0.1"
-
private const val NAV_SUPPORT_VERSION = "27.1.1"
const val NAV_SUPPORT_COMPAT = "com.android.support:support-compat:$NAV_SUPPORT_VERSION"
const val NAV_SUPPORT_CORE_UTILS = "com.android.support:support-core-utils:$NAV_SUPPORT_VERSION"
diff --git a/car/build.gradle b/car/build.gradle
index 1d6a24b..0eba411 100644
--- a/car/build.gradle
+++ b/car/build.gradle
@@ -17,14 +17,15 @@
api(CONSTRAINT_LAYOUT, { transitive = true })
api(SUPPORT_DESIGN, libs.exclude_for_material)
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CONTRIB_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CONTRIB, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
testImplementation(JUNIT)
- testImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ testImplementation(TEST_RUNNER)
testImplementation(MOCKITO_CORE)
compileOnly fileTree(dir: 'car-stubs', include: ['android.car.jar'])
diff --git a/car/src/androidTest/java/androidx/car/drawer/CarDrawerTest.java b/car/src/androidTest/java/androidx/car/drawer/CarDrawerTest.java
index 9bf9ec7..e6b1dfe 100644
--- a/car/src/androidTest/java/androidx/car/drawer/CarDrawerTest.java
+++ b/car/src/androidTest/java/androidx/car/drawer/CarDrawerTest.java
@@ -16,9 +16,9 @@
package androidx.car.drawer;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.contrib.RecyclerViewActions.scrollToPosition;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.lessThan;
@@ -27,15 +27,15 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.contrib.DrawerActions;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.car.test.R;
import androidx.car.utils.CarUxRestrictionsTestUtils;
import androidx.car.widget.PagedListView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.espresso.contrib.DrawerActions;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Assume;
diff --git a/car/src/androidTest/java/androidx/car/moderator/ContentRateLimiterTest.java b/car/src/androidTest/java/androidx/car/moderator/ContentRateLimiterTest.java
index 4fb0fc0..b1295df 100644
--- a/car/src/androidTest/java/androidx/car/moderator/ContentRateLimiterTest.java
+++ b/car/src/androidTest/java/androidx/car/moderator/ContentRateLimiterTest.java
@@ -22,8 +22,8 @@
import static java.util.concurrent.TimeUnit.SECONDS;
-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.Before;
import org.junit.Test;
diff --git a/car/src/androidTest/java/androidx/car/navigation/utils/BundlableTest.java b/car/src/androidTest/java/androidx/car/navigation/utils/BundlableTest.java
index 7f149d0..a53b130 100644
--- a/car/src/androidTest/java/androidx/car/navigation/utils/BundlableTest.java
+++ b/car/src/androidTest/java/androidx/car/navigation/utils/BundlableTest.java
@@ -18,8 +18,8 @@
import static org.junit.Assert.assertEquals;
-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/car/src/androidTest/java/androidx/car/navigation/utils/BundleMarshallerTest.java b/car/src/androidTest/java/androidx/car/navigation/utils/BundleMarshallerTest.java
index cf5ac15..ad84267 100644
--- a/car/src/androidTest/java/androidx/car/navigation/utils/BundleMarshallerTest.java
+++ b/car/src/androidTest/java/androidx/car/navigation/utils/BundleMarshallerTest.java
@@ -23,8 +23,9 @@
import static org.junit.Assert.fail;
import android.os.Bundle;
-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/car/src/androidTest/java/androidx/car/widget/ActionBarTest.java b/car/src/androidTest/java/androidx/car/widget/ActionBarTest.java
index cdebc76..19d97af 100644
--- a/car/src/androidTest/java/androidx/car/widget/ActionBarTest.java
+++ b/car/src/androidTest/java/androidx/car/widget/ActionBarTest.java
@@ -16,33 +16,33 @@
package androidx.car.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import android.content.Context;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import androidx.core.util.Preconditions;
import android.view.View;
import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.Space;
import android.widget.ToggleButton;
+import androidx.car.R;
+import androidx.core.util.Preconditions;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
-import androidx.car.R;
-
/** Unit tests for {@link ActionBar}. */
@RunWith(AndroidJUnit4.class)
@MediumTest
diff --git a/car/src/androidTest/java/androidx/car/widget/ColumnCardViewTest.java b/car/src/androidTest/java/androidx/car/widget/ColumnCardViewTest.java
index 3a53c46..658e03c 100644
--- a/car/src/androidTest/java/androidx/car/widget/ColumnCardViewTest.java
+++ b/car/src/androidTest/java/androidx/car/widget/ColumnCardViewTest.java
@@ -19,14 +19,14 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.ViewTreeObserver;
import androidx.car.test.R;
import androidx.car.util.ColumnCalculator;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/car/src/androidTest/java/androidx/car/widget/DividerVisibilityManagerTest.java b/car/src/androidTest/java/androidx/car/widget/DividerVisibilityManagerTest.java
index 89fd853..2088a9a 100644
--- a/car/src/androidTest/java/androidx/car/widget/DividerVisibilityManagerTest.java
+++ b/car/src/androidTest/java/androidx/car/widget/DividerVisibilityManagerTest.java
@@ -26,10 +26,6 @@
import static org.junit.Assert.assertTrue;
import android.content.pm.PackageManager;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -37,6 +33,10 @@
import androidx.car.test.R;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Assume;
import org.junit.Before;
diff --git a/car/src/androidTest/java/androidx/car/widget/ListItemAdapterTest.java b/car/src/androidTest/java/androidx/car/widget/ListItemAdapterTest.java
index a50beb0..aea4b30 100644
--- a/car/src/androidTest/java/androidx/car/widget/ListItemAdapterTest.java
+++ b/car/src/androidTest/java/androidx/car/widget/ListItemAdapterTest.java
@@ -22,14 +22,14 @@
import android.car.drivingstate.CarUxRestrictions;
import android.content.Context;
import android.content.pm.PackageManager;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.widget.FrameLayout;
import androidx.annotation.NonNull;
import androidx.car.test.R;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Assume;
import org.junit.Before;
diff --git a/car/src/androidTest/java/androidx/car/widget/PagedListViewSavedStateTest.java b/car/src/androidTest/java/androidx/car/widget/PagedListViewSavedStateTest.java
index 7856b23..1cd16f4 100644
--- a/car/src/androidTest/java/androidx/car/widget/PagedListViewSavedStateTest.java
+++ b/car/src/androidTest/java/androidx/car/widget/PagedListViewSavedStateTest.java
@@ -16,29 +16,31 @@
package androidx.car.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.hamcrest.Matchers.allOf;
import static org.junit.Assert.assertEquals;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
-import android.support.test.espresso.IdlingRegistry;
-import android.support.test.espresso.IdlingResource;
-import android.support.test.filters.SmallTest;
-import android.support.test.filters.Suppress;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.car.test.R;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.espresso.IdlingRegistry;
+import androidx.test.espresso.IdlingResource;
+import androidx.test.filters.SmallTest;
+import androidx.test.filters.Suppress;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
import org.hamcrest.Matcher;
import org.junit.After;
import org.junit.Assume;
@@ -51,8 +53,6 @@
import java.util.List;
import java.util.Random;
-import androidx.car.test.R;
-
/** Unit tests for the ability of the {@link PagedListView} to save state. */
@RunWith(AndroidJUnit4.class)
@SmallTest
diff --git a/car/src/androidTest/java/androidx/car/widget/PagedListViewTest.java b/car/src/androidTest/java/androidx/car/widget/PagedListViewTest.java
index b00bddb..a530001 100644
--- a/car/src/androidTest/java/androidx/car/widget/PagedListViewTest.java
+++ b/car/src/androidTest/java/androidx/car/widget/PagedListViewTest.java
@@ -16,18 +16,18 @@
package androidx.car.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.action.ViewActions.swipeDown;
-import static android.support.test.espresso.action.ViewActions.swipeUp;
-import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition;
-import static android.support.test.espresso.contrib.RecyclerViewActions.scrollToPosition;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.isEnabled;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.swipeDown;
+import static androidx.test.espresso.action.ViewActions.swipeUp;
+import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition;
+import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
@@ -40,14 +40,6 @@
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.espresso.Espresso;
-import android.support.test.espresso.IdlingResource;
-import android.support.test.espresso.matcher.ViewMatchers;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -60,6 +52,14 @@
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.OrientationHelper;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.espresso.Espresso;
+import androidx.test.espresso.IdlingResource;
+import androidx.test.espresso.matcher.ViewMatchers;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
diff --git a/car/src/androidTest/java/androidx/car/widget/SeekbarListItemTest.java b/car/src/androidTest/java/androidx/car/widget/SeekbarListItemTest.java
index bb89506..f396a71 100644
--- a/car/src/androidTest/java/androidx/car/widget/SeekbarListItemTest.java
+++ b/car/src/androidTest/java/androidx/car/widget/SeekbarListItemTest.java
@@ -16,10 +16,10 @@
package androidx.car.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition;
-import static android.support.test.espresso.contrib.RecyclerViewActions.scrollToPosition;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition;
+import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsEqual.equalTo;
@@ -31,16 +31,16 @@
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.view.ViewGroup;
import android.widget.SeekBar;
import androidx.car.test.R;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.hamcrest.Matcher;
import org.junit.Assume;
diff --git a/car/src/androidTest/java/androidx/car/widget/SubheaderListItemTest.java b/car/src/androidTest/java/androidx/car/widget/SubheaderListItemTest.java
index 7469d39..1f00409 100644
--- a/car/src/androidTest/java/androidx/car/widget/SubheaderListItemTest.java
+++ b/car/src/androidTest/java/androidx/car/widget/SubheaderListItemTest.java
@@ -16,9 +16,9 @@
package androidx.car.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.contrib.RecyclerViewActions.scrollToPosition;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsEqual.equalTo;
@@ -26,11 +26,11 @@
import static org.junit.Assert.assertThat;
import android.content.pm.PackageManager;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.car.test.R;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Assume;
import org.junit.Before;
diff --git a/car/src/androidTest/java/androidx/car/widget/TextListItemTest.java b/car/src/androidTest/java/androidx/car/widget/TextListItemTest.java
index fce0745..c70f7bd 100644
--- a/car/src/androidTest/java/androidx/car/widget/TextListItemTest.java
+++ b/car/src/androidTest/java/androidx/car/widget/TextListItemTest.java
@@ -16,11 +16,11 @@
package androidx.car.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition;
-import static android.support.test.espresso.contrib.RecyclerViewActions.scrollToPosition;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.contrib.RecyclerViewActions.actionOnItemAtPosition;
+import static androidx.test.espresso.contrib.RecyclerViewActions.scrollToPosition;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.Matchers.greaterThan;
@@ -35,12 +35,6 @@
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.text.InputFilter;
import android.text.TextUtils;
import android.view.View;
@@ -49,6 +43,12 @@
import androidx.car.test.R;
import androidx.car.utils.CarUxRestrictionsTestUtils;
import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.hamcrest.Matcher;
import org.junit.Assume;
diff --git a/compat/build.gradle b/compat/build.gradle
index 338583f..d6b1f20 100644
--- a/compat/build.gradle
+++ b/compat/build.gradle
@@ -12,8 +12,9 @@
api(ARCH_LIFECYCLE_RUNTIME, libs.exclude_annotations_transitive)
api project(':versionedparcelable')
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':internal-testutils'), {
diff --git a/compat/src/androidTest/java/android/support/v4/BaseInstrumentationTestCase.java b/compat/src/androidTest/java/android/support/v4/BaseInstrumentationTestCase.java
index e480297..5bac999 100644
--- a/compat/src/androidTest/java/android/support/v4/BaseInstrumentationTestCase.java
+++ b/compat/src/androidTest/java/android/support/v4/BaseInstrumentationTestCase.java
@@ -17,8 +17,9 @@
package android.support.v4;
import android.app.Activity;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/android/support/v4/testutils/LayoutDirectionActions.java b/compat/src/androidTest/java/android/support/v4/testutils/LayoutDirectionActions.java
index e71d9ba..4199a63 100755
--- a/compat/src/androidTest/java/android/support/v4/testutils/LayoutDirectionActions.java
+++ b/compat/src/androidTest/java/android/support/v4/testutils/LayoutDirectionActions.java
@@ -16,13 +16,13 @@
package android.support.v4.testutils;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
import android.view.View;
import androidx.core.view.ViewCompat;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
import org.hamcrest.Matcher;
diff --git a/compat/src/androidTest/java/android/support/v4/testutils/TextViewActions.java b/compat/src/androidTest/java/android/support/v4/testutils/TextViewActions.java
index feec51f..e425594 100644
--- a/compat/src/androidTest/java/android/support/v4/testutils/TextViewActions.java
+++ b/compat/src/androidTest/java/android/support/v4/testutils/TextViewActions.java
@@ -16,11 +16,9 @@
package android.support.v4.testutils;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
import android.graphics.drawable.Drawable;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
import android.view.View;
import android.widget.TextView;
@@ -29,6 +27,8 @@
import androidx.annotation.StringRes;
import androidx.annotation.StyleRes;
import androidx.core.widget.TextViewCompat;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
import org.hamcrest.Matcher;
diff --git a/compat/src/androidTest/java/androidx/core/app/ActivityCompatTest.java b/compat/src/androidTest/java/androidx/core/app/ActivityCompatTest.java
index da9c031..27d2e8c 100644
--- a/compat/src/androidTest/java/androidx/core/app/ActivityCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/app/ActivityCompatTest.java
@@ -26,13 +26,13 @@
import android.Manifest;
import android.app.Activity;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.BaseInstrumentationTestCase;
import android.view.View;
import androidx.core.app.ActivityCompat.PermissionCompatDelegate;
import androidx.core.test.R;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/app/ComponentActivityTest.java b/compat/src/androidTest/java/androidx/core/app/ComponentActivityTest.java
index 57e28a9..d6249e8 100644
--- a/compat/src/androidTest/java/androidx/core/app/ComponentActivityTest.java
+++ b/compat/src/androidTest/java/androidx/core/app/ComponentActivityTest.java
@@ -18,10 +18,11 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.BaseInstrumentationTestCase;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/app/FrameMetricsAggregatorTest.java b/compat/src/androidTest/java/androidx/core/app/FrameMetricsAggregatorTest.java
index aeb4fe4..b06d9bd 100644
--- a/compat/src/androidTest/java/androidx/core/app/FrameMetricsAggregatorTest.java
+++ b/compat/src/androidTest/java/androidx/core/app/FrameMetricsAggregatorTest.java
@@ -23,13 +23,14 @@
import android.content.Intent;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.util.SparseIntArray;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/app/JobIntentServiceTest.java b/compat/src/androidTest/java/androidx/core/app/JobIntentServiceTest.java
index 6f33d091..7ac86e0 100644
--- a/compat/src/androidTest/java/androidx/core/app/JobIntentServiceTest.java
+++ b/compat/src/androidTest/java/androidx/core/app/JobIntentServiceTest.java
@@ -27,13 +27,13 @@
import android.os.Build;
import android.os.Parcel;
import android.os.Parcelable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/app/NotificationCompatTest.java b/compat/src/androidTest/java/androidx/core/app/NotificationCompatTest.java
index f0bdb1b..75fbb0a 100644
--- a/compat/src/androidTest/java/androidx/core/app/NotificationCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/app/NotificationCompatTest.java
@@ -43,14 +43,14 @@
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.BaseInstrumentationTestCase;
import androidx.core.R;
import androidx.core.app.NotificationCompat.MessagingStyle.Message;
import androidx.core.graphics.drawable.IconCompat;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/app/PersonTest.java b/compat/src/androidTest/java/androidx/core/app/PersonTest.java
index f107e6f..09e8dd6 100644
--- a/compat/src/androidTest/java/androidx/core/app/PersonTest.java
+++ b/compat/src/androidTest/java/androidx/core/app/PersonTest.java
@@ -22,11 +22,11 @@
import android.graphics.Bitmap;
import android.os.Bundle;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.core.graphics.drawable.IconCompat;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/app/RemoteInputTest.java b/compat/src/androidTest/java/androidx/core/app/RemoteInputTest.java
index 35d3400..f11e8db 100644
--- a/compat/src/androidTest/java/androidx/core/app/RemoteInputTest.java
+++ b/compat/src/androidTest/java/androidx/core/app/RemoteInputTest.java
@@ -24,11 +24,12 @@
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.BaseInstrumentationTestCase;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/content/ContextCompatTest.java b/compat/src/androidTest/java/androidx/core/content/ContextCompatTest.java
index 1c486c4..75cbd9f 100644
--- a/compat/src/androidTest/java/androidx/core/content/ContextCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/content/ContextCompatTest.java
@@ -28,8 +28,6 @@
import android.content.res.ColorStateList;
import android.graphics.drawable.Drawable;
import android.os.Build;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
import android.support.v4.BaseInstrumentationTestCase;
import android.support.v4.ThemedYellowActivity;
import android.support.v4.testutils.TestUtils;
@@ -37,6 +35,8 @@
import android.view.LayoutInflater;
import androidx.core.test.R;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/content/FileProviderTest.java b/compat/src/androidTest/java/androidx/core/content/FileProviderTest.java
index 4872cf5d..63b00ec 100644
--- a/compat/src/androidTest/java/androidx/core/content/FileProviderTest.java
+++ b/compat/src/androidTest/java/androidx/core/content/FileProviderTest.java
@@ -29,11 +29,11 @@
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.core.content.FileProvider.SimplePathStrategy;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/content/MimeTypeFilterTest.java b/compat/src/androidTest/java/androidx/core/content/MimeTypeFilterTest.java
index 20cbc2d..235ae83 100644
--- a/compat/src/androidTest/java/androidx/core/content/MimeTypeFilterTest.java
+++ b/compat/src/androidTest/java/androidx/core/content/MimeTypeFilterTest.java
@@ -23,8 +23,8 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-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/compat/src/androidTest/java/androidx/core/content/PermissionCheckerTest.java b/compat/src/androidTest/java/androidx/core/content/PermissionCheckerTest.java
index 72ab03a..aaf1c9c 100644
--- a/compat/src/androidTest/java/androidx/core/content/PermissionCheckerTest.java
+++ b/compat/src/androidTest/java/androidx/core/content/PermissionCheckerTest.java
@@ -20,9 +20,10 @@
import android.Manifest;
import android.content.Context;
-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 org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/content/pm/PackageInfoCompatTest.java b/compat/src/androidTest/java/androidx/core/content/pm/PackageInfoCompatTest.java
index e3e5504..3ea56a4 100644
--- a/compat/src/androidTest/java/androidx/core/content/pm/PackageInfoCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/content/pm/PackageInfoCompatTest.java
@@ -21,8 +21,9 @@
import static org.junit.Assert.assertEquals;
import android.content.pm.PackageInfo;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/content/pm/PermissionInfoCompatTest.java b/compat/src/androidTest/java/androidx/core/content/pm/PermissionInfoCompatTest.java
index 79613be..def7e6f 100644
--- a/compat/src/androidTest/java/androidx/core/content/pm/PermissionInfoCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/content/pm/PermissionInfoCompatTest.java
@@ -17,8 +17,9 @@
package androidx.core.content.pm;
import android.content.pm.PermissionInfo;
-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.Assert;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/content/pm/ShortcutInfoCompatTest.java b/compat/src/androidTest/java/androidx/core/content/pm/ShortcutInfoCompatTest.java
index 9f40145..26792656 100644
--- a/compat/src/androidTest/java/androidx/core/content/pm/ShortcutInfoCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/content/pm/ShortcutInfoCompatTest.java
@@ -31,14 +31,14 @@
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.core.app.TestActivity;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.drawable.IconCompat;
import androidx.core.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/content/pm/ShortcutManagerCompatTest.java b/compat/src/androidTest/java/androidx/core/content/pm/ShortcutManagerCompatTest.java
index 6e28066..91d1ea2 100644
--- a/compat/src/androidTest/java/androidx/core/content/pm/ShortcutManagerCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/content/pm/ShortcutManagerCompatTest.java
@@ -45,14 +45,14 @@
import android.content.pm.ShortcutInfo;
import android.content.pm.ShortcutManager;
import android.graphics.Bitmap;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.BaseInstrumentationTestCase;
import androidx.core.app.TestActivity;
import androidx.core.graphics.drawable.IconCompat;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/content/res/ColorStateListInflaterCompatTest.java b/compat/src/androidTest/java/androidx/core/content/res/ColorStateListInflaterCompatTest.java
index 09eb5d4..08cab83 100644
--- a/compat/src/androidTest/java/androidx/core/content/res/ColorStateListInflaterCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/content/res/ColorStateListInflaterCompatTest.java
@@ -25,11 +25,11 @@
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.Color;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.core.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/content/res/ComplexColorCompatTest.java b/compat/src/androidTest/java/androidx/core/content/res/ComplexColorCompatTest.java
index 2bf8c40..bccb813 100644
--- a/compat/src/androidTest/java/androidx/core/content/res/ComplexColorCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/content/res/ComplexColorCompatTest.java
@@ -27,11 +27,11 @@
import android.graphics.Color;
import android.graphics.LinearGradient;
import android.graphics.Shader;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.core.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/content/res/FontResourcesParserCompatTest.java b/compat/src/androidTest/java/androidx/core/content/res/FontResourcesParserCompatTest.java
index b3982f1..f6f7bae 100644
--- a/compat/src/androidTest/java/androidx/core/content/res/FontResourcesParserCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/content/res/FontResourcesParserCompatTest.java
@@ -29,13 +29,13 @@
import android.content.res.Resources;
import android.content.res.XmlResourceParser;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Base64;
import androidx.core.provider.FontRequest;
import androidx.core.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/content/res/GradientColorInflaterCompatTest.java b/compat/src/androidTest/java/androidx/core/content/res/GradientColorInflaterCompatTest.java
index 25c05c2..c25f4fb 100644
--- a/compat/src/androidTest/java/androidx/core/content/res/GradientColorInflaterCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/content/res/GradientColorInflaterCompatTest.java
@@ -26,11 +26,11 @@
import android.graphics.RadialGradient;
import android.graphics.Shader;
import android.graphics.SweepGradient;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.core.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/content/res/ResourcesCompatTest.java b/compat/src/androidTest/java/androidx/core/content/res/ResourcesCompatTest.java
index 90510c2..56d692f 100644
--- a/compat/src/androidTest/java/androidx/core/content/res/ResourcesCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/content/res/ResourcesCompatTest.java
@@ -28,8 +28,6 @@
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
import android.support.v4.testutils.TestUtils;
import android.util.DisplayMetrics;
@@ -37,6 +35,8 @@
import androidx.core.provider.FontsContractCompat;
import androidx.core.provider.MockFontProvider;
import androidx.core.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/graphics/ColorUtilsTest.java b/compat/src/androidTest/java/androidx/core/graphics/ColorUtilsTest.java
index 2940599..1cc4bcf 100644
--- a/compat/src/androidTest/java/androidx/core/graphics/ColorUtilsTest.java
+++ b/compat/src/androidTest/java/androidx/core/graphics/ColorUtilsTest.java
@@ -25,9 +25,10 @@
import android.graphics.Color;
import android.graphics.ColorSpace;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/graphics/DrawableCompatTest.java b/compat/src/androidTest/java/androidx/core/graphics/DrawableCompatTest.java
index 28050f0..a93d0e4 100644
--- a/compat/src/androidTest/java/androidx/core/graphics/DrawableCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/graphics/DrawableCompatTest.java
@@ -31,10 +31,10 @@
import android.graphics.drawable.Drawable;
import android.graphics.drawable.GradientDrawable;
import android.os.Build;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/graphics/PaintCompatHasGlyphTest.java b/compat/src/androidTest/java/androidx/core/graphics/PaintCompatHasGlyphTest.java
index 2660835..fd8c188 100644
--- a/compat/src/androidTest/java/androidx/core/graphics/PaintCompatHasGlyphTest.java
+++ b/compat/src/androidTest/java/androidx/core/graphics/PaintCompatHasGlyphTest.java
@@ -21,7 +21,8 @@
import static org.junit.Assert.assertEquals;
import android.graphics.Paint;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.filters.SmallTest;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/graphics/PathUtilsTest.java b/compat/src/androidTest/java/androidx/core/graphics/PathUtilsTest.java
index 682ac25..4da2be8 100644
--- a/compat/src/androidTest/java/androidx/core/graphics/PathUtilsTest.java
+++ b/compat/src/androidTest/java/androidx/core/graphics/PathUtilsTest.java
@@ -22,8 +22,9 @@
import android.graphics.Path;
import android.graphics.PointF;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/graphics/TypefaceCompatTest.java b/compat/src/androidTest/java/androidx/core/graphics/TypefaceCompatTest.java
index e1a1834..7749379 100644
--- a/compat/src/androidTest/java/androidx/core/graphics/TypefaceCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/graphics/TypefaceCompatTest.java
@@ -32,8 +32,6 @@
import android.graphics.Paint;
import android.graphics.Typeface;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
import androidx.annotation.NonNull;
import androidx.core.content.res.FontResourcesParserCompat;
@@ -44,6 +42,8 @@
import androidx.core.provider.FontsContractCompat;
import androidx.core.provider.MockFontProvider;
import androidx.core.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
import org.junit.After;
import org.junit.Before;
diff --git a/compat/src/androidTest/java/androidx/core/graphics/TypefaceCompatUtilTest.java b/compat/src/androidTest/java/androidx/core/graphics/TypefaceCompatUtilTest.java
index cd2932b..e036721 100644
--- a/compat/src/androidTest/java/androidx/core/graphics/TypefaceCompatUtilTest.java
+++ b/compat/src/androidTest/java/androidx/core/graphics/TypefaceCompatUtilTest.java
@@ -21,11 +21,11 @@
import android.content.Context;
import android.net.Uri;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
import androidx.annotation.RequiresApi;
import androidx.core.provider.MockFontProvider;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/graphics/drawable/IconCompatTest.java b/compat/src/androidTest/java/androidx/core/graphics/drawable/IconCompatTest.java
index a3ff8d7..10de974 100644
--- a/compat/src/androidTest/java/androidx/core/graphics/drawable/IconCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/graphics/drawable/IconCompatTest.java
@@ -37,13 +37,13 @@
import android.os.Build;
import android.os.Bundle;
import android.os.Parcel;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.core.content.ContextCompat;
import androidx.core.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.versionedparcelable.ParcelUtils;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/math/MathUtilsTest.java b/compat/src/androidTest/java/androidx/core/math/MathUtilsTest.java
index e84c1d4..55cc536 100644
--- a/compat/src/androidTest/java/androidx/core/math/MathUtilsTest.java
+++ b/compat/src/androidTest/java/androidx/core/math/MathUtilsTest.java
@@ -18,8 +18,8 @@
import static org.junit.Assert.assertEquals;
-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/compat/src/androidTest/java/androidx/core/os/HandlerCompatTest.java b/compat/src/androidTest/java/androidx/core/os/HandlerCompatTest.java
index 37823e7..833e88f 100644
--- a/compat/src/androidTest/java/androidx/core/os/HandlerCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/os/HandlerCompatTest.java
@@ -24,7 +24,8 @@
import android.os.Handler;
import android.os.HandlerThread;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.filters.SmallTest;
import org.junit.After;
import org.junit.Before;
diff --git a/compat/src/androidTest/java/androidx/core/os/LocaleListCompatTest.java b/compat/src/androidTest/java/androidx/core/os/LocaleListCompatTest.java
index 6383d70..b451f83 100644
--- a/compat/src/androidTest/java/androidx/core/os/LocaleListCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/os/LocaleListCompatTest.java
@@ -26,9 +26,10 @@
import static org.junit.Assert.fail;
import android.os.Build;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/os/ParcelCompatTest.java b/compat/src/androidTest/java/androidx/core/os/ParcelCompatTest.java
index b9ac742..324a2ec 100644
--- a/compat/src/androidTest/java/androidx/core/os/ParcelCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/os/ParcelCompatTest.java
@@ -20,8 +20,9 @@
import static org.junit.Assert.assertTrue;
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/compat/src/androidTest/java/androidx/core/provider/FontRequestTest.java b/compat/src/androidTest/java/androidx/core/provider/FontRequestTest.java
index a0ed3f3..4110299 100644
--- a/compat/src/androidTest/java/androidx/core/provider/FontRequestTest.java
+++ b/compat/src/androidTest/java/androidx/core/provider/FontRequestTest.java
@@ -16,10 +16,11 @@
package androidx.core.provider;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Base64;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/provider/FontsContractCompatTest.java b/compat/src/androidTest/java/androidx/core/provider/FontsContractCompatTest.java
index 23149df..d0ec1a6 100644
--- a/compat/src/androidTest/java/androidx/core/provider/FontsContractCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/provider/FontsContractCompatTest.java
@@ -40,15 +40,15 @@
import android.content.pm.ProviderInfo;
import android.content.pm.Signature;
import android.graphics.Typeface;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Base64;
import androidx.annotation.NonNull;
import androidx.core.content.res.ResourcesCompat;
import androidx.core.provider.FontsContractCompat.FontFamilyResult;
import androidx.core.provider.FontsContractCompat.FontInfo;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/compat/src/androidTest/java/androidx/core/provider/SelfDestructiveThreadTest.java b/compat/src/androidTest/java/androidx/core/provider/SelfDestructiveThreadTest.java
index d193fc9..64e635c 100644
--- a/compat/src/androidTest/java/androidx/core/provider/SelfDestructiveThreadTest.java
+++ b/compat/src/androidTest/java/androidx/core/provider/SelfDestructiveThreadTest.java
@@ -25,12 +25,12 @@
import static org.junit.Assert.fail;
import android.os.Process;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.GuardedBy;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/text/BidiFormatterTest.java b/compat/src/androidTest/java/androidx/core/text/BidiFormatterTest.java
index 5ee2d13..2b48cdf 100644
--- a/compat/src/androidTest/java/androidx/core/text/BidiFormatterTest.java
+++ b/compat/src/androidTest/java/androidx/core/text/BidiFormatterTest.java
@@ -19,12 +19,13 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.RelativeSizeSpan;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/text/IcuCompatTest.java b/compat/src/androidTest/java/androidx/core/text/IcuCompatTest.java
index 68960f9..73c9537 100644
--- a/compat/src/androidTest/java/androidx/core/text/IcuCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/text/IcuCompatTest.java
@@ -19,8 +19,9 @@
import static org.junit.Assert.assertEquals;
import android.os.Build;
-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/compat/src/androidTest/java/androidx/core/text/PrecomputedTextCompatTest.java b/compat/src/androidTest/java/androidx/core/text/PrecomputedTextCompatTest.java
index a822b7c..999f950 100644
--- a/compat/src/androidTest/java/androidx/core/text/PrecomputedTextCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/text/PrecomputedTextCompatTest.java
@@ -26,9 +26,6 @@
import static org.junit.Assert.fail;
import android.graphics.Color;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.Layout;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
@@ -39,6 +36,9 @@
import android.text.style.TypefaceSpan;
import androidx.core.text.PrecomputedTextCompat.Params;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/text/util/FindAddressTest.java b/compat/src/androidTest/java/androidx/core/text/util/FindAddressTest.java
index 9cfa78a..897694a 100644
--- a/compat/src/androidTest/java/androidx/core/text/util/FindAddressTest.java
+++ b/compat/src/androidTest/java/androidx/core/text/util/FindAddressTest.java
@@ -16,8 +16,8 @@
package androidx.core.text.util;
-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.Assert;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/text/util/LinkifyCompatTest.java b/compat/src/androidTest/java/androidx/core/text/util/LinkifyCompatTest.java
index 4400d22..c9a06d2 100644
--- a/compat/src/androidTest/java/androidx/core/text/util/LinkifyCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/text/util/LinkifyCompatTest.java
@@ -22,8 +22,6 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.style.URLSpan;
@@ -32,6 +30,8 @@
import android.text.util.Linkify.TransformFilter;
import androidx.core.util.PatternsCompat;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/util/ObjectsCompatTest.java b/compat/src/androidTest/java/androidx/core/util/ObjectsCompatTest.java
index 677aeaa..7c10019 100644
--- a/compat/src/androidTest/java/androidx/core/util/ObjectsCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/util/ObjectsCompatTest.java
@@ -20,8 +20,8 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-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/compat/src/androidTest/java/androidx/core/util/PatternsCompatTest.java b/compat/src/androidTest/java/androidx/core/util/PatternsCompatTest.java
index c8173f7..1ce218d 100644
--- a/compat/src/androidTest/java/androidx/core/util/PatternsCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/util/PatternsCompatTest.java
@@ -19,8 +19,8 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-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/compat/src/androidTest/java/androidx/core/view/DisplayCutoutCompatTest.java b/compat/src/androidTest/java/androidx/core/view/DisplayCutoutCompatTest.java
index 88a31f6..c30969a 100644
--- a/compat/src/androidTest/java/androidx/core/view/DisplayCutoutCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/view/DisplayCutoutCompatTest.java
@@ -23,8 +23,9 @@
import static org.junit.Assert.assertNull;
import android.graphics.Rect;
-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.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/view/DragStartHelperTest.java b/compat/src/androidTest/java/androidx/core/view/DragStartHelperTest.java
index f6e5d30..e33e9ef 100644
--- a/compat/src/androidTest/java/androidx/core/view/DragStartHelperTest.java
+++ b/compat/src/androidTest/java/androidx/core/view/DragStartHelperTest.java
@@ -29,11 +29,6 @@
import android.app.Instrumentation;
import android.graphics.Point;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.InputDevice;
import android.view.MotionEvent;
import android.view.View;
@@ -41,6 +36,11 @@
import androidx.annotation.NonNull;
import androidx.core.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/compat/src/androidTest/java/androidx/core/view/GravityCompatTest.java b/compat/src/androidTest/java/androidx/core/view/GravityCompatTest.java
index 4c8424f..91680a0 100644
--- a/compat/src/androidTest/java/androidx/core/view/GravityCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/view/GravityCompatTest.java
@@ -19,11 +19,12 @@
import android.graphics.Rect;
import android.os.Build;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.testutils.TestUtils;
import android.view.Gravity;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/view/MarginLayoutParamsCompatTest.java b/compat/src/androidTest/java/androidx/core/view/MarginLayoutParamsCompatTest.java
index 78ff112..6c4e67f 100644
--- a/compat/src/androidTest/java/androidx/core/view/MarginLayoutParamsCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/view/MarginLayoutParamsCompatTest.java
@@ -18,10 +18,11 @@
import static org.junit.Assert.assertEquals;
import android.os.Build;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.ViewGroup;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/view/PointerIconCompatTest.java b/compat/src/androidTest/java/androidx/core/view/PointerIconCompatTest.java
index 5aac25e..153f947 100644
--- a/compat/src/androidTest/java/androidx/core/view/PointerIconCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/view/PointerIconCompatTest.java
@@ -22,15 +22,15 @@
import android.app.Activity;
import android.graphics.Bitmap;
import android.os.Build;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.BaseInstrumentationTestCase;
import android.view.PointerIcon;
import android.view.View;
import androidx.core.test.R;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/view/ViewCompatTest.java b/compat/src/androidTest/java/androidx/core/view/ViewCompatTest.java
index 0c94522..9e3c2ed 100644
--- a/compat/src/androidTest/java/androidx/core/view/ViewCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/view/ViewCompatTest.java
@@ -24,13 +24,13 @@
import static org.junit.Assert.assertTrue;
import android.app.Activity;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.BaseInstrumentationTestCase;
import android.view.Display;
import android.view.View;
import androidx.core.test.R;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/view/ViewGroupCompatTest.java b/compat/src/androidTest/java/androidx/core/view/ViewGroupCompatTest.java
index 08263f3..644802a 100644
--- a/compat/src/androidTest/java/androidx/core/view/ViewGroupCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/view/ViewGroupCompatTest.java
@@ -22,13 +22,13 @@
import android.app.Activity;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.BaseInstrumentationTestCase;
import android.view.ViewGroup;
import androidx.core.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/view/ViewPropertyAnimatorCompatTest.java b/compat/src/androidTest/java/androidx/core/view/ViewPropertyAnimatorCompatTest.java
index e1fc717..9f99a38 100644
--- a/compat/src/androidTest/java/androidx/core/view/ViewPropertyAnimatorCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/view/ViewPropertyAnimatorCompatTest.java
@@ -19,11 +19,11 @@
import static org.junit.Assert.assertTrue;
import android.app.Activity;
-import android.support.test.filters.MediumTest;
import android.support.v4.BaseInstrumentationTestCase;
import android.view.View;
import androidx.core.test.R;
+import androidx.test.filters.MediumTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/view/WindowInsetsCompatTest.java b/compat/src/androidTest/java/androidx/core/view/WindowInsetsCompatTest.java
index 912b489..950c35f 100644
--- a/compat/src/androidTest/java/androidx/core/view/WindowInsetsCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/view/WindowInsetsCompatTest.java
@@ -21,8 +21,8 @@
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertThat;
-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/compat/src/androidTest/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompatTest.java b/compat/src/androidTest/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompatTest.java
index 3e668b4..3e205e8 100644
--- a/compat/src/androidTest/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/view/accessibility/AccessibilityNodeInfoCompatTest.java
@@ -21,11 +21,12 @@
import static org.junit.Assert.assertThat;
import android.os.Build;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.accessibility.AccessibilityNodeInfo;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/widget/ContentLoadingProgressBarTest.java b/compat/src/androidTest/java/androidx/core/widget/ContentLoadingProgressBarTest.java
index e2f8f8c..c00d11a 100644
--- a/compat/src/androidTest/java/androidx/core/widget/ContentLoadingProgressBarTest.java
+++ b/compat/src/androidTest/java/androidx/core/widget/ContentLoadingProgressBarTest.java
@@ -18,12 +18,12 @@
import static org.junit.Assert.assertEquals;
-import android.support.test.filters.LargeTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import androidx.core.test.R;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.testutils.PollingCheck;
import org.junit.Before;
diff --git a/compat/src/androidTest/java/androidx/core/widget/ListViewCompatTest.java b/compat/src/androidTest/java/androidx/core/widget/ListViewCompatTest.java
index 835fe6c..4baf161 100644
--- a/compat/src/androidTest/java/androidx/core/widget/ListViewCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/widget/ListViewCompatTest.java
@@ -21,8 +21,6 @@
import static org.junit.Assert.assertTrue;
import android.annotation.SuppressLint;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
import android.support.v4.BaseInstrumentationTestCase;
import android.view.LayoutInflater;
import android.view.View;
@@ -35,6 +33,8 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.test.R;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/widget/NestedScrollViewNestedScrollingParentTest.java b/compat/src/androidTest/java/androidx/core/widget/NestedScrollViewNestedScrollingParentTest.java
index 9ffbbd2..9be4f6c 100644
--- a/compat/src/androidTest/java/androidx/core/widget/NestedScrollViewNestedScrollingParentTest.java
+++ b/compat/src/androidTest/java/androidx/core/widget/NestedScrollViewNestedScrollingParentTest.java
@@ -28,8 +28,6 @@
import static org.mockito.Mockito.verify;
import android.content.Context;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.BaseInstrumentationTestCase;
import android.view.View;
import android.view.ViewGroup;
@@ -41,6 +39,8 @@
import androidx.core.view.NestedScrollingChild2;
import androidx.core.view.NestedScrollingParent2;
import androidx.core.view.ViewCompat;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/compat/src/androidTest/java/androidx/core/widget/NestedScrollViewTest.java b/compat/src/androidTest/java/androidx/core/widget/NestedScrollViewTest.java
index 07b7303..6079c48 100644
--- a/compat/src/androidTest/java/androidx/core/widget/NestedScrollViewTest.java
+++ b/compat/src/androidTest/java/androidx/core/widget/NestedScrollViewTest.java
@@ -22,8 +22,6 @@
import android.graphics.Rect;
import android.graphics.drawable.GradientDrawable;
import android.os.Parcelable;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.BaseInstrumentationTestCase;
import android.view.KeyEvent;
import android.view.View;
@@ -31,6 +29,8 @@
import androidx.core.test.R;
import androidx.core.view.NestedScrollingParent2;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/widget/ScrollerCompatTestBase.java b/compat/src/androidTest/java/androidx/core/widget/ScrollerCompatTestBase.java
index 43a9694..48fa072 100644
--- a/compat/src/androidTest/java/androidx/core/widget/ScrollerCompatTestBase.java
+++ b/compat/src/androidTest/java/androidx/core/widget/ScrollerCompatTestBase.java
@@ -19,12 +19,13 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import android.view.animation.Interpolator;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/compat/src/androidTest/java/androidx/core/widget/TextViewCompatTest.java b/compat/src/androidTest/java/androidx/core/widget/TextViewCompatTest.java
index 6c57a98..c7d56f2 100644
--- a/compat/src/androidTest/java/androidx/core/widget/TextViewCompatTest.java
+++ b/compat/src/androidTest/java/androidx/core/widget/TextViewCompatTest.java
@@ -16,8 +16,6 @@
package androidx.core.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
import static android.support.v4.testutils.LayoutDirectionActions.setLayoutDirection;
import static android.support.v4.testutils.TextViewActions.setCompoundDrawablesRelative;
import static android.support.v4.testutils.TextViewActions
@@ -27,6 +25,9 @@
import static android.support.v4.testutils.TextViewActions.setText;
import static android.support.v4.testutils.TextViewActions.setTextAppearance;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
@@ -49,9 +50,6 @@
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Looper;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
import android.support.v4.BaseInstrumentationTestCase;
import android.support.v4.testutils.TestUtils;
import android.text.Layout;
@@ -67,6 +65,9 @@
import androidx.core.test.R;
import androidx.core.text.PrecomputedTextCompat;
import androidx.core.view.ViewCompat;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/content/build.gradle b/content/build.gradle
index 35ae8da..abc6fe7 100644
--- a/content/build.gradle
+++ b/content/build.gradle
@@ -27,8 +27,9 @@
api(project(":core"))
androidTestImplementation(JUNIT)
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
}
supportLibrary {
diff --git a/content/src/androidTest/java/androidx/contentpager/content/ContentPagerTest.java b/content/src/androidTest/java/androidx/contentpager/content/ContentPagerTest.java
index f798d14..13b7938 100644
--- a/content/src/androidTest/java/androidx/contentpager/content/ContentPagerTest.java
+++ b/content/src/androidTest/java/androidx/contentpager/content/ContentPagerTest.java
@@ -33,12 +33,12 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.Nullable;
import androidx.contentpager.content.ContentPager.ContentCallback;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/content/src/androidTest/java/androidx/contentpager/content/LoaderQueryRunnerTest.java b/content/src/androidTest/java/androidx/contentpager/content/LoaderQueryRunnerTest.java
index a4fbf0b..1917cf8 100644
--- a/content/src/androidTest/java/androidx/contentpager/content/LoaderQueryRunnerTest.java
+++ b/content/src/androidTest/java/androidx/contentpager/content/LoaderQueryRunnerTest.java
@@ -21,12 +21,12 @@
import android.app.Activity;
import android.database.Cursor;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.contentpager.content.ContentPager.ContentCallback;
import androidx.contentpager.content.ContentPager.QueryRunner;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/content/src/androidTest/java/androidx/contentpager/content/QueryTest.java b/content/src/androidTest/java/androidx/contentpager/content/QueryTest.java
index cf507f9..ceaa3b3 100644
--- a/content/src/androidTest/java/androidx/contentpager/content/QueryTest.java
+++ b/content/src/androidTest/java/androidx/contentpager/content/QueryTest.java
@@ -20,10 +20,10 @@
import android.database.Cursor;
import android.net.Uri;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.contentpager.content.ContentPager.ContentCallback;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/coordinatorlayout/build.gradle b/coordinatorlayout/build.gradle
index 4775f67..a43f86c 100644
--- a/coordinatorlayout/build.gradle
+++ b/coordinatorlayout/build.gradle
@@ -11,9 +11,10 @@
api(project(":core"))
api(project(":customview"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CONTRIB_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CONTRIB, libs.exclude_for_espresso)
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':internal-testutils'), {
exclude group: 'androidx.coordinatorlayout', module: 'coordinatorlayout'
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseDynamicCoordinatorLayoutTest.java b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseDynamicCoordinatorLayoutTest.java
index e1b4914..1ef6bd0 100755
--- a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseDynamicCoordinatorLayoutTest.java
+++ b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseDynamicCoordinatorLayoutTest.java
@@ -15,20 +15,20 @@
*/
package androidx.coordinatorlayout.widget;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
import static org.hamcrest.CoreMatchers.allOf;
import static org.hamcrest.Matchers.any;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
import android.view.View;
import android.view.ViewStub;
import androidx.annotation.LayoutRes;
import androidx.coordinatorlayout.test.R;
import androidx.core.view.ViewCompat;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseInstrumentationTestCase.java b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseInstrumentationTestCase.java
index 3074d92..ba51756 100644
--- a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseInstrumentationTestCase.java
+++ b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/BaseInstrumentationTestCase.java
@@ -17,8 +17,9 @@
package androidx.coordinatorlayout.widget;
import android.app.Activity;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.runner.RunWith;
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutSortTest.java b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutSortTest.java
index ba193c6..eb22e0f 100644
--- a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutSortTest.java
+++ b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutSortTest.java
@@ -19,12 +19,12 @@
import static org.junit.Assert.assertEquals;
import android.app.Instrumentation;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
import android.view.View;
import androidx.coordinatorlayout.testutils.CoordinatorLayoutUtils;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
import org.junit.Rule;
import org.junit.Test;
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTest.java b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTest.java
index 578f8d5..77b183b 100644
--- a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTest.java
+++ b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTest.java
@@ -16,10 +16,10 @@
package androidx.coordinatorlayout.widget;
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.swipeUp;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.InstrumentationRegistry.getInstrumentation;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.swipeUp;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -40,11 +40,6 @@
import android.app.Instrumentation;
import android.content.Context;
import android.graphics.Rect;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -58,6 +53,11 @@
import androidx.core.view.GravityCompat;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorSnackbarWithButtonTest.java b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorSnackbarWithButtonTest.java
index 04e1e04..0c414fd 100644
--- a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorSnackbarWithButtonTest.java
+++ b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorSnackbarWithButtonTest.java
@@ -16,19 +16,15 @@
package androidx.coordinatorlayout.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import static android.support.test.espresso.matcher.ViewMatchers.isEnabled;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.junit.Assert.assertTrue;
import android.os.Handler;
import android.os.Looper;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.filters.MediumTest;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
@@ -36,6 +32,10 @@
import androidx.coordinatorlayout.custom.CustomBar;
import androidx.coordinatorlayout.custom.TestFloatingBehavior;
import androidx.coordinatorlayout.test.R;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.filters.MediumTest;
import org.hamcrest.Matcher;
import org.junit.After;
diff --git a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/DesignViewActions.java b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/DesignViewActions.java
index e3cc81e..dcafac3 100644
--- a/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/DesignViewActions.java
+++ b/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/DesignViewActions.java
@@ -16,11 +16,12 @@
package androidx.coordinatorlayout.widget;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.espresso.matcher.ViewMatchers;
import android.view.View;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.matcher.ViewMatchers;
+
import org.hamcrest.Matcher;
public final class DesignViewActions {
diff --git a/core/ktx/src/androidTest/java/androidx/core/animation/AnimatorTest.kt b/core/ktx/src/androidTest/java/androidx/core/animation/AnimatorTest.kt
index de298a5..1cd2f1e 100644
--- a/core/ktx/src/androidTest/java/androidx/core/animation/AnimatorTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/animation/AnimatorTest.kt
@@ -18,10 +18,10 @@
import android.animation.Animator
import android.animation.ObjectAnimator
-import android.support.test.InstrumentationRegistry
-import android.support.test.annotation.UiThreadTest
-import android.support.test.filters.SdkSuppress
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.InstrumentationRegistry
+import androidx.test.annotation.UiThreadTest
+import androidx.test.filters.SdkSuppress
+import androidx.test.runner.AndroidJUnit4
import android.view.View
import org.junit.Assert.assertTrue
import org.junit.Before
diff --git a/core/ktx/src/androidTest/java/androidx/core/content/ContextTest.kt b/core/ktx/src/androidTest/java/androidx/core/content/ContextTest.kt
index 102899c..8db8ca4 100644
--- a/core/ktx/src/androidTest/java/androidx/core/content/ContextTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/content/ContextTest.kt
@@ -17,8 +17,8 @@
package androidx.core.content
import android.content.ContextWrapper
-import android.support.test.InstrumentationRegistry
-import android.support.test.filters.SdkSuppress
+import androidx.test.InstrumentationRegistry
+import androidx.test.filters.SdkSuppress
import androidx.core.ktx.test.R
import androidx.core.getAttributeSet
import org.junit.Assert.assertEquals
diff --git a/core/ktx/src/androidTest/java/androidx/core/content/SharedPreferencesTest.kt b/core/ktx/src/androidTest/java/androidx/core/content/SharedPreferencesTest.kt
index bf1e67d..2c65bc5 100644
--- a/core/ktx/src/androidTest/java/androidx/core/content/SharedPreferencesTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/content/SharedPreferencesTest.kt
@@ -16,7 +16,7 @@
package androidx.core.content
-import android.support.test.InstrumentationRegistry
+import androidx.test.InstrumentationRegistry
import org.junit.Assert.assertEquals
import org.junit.Test
diff --git a/core/ktx/src/androidTest/java/androidx/core/content/res/TypedArrayTest.kt b/core/ktx/src/androidTest/java/androidx/core/content/res/TypedArrayTest.kt
index fe576df..29cb0d8 100644
--- a/core/ktx/src/androidTest/java/androidx/core/content/res/TypedArrayTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/content/res/TypedArrayTest.kt
@@ -17,8 +17,8 @@
package androidx.core.content.res
import android.graphics.Color
-import android.support.test.InstrumentationRegistry
-import android.support.test.filters.SdkSuppress
+import androidx.test.InstrumentationRegistry
+import androidx.test.filters.SdkSuppress
import androidx.core.ktx.test.R
import androidx.testutils.assertThrows
import androidx.core.getAttributeSet
diff --git a/core/ktx/src/androidTest/java/androidx/core/database/sqlite/SQLiteDatabaseTest.kt b/core/ktx/src/androidTest/java/androidx/core/database/sqlite/SQLiteDatabaseTest.kt
index c8ed67d..b86babc 100644
--- a/core/ktx/src/androidTest/java/androidx/core/database/sqlite/SQLiteDatabaseTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/database/sqlite/SQLiteDatabaseTest.kt
@@ -19,7 +19,7 @@
import android.content.ContentValues
import android.database.sqlite.SQLiteDatabase
import android.database.sqlite.SQLiteOpenHelper
-import android.support.test.InstrumentationRegistry
+import androidx.test.InstrumentationRegistry
import androidx.testutils.assertThrows
import org.junit.Assert.assertEquals
import org.junit.Test
diff --git a/core/ktx/src/androidTest/java/androidx/core/graphics/BitmapTest.kt b/core/ktx/src/androidTest/java/androidx/core/graphics/BitmapTest.kt
index 25b318b..898bbd1 100644
--- a/core/ktx/src/androidTest/java/androidx/core/graphics/BitmapTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/graphics/BitmapTest.kt
@@ -18,7 +18,7 @@
import android.graphics.Bitmap
import android.graphics.ColorSpace
-import android.support.test.filters.SdkSuppress
+import androidx.test.filters.SdkSuppress
import org.junit.Assert.assertEquals
import org.junit.Test
diff --git a/core/ktx/src/androidTest/java/androidx/core/graphics/ColorTest.kt b/core/ktx/src/androidTest/java/androidx/core/graphics/ColorTest.kt
index 5c647d1..151c66a 100644
--- a/core/ktx/src/androidTest/java/androidx/core/graphics/ColorTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/graphics/ColorTest.kt
@@ -18,7 +18,7 @@
import android.graphics.Color
import android.graphics.ColorSpace
-import android.support.test.filters.SdkSuppress
+import androidx.test.filters.SdkSuppress
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
diff --git a/core/ktx/src/androidTest/java/androidx/core/graphics/PathTest.kt b/core/ktx/src/androidTest/java/androidx/core/graphics/PathTest.kt
index 36f2cba..85f38d2 100644
--- a/core/ktx/src/androidTest/java/androidx/core/graphics/PathTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/graphics/PathTest.kt
@@ -18,7 +18,7 @@
import android.graphics.Path
import android.graphics.RectF
-import android.support.test.filters.SdkSuppress
+import androidx.test.filters.SdkSuppress
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNotEquals
import org.junit.Assert.assertTrue
diff --git a/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/BitmapDrawableTest.kt b/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/BitmapDrawableTest.kt
index 4c4ceb6..6f289d3 100644
--- a/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/BitmapDrawableTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/BitmapDrawableTest.kt
@@ -16,7 +16,7 @@
package androidx.core.graphics.drawable
-import android.support.test.InstrumentationRegistry
+import androidx.test.InstrumentationRegistry
import androidx.core.graphics.createBitmap
import org.junit.Assert.assertEquals
import org.junit.Test
diff --git a/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/ColorDrawableTest.kt b/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/ColorDrawableTest.kt
index ad7a39b..ef535ca 100644
--- a/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/ColorDrawableTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/ColorDrawableTest.kt
@@ -17,7 +17,7 @@
package androidx.core.graphics.drawable
import android.graphics.Color
-import android.support.test.filters.SdkSuppress
+import androidx.test.filters.SdkSuppress
import org.junit.Assert.assertEquals
import org.junit.Test
diff --git a/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/DrawableTest.kt b/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/DrawableTest.kt
index 6455d0a..49fc9e2 100644
--- a/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/DrawableTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/DrawableTest.kt
@@ -20,7 +20,7 @@
import android.graphics.Color
import android.graphics.drawable.BitmapDrawable
import android.graphics.drawable.ColorDrawable
-import android.support.test.InstrumentationRegistry
+import androidx.test.InstrumentationRegistry
import androidx.core.graphics.createBitmap
import org.junit.Assert.assertEquals
import org.junit.Test
diff --git a/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/IconTest.kt b/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/IconTest.kt
index e2dd84c..4a5d409 100644
--- a/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/IconTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/graphics/drawable/IconTest.kt
@@ -21,8 +21,8 @@
import android.graphics.Canvas
import android.graphics.Color
import android.graphics.drawable.Icon
-import android.support.test.InstrumentationRegistry
-import android.support.test.filters.SdkSuppress
+import androidx.test.InstrumentationRegistry
+import androidx.test.filters.SdkSuppress
import androidx.core.graphics.createBitmap
import androidx.core.net.toUri
import org.junit.Assert.assertEquals
diff --git a/core/ktx/src/androidTest/java/androidx/core/os/BundleTest.kt b/core/ktx/src/androidTest/java/androidx/core/os/BundleTest.kt
index 924e9ad..898503b 100644
--- a/core/ktx/src/androidTest/java/androidx/core/os/BundleTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/os/BundleTest.kt
@@ -19,8 +19,8 @@
import android.graphics.Rect
import android.os.Binder
import android.os.Bundle
-import android.support.test.InstrumentationRegistry
-import android.support.test.filters.SdkSuppress
+import androidx.test.InstrumentationRegistry
+import androidx.test.filters.SdkSuppress
import android.util.Size
import android.util.SizeF
import android.view.View
diff --git a/core/ktx/src/androidTest/java/androidx/core/os/PersistableBundleTest.kt b/core/ktx/src/androidTest/java/androidx/core/os/PersistableBundleTest.kt
index 8683155..a258844 100644
--- a/core/ktx/src/androidTest/java/androidx/core/os/PersistableBundleTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/os/PersistableBundleTest.kt
@@ -16,8 +16,8 @@
package androidx.core.os
-import android.support.test.InstrumentationRegistry
-import android.support.test.filters.SdkSuppress
+import androidx.test.InstrumentationRegistry
+import androidx.test.filters.SdkSuppress
import android.view.View
import androidx.testutils.assertThrows
import com.google.common.truth.Truth.assertThat
diff --git a/core/ktx/src/androidTest/java/androidx/core/transition/TransitionTest.kt b/core/ktx/src/androidTest/java/androidx/core/transition/TransitionTest.kt
index c3a2d22..3a8ddd6 100644
--- a/core/ktx/src/androidTest/java/androidx/core/transition/TransitionTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/transition/TransitionTest.kt
@@ -16,9 +16,9 @@
package androidx.core.transition
-import android.support.test.InstrumentationRegistry
-import android.support.test.filters.SdkSuppress
-import android.support.test.rule.ActivityTestRule
+import androidx.test.InstrumentationRegistry
+import androidx.test.filters.SdkSuppress
+import androidx.test.rule.ActivityTestRule
import android.transition.Fade
import android.transition.Transition
import android.transition.TransitionManager
diff --git a/core/ktx/src/androidTest/java/androidx/core/util/AtomicFileTest.kt b/core/ktx/src/androidTest/java/androidx/core/util/AtomicFileTest.kt
index 59fc8d9..1180d57 100644
--- a/core/ktx/src/androidTest/java/androidx/core/util/AtomicFileTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/util/AtomicFileTest.kt
@@ -16,7 +16,7 @@
package androidx.core.util
-import android.support.test.filters.SdkSuppress
+import androidx.test.filters.SdkSuppress
import android.util.AtomicFile
import androidx.testutils.assertThrows
import org.junit.Assert.assertArrayEquals
diff --git a/core/ktx/src/androidTest/java/androidx/core/util/HalfTest.kt b/core/ktx/src/androidTest/java/androidx/core/util/HalfTest.kt
index b79e064..1948d0d 100644
--- a/core/ktx/src/androidTest/java/androidx/core/util/HalfTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/util/HalfTest.kt
@@ -16,7 +16,7 @@
package androidx.core.util
-import android.support.test.filters.SdkSuppress
+import androidx.test.filters.SdkSuppress
import android.util.Half
import org.junit.Assert.assertEquals
import org.junit.Test
diff --git a/core/ktx/src/androidTest/java/androidx/core/util/LongSparseArrayTest.kt b/core/ktx/src/androidTest/java/androidx/core/util/LongSparseArrayTest.kt
index c2289e6..1a67f7f8 100644
--- a/core/ktx/src/androidTest/java/androidx/core/util/LongSparseArrayTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/util/LongSparseArrayTest.kt
@@ -16,7 +16,7 @@
package androidx.core.util
-import android.support.test.filters.SdkSuppress
+import androidx.test.filters.SdkSuppress
import android.util.LongSparseArray
import androidx.testutils.fail
import com.google.common.truth.Truth.assertThat
diff --git a/core/ktx/src/androidTest/java/androidx/core/util/RangeTest.kt b/core/ktx/src/androidTest/java/androidx/core/util/RangeTest.kt
index ec5d238..dd3dad4 100644
--- a/core/ktx/src/androidTest/java/androidx/core/util/RangeTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/util/RangeTest.kt
@@ -16,7 +16,7 @@
package androidx.core.util
-import android.support.test.filters.SdkSuppress
+import androidx.test.filters.SdkSuppress
import android.util.Range
import org.junit.Assert.assertEquals
import org.junit.Test
diff --git a/core/ktx/src/androidTest/java/androidx/core/util/SizeTest.kt b/core/ktx/src/androidTest/java/androidx/core/util/SizeTest.kt
index b38c747..3f345e9 100644
--- a/core/ktx/src/androidTest/java/androidx/core/util/SizeTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/util/SizeTest.kt
@@ -16,7 +16,7 @@
package androidx.core.util
-import android.support.test.filters.SdkSuppress
+import androidx.test.filters.SdkSuppress
import android.util.Size
import android.util.SizeF
import org.junit.Assert.assertEquals
diff --git a/core/ktx/src/androidTest/java/androidx/core/util/SparseLongArrayTest.kt b/core/ktx/src/androidTest/java/androidx/core/util/SparseLongArrayTest.kt
index c65c2ad..8e28a1c 100644
--- a/core/ktx/src/androidTest/java/androidx/core/util/SparseLongArrayTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/util/SparseLongArrayTest.kt
@@ -16,7 +16,7 @@
package androidx.core.util
-import android.support.test.filters.SdkSuppress
+import androidx.test.filters.SdkSuppress
import android.util.SparseLongArray
import androidx.testutils.fail
import com.google.common.truth.Truth.assertThat
diff --git a/core/ktx/src/androidTest/java/androidx/core/view/MenuTest.kt b/core/ktx/src/androidTest/java/androidx/core/view/MenuTest.kt
index 313ed1b..6cb1c7f 100644
--- a/core/ktx/src/androidTest/java/androidx/core/view/MenuTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/view/MenuTest.kt
@@ -16,7 +16,7 @@
package androidx.core.view
-import android.support.test.InstrumentationRegistry
+import androidx.test.InstrumentationRegistry
import android.view.Menu.NONE
import android.view.MenuItem
import android.widget.Toolbar
diff --git a/core/ktx/src/androidTest/java/androidx/core/view/ViewGroupTest.kt b/core/ktx/src/androidTest/java/androidx/core/view/ViewGroupTest.kt
index 7ec791d..a1664f9 100644
--- a/core/ktx/src/androidTest/java/androidx/core/view/ViewGroupTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/view/ViewGroupTest.kt
@@ -16,8 +16,8 @@
package androidx.core.view
-import android.support.test.InstrumentationRegistry
-import android.support.test.filters.SdkSuppress
+import androidx.test.InstrumentationRegistry
+import androidx.test.filters.SdkSuppress
import android.view.View
import android.view.ViewGroup
import android.widget.LinearLayout
diff --git a/core/ktx/src/androidTest/java/androidx/core/view/ViewTest.kt b/core/ktx/src/androidTest/java/androidx/core/view/ViewTest.kt
index 4647d54..f249c4b 100644
--- a/core/ktx/src/androidTest/java/androidx/core/view/ViewTest.kt
+++ b/core/ktx/src/androidTest/java/androidx/core/view/ViewTest.kt
@@ -18,7 +18,7 @@
import android.graphics.Bitmap
import android.graphics.Color
-import android.support.test.InstrumentationRegistry
+import androidx.test.InstrumentationRegistry
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
diff --git a/customview/build.gradle b/customview/build.gradle
index f2ebd43..8c8237c 100644
--- a/customview/build.gradle
+++ b/customview/build.gradle
@@ -11,8 +11,8 @@
api(project(":core"))
androidTestImplementation(JUNIT)
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(TEST_RULES_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
}
supportLibrary {
diff --git a/customview/src/androidTest/java/androidx/customview/widget/ExploreByTouchHelperTest.java b/customview/src/androidTest/java/androidx/customview/widget/ExploreByTouchHelperTest.java
index 95370f4..409593c 100644
--- a/customview/src/androidTest/java/androidx/customview/widget/ExploreByTouchHelperTest.java
+++ b/customview/src/androidTest/java/androidx/customview/widget/ExploreByTouchHelperTest.java
@@ -22,16 +22,16 @@
import android.graphics.Rect;
import android.os.Bundle;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.core.view.ViewCompat;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
import androidx.customview.test.R;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/dynamic-animation/build.gradle b/dynamic-animation/build.gradle
index 6da13e0..0f8fca9 100644
--- a/dynamic-animation/build.gradle
+++ b/dynamic-animation/build.gradle
@@ -11,8 +11,9 @@
api(project(":collection"))
api(project(":legacy-support-core-utils"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
}
diff --git a/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/FlingTests.java b/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/FlingTests.java
index 9415b73..b872bdc 100644
--- a/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/FlingTests.java
+++ b/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/FlingTests.java
@@ -24,10 +24,6 @@
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import androidx.dynamicanimation.animation.DynamicAnimation;
@@ -35,6 +31,10 @@
import androidx.dynamicanimation.animation.FloatPropertyCompat;
import androidx.dynamicanimation.animation.FloatValueHolder;
import androidx.dynamicanimation.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/SpringTests.java b/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/SpringTests.java
index d154ba7..962025c 100644
--- a/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/SpringTests.java
+++ b/dynamic-animation/src/androidTest/java/androidx/dynamicanimation/tests/SpringTests.java
@@ -32,11 +32,6 @@
import static org.mockito.Mockito.verifyZeroInteractions;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.util.AndroidRuntimeException;
import android.view.View;
@@ -47,6 +42,11 @@
import androidx.dynamicanimation.animation.SpringAnimation;
import androidx.dynamicanimation.animation.SpringForce;
import androidx.dynamicanimation.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/emoji/core/build.gradle b/emoji/core/build.gradle
index f38f617..2c892ff 100644
--- a/emoji/core/build.gradle
+++ b/emoji/core/build.gradle
@@ -24,8 +24,9 @@
api(project(":core"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':internal-testutils')
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/AllEmojisTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/AllEmojisTest.java
index f3a1bcd..ae41da7 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/AllEmojisTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/AllEmojisTest.java
@@ -23,13 +23,13 @@
import android.content.Context;
import android.graphics.Paint;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
import android.text.Spanned;
import androidx.core.graphics.PaintCompat;
import androidx.emoji.util.TestString;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/ConfigTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/ConfigTest.java
index c8d3dad..61473d3 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/ConfigTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/ConfigTest.java
@@ -32,12 +32,12 @@
import android.content.Context;
import android.graphics.Color;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.emoji.util.TestString;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiCompatTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiCompatTest.java
index fd9df56..9de5be3 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiCompatTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiCompatTest.java
@@ -63,10 +63,6 @@
import android.annotation.SuppressLint;
import android.os.Bundle;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.Editable;
import android.text.Selection;
import android.text.Spannable;
@@ -79,6 +75,10 @@
import androidx.emoji.util.Emoji.EmojiMapping;
import androidx.emoji.util.TestString;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiKeyboardTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiKeyboardTest.java
index 1baff6d..57b7a37 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiKeyboardTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiKeyboardTest.java
@@ -25,11 +25,6 @@
import static org.junit.Assert.assertThat;
import android.app.Instrumentation;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.Suppress;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.text.Editable;
import android.view.inputmethod.InputConnection;
import android.widget.EditText;
@@ -37,6 +32,11 @@
import androidx.emoji.test.R;
import androidx.emoji.util.KeyboardUtil;
import androidx.emoji.util.TestString;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.Suppress;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.testutils.PollingCheck;
import org.junit.Before;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanInstrumentationTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanInstrumentationTest.java
index 7ce61f0..491711b 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanInstrumentationTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanInstrumentationTest.java
@@ -24,11 +24,6 @@
import static org.junit.Assert.assertThat;
import android.app.Instrumentation;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.text.Spannable;
import android.text.Spanned;
import android.text.style.RelativeSizeSpan;
@@ -36,6 +31,11 @@
import android.widget.TextView;
import androidx.emoji.util.TestString;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanTest.java
index 0ae75fd..c9156ca3 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/EmojiSpanTest.java
@@ -27,11 +27,12 @@
import android.graphics.Canvas;
import android.graphics.Paint;
import android.graphics.Paint.FontMetricsInt;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.TextPaint;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/FontRequestEmojiCompatConfigTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/FontRequestEmojiCompatConfigTest.java
index c5337f2..87e51de 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/FontRequestEmojiCompatConfigTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/FontRequestEmojiCompatConfigTest.java
@@ -46,10 +46,6 @@
import android.net.Uri;
import android.os.Handler;
import android.os.HandlerThread;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.GuardedBy;
import androidx.annotation.NonNull;
@@ -57,6 +53,10 @@
import androidx.core.provider.FontRequest;
import androidx.core.provider.FontsContractCompat.FontFamilyResult;
import androidx.core.provider.FontsContractCompat.FontInfo;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/HardDeleteTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/HardDeleteTest.java
index 02d865e..9d344e5 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/HardDeleteTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/HardDeleteTest.java
@@ -34,15 +34,15 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.Editable;
import android.text.Selection;
import android.text.SpannableStringBuilder;
import android.view.KeyEvent;
import androidx.emoji.util.TestString;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/InitCallbackTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/InitCallbackTest.java
index 3d479e4..e7adb56 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/InitCallbackTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/InitCallbackTest.java
@@ -22,12 +22,11 @@
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.annotation.NonNull;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/MetadataRepoTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/MetadataRepoTest.java
index adc15fa..15e76bf 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/MetadataRepoTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/MetadataRepoTest.java
@@ -18,9 +18,9 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/SoftDeleteTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/SoftDeleteTest.java
index 1e32da3..80c7ca1 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/SoftDeleteTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/SoftDeleteTest.java
@@ -28,9 +28,6 @@
import static org.mockito.Mockito.mock;
import android.annotation.SuppressLint;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.Editable;
import android.text.Selection;
import android.text.SpannableStringBuilder;
@@ -38,6 +35,9 @@
import androidx.emoji.util.Emoji;
import androidx.emoji.util.TestString;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/TestConfigBuilder.java b/emoji/core/src/androidTest/java/androidx/emoji/text/TestConfigBuilder.java
index a5aaf40..74ab9f6 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/TestConfigBuilder.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/TestConfigBuilder.java
@@ -18,10 +18,10 @@
import static org.junit.Assert.fail;
import android.content.res.AssetManager;
-import android.support.test.InstrumentationRegistry;
import androidx.annotation.GuardedBy;
import androidx.annotation.NonNull;
+import androidx.test.InstrumentationRegistry;
import java.util.concurrent.CountDownLatch;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/text/UninitializedStateTest.java b/emoji/core/src/androidTest/java/androidx/emoji/text/UninitializedStateTest.java
index e9bc551..a3afc15 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/text/UninitializedStateTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/text/UninitializedStateTest.java
@@ -15,9 +15,9 @@
*/
package androidx.emoji.text;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperPre19Test.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperPre19Test.java
index 449b3d1..e231a99 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperPre19Test.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperPre19Test.java
@@ -24,15 +24,16 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.TextWatcher;
import android.text.method.KeyListener;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection;
import android.widget.EditText;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperTest.java
index 87084d8..2a12407 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperTest.java
@@ -26,10 +26,6 @@
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.TextWatcher;
import android.text.method.KeyListener;
import android.view.inputmethod.EditorInfo;
@@ -37,6 +33,10 @@
import android.widget.EditText;
import androidx.emoji.text.EmojiCompat;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextTest.java
index be7e649..7f831da 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextTest.java
@@ -24,18 +24,18 @@
import static org.junit.Assert.assertThat;
import android.app.Instrumentation;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.emoji.test.R;
import androidx.emoji.text.EmojiCompat;
import androidx.emoji.text.TestActivity;
import androidx.emoji.text.TestConfigBuilder;
import androidx.emoji.util.TestString;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditableFactoryTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditableFactoryTest.java
index a28a162..b4a499a 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditableFactoryTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditableFactoryTest.java
@@ -24,8 +24,6 @@
import static org.mockito.Mockito.mock;
import android.annotation.SuppressLint;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.Editable;
import android.text.SpannableString;
import android.text.Spanned;
@@ -33,6 +31,8 @@
import androidx.emoji.text.EmojiMetadata;
import androidx.emoji.text.EmojiSpan;
import androidx.emoji.text.TypefaceEmojiSpan;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiExtractTextLayoutTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiExtractTextLayoutTest.java
index e9c30d7..ce0598c 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiExtractTextLayoutTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiExtractTextLayoutTest.java
@@ -32,11 +32,6 @@
import android.content.Context;
import android.inputmethodservice.InputMethodService;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.InputType;
import android.view.LayoutInflater;
import android.view.View;
@@ -45,6 +40,11 @@
import androidx.emoji.R;
import androidx.emoji.text.EmojiCompat;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputConnectionTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputConnectionTest.java
index 1f36459..9b47fbf 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputConnectionTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputConnectionTest.java
@@ -31,10 +31,6 @@
import android.content.Context;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.Editable;
import android.text.Selection;
import android.text.SpannableStringBuilder;
@@ -46,6 +42,10 @@
import androidx.emoji.text.TestConfigBuilder;
import androidx.emoji.util.Emoji;
import androidx.emoji.util.TestString;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java
index 28828586..c4548f7 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiInputFilterTest.java
@@ -30,13 +30,13 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.Spannable;
import android.text.SpannableString;
import android.widget.TextView;
import androidx.emoji.text.EmojiCompat;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiKeyListenerTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiKeyListenerTest.java
index 39afd2e..98cd6ef 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiKeyListenerTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiKeyListenerTest.java
@@ -38,9 +38,6 @@
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.Editable;
import android.text.Selection;
import android.text.SpannableStringBuilder;
@@ -51,6 +48,9 @@
import androidx.emoji.text.EmojiCompat;
import androidx.emoji.text.TestConfigBuilder;
import androidx.emoji.util.TestString;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperPre19Test.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperPre19Test.java
index a135876..e387a9c 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperPre19Test.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperPre19Test.java
@@ -20,14 +20,15 @@
import static org.junit.Assert.assertSame;
import static org.mockito.Mockito.mock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.InputFilter;
import android.text.method.TransformationMethod;
import android.widget.TextView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperTest.java
index fc9f80c..733e246 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextViewHelperTest.java
@@ -25,15 +25,16 @@
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.InputFilter;
import android.text.method.PasswordTransformationMethod;
import android.text.method.TransformationMethod;
import android.widget.TextView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java
index b8f0154..3e6607a 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTextWatcherTest.java
@@ -27,13 +27,13 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.Spannable;
import android.text.SpannableString;
import android.widget.EditText;
import androidx.emoji.text.EmojiCompat;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTransformationMethodTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTransformationMethodTest.java
index cf74331..014b3ef 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTransformationMethodTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiTransformationMethodTest.java
@@ -15,6 +15,8 @@
*/
package androidx.emoji.widget;
+import static androidx.emoji.util.EmojiMatcher.sameCharSequence;
+
import static junit.framework.TestCase.assertSame;
import static org.junit.Assert.assertNull;
@@ -27,24 +29,22 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import static androidx.emoji.util.EmojiMatcher.sameCharSequence;
-
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextUtils;
import android.text.method.TransformationMethod;
import android.view.View;
+import androidx.emoji.text.EmojiCompat;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import androidx.emoji.text.EmojiCompat;
-
@SmallTest
@RunWith(AndroidJUnit4.class)
public class EmojiTransformationMethodTest {
diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/SpannableBuilderTest.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/SpannableBuilderTest.java
index b4b3572..db48ebc 100644
--- a/emoji/core/src/androidTest/java/androidx/emoji/widget/SpannableBuilderTest.java
+++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/SpannableBuilderTest.java
@@ -32,8 +32,6 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.withSettings;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.Editable;
import android.text.SpanWatcher;
import android.text.Spannable;
@@ -42,6 +40,8 @@
import android.text.style.QuoteSpan;
import androidx.emoji.text.EmojiSpan;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/exifinterface/build.gradle b/exifinterface/build.gradle
index c3e56ff..ffe28d3 100644
--- a/exifinterface/build.gradle
+++ b/exifinterface/build.gradle
@@ -9,7 +9,7 @@
dependencies {
api(project(":annotation"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
}
supportLibrary {
diff --git a/exifinterface/src/androidTest/java/androidx/exifinterface/media/ExifInterfaceTest.java b/exifinterface/src/androidTest/java/androidx/exifinterface/media/ExifInterfaceTest.java
index a8dbc24..3c65354 100644
--- a/exifinterface/src/androidTest/java/androidx/exifinterface/media/ExifInterfaceTest.java
+++ b/exifinterface/src/androidTest/java/androidx/exifinterface/media/ExifInterfaceTest.java
@@ -16,7 +16,7 @@
package androidx.exifinterface.media;
-import static android.support.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getContext;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -27,13 +27,13 @@
import android.graphics.Bitmap;
import android.location.Location;
import android.os.Environment;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import android.util.Pair;
import androidx.exifinterface.test.R;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/fragment/build.gradle b/fragment/build.gradle
index 7faa903..dadfc21 100644
--- a/fragment/build.gradle
+++ b/fragment/build.gradle
@@ -14,8 +14,9 @@
api(project(":loader"))
api(ARCH_LIFECYCLE_VIEWMODEL, libs.exclude_annotations_transitive)
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':internal-testutils'), {
diff --git a/fragment/ktx/build.gradle b/fragment/ktx/build.gradle
index 52cb265..d545a0d 100644
--- a/fragment/ktx/build.gradle
+++ b/fragment/ktx/build.gradle
@@ -36,8 +36,8 @@
api(KOTLIN_STDLIB)
androidTestImplementation(JUNIT)
androidTestImplementation(TRUTH)
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(TEST_RULES_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
}
supportLibrary {
diff --git a/fragment/ktx/src/androidTest/java/androidx/fragment/app/FragmentManagerTest.kt b/fragment/ktx/src/androidTest/java/androidx/fragment/app/FragmentManagerTest.kt
index 7097955..4718f97 100644
--- a/fragment/ktx/src/androidTest/java/androidx/fragment/app/FragmentManagerTest.kt
+++ b/fragment/ktx/src/androidTest/java/androidx/fragment/app/FragmentManagerTest.kt
@@ -1,8 +1,8 @@
package androidx.fragment.app
-import android.support.test.annotation.UiThreadTest
-import android.support.test.filters.MediumTest
-import android.support.test.rule.ActivityTestRule
+import androidx.test.annotation.UiThreadTest
+import androidx.test.filters.MediumTest
+import androidx.test.rule.ActivityTestRule
import com.google.common.truth.Truth.assertThat
import org.junit.Rule
import org.junit.Test
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/ChildFragmentStateTest.java b/fragment/src/androidTest/java/androidx/fragment/app/ChildFragmentStateTest.java
index 101ab4e..21e8bc4 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/ChildFragmentStateTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/ChildFragmentStateTest.java
@@ -19,13 +19,12 @@
import static org.junit.Assert.assertTrue;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.fragment.app.test.FragmentTestActivity;
import androidx.fragment.app.test.FragmentTestActivity.ParentFragment;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/DialogFragmentTest.java b/fragment/src/androidTest/java/androidx/fragment/app/DialogFragmentTest.java
index 6d15326..c88c258 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/DialogFragmentTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/DialogFragmentTest.java
@@ -24,17 +24,17 @@
import android.app.AlertDialog;
import android.app.Dialog;
import android.os.Bundle;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.Suppress;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.NonNull;
import androidx.fragment.app.test.EmptyFragmentTestActivity;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.Suppress;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimationTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimationTest.java
index 385fabd..8af8bd1 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimationTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimationTest.java
@@ -24,10 +24,6 @@
import android.app.Instrumentation;
import android.os.Bundle;
import android.os.Parcelable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Pair;
import android.view.LayoutInflater;
import android.view.View;
@@ -40,6 +36,10 @@
import androidx.core.view.ViewCompat;
import androidx.fragment.app.test.FragmentTestActivity;
import androidx.fragment.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimatorTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimatorTest.java
index 05c6482..ec1a2a7 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimatorTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentAnimatorTest.java
@@ -27,9 +27,6 @@
import android.animation.ValueAnimator;
import android.os.Build;
import android.os.Parcelable;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Pair;
import android.view.View;
@@ -38,6 +35,9 @@
import androidx.core.view.ViewCompat;
import androidx.fragment.app.test.FragmentTestActivity;
import androidx.fragment.test.R;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentArchLifecycleTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentArchLifecycleTest.java
index 9c3c7dc..2d61243 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentArchLifecycleTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentArchLifecycleTest.java
@@ -19,15 +19,15 @@
import static org.junit.Assert.assertEquals;
import android.os.Bundle;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.fragment.app.test.EmptyFragmentTestActivity;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Assert;
import org.junit.Rule;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentLifecycleTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentLifecycleTest.java
index 12fe1a0..1aeaead 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentLifecycleTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentLifecycleTest.java
@@ -35,12 +35,6 @@
import android.os.Build;
import android.os.Bundle;
import android.os.Parcelable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Pair;
import android.view.LayoutInflater;
import android.view.Menu;
@@ -56,6 +50,12 @@
import androidx.fragment.app.test.EmptyFragmentTestActivity;
import androidx.fragment.app.test.FragmentTestActivity;
import androidx.fragment.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Assert;
import org.junit.Rule;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentManagerNonConfigTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentManagerNonConfigTest.java
index 57665110..b258e6c 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentManagerNonConfigTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentManagerNonConfigTest.java
@@ -21,12 +21,12 @@
import static org.junit.Assert.assertTrue;
import android.os.Build;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.fragment.app.test.NonConfigOnStopActivity;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.testutils.FragmentActivityUtils;
import org.junit.Rule;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentReceiveResultTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentReceiveResultTest.java
index 6d28ab4..455cda8 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentReceiveResultTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentReceiveResultTest.java
@@ -28,15 +28,15 @@
import android.app.PendingIntent;
import android.content.Intent;
import android.content.IntentSender;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.core.app.ActivityCompat;
import androidx.fragment.app.test.FragmentResultActivity;
import androidx.fragment.app.test.FragmentTestActivity;
import androidx.fragment.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentReorderingTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentReorderingTest.java
index e0f7d6a..b2890d57 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentReorderingTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentReorderingTest.java
@@ -20,17 +20,17 @@
import static org.junit.Assert.assertTrue;
import android.app.Instrumentation;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.view.ViewGroup;
import android.widget.EditText;
import androidx.fragment.app.test.FragmentTestActivity;
import androidx.fragment.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentReplaceTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentReplaceTest.java
index 58d1ec9..91ea333 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentReplaceTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentReplaceTest.java
@@ -22,15 +22,15 @@
import android.app.Activity;
import android.app.Fragment;
import android.app.Instrumentation;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.KeyEvent;
import androidx.fragment.app.test.FragmentTestActivity;
import androidx.fragment.app.test.FragmentTestActivity.TestFragment;
import androidx.fragment.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentTest.java
index 353cc5e..c541130 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentTest.java
@@ -21,19 +21,19 @@
import android.app.Instrumentation;
import android.os.Bundle;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.fragment.app.test.FragmentTestActivity;
import androidx.fragment.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentTestUtil.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentTestUtil.java
index 1c8855d..9de64fe 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentTestUtil.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentTestUtil.java
@@ -24,13 +24,13 @@
import android.os.Looper;
import android.os.Parcelable;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.ActivityTestRule;
import android.util.Pair;
import android.view.ViewGroup;
import android.view.animation.Animation;
import androidx.fragment.app.test.FragmentTestActivity;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.rule.ActivityTestRule;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransactionTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransactionTest.java
index 8550cb3..094264c 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransactionTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransactionTest.java
@@ -27,11 +27,6 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -40,6 +35,11 @@
import androidx.fragment.app.test.FragmentTestActivity;
import androidx.fragment.app.test.NewIntentActivity;
import androidx.fragment.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Assert;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransitionTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransitionTest.java
index 727f22e..b6c8562 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransitionTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentTransitionTest.java
@@ -27,16 +27,16 @@
import android.graphics.Rect;
import android.os.Build;
import android.os.Bundle;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.rule.ActivityTestRule;
import android.transition.TransitionSet;
import android.view.View;
import androidx.core.app.SharedElementCallback;
import androidx.fragment.app.test.FragmentTestActivity;
import androidx.fragment.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.rule.ActivityTestRule;
import org.junit.After;
import org.junit.Before;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentViewLifecycleTest.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentViewLifecycleTest.java
index 32861f9..40fb9c2 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentViewLifecycleTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentViewLifecycleTest.java
@@ -23,10 +23,6 @@
import static org.junit.Assert.fail;
import android.os.Bundle;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -37,6 +33,10 @@
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.MutableLiveData;
import androidx.lifecycle.Observer;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/FragmentViewTests.java b/fragment/src/androidTest/java/androidx/fragment/app/FragmentViewTests.java
index 135697d..4547a4d 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/FragmentViewTests.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/FragmentViewTests.java
@@ -25,10 +25,6 @@
import android.app.Instrumentation;
import android.os.Bundle;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -36,6 +32,10 @@
import androidx.annotation.Nullable;
import androidx.fragment.app.test.FragmentTestActivity;
import androidx.fragment.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/HangingFragmentTest.java b/fragment/src/androidTest/java/androidx/fragment/app/HangingFragmentTest.java
index 37b0219..b7487e2 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/HangingFragmentTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/HangingFragmentTest.java
@@ -16,11 +16,10 @@
package androidx.fragment.app;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.fragment.app.test.HangingFragmentActivity;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.testutils.FragmentActivityUtils;
import org.junit.Assert;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/LoaderTest.java b/fragment/src/androidTest/java/androidx/fragment/app/LoaderTest.java
index 888abf2..fa9391b 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/LoaderTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/LoaderTest.java
@@ -25,10 +25,6 @@
import android.content.Context;
import android.os.Bundle;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -37,6 +33,10 @@
import androidx.loader.app.LoaderManager;
import androidx.loader.content.AsyncTaskLoader;
import androidx.loader.content.Loader;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.testutils.FragmentActivityUtils;
import androidx.testutils.RecreatedActivity;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentRestoreTest.java b/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentRestoreTest.java
index 6caee5a..585e339 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentRestoreTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentRestoreTest.java
@@ -22,14 +22,14 @@
import static org.junit.Assert.assertTrue;
import android.content.Context;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.fragment.app.test.FragmentTestActivity;
import androidx.fragment.app.test.FragmentTestActivity.ChildFragment;
import androidx.fragment.app.test.FragmentTestActivity.ChildFragment.OnAttachListener;
import androidx.fragment.app.test.FragmentTestActivity.ParentFragment;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentTest.java b/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentTest.java
index 6d2e1b3..b2d26b9 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/NestedFragmentTest.java
@@ -24,15 +24,15 @@
import android.app.Instrumentation;
import android.content.Intent;
import android.content.IntentFilter;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.LargeTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.fragment.app.test.FragmentTestActivity;
import androidx.fragment.app.test.FragmentTestActivity.ChildFragment;
import androidx.fragment.app.test.FragmentTestActivity.ParentFragment;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/NestedInflatedFragmentTest.java b/fragment/src/androidTest/java/androidx/fragment/app/NestedInflatedFragmentTest.java
index 84fe422..3c5d351 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/NestedInflatedFragmentTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/NestedInflatedFragmentTest.java
@@ -18,10 +18,6 @@
package androidx.fragment.app;
import android.os.Bundle;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -30,6 +26,10 @@
import androidx.annotation.Nullable;
import androidx.fragment.app.test.FragmentTestActivity;
import androidx.fragment.test.R;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/PostponedTransitionTest.java b/fragment/src/androidTest/java/androidx/fragment/app/PostponedTransitionTest.java
index f56e348..96d5915 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/PostponedTransitionTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/PostponedTransitionTest.java
@@ -26,11 +26,6 @@
import android.os.Build;
import android.os.Bundle;
import android.os.Parcelable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Pair;
import android.view.LayoutInflater;
import android.view.View;
@@ -38,6 +33,11 @@
import androidx.fragment.app.test.FragmentTestActivity;
import androidx.fragment.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/PrimaryNavFragmentTest.java b/fragment/src/androidTest/java/androidx/fragment/app/PrimaryNavFragmentTest.java
index b5af38c..3288c68 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/PrimaryNavFragmentTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/PrimaryNavFragmentTest.java
@@ -22,11 +22,10 @@
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.fragment.app.test.EmptyFragmentTestActivity;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/ViewModelTest.java b/fragment/src/androidTest/java/androidx/fragment/app/ViewModelTest.java
index 6db9443..c196b89 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/ViewModelTest.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/ViewModelTest.java
@@ -25,11 +25,6 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.app.Instrumentation;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.fragment.app.test.TestViewModel;
import androidx.fragment.app.test.ViewModelActivity;
@@ -37,6 +32,11 @@
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.lifecycle.ViewModelProvider;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/fragment/src/androidTest/java/androidx/fragment/app/ViewModelTestInTransaction.java b/fragment/src/androidTest/java/androidx/fragment/app/ViewModelTestInTransaction.java
index df7f047..9fa935f 100644
--- a/fragment/src/androidTest/java/androidx/fragment/app/ViewModelTestInTransaction.java
+++ b/fragment/src/androidTest/java/androidx/fragment/app/ViewModelTestInTransaction.java
@@ -21,15 +21,15 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.os.Bundle;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.Nullable;
import androidx.fragment.app.test.EmptyFragmentTestActivity;
import androidx.fragment.app.test.TestViewModel;
import androidx.lifecycle.ViewModelProvider;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/graphics/drawable/animated/build.gradle b/graphics/drawable/animated/build.gradle
index 139dee2..83ac96b 100644
--- a/graphics/drawable/animated/build.gradle
+++ b/graphics/drawable/animated/build.gradle
@@ -10,8 +10,9 @@
api(project(":vectordrawable"))
api(project(":legacy-support-core-ui"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
}
android {
diff --git a/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/AnimatedVectorDrawableParameterizedTest.java b/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/AnimatedVectorDrawableParameterizedTest.java
index 0f07a27..8eba076 100644
--- a/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/AnimatedVectorDrawableParameterizedTest.java
+++ b/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/AnimatedVectorDrawableParameterizedTest.java
@@ -26,10 +26,10 @@
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
import androidx.vectordrawable.graphics.drawable.Animatable2Compat.AnimationCallback;
import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
import androidx.vectordrawable.test.R;
diff --git a/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/AnimatedVectorDrawableTest.java b/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/AnimatedVectorDrawableTest.java
index 6fa9cd4..e47cb5a 100644
--- a/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/AnimatedVectorDrawableTest.java
+++ b/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/AnimatedVectorDrawableTest.java
@@ -34,11 +34,6 @@
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.Drawable.ConstantState;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.util.AttributeSet;
import android.util.Xml;
import android.view.View;
@@ -46,6 +41,11 @@
import androidx.annotation.DrawableRes;
import androidx.core.view.ViewCompat;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.vectordrawable.graphics.drawable.Animatable2Compat.AnimationCallback;
import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
import androidx.vectordrawable.test.R;
diff --git a/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/PathInterpolatorExceptionParameterizedTest.java b/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/PathInterpolatorExceptionParameterizedTest.java
index 029b39e..2ff0efb 100644
--- a/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/PathInterpolatorExceptionParameterizedTest.java
+++ b/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/PathInterpolatorExceptionParameterizedTest.java
@@ -17,9 +17,9 @@
package androidx.vectordrawable.graphics.drawable.tests;
import android.app.Activity;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
import androidx.vectordrawable.test.R;
diff --git a/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/PathInterpolatorParameterizedTest.java b/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/PathInterpolatorParameterizedTest.java
index 5597d66..cdefa4c 100644
--- a/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/PathInterpolatorParameterizedTest.java
+++ b/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/PathInterpolatorParameterizedTest.java
@@ -23,10 +23,10 @@
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
import androidx.vectordrawable.graphics.drawable.Animatable2Compat;
import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat;
import androidx.vectordrawable.test.R;
diff --git a/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/PathInterpolatorValueParameterizedTest.java b/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/PathInterpolatorValueParameterizedTest.java
index 1ac182e..d3f08a7 100644
--- a/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/PathInterpolatorValueParameterizedTest.java
+++ b/graphics/drawable/animated/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/PathInterpolatorValueParameterizedTest.java
@@ -19,10 +19,10 @@
import static org.junit.Assert.assertTrue;
import android.app.Activity;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
import android.view.animation.Interpolator;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
import androidx.vectordrawable.graphics.drawable.AnimationUtilsCompat;
import androidx.vectordrawable.test.R;
diff --git a/graphics/drawable/static/build.gradle b/graphics/drawable/static/build.gradle
index 423cb22..30bcd11 100644
--- a/graphics/drawable/static/build.gradle
+++ b/graphics/drawable/static/build.gradle
@@ -10,7 +10,8 @@
api(project(":annotation"))
api(project(":core"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
}
android {
diff --git a/graphics/drawable/static/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/VectorDrawableTest.java b/graphics/drawable/static/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/VectorDrawableTest.java
index 4740ae5..fa91772 100644
--- a/graphics/drawable/static/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/VectorDrawableTest.java
+++ b/graphics/drawable/static/src/androidTest/java/androidx/vectordrawable/graphics/drawable/tests/VectorDrawableTest.java
@@ -36,11 +36,11 @@
import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
import androidx.vectordrawable.test.R;
diff --git a/gridlayout/build.gradle b/gridlayout/build.gradle
index 930e191..ddae434 100644
--- a/gridlayout/build.gradle
+++ b/gridlayout/build.gradle
@@ -10,8 +10,9 @@
api(project(":core"))
api(project(":legacy-support-core-ui"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
}
supportLibrary {
diff --git a/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTest.java b/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTest.java
index 6d37cc5..6678909 100644
--- a/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTest.java
+++ b/gridlayout/src/androidTest/java/androidx/gridlayout/widget/GridLayoutTest.java
@@ -22,10 +22,6 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.LayoutInflater;
@@ -33,6 +29,10 @@
import android.view.ViewGroup;
import androidx.gridlayout.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/heifwriter/build.gradle b/heifwriter/build.gradle
index 1c6039c..810c395 100644
--- a/heifwriter/build.gradle
+++ b/heifwriter/build.gradle
@@ -9,8 +9,9 @@
dependencies {
api(project(":annotation"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
}
supportLibrary {
diff --git a/heifwriter/src/androidTest/java/androidx/heifwriter/HeifWriterTest.java b/heifwriter/src/androidTest/java/androidx/heifwriter/HeifWriterTest.java
index 3206137..ef9e598 100644
--- a/heifwriter/src/androidTest/java/androidx/heifwriter/HeifWriterTest.java
+++ b/heifwriter/src/androidTest/java/androidx/heifwriter/HeifWriterTest.java
@@ -16,7 +16,13 @@
package androidx.heifwriter;
-import static android.support.test.InstrumentationRegistry.getContext;
+import static androidx.heifwriter.HeifWriter.INPUT_MODE_BITMAP;
+import static androidx.heifwriter.HeifWriter.INPUT_MODE_BUFFER;
+import static androidx.heifwriter.HeifWriter.INPUT_MODE_SURFACE;
+import static androidx.test.InstrumentationRegistry.getContext;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import android.Manifest;
import android.graphics.Bitmap;
@@ -32,21 +38,14 @@
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Process;
-import android.support.test.filters.LargeTest;
-import android.support.test.rule.GrantPermissionRule;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
-import static androidx.heifwriter.HeifWriter.INPUT_MODE_BITMAP;
-import static androidx.heifwriter.HeifWriter.INPUT_MODE_BUFFER;
-import static androidx.heifwriter.HeifWriter.INPUT_MODE_SURFACE;
-
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.heifwriter.test.R;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.GrantPermissionRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/bytecode/CoreRemapperImplTest.kt b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/bytecode/CoreRemapperImplTest.kt
index cf69fb2..f212ed9 100644
--- a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/bytecode/CoreRemapperImplTest.kt
+++ b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/bytecode/CoreRemapperImplTest.kt
@@ -32,12 +32,12 @@
TypesMap(mapOf(
JavaType.fromDotVersion("androidx.test.InputConnectionCompat")
to JavaType.fromDotVersion(
- "android.support.test.InputConnectionCompat")
+ "androidx.test.InputConnectionCompat")
)),
"androidx/")
val given = "androidx.test.InputConnectionCompat.CONTENT_URI"
- val expected = "android.support.test.InputConnectionCompat.CONTENT_URI"
+ val expected = "androidx.test.InputConnectionCompat.CONTENT_URI"
Truth.assertThat(remapper.rewriteString(given)).isEqualTo(expected)
}
diff --git a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/resource/XmlResourcesTransformerTest.kt b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/resource/XmlResourcesTransformerTest.kt
index 2f988c6..9d2415c 100644
--- a/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/resource/XmlResourcesTransformerTest.kt
+++ b/jetifier/jetifier/processor/src/test/kotlin/com/android/tools/build/jetifier/processor/transform/resource/XmlResourcesTransformerTest.kt
@@ -277,17 +277,17 @@
testRewrite(
givenXml =
"<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\n" +
- " package=\"android.support.test\">\n" +
+ " package=\"androidx.test\">\n" +
"</manifest>",
expectedXml =
"<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\n" +
- " package=\"android.support.test\">\n" +
+ " package=\"androidx.test\">\n" +
"</manifest>",
prefixes = setOf(
"android/support/"
),
rulesMap = RewriteRulesMap(
- RewriteRule("android/support/test/(.*)", "ignore")
+ RewriteRule("androidx.test/(.*)", "ignore")
),
packageMap = PackageMap.EMPTY,
rewritingSupportLib = true
diff --git a/leanback/build.gradle b/leanback/build.gradle
index a1e468b..1666e2c 100644
--- a/leanback/build.gradle
+++ b/leanback/build.gradle
@@ -13,8 +13,9 @@
api(project(":fragment"))
api(project(":recyclerview"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
}
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/BackgroundManagerTest.java b/leanback/src/androidTest/java/androidx/leanback/app/BackgroundManagerTest.java
index fbe9286..861cd3d 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/BackgroundManagerTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/BackgroundManagerTest.java
@@ -29,10 +29,10 @@
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import android.support.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.leanback.testutils.PollingCheck;
+import androidx.test.filters.LargeTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/BrowseFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/BrowseFragmentTest.java
index e05ea72..a190cc9 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/BrowseFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/BrowseFragmentTest.java
@@ -26,15 +26,12 @@
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
+import android.app.Fragment;
import android.app.Instrumentation;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@@ -44,7 +41,6 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import android.app.Fragment;
import androidx.leanback.testutils.PollingCheck;
import androidx.leanback.widget.ArrayObjectAdapter;
import androidx.leanback.widget.ItemBridgeAdapter;
@@ -53,6 +49,10 @@
import androidx.leanback.widget.Row;
import androidx.leanback.widget.RowPresenter;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Rule;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/BrowseFragmentTestActivity.java b/leanback/src/androidTest/java/androidx/leanback/app/BrowseFragmentTestActivity.java
index c12af8e..dff2a16 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/BrowseFragmentTestActivity.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/BrowseFragmentTestActivity.java
@@ -18,11 +18,11 @@
*/
package androidx.leanback.app;
+import android.app.Activity;
+import android.app.FragmentTransaction;
import android.content.Intent;
import android.os.Bundle;
-import android.app.Activity;
-import android.app.FragmentTransaction;
import androidx.leanback.test.R;
public class BrowseFragmentTestActivity extends Activity {
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/BrowseSupportFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/BrowseSupportFragmentTest.java
index d8cc0cd7..3bca404 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/BrowseSupportFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/BrowseSupportFragmentTest.java
@@ -28,10 +28,6 @@
import android.os.Build;
import android.os.Bundle;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@@ -50,6 +46,10 @@
import androidx.leanback.widget.Row;
import androidx.leanback.widget.RowPresenter;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Rule;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/BrowseTestFragment.java b/leanback/src/androidTest/java/androidx/leanback/app/BrowseTestFragment.java
index 6e1d5ed..58d81a4 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/BrowseTestFragment.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/BrowseTestFragment.java
@@ -20,10 +20,8 @@
import static androidx.leanback.app.BrowseFragmentTestActivity.EXTRA_LOAD_DATA_DELAY;
import static androidx.leanback.app.BrowseFragmentTestActivity.EXTRA_NUM_ROWS;
import static androidx.leanback.app.BrowseFragmentTestActivity.EXTRA_REPEAT_PER_ROW;
-import static androidx.leanback.app.BrowseFragmentTestActivity
- .EXTRA_SET_ADAPTER_AFTER_DATA_LOAD;
-import static androidx.leanback.app.BrowseFragmentTestActivity
- .EXTRA_TEST_ENTRANCE_TRANSITION;
+import static androidx.leanback.app.BrowseFragmentTestActivity.EXTRA_SET_ADAPTER_AFTER_DATA_LOAD;
+import static androidx.leanback.app.BrowseFragmentTestActivity.EXTRA_TEST_ENTRANCE_TRANSITION;
import android.os.Bundle;
import android.os.Handler;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/DetailsFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/DetailsFragmentTest.java
index 7ae6100..b1847f7 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/DetailsFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/DetailsFragmentTest.java
@@ -24,6 +24,7 @@
import static org.junit.Assert.assertTrue;
import android.animation.PropertyValuesHolder;
+import android.app.Fragment;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@@ -34,13 +35,9 @@
import android.os.Build;
import android.os.Bundle;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
import android.view.KeyEvent;
import android.view.View;
-import android.app.Fragment;
import androidx.leanback.R;
import androidx.leanback.graphics.FitWidthBitmapDrawable;
import androidx.leanback.media.MediaPlayerGlue;
@@ -53,6 +50,9 @@
import androidx.leanback.widget.ParallaxTarget;
import androidx.leanback.widget.RecyclerViewParallax;
import androidx.leanback.widget.VerticalGridView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/DetailsSupportFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/DetailsSupportFragmentTest.java
index 5c1fcd6..58b1ad1 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/DetailsSupportFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/DetailsSupportFragmentTest.java
@@ -31,9 +31,6 @@
import android.os.Build;
import android.os.Bundle;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
import android.view.KeyEvent;
import android.view.View;
@@ -50,6 +47,9 @@
import androidx.leanback.widget.ParallaxTarget;
import androidx.leanback.widget.RecyclerViewParallax;
import androidx.leanback.widget.VerticalGridView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTest.java
index 44927c6..4a8ff3b 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTest.java
@@ -29,9 +29,6 @@
import static org.mockito.Mockito.verify;
import android.os.Bundle;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
@@ -43,6 +40,9 @@
import androidx.leanback.widget.VerticalGridView;
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTestActivity.java b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTestActivity.java
index e4c1171..1a28995 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTestActivity.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTestActivity.java
@@ -17,11 +17,10 @@
package androidx.leanback.app;
+import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
-import android.app.Activity;
-
public class GuidedStepFragmentTestActivity extends Activity {
/**
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTestBase.java b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTestBase.java
index 8dc2d00..b4c5fca 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTestBase.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepFragmentTestBase.java
@@ -24,12 +24,12 @@
import static org.mockito.Mockito.when;
import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.ActivityTestRule;
import android.view.View;
import androidx.leanback.R;
import androidx.leanback.testutils.PollingCheck;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.rule.ActivityTestRule;
import org.junit.Before;
import org.junit.Rule;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepSupportFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepSupportFragmentTest.java
index 2fb5c7a..91f87c3 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepSupportFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepSupportFragmentTest.java
@@ -26,9 +26,6 @@
import static org.mockito.Mockito.verify;
import android.os.Bundle;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
@@ -40,6 +37,9 @@
import androidx.leanback.widget.VerticalGridView;
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepSupportFragmentTestBase.java b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepSupportFragmentTestBase.java
index 1d1fdcf..8137d38 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepSupportFragmentTestBase.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepSupportFragmentTestBase.java
@@ -21,12 +21,12 @@
import static org.mockito.Mockito.when;
import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.ActivityTestRule;
import android.view.View;
import androidx.leanback.R;
import androidx.leanback.testutils.PollingCheck;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.rule.ActivityTestRule;
import org.junit.Before;
import org.junit.Rule;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepTestFragment.java b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepTestFragment.java
index dc93ff5..897e859 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepTestFragment.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/GuidedStepTestFragment.java
@@ -17,13 +17,13 @@
package androidx.leanback.app;
+import android.app.Activity;
+import android.app.FragmentManager;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.app.Activity;
-import android.app.FragmentManager;
import androidx.leanback.widget.GuidanceStylist.Guidance;
import androidx.leanback.widget.GuidedAction;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/HeadersFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/HeadersFragmentTest.java
index 2ed20d2..4b9cd9c 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/HeadersFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/HeadersFragmentTest.java
@@ -22,8 +22,6 @@
import static org.junit.Assert.assertTrue;
import android.os.Bundle;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import androidx.leanback.widget.ArrayObjectAdapter;
@@ -33,6 +31,8 @@
import androidx.leanback.widget.ListRow;
import androidx.leanback.widget.ListRowPresenter;
import androidx.leanback.widget.VerticalGridView;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/HeadersSupportFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/HeadersSupportFragmentTest.java
index 3d18962..74bb1bc 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/HeadersSupportFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/HeadersSupportFragmentTest.java
@@ -19,8 +19,6 @@
import static org.junit.Assert.assertTrue;
import android.os.Bundle;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import androidx.leanback.widget.ArrayObjectAdapter;
@@ -30,6 +28,8 @@
import androidx.leanback.widget.ListRow;
import androidx.leanback.widget.ListRowPresenter;
import androidx.leanback.widget.VerticalGridView;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/ListRowDataAdapterTest.java b/leanback/src/androidTest/java/androidx/leanback/app/ListRowDataAdapterTest.java
index 7809dc5..50af75f 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/ListRowDataAdapterTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/ListRowDataAdapterTest.java
@@ -20,10 +20,6 @@
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.leanback.widget.ArrayObjectAdapter;
import androidx.leanback.widget.DividerRow;
import androidx.leanback.widget.HeaderItem;
@@ -31,6 +27,9 @@
import androidx.leanback.widget.ObjectAdapter;
import androidx.leanback.widget.PresenterSelector;
import androidx.leanback.widget.SectionRow;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/PlaybackFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/PlaybackFragmentTest.java
index a21ba5f..cbb716e 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/PlaybackFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/PlaybackFragmentTest.java
@@ -29,10 +29,6 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import android.support.test.filters.FlakyTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.Suppress;
-import android.support.test.runner.AndroidJUnit4;
import android.view.KeyEvent;
import android.view.View;
@@ -49,6 +45,10 @@
import androidx.leanback.widget.Row;
import androidx.leanback.widget.RowPresenter;
import androidx.leanback.widget.SparseArrayObjectAdapter;
+import androidx.test.filters.FlakyTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.Suppress;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/PlaybackSupportFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/PlaybackSupportFragmentTest.java
index 5898e9e..1c42133 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/PlaybackSupportFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/PlaybackSupportFragmentTest.java
@@ -26,10 +26,6 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import android.support.test.filters.FlakyTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.Suppress;
-import android.support.test.runner.AndroidJUnit4;
import android.view.KeyEvent;
import android.view.View;
@@ -46,6 +42,10 @@
import androidx.leanback.widget.Row;
import androidx.leanback.widget.RowPresenter;
import androidx.leanback.widget.SparseArrayObjectAdapter;
+import androidx.test.filters.FlakyTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.Suppress;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/ProgressBarManagerTest.java b/leanback/src/androidTest/java/androidx/leanback/app/ProgressBarManagerTest.java
index 6fe875c..62a1d25 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/ProgressBarManagerTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/ProgressBarManagerTest.java
@@ -18,13 +18,13 @@
import static org.junit.Assert.assertSame;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import androidx.leanback.testutils.PollingCheck;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/RowsFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/RowsFragmentTest.java
index b851510..e2daa39 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/RowsFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/RowsFragmentTest.java
@@ -26,22 +26,18 @@
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import android.app.Fragment;
import android.graphics.Rect;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.SystemClock;
-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.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
-import android.app.Fragment;
import androidx.leanback.test.R;
import androidx.leanback.testutils.PollingCheck;
import androidx.leanback.widget.ArrayObjectAdapter;
@@ -58,6 +54,10 @@
import androidx.leanback.widget.RowPresenter;
import androidx.leanback.widget.SinglePresenterSelector;
import androidx.leanback.widget.VerticalGridView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/RowsSupportFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/RowsSupportFragmentTest.java
index 0d8105d..98289ee 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/RowsSupportFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/RowsSupportFragmentTest.java
@@ -28,10 +28,6 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.SystemClock;
-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.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.View;
@@ -55,6 +51,10 @@
import androidx.leanback.widget.RowPresenter;
import androidx.leanback.widget.SinglePresenterSelector;
import androidx.leanback.widget.VerticalGridView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/SingleFragmentTestActivity.java b/leanback/src/androidTest/java/androidx/leanback/app/SingleFragmentTestActivity.java
index 9b052a5..35fbdee 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/SingleFragmentTestActivity.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/SingleFragmentTestActivity.java
@@ -18,13 +18,13 @@
*/
package androidx.leanback.app;
+import android.app.Activity;
+import android.app.Fragment;
+import android.app.FragmentTransaction;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
-import android.app.Fragment;
-import android.app.Activity;
-import android.app.FragmentTransaction;
import androidx.leanback.test.R;
public class SingleFragmentTestActivity extends Activity {
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/SingleFragmentTestBase.java b/leanback/src/androidTest/java/androidx/leanback/app/SingleFragmentTestBase.java
index dcf5a10..4cec836e 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/SingleFragmentTestBase.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/SingleFragmentTestBase.java
@@ -21,10 +21,10 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.ActivityTestRule;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.rule.ActivityTestRule;
import org.junit.Rule;
import org.junit.rules.TestName;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/SingleSupportFragmentTestBase.java b/leanback/src/androidTest/java/androidx/leanback/app/SingleSupportFragmentTestBase.java
index 531385e..3864604 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/SingleSupportFragmentTestBase.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/SingleSupportFragmentTestBase.java
@@ -18,10 +18,10 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.ActivityTestRule;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.rule.ActivityTestRule;
import org.junit.Rule;
import org.junit.rules.TestName;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/TestActivity.java b/leanback/src/androidTest/java/androidx/leanback/app/TestActivity.java
index 70adc81..937cdb9 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/TestActivity.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/TestActivity.java
@@ -18,9 +18,9 @@
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
-import android.support.test.rule.ActivityTestRule;
import androidx.annotation.CallSuper;
+import androidx.test.rule.ActivityTestRule;
import java.util.HashMap;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/VerticalGridFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/VerticalGridFragmentTest.java
index 549b61c..684fd07 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/VerticalGridFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/VerticalGridFragmentTest.java
@@ -19,14 +19,14 @@
package androidx.leanback.app;
-import android.os.Bundle;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
-
import android.app.Fragment;
+import android.os.Bundle;
+
import androidx.leanback.widget.ArrayObjectAdapter;
import androidx.leanback.widget.VerticalGridPresenter;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/VerticalGridSupportFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/VerticalGridSupportFragmentTest.java
index 343ea61..44615b4 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/VerticalGridSupportFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/VerticalGridSupportFragmentTest.java
@@ -17,13 +17,13 @@
package androidx.leanback.app;
import android.os.Bundle;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.fragment.app.Fragment;
import androidx.leanback.widget.ArrayObjectAdapter;
import androidx.leanback.widget.VerticalGridPresenter;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/VideoFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/VideoFragmentTest.java
index a9a597a..7b78824 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/VideoFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/VideoFragmentTest.java
@@ -27,9 +27,6 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.LayoutInflater;
import android.view.SurfaceHolder;
import android.view.View;
@@ -40,6 +37,9 @@
import androidx.leanback.media.PlaybackGlueHost;
import androidx.leanback.test.R;
import androidx.leanback.testutils.PollingCheck;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/VideoSupportFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/VideoSupportFragmentTest.java
index d29913b..60a1fe7 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/VideoSupportFragmentTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/VideoSupportFragmentTest.java
@@ -24,9 +24,6 @@
import android.net.Uri;
import android.os.Bundle;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.LayoutInflater;
import android.view.SurfaceHolder;
import android.view.View;
@@ -37,6 +34,9 @@
import androidx.leanback.media.PlaybackGlueHost;
import androidx.leanback.test.R;
import androidx.leanback.testutils.PollingCheck;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedDatePickerTest.java b/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedDatePickerTest.java
index 123820b..2db87e4 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedDatePickerTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedDatePickerTest.java
@@ -19,10 +19,6 @@
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import android.view.KeyEvent;
import android.widget.LinearLayout;
@@ -34,6 +30,10 @@
import androidx.leanback.widget.GuidedDatePickerAction;
import androidx.leanback.widget.VerticalGridView;
import androidx.leanback.widget.picker.DatePicker;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedStepAttributesTest.java b/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedStepAttributesTest.java
index b6135ef..bd64ca0 100644
--- a/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedStepAttributesTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/app/wizard/GuidedStepAttributesTest.java
@@ -19,16 +19,16 @@
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.KeyEvent;
import androidx.leanback.app.GuidedStepFragment;
import androidx.leanback.test.R;
import androidx.leanback.widget.GuidanceStylist;
import androidx.leanback.widget.GuidedAction;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/leanback/src/androidTest/java/androidx/leanback/graphics/CompositeDrawableTest.java b/leanback/src/androidTest/java/androidx/leanback/graphics/CompositeDrawableTest.java
index 2b85ef8..9c01de2 100644
--- a/leanback/src/androidTest/java/androidx/leanback/graphics/CompositeDrawableTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/graphics/CompositeDrawableTest.java
@@ -24,12 +24,12 @@
import android.graphics.Rect;
import android.graphics.drawable.BitmapDrawable;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.leanback.graphics.BoundsRule.ValueRule;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/graphics/FitWidthBitmapDrawableTest.java b/leanback/src/androidTest/java/androidx/leanback/graphics/FitWidthBitmapDrawableTest.java
index 6efba00..bd5ac81 100644
--- a/leanback/src/androidTest/java/androidx/leanback/graphics/FitWidthBitmapDrawableTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/graphics/FitWidthBitmapDrawableTest.java
@@ -25,10 +25,11 @@
import android.graphics.Paint;
import android.graphics.Rect;
import android.os.Build;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/media/MediaControllerAdapterTest.java b/leanback/src/androidTest/java/androidx/leanback/media/MediaControllerAdapterTest.java
index eba9864..f72822e 100644
--- a/leanback/src/androidTest/java/androidx/leanback/media/MediaControllerAdapterTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/media/MediaControllerAdapterTest.java
@@ -16,8 +16,8 @@
package androidx.leanback.media;
-import static android.support.test.InstrumentationRegistry.getContext;
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
+import static androidx.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getInstrumentation;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -29,16 +29,16 @@
import android.os.Build;
import android.os.Handler;
import android.os.Looper;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.media.MediaMetadataCompat;
import android.support.v4.media.session.MediaControllerCompat;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.PlaybackStateCompat;
import androidx.leanback.widget.PlaybackControlsRow;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/leanback/src/androidTest/java/androidx/leanback/media/MediaPlayerGlueTest.java b/leanback/src/androidTest/java/androidx/leanback/media/MediaPlayerGlueTest.java
index 8fb415a..4f51b84 100644
--- a/leanback/src/androidTest/java/androidx/leanback/media/MediaPlayerGlueTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/media/MediaPlayerGlueTest.java
@@ -25,12 +25,12 @@
import android.net.Uri;
import android.os.Build;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.runner.AndroidJUnit4;
import androidx.leanback.testutils.PollingCheck;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/media/PlaybackBannerControlGlueTest.java b/leanback/src/androidTest/java/androidx/leanback/media/PlaybackBannerControlGlueTest.java
index 766e466..406e323 100644
--- a/leanback/src/androidTest/java/androidx/leanback/media/PlaybackBannerControlGlueTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/media/PlaybackBannerControlGlueTest.java
@@ -25,8 +25,6 @@
import static org.mockito.Mockito.when;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
import android.view.ContextThemeWrapper;
import android.view.ViewGroup;
import android.widget.FrameLayout;
@@ -36,6 +34,8 @@
import androidx.leanback.widget.PlaybackControlsRowPresenter;
import androidx.leanback.widget.PlaybackRowPresenter;
import androidx.leanback.widget.RowPresenter;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
import org.junit.Test;
import org.mockito.Mockito;
diff --git a/leanback/src/androidTest/java/androidx/leanback/media/PlaybackControlGlueTest.java b/leanback/src/androidTest/java/androidx/leanback/media/PlaybackControlGlueTest.java
index 24d7ded..45c84fa 100644
--- a/leanback/src/androidTest/java/androidx/leanback/media/PlaybackControlGlueTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/media/PlaybackControlGlueTest.java
@@ -22,8 +22,6 @@
import android.content.Context;
import android.graphics.drawable.Drawable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
import android.view.ViewGroup;
import android.widget.LinearLayout;
@@ -31,6 +29,8 @@
import androidx.leanback.widget.PlaybackControlsRowPresenter;
import androidx.leanback.widget.PlaybackRowPresenter;
import androidx.leanback.widget.RowPresenter;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
import org.junit.Test;
import org.mockito.Mockito;
diff --git a/leanback/src/androidTest/java/androidx/leanback/media/PlaybackGlueTest.java b/leanback/src/androidTest/java/androidx/leanback/media/PlaybackGlueTest.java
index 25c7537..91f0664 100644
--- a/leanback/src/androidTest/java/androidx/leanback/media/PlaybackGlueTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/media/PlaybackGlueTest.java
@@ -26,9 +26,10 @@
import static org.mockito.Mockito.when;
import android.content.Context;
-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 org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/media/PlaybackTransportControlGlueTest.java b/leanback/src/androidTest/java/androidx/leanback/media/PlaybackTransportControlGlueTest.java
index 02d7fcf..b52cfb6 100644
--- a/leanback/src/androidTest/java/androidx/leanback/media/PlaybackTransportControlGlueTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/media/PlaybackTransportControlGlueTest.java
@@ -26,8 +26,6 @@
import static org.mockito.Mockito.when;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
import android.view.ContextThemeWrapper;
import android.view.KeyEvent;
import android.view.ViewGroup;
@@ -38,6 +36,8 @@
import androidx.leanback.widget.PlaybackRowPresenter;
import androidx.leanback.widget.PlaybackTransportRowPresenter;
import androidx.leanback.widget.RowPresenter;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
import org.junit.Test;
import org.mockito.Mockito;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/BaseCardViewTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/BaseCardViewTest.java
index e4b280e..0d4195d 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/BaseCardViewTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/BaseCardViewTest.java
@@ -28,10 +28,11 @@
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
import android.view.View;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ControlBarTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ControlBarTest.java
index 80d2b9e..d4c0e39 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ControlBarTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ControlBarTest.java
@@ -21,14 +21,15 @@
import static org.junit.Assert.assertTrue;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/GridWidgetPrefetchTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/GridWidgetPrefetchTest.java
index fdd1c07..d2ab42e 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/GridWidgetPrefetchTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/GridWidgetPrefetchTest.java
@@ -10,13 +10,13 @@
import android.content.Context;
import android.os.Parcelable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.view.ViewGroup;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/GridWidgetTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/GridWidgetTest.java
index 21e9a6a..0c42193 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/GridWidgetTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/GridWidgetTest.java
@@ -36,11 +36,6 @@
import android.graphics.drawable.ColorDrawable;
import android.os.Build;
import android.os.Parcelable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.text.Selection;
import android.text.Spannable;
import android.util.DisplayMetrics;
@@ -58,6 +53,11 @@
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Rule;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/GuidedActionStylistTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/GuidedActionStylistTest.java
index 96ebde7..d7941ff 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/GuidedActionStylistTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/GuidedActionStylistTest.java
@@ -21,15 +21,15 @@
import static org.junit.Assert.assertTrue;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.InputType;
import android.view.ContextThemeWrapper;
import android.widget.FrameLayout;
import androidx.leanback.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ImageCardViewTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ImageCardViewTest.java
index 25ab224..13d008e 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ImageCardViewTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ImageCardViewTest.java
@@ -27,14 +27,14 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.SystemClock;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.widget.ImageView;
import androidx.leanback.R;
import androidx.leanback.app.TestActivity;
import androidx.leanback.testutils.PollingCheck;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ItemBridgeAdapterTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ItemBridgeAdapterTest.java
index 40c741c..44927ed 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ItemBridgeAdapterTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ItemBridgeAdapterTest.java
@@ -18,18 +18,17 @@
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
import android.view.View;
import android.view.ViewGroup;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ListRowPresenterTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ListRowPresenterTest.java
index 89e6b80f..bb1f9fd 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ListRowPresenterTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ListRowPresenterTest.java
@@ -25,15 +25,15 @@
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import androidx.core.view.ViewCompat;
import androidx.leanback.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/MediaNowPlayingViewTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/MediaNowPlayingViewTest.java
index 574c093..94319b9 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/MediaNowPlayingViewTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/MediaNowPlayingViewTest.java
@@ -16,9 +16,10 @@
package androidx.leanback.widget;
import android.content.Context;
-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 org.junit.Before;
import org.junit.Test;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ObjectAdapterTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ObjectAdapterTest.java
index c007ac9..33a10a5 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ObjectAdapterTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ObjectAdapterTest.java
@@ -27,8 +27,6 @@
import android.content.Context;
import android.os.Bundle;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
@@ -36,6 +34,8 @@
import androidx.annotation.Nullable;
import androidx.leanback.R;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/PagingIndicatorTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/PagingIndicatorTest.java
index b04dc08..9179488 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/PagingIndicatorTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/PagingIndicatorTest.java
@@ -17,9 +17,9 @@
import static org.junit.Assert.assertEquals;
-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 org.junit.Before;
import org.junit.Test;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxFloatEffectTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxFloatEffectTest.java
index da4dd91..701e087 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxFloatEffectTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxFloatEffectTest.java
@@ -19,14 +19,14 @@
package androidx.leanback.widget;
-import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Property;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxFloatTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxFloatTest.java
index 3ca207a..20fc885 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxFloatTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxFloatTest.java
@@ -21,8 +21,8 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
-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.Before;
import org.junit.Test;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxIntEffectTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxIntEffectTest.java
index ac4e46e..9a979d8 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxIntEffectTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxIntEffectTest.java
@@ -20,10 +20,11 @@
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Property;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxIntTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxIntTest.java
index f367770..2b5181f 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxIntTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ParallaxIntTest.java
@@ -18,8 +18,8 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
-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.Before;
import org.junit.Test;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/PlaybackTransportRowPresenterTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/PlaybackTransportRowPresenterTest.java
index 14c829d..84df047 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/PlaybackTransportRowPresenterTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/PlaybackTransportRowPresenterTest.java
@@ -30,8 +30,6 @@
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.drawable.ColorDrawable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
import android.view.ContextThemeWrapper;
import android.view.KeyEvent;
import android.view.View;
@@ -40,6 +38,8 @@
import androidx.leanback.media.PlaybackTransportControlGlue;
import androidx.leanback.media.PlayerAdapter;
import androidx.leanback.widget.PlaybackSeekDataProvider.ResultCallback;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/PresenterTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/PresenterTest.java
index 1d73cba..8cf4f19 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/PresenterTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/PresenterTest.java
@@ -22,9 +22,6 @@
import android.content.Context;
import android.graphics.Bitmap;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.ContextThemeWrapper;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
@@ -32,6 +29,9 @@
import androidx.leanback.R;
import androidx.leanback.app.HeadersFragment;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ShadowOverlayContainerTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ShadowOverlayContainerTest.java
index 781dc35..6c30390 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ShadowOverlayContainerTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ShadowOverlayContainerTest.java
@@ -19,14 +19,15 @@
import static org.junit.Assert.assertTrue;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View.MeasureSpec;
import android.view.ViewGroup.LayoutParams;
import android.widget.FrameLayout;
import android.widget.TextView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/SingleRowTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/SingleRowTest.java
index 1f65bc2..b040efe 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/SingleRowTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/SingleRowTest.java
@@ -21,10 +21,9 @@
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/StaggeredGridDefaultTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/StaggeredGridDefaultTest.java
index 342eb64..d0f4333 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/StaggeredGridDefaultTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/StaggeredGridDefaultTest.java
@@ -17,8 +17,8 @@
import static org.junit.Assert.assertEquals;
-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/leanback/src/androidTest/java/androidx/leanback/widget/ThumbsBarTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ThumbsBarTest.java
index 12445086..ad42595 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/ThumbsBarTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/ThumbsBarTest.java
@@ -21,12 +21,12 @@
import static org.mockito.Mockito.when;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import androidx.leanback.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/TitleViewAdapterTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/TitleViewAdapterTest.java
index 3a036a1..0e4942e 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/TitleViewAdapterTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/TitleViewAdapterTest.java
@@ -18,13 +18,14 @@
import android.content.Context;
import android.graphics.drawable.GradientDrawable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.util.AttributeSet;
import android.view.View;
import android.widget.LinearLayout;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/picker/DatePickerTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/picker/DatePickerTest.java
index 34d97b2..f49e6c6 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/picker/DatePickerTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/picker/DatePickerTest.java
@@ -23,16 +23,16 @@
import android.content.Context;
import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.view.ViewGroup;
import androidx.leanback.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/picker/TimePickerTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/picker/TimePickerTest.java
index e18022c..cc66a76 100644
--- a/leanback/src/androidTest/java/androidx/leanback/widget/picker/TimePickerTest.java
+++ b/leanback/src/androidTest/java/androidx/leanback/widget/picker/TimePickerTest.java
@@ -22,15 +22,15 @@
import android.content.Context;
import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.KeyEvent;
import android.view.View;
import android.view.ViewGroup;
import androidx.leanback.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/legacy/core-ui/build.gradle b/legacy/core-ui/build.gradle
index bc8e865..7952df4 100644
--- a/legacy/core-ui/build.gradle
+++ b/legacy/core-ui/build.gradle
@@ -20,9 +20,9 @@
api(project(":asynclayoutinflater"))
api(project(":cursoradapter"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CONTRIB_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CONTRIB, libs.exclude_for_espresso)
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':internal-testutils'), {
exclude group: 'androidx.legacy', module: 'legacy-support-core-ui'
diff --git a/legacy/core-utils/build.gradle b/legacy/core-utils/build.gradle
index c90d349..980bb91 100644
--- a/legacy/core-utils/build.gradle
+++ b/legacy/core-utils/build.gradle
@@ -14,8 +14,8 @@
api(project(":localbroadcastmanager"))
api(project(":print"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
}
diff --git a/lifecycle/common/build.gradle b/lifecycle/common/build.gradle
index 89f46a7..e95d252 100644
--- a/lifecycle/common/build.gradle
+++ b/lifecycle/common/build.gradle
@@ -14,10 +14,12 @@
* limitations under the License.
*/
-import static androidx.build.dependencies.DependenciesKt.*
+
import androidx.build.LibraryGroups
-import androidx.build.LibraryVersions;
-import androidx.build.SupportLibraryExtension;
+import androidx.build.LibraryVersions
+import androidx.build.SupportLibraryExtension
+
+import static androidx.build.dependencies.DependenciesKt.*
plugins {
id("SupportJavaLibraryPlugin")
diff --git a/lifecycle/extensions/build.gradle b/lifecycle/extensions/build.gradle
index f3b6e2f..e5cf39c 100644
--- a/lifecycle/extensions/build.gradle
+++ b/lifecycle/extensions/build.gradle
@@ -39,6 +39,7 @@
testImplementation(MOCKITO_CORE)
androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
androidTestImplementation(ESPRESSO_CORE)
androidTestImplementation(SUPPORT_APPCOMPAT, libs.support_exclude_config)
}
diff --git a/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/FragmentLifecycleInActivityTest.java b/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/FragmentLifecycleInActivityTest.java
index 40c7225..f82611e 100644
--- a/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/FragmentLifecycleInActivityTest.java
+++ b/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/FragmentLifecycleInActivityTest.java
@@ -30,12 +30,12 @@
import android.app.Instrumentation;
import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.activity.FragmentLifecycleActivity;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
import org.junit.Before;
import org.junit.Rule;
diff --git a/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/FragmentOperationsLifecycleTest.java b/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/FragmentOperationsLifecycleTest.java
index 0e30381c..26682ff 100644
--- a/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/FragmentOperationsLifecycleTest.java
+++ b/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/FragmentOperationsLifecycleTest.java
@@ -28,15 +28,14 @@
import static java.util.Arrays.asList;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.activity.EmptyActivity;
import androidx.lifecycle.extensions.test.R;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/ViewModelTest.java b/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/ViewModelTest.java
index 89d32ff..dbab932 100644
--- a/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/ViewModelTest.java
+++ b/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/ViewModelTest.java
@@ -24,11 +24,6 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.app.Instrumentation;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
@@ -36,6 +31,11 @@
import androidx.lifecycle.viewmodeltest.TestViewModel;
import androidx.lifecycle.viewmodeltest.ViewModelActivity;
import androidx.lifecycle.viewmodeltest.ViewModelActivity.ViewModelFragment;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/ViewModelTestInTransaction.java b/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/ViewModelTestInTransaction.java
index 091bede..1ebaf8a 100644
--- a/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/ViewModelTestInTransaction.java
+++ b/lifecycle/extensions/src/androidTest/java/androidx/lifecycle/ViewModelTestInTransaction.java
@@ -21,14 +21,14 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.os.Bundle;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.viewmodeltest.TestViewModel;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/LiveDataTransactionTest.java b/lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/LiveDataTransactionTest.java
index 443662a..0a49f09 100644
--- a/lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/LiveDataTransactionTest.java
+++ b/lifecycle/integration-tests/test-app/src/androidTest/java/com/android/support/lifecycle/LiveDataTransactionTest.java
@@ -24,8 +24,8 @@
import static org.hamcrest.Matchers.is;
import android.os.Bundle;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
diff --git a/lifecycle/integration-tests/testapp/build.gradle b/lifecycle/integration-tests/testapp/build.gradle
index a842c45..12e6725 100644
--- a/lifecycle/integration-tests/testapp/build.gradle
+++ b/lifecycle/integration-tests/testapp/build.gradle
@@ -44,6 +44,7 @@
androidTestAnnotationProcessor(project(":lifecycle:lifecycle-compiler"))
androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
androidTestImplementation(ESPRESSO_CORE)
testImplementation(JUNIT)
diff --git a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/ActivityFullLifecycleTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/ActivityFullLifecycleTest.java
index 26e309e..3f7293e 100644
--- a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/ActivityFullLifecycleTest.java
+++ b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/ActivityFullLifecycleTest.java
@@ -28,8 +28,6 @@
import static org.hamcrest.Matchers.is;
import android.app.Activity;
-import android.support.test.filters.LargeTest;
-import android.support.test.rule.ActivityTestRule;
import androidx.core.util.Pair;
import androidx.lifecycle.Lifecycle.Event;
@@ -37,6 +35,8 @@
import androidx.lifecycle.testapp.CollectingSupportActivity;
import androidx.lifecycle.testapp.FrameworkLifecycleRegistryActivity;
import androidx.lifecycle.testapp.TestEvent;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
import org.junit.Rule;
import org.junit.Test;
diff --git a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/FragmentInBackStackLifecycleTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/FragmentInBackStackLifecycleTest.java
index e20d95c..db36be5 100644
--- a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/FragmentInBackStackLifecycleTest.java
+++ b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/FragmentInBackStackLifecycleTest.java
@@ -31,16 +31,15 @@
import static java.util.Arrays.asList;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import androidx.lifecycle.Lifecycle.Event;
import androidx.lifecycle.testapp.EmptyActivity;
import androidx.lifecycle.testapp.R;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/LiveDataOnSaveInstanceStateTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/LiveDataOnSaveInstanceStateTest.java
index 32312c0..4ea1431 100644
--- a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/LiveDataOnSaveInstanceStateTest.java
+++ b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/LiveDataOnSaveInstanceStateTest.java
@@ -22,16 +22,16 @@
import android.app.Instrumentation;
import android.content.Intent;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.testapp.CollectingSupportActivity;
import androidx.lifecycle.testapp.CollectingSupportFragment;
import androidx.lifecycle.testapp.NavigationDialogActivity;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/PartiallyCoveredActivityTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/PartiallyCoveredActivityTest.java
index 7a6d389..5735a8b 100644
--- a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/PartiallyCoveredActivityTest.java
+++ b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/PartiallyCoveredActivityTest.java
@@ -38,9 +38,6 @@
import android.app.Instrumentation;
import android.content.Intent;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.rule.ActivityTestRule;
import androidx.core.util.Pair;
import androidx.fragment.app.FragmentActivity;
@@ -49,6 +46,9 @@
import androidx.lifecycle.testapp.CollectingSupportFragment;
import androidx.lifecycle.testapp.NavigationDialogActivity;
import androidx.lifecycle.testapp.TestEvent;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
import org.junit.Rule;
import org.junit.Test;
diff --git a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/ProcessOwnerTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/ProcessOwnerTest.java
index 1e27357..699f059 100644
--- a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/ProcessOwnerTest.java
+++ b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/ProcessOwnerTest.java
@@ -29,10 +29,6 @@
import android.app.Instrumentation;
import android.content.Context;
import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.Lifecycle.Event;
@@ -40,6 +36,10 @@
import androidx.lifecycle.testapp.NavigationTestActivityFirst;
import androidx.lifecycle.testapp.NavigationTestActivitySecond;
import androidx.lifecycle.testapp.NonSupportActivity;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Rule;
diff --git a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/SimpleAppFullLifecycleTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/SimpleAppFullLifecycleTest.java
index 3a79160..18bc289 100644
--- a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/SimpleAppFullLifecycleTest.java
+++ b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/SimpleAppFullLifecycleTest.java
@@ -23,15 +23,15 @@
import static org.hamcrest.Matchers.isIn;
import static org.hamcrest.Matchers.notNullValue;
-import android.support.test.filters.LargeTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Pair;
import androidx.lifecycle.Lifecycle.Event;
import androidx.lifecycle.Lifecycle.State;
import androidx.lifecycle.testapp.SimpleAppLifecycleTestActivity;
import androidx.lifecycle.testapp.SimpleAppLifecycleTestActivity.TestEventType;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/SynchronousActivityLifecycleTest.java b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/SynchronousActivityLifecycleTest.java
index 1d18d29..6fed56c 100644
--- a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/SynchronousActivityLifecycleTest.java
+++ b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/SynchronousActivityLifecycleTest.java
@@ -16,7 +16,7 @@
package androidx.lifecycle;
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
+import static androidx.test.InstrumentationRegistry.getInstrumentation;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
@@ -28,13 +28,13 @@
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.os.Build;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.UiThreadTestRule;
-import android.support.test.runner.AndroidJUnit4;
import androidx.lifecycle.Lifecycle.Event;
import androidx.lifecycle.testapp.LifecycleTestActivity;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.UiThreadTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/TestUtils.java b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/TestUtils.java
index 2045181..86a2984 100644
--- a/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/TestUtils.java
+++ b/lifecycle/integration-tests/testapp/src/androidTest/java/androidx/lifecycle/TestUtils.java
@@ -35,11 +35,11 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.app.Instrumentation.ActivityMonitor;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.ActivityTestRule;
import androidx.core.util.Pair;
import androidx.lifecycle.testapp.TestEvent;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.rule.ActivityTestRule;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/lifecycle/livedata/src/test/java/androidx/lifecycle/TransformationsTest.java b/lifecycle/livedata/src/test/java/androidx/lifecycle/TransformationsTest.java
index 4994523..2d2151c 100644
--- a/lifecycle/livedata/src/test/java/androidx/lifecycle/TransformationsTest.java
+++ b/lifecycle/livedata/src/test/java/androidx/lifecycle/TransformationsTest.java
@@ -26,8 +26,8 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import androidx.arch.core.util.Function;
import androidx.arch.core.executor.ArchTaskExecutor;
+import androidx.arch.core.util.Function;
import androidx.lifecycle.util.InstantTaskExecutor;
import org.junit.Before;
diff --git a/lifecycle/runtime/src/androidTest/java/androidx/lifecycle/MissingClassTest.java b/lifecycle/runtime/src/androidTest/java/androidx/lifecycle/MissingClassTest.java
index 1992f79..c96d5a4 100644
--- a/lifecycle/runtime/src/androidTest/java/androidx/lifecycle/MissingClassTest.java
+++ b/lifecycle/runtime/src/androidTest/java/androidx/lifecycle/MissingClassTest.java
@@ -18,9 +18,10 @@
import android.app.PictureInPictureParams;
import android.os.Build;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/lifecycle/service/src/androidTest/java/androidx/lifecycle/ServiceLifecycleTest.java b/lifecycle/service/src/androidTest/java/androidx/lifecycle/ServiceLifecycleTest.java
index 7f58907f..c56dd0f 100644
--- a/lifecycle/service/src/androidTest/java/androidx/lifecycle/ServiceLifecycleTest.java
+++ b/lifecycle/service/src/androidTest/java/androidx/lifecycle/ServiceLifecycleTest.java
@@ -31,13 +31,13 @@
import android.content.IntentFilter;
import android.content.ServiceConnection;
import android.os.IBinder;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.lifecycle.Lifecycle.Event;
import androidx.lifecycle.service.TestService;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/lifecycle/viewmodel/ktx/src/test/java/androidx/lifecycle/ViewModelProviderTest.kt b/lifecycle/viewmodel/ktx/src/test/java/androidx/lifecycle/ViewModelProviderTest.kt
index e8e76ce..913731e 100644
--- a/lifecycle/viewmodel/ktx/src/test/java/androidx/lifecycle/ViewModelProviderTest.kt
+++ b/lifecycle/viewmodel/ktx/src/test/java/androidx/lifecycle/ViewModelProviderTest.kt
@@ -16,7 +16,7 @@
package androidx.lifecycle
-import android.support.test.filters.SmallTest
+import androidx.test.filters.SmallTest
import org.junit.Assert.assertNotNull
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/loader/build.gradle b/loader/build.gradle
index 9a34ff2..73d8803 100644
--- a/loader/build.gradle
+++ b/loader/build.gradle
@@ -12,8 +12,9 @@
api(ARCH_LIFECYCLE_LIVEDATA_CORE, libs.exclude_annotations_transitive)
api(ARCH_LIFECYCLE_VIEWMODEL, libs.exclude_annotations_transitive)
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
}
diff --git a/loader/src/androidTest/java/androidx/loader/app/LoaderInfoTest.java b/loader/src/androidTest/java/androidx/loader/app/LoaderInfoTest.java
index 963d390..ece2cd7 100644
--- a/loader/src/androidTest/java/androidx/loader/app/LoaderInfoTest.java
+++ b/loader/src/androidTest/java/androidx/loader/app/LoaderInfoTest.java
@@ -22,10 +22,6 @@
import static org.mockito.Mockito.when;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleOwner;
@@ -33,6 +29,10 @@
import androidx.loader.app.test.DelayLoader;
import androidx.loader.app.test.DummyLoaderCallbacks;
import androidx.loader.content.Loader;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/loader/src/androidTest/java/androidx/loader/app/LoaderManagerTest.java b/loader/src/androidTest/java/androidx/loader/app/LoaderManagerTest.java
index bbe7e52..3b0e16c 100644
--- a/loader/src/androidTest/java/androidx/loader/app/LoaderManagerTest.java
+++ b/loader/src/androidTest/java/androidx/loader/app/LoaderManagerTest.java
@@ -23,10 +23,6 @@
import android.content.Context;
import android.os.Bundle;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.NonNull;
import androidx.lifecycle.Lifecycle;
@@ -37,6 +33,10 @@
import androidx.loader.app.test.DelayLoaderCallbacks;
import androidx.loader.app.test.DummyLoaderCallbacks;
import androidx.loader.content.Loader;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/loader/src/androidTest/java/androidx/loader/app/LoaderObserverTest.java b/loader/src/androidTest/java/androidx/loader/app/LoaderObserverTest.java
index 8eb59c1..33a2c96 100644
--- a/loader/src/androidTest/java/androidx/loader/app/LoaderObserverTest.java
+++ b/loader/src/androidTest/java/androidx/loader/app/LoaderObserverTest.java
@@ -21,10 +21,10 @@
import static org.mockito.Mockito.mock;
import android.content.Context;
-import android.support.test.filters.SmallTest;
import androidx.loader.app.test.DummyLoaderCallbacks;
import androidx.loader.content.Loader;
+import androidx.test.filters.SmallTest;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/loader/src/androidTest/java/androidx/loader/app/LoaderViewModelTest.java b/loader/src/androidTest/java/androidx/loader/app/LoaderViewModelTest.java
index 3387eba..ca0068a 100644
--- a/loader/src/androidTest/java/androidx/loader/app/LoaderViewModelTest.java
+++ b/loader/src/androidTest/java/androidx/loader/app/LoaderViewModelTest.java
@@ -22,10 +22,10 @@
import static org.mockito.Mockito.mock;
import android.content.Context;
-import android.support.test.filters.SmallTest;
import androidx.loader.app.test.DummyLoader;
import androidx.loader.content.Loader;
+import androidx.test.filters.SmallTest;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/loader/src/androidTest/java/androidx/loader/content/ModernAsyncTaskTest.java b/loader/src/androidTest/java/androidx/loader/content/ModernAsyncTaskTest.java
index 833022b..f1dd536 100644
--- a/loader/src/androidTest/java/androidx/loader/content/ModernAsyncTaskTest.java
+++ b/loader/src/androidTest/java/androidx/loader/content/ModernAsyncTaskTest.java
@@ -18,11 +18,10 @@
import static org.junit.Assert.fail;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.annotation.NonNull;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/media-widget/build.gradle b/media-widget/build.gradle
index 0c96c9c..d6fb71a 100644
--- a/media-widget/build.gradle
+++ b/media-widget/build.gradle
@@ -28,9 +28,9 @@
api(project(":appcompat"))
api(project(":palette"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
- androidTestImplementation(TEST_RULES_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':internal-testutils')
diff --git a/media-widget/src/androidTest/java/androidx/media/widget/VideoView2Test.java b/media-widget/src/androidTest/java/androidx/media/widget/VideoView2Test.java
index f8baa14..29809a9 100644
--- a/media-widget/src/androidTest/java/androidx/media/widget/VideoView2Test.java
+++ b/media-widget/src/androidTest/java/androidx/media/widget/VideoView2Test.java
@@ -34,12 +34,6 @@
import android.content.res.AssetFileDescriptor;
import android.net.Uri;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import android.view.View;
import android.view.WindowManager;
@@ -50,6 +44,12 @@
import androidx.media2.MediaController2;
import androidx.media2.MediaItem2;
import androidx.media2.SessionCommandGroup2;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media/build.gradle b/media/build.gradle
index 5293e87..6ca6bdb 100644
--- a/media/build.gradle
+++ b/media/build.gradle
@@ -11,8 +11,8 @@
api(project(":core"))
api(project(':versionedparcelable'))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation project(':internal-testutils')
annotationProcessor(project(":versionedparcelable-annotation"))
}
diff --git a/media/version-compat-tests/current/client/build.gradle b/media/version-compat-tests/current/client/build.gradle
index 9b68632..89f2442 100644
--- a/media/version-compat-tests/current/client/build.gradle
+++ b/media/version-compat-tests/current/client/build.gradle
@@ -24,5 +24,5 @@
androidTestImplementation(project(":media2"))
androidTestImplementation(project(":support-media-compat-test-lib"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
}
diff --git a/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/AudioAttributesCompatTest.java b/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/AudioAttributesCompatTest.java
index 47e4559..f0691eb 100644
--- a/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/AudioAttributesCompatTest.java
+++ b/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/AudioAttributesCompatTest.java
@@ -22,11 +22,11 @@
import android.media.AudioAttributes;
import android.media.AudioManager;
import android.os.Build;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.media.AudioAttributesCompat;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaBrowserCompatTest.java b/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaBrowserCompatTest.java
index ba89f99..60e4567 100644
--- a/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaBrowserCompatTest.java
+++ b/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaBrowserCompatTest.java
@@ -52,9 +52,10 @@
import static android.support.mediacompat.testlib.VersionConstants.VERSION_TOT;
import static android.support.mediacompat.testlib.util.IntentUtil.SERVICE_PACKAGE_NAME;
import static android.support.mediacompat.testlib.util.IntentUtil.callMediaBrowserServiceMethod;
-import static android.support.test.InstrumentationRegistry.getArguments;
-import static android.support.test.InstrumentationRegistry.getContext;
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
+
+import static androidx.test.InstrumentationRegistry.getArguments;
+import static androidx.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getInstrumentation;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -68,10 +69,6 @@
import android.os.Build;
import android.os.Bundle;
import android.support.mediacompat.testlib.util.PollingCheck;
-import android.support.test.filters.FlakyTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.media.MediaBrowserCompat;
import android.support.v4.media.MediaBrowserCompat.MediaItem;
import android.support.v4.media.MediaDescriptionCompat;
@@ -81,6 +78,10 @@
import androidx.annotation.NonNull;
import androidx.media.MediaBrowserServiceCompat;
+import androidx.test.filters.FlakyTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaControllerCompatCallbackTest.java b/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaControllerCompatCallbackTest.java
index bec9e0a..30fa2ef 100644
--- a/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaControllerCompatCallbackTest.java
+++ b/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaControllerCompatCallbackTest.java
@@ -49,12 +49,13 @@
import static android.support.mediacompat.testlib.util.IntentUtil.SERVICE_PACKAGE_NAME;
import static android.support.mediacompat.testlib.util.IntentUtil.callMediaSessionMethod;
import static android.support.mediacompat.testlib.util.TestUtil.assertBundleEquals;
-import static android.support.test.InstrumentationRegistry.getArguments;
-import static android.support.test.InstrumentationRegistry.getContext;
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
-import static android.support.test.InstrumentationRegistry.getTargetContext;
import static android.support.v4.media.MediaMetadataCompat.METADATA_KEY_RATING;
+import static androidx.test.InstrumentationRegistry.getArguments;
+import static androidx.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getInstrumentation;
+import static androidx.test.InstrumentationRegistry.getTargetContext;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -72,10 +73,6 @@
import android.os.Handler;
import android.os.Looper;
import android.support.mediacompat.testlib.util.PollingCheck;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.media.MediaBrowserCompat;
import android.support.v4.media.MediaDescriptionCompat;
import android.support.v4.media.MediaMetadataCompat;
@@ -88,6 +85,10 @@
import android.util.Log;
import androidx.media.VolumeProviderCompat;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaItemTest.java b/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaItemTest.java
index 179a178..49a45a4 100644
--- a/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaItemTest.java
+++ b/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/MediaItemTest.java
@@ -20,10 +20,11 @@
import static org.junit.Assert.assertTrue;
import android.os.Parcel;
-import android.support.test.filters.SmallTest;
import android.support.v4.media.MediaBrowserCompat.MediaItem;
import android.support.v4.media.MediaDescriptionCompat;
+import androidx.test.filters.SmallTest;
+
import org.junit.Test;
/**
diff --git a/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/PlaybackStateCompatTest.java b/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/PlaybackStateCompatTest.java
index 7962731..811f179 100644
--- a/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/PlaybackStateCompatTest.java
+++ b/media/version-compat-tests/current/client/src/androidTest/java/android/support/mediacompat/client/PlaybackStateCompatTest.java
@@ -22,11 +22,12 @@
import android.os.Bundle;
import android.os.Parcel;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.PlaybackStateCompat;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaBrowser2CallbackTest.java b/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaBrowser2CallbackTest.java
index 3e1d753..031fc7d 100644
--- a/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaBrowser2CallbackTest.java
+++ b/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaBrowser2CallbackTest.java
@@ -43,10 +43,6 @@
import android.os.Build;
import android.os.Bundle;
import android.os.ResultReceiver;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.CallSuper;
import androidx.annotation.GuardedBy;
@@ -64,6 +60,10 @@
import androidx.media2.SessionCommand2;
import androidx.media2.SessionCommandGroup2;
import androidx.media2.SessionToken2;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaBrowser2Test.java b/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaBrowser2Test.java
index 83138c0..972d118 100644
--- a/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaBrowser2Test.java
+++ b/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaBrowser2Test.java
@@ -21,9 +21,6 @@
import android.content.Context;
import android.os.Build;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.CallSuper;
import androidx.annotation.NonNull;
@@ -33,6 +30,9 @@
import androidx.media2.MediaController2.ControllerCallback;
import androidx.media2.SessionCommandGroup2;
import androidx.media2.SessionToken2;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.runner.RunWith;
diff --git a/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaController2CallbackTest.java b/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaController2CallbackTest.java
index 4307736..f3f2066 100644
--- a/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaController2CallbackTest.java
+++ b/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaController2CallbackTest.java
@@ -46,10 +46,6 @@
import android.os.Build;
import android.os.Bundle;
import android.os.ResultReceiver;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -68,6 +64,10 @@
import androidx.media2.SessionCommand2;
import androidx.media2.SessionCommandGroup2;
import androidx.media2.SessionToken2;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaController2Test.java b/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaController2Test.java
index ed3f1b7..a82af58 100644
--- a/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaController2Test.java
+++ b/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaController2Test.java
@@ -49,9 +49,6 @@
import android.os.Build;
import android.os.Bundle;
import android.support.mediacompat.testlib.util.PollingCheck;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.media.AudioAttributesCompat;
import androidx.media.test.client.MediaTestUtils;
@@ -60,6 +57,9 @@
import androidx.media2.MediaController2;
import androidx.media2.MediaController2.PlaybackInfo;
import androidx.media2.MediaItem2;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaSession2TestBase.java b/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaSession2TestBase.java
index 671bd3b..ec047c7 100644
--- a/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaSession2TestBase.java
+++ b/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/MediaSession2TestBase.java
@@ -25,7 +25,6 @@
import android.os.HandlerThread;
import android.os.Looper;
import android.os.ResultReceiver;
-import android.support.test.InstrumentationRegistry;
import androidx.annotation.CallSuper;
import androidx.annotation.GuardedBy;
@@ -40,6 +39,7 @@
import androidx.media2.SessionCommand2;
import androidx.media2.SessionCommandGroup2;
import androidx.media2.SessionToken2;
+import androidx.test.InstrumentationRegistry;
import org.junit.AfterClass;
import org.junit.BeforeClass;
diff --git a/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/RemoteMediaSession2Test.java b/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/RemoteMediaSession2Test.java
index 962c16f..1ad72ad 100644
--- a/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/RemoteMediaSession2Test.java
+++ b/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/RemoteMediaSession2Test.java
@@ -24,13 +24,13 @@
import static org.junit.Assert.assertNotNull;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.media.test.client.RemoteMediaSession2;
import androidx.media2.MediaController2;
import androidx.media2.SessionToken2;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/RemoteMediaSessionCompatTest.java b/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/RemoteMediaSessionCompatTest.java
index c47fc6f..ac43924 100644
--- a/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/RemoteMediaSessionCompatTest.java
+++ b/media/version-compat-tests/current/client/src/androidTest/java/androidx/media/test/client/tests/RemoteMediaSessionCompatTest.java
@@ -24,13 +24,13 @@
import static org.junit.Assert.assertNotNull;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.media.session.MediaControllerCompat;
import android.support.v4.media.session.MediaSessionCompat;
import androidx.media.test.client.RemoteMediaSessionCompat;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media/version-compat-tests/current/service/build.gradle b/media/version-compat-tests/current/service/build.gradle
index 9b68632..89f2442 100644
--- a/media/version-compat-tests/current/service/build.gradle
+++ b/media/version-compat-tests/current/service/build.gradle
@@ -24,5 +24,5 @@
androidTestImplementation(project(":media2"))
androidTestImplementation(project(":support-media-compat-test-lib"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
}
diff --git a/media/version-compat-tests/current/service/src/androidTest/java/android/support/mediacompat/service/MediaSessionCompatCallbackTest.java b/media/version-compat-tests/current/service/src/androidTest/java/android/support/mediacompat/service/MediaSessionCompatCallbackTest.java
index 544d716..fb9c183 100644
--- a/media/version-compat-tests/current/service/src/androidTest/java/android/support/mediacompat/service/MediaSessionCompatCallbackTest.java
+++ b/media/version-compat-tests/current/service/src/androidTest/java/android/support/mediacompat/service/MediaSessionCompatCallbackTest.java
@@ -58,10 +58,11 @@
import static android.support.mediacompat.testlib.util.IntentUtil.callMediaControllerMethod;
import static android.support.mediacompat.testlib.util.IntentUtil.callTransportControlsMethod;
import static android.support.mediacompat.testlib.util.TestUtil.assertBundleEquals;
-import static android.support.test.InstrumentationRegistry.getArguments;
-import static android.support.test.InstrumentationRegistry.getContext;
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
-import static android.support.test.InstrumentationRegistry.getTargetContext;
+
+import static androidx.test.InstrumentationRegistry.getArguments;
+import static androidx.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getInstrumentation;
+import static androidx.test.InstrumentationRegistry.getTargetContext;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -88,10 +89,6 @@
import android.os.ResultReceiver;
import android.os.SystemClock;
import android.support.mediacompat.testlib.util.PollingCheck;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.media.MediaBrowserCompat;
import android.support.v4.media.MediaDescriptionCompat;
import android.support.v4.media.RatingCompat;
@@ -103,6 +100,10 @@
import androidx.media.MediaSessionManager.RemoteUserInfo;
import androidx.media.VolumeProviderCompat;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/BaseMediaPlayerTest.java b/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/BaseMediaPlayerTest.java
index abd8517..3380f96 100644
--- a/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/BaseMediaPlayerTest.java
+++ b/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/BaseMediaPlayerTest.java
@@ -23,9 +23,6 @@
import static org.junit.Assert.fail;
import android.os.Build;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.media.test.service.MockPlayer;
import androidx.media.test.service.MockPlaylistAgent;
@@ -33,6 +30,9 @@
import androidx.media2.BaseMediaPlayer;
import androidx.media2.MediaSession2;
import androidx.media2.SessionCommandGroup2;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/BaseRemoteMediaPlayerTest.java b/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/BaseRemoteMediaPlayerTest.java
index 638d7be..54b41f5 100644
--- a/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/BaseRemoteMediaPlayerTest.java
+++ b/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/BaseRemoteMediaPlayerTest.java
@@ -23,9 +23,6 @@
import android.media.AudioManager;
import android.os.Build;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.media.test.service.MockPlayer;
import androidx.media.test.service.MockPlaylistAgent;
@@ -34,6 +31,9 @@
import androidx.media2.BaseRemoteMediaPlayer;
import androidx.media2.MediaSession2;
import androidx.media2.SessionCommandGroup2;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaLibrarySessionCallbackTest.java b/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaLibrarySessionCallbackTest.java
index 4ba7da7..dc7ea68 100644
--- a/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaLibrarySessionCallbackTest.java
+++ b/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaLibrarySessionCallbackTest.java
@@ -21,9 +21,6 @@
import android.os.Build;
import android.os.Bundle;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.media.test.lib.TestUtils;
import androidx.media.test.service.MockMediaLibraryService2;
@@ -31,6 +28,9 @@
import androidx.media.test.service.RemoteMediaBrowser2;
import androidx.media2.MediaLibraryService2.MediaLibrarySession;
import androidx.media2.MediaSession2;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaPlaylistAgentTest.java b/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaPlaylistAgentTest.java
index b9676db..e846ba7 100644
--- a/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaPlaylistAgentTest.java
+++ b/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaPlaylistAgentTest.java
@@ -25,9 +25,6 @@
import static org.junit.Assert.assertTrue;
import android.os.Build;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.media.test.service.MediaTestUtils;
import androidx.media.test.service.MockPlayer;
@@ -38,6 +35,9 @@
import androidx.media2.MediaPlaylistAgent;
import androidx.media2.MediaSession2;
import androidx.media2.SessionCommandGroup2;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaSession2CallbackTest.java b/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaSession2CallbackTest.java
index db19c3f..64ccdbb 100644
--- a/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaSession2CallbackTest.java
+++ b/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaSession2CallbackTest.java
@@ -28,9 +28,6 @@
import android.os.Build;
import android.os.Bundle;
import android.os.ResultReceiver;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.NonNull;
import androidx.media.test.lib.TestUtils;
@@ -47,6 +44,9 @@
import androidx.media2.Rating2;
import androidx.media2.SessionCommand2;
import androidx.media2.SessionCommandGroup2;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaSession2Test.java b/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaSession2Test.java
index af2417a..4687f9b 100644
--- a/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaSession2Test.java
+++ b/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaSession2Test.java
@@ -26,9 +26,6 @@
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Process;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.media.test.lib.TestUtils.SyncHandler;
import androidx.media.test.service.MediaTestUtils;
@@ -42,6 +39,9 @@
import androidx.media2.MediaSession2;
import androidx.media2.MediaSession2.SessionCallback;
import androidx.media2.SessionCommandGroup2;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaSession2TestBase.java b/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaSession2TestBase.java
index 15c51b3..f3bb967 100644
--- a/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaSession2TestBase.java
+++ b/media/version-compat-tests/current/service/src/androidTest/java/androidx/media/test/service/tests/MediaSession2TestBase.java
@@ -20,7 +20,6 @@
import android.os.Build;
import android.os.HandlerThread;
import android.os.Looper;
-import android.support.test.InstrumentationRegistry;
import androidx.annotation.CallSuper;
import androidx.annotation.NonNull;
@@ -28,6 +27,7 @@
import androidx.media.test.service.RemoteMediaBrowser2;
import androidx.media.test.service.RemoteMediaController2;
import androidx.media2.SessionToken2;
+import androidx.test.InstrumentationRegistry;
import org.junit.AfterClass;
import org.junit.BeforeClass;
diff --git a/media/version-compat-tests/lib/src/main/java/android/support/mediacompat/testlib/util/PollingCheck.java b/media/version-compat-tests/lib/src/main/java/android/support/mediacompat/testlib/util/PollingCheck.java
index 37486aa..459e18e 100644
--- a/media/version-compat-tests/lib/src/main/java/android/support/mediacompat/testlib/util/PollingCheck.java
+++ b/media/version-compat-tests/lib/src/main/java/android/support/mediacompat/testlib/util/PollingCheck.java
@@ -20,7 +20,7 @@
/**
* Utility used for testing that allows to poll for a certain condition to happen within a timeout.
- * (Copied from testutils/src/main/java/android/support/testutils/PollingCheck.java.)
+ * (Copied from testutils/src/main/java/androidx.testutils/PollingCheck.java.)
*/
public abstract class PollingCheck {
private static final long DEFAULT_TIMEOUT = 3000;
diff --git a/media/version-compat-tests/previous/client/build.gradle b/media/version-compat-tests/previous/client/build.gradle
index 06e446f..25c4322 100644
--- a/media/version-compat-tests/previous/client/build.gradle
+++ b/media/version-compat-tests/previous/client/build.gradle
@@ -24,5 +24,5 @@
androidTestImplementation project(':support-media-compat-test-lib')
androidTestImplementation "com.android.support:support-media-compat:27.1.0"
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
}
diff --git a/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/AudioAttributesCompatTest.java b/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/AudioAttributesCompatTest.java
index 675c0fc..371a18f 100644
--- a/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/AudioAttributesCompatTest.java
+++ b/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/AudioAttributesCompatTest.java
@@ -22,11 +22,12 @@
import android.media.AudioAttributes;
import android.media.AudioManager;
import android.os.Build;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.media.AudioAttributesCompat;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/MediaBrowserCompatTest.java b/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/MediaBrowserCompatTest.java
index 7457ca9..dc66589 100644
--- a/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/MediaBrowserCompatTest.java
+++ b/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/MediaBrowserCompatTest.java
@@ -49,9 +49,10 @@
import static android.support.mediacompat.testlib.VersionConstants.KEY_SERVICE_VERSION;
import static android.support.mediacompat.testlib.util.IntentUtil.SERVICE_PACKAGE_NAME;
import static android.support.mediacompat.testlib.util.IntentUtil.callMediaBrowserServiceMethod;
-import static android.support.test.InstrumentationRegistry.getArguments;
-import static android.support.test.InstrumentationRegistry.getContext;
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
+
+import static androidx.test.InstrumentationRegistry.getArguments;
+import static androidx.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getInstrumentation;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -65,16 +66,17 @@
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.mediacompat.testlib.util.PollingCheck;
-import android.support.test.filters.FlakyTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.media.MediaBrowserCompat;
import android.support.v4.media.MediaBrowserCompat.MediaItem;
import android.support.v4.media.MediaBrowserServiceCompat;
import android.support.v4.media.MediaDescriptionCompat;
import android.util.Log;
+import androidx.test.filters.FlakyTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/MediaControllerCompatCallbackTest.java b/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/MediaControllerCompatCallbackTest.java
index b173a4d..70877cd 100644
--- a/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/MediaControllerCompatCallbackTest.java
+++ b/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/MediaControllerCompatCallbackTest.java
@@ -49,12 +49,13 @@
import static android.support.mediacompat.testlib.util.IntentUtil.SERVICE_PACKAGE_NAME;
import static android.support.mediacompat.testlib.util.IntentUtil.callMediaSessionMethod;
import static android.support.mediacompat.testlib.util.TestUtil.assertBundleEquals;
-import static android.support.test.InstrumentationRegistry.getArguments;
-import static android.support.test.InstrumentationRegistry.getContext;
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
-import static android.support.test.InstrumentationRegistry.getTargetContext;
import static android.support.v4.media.MediaMetadataCompat.METADATA_KEY_RATING;
+import static androidx.test.InstrumentationRegistry.getArguments;
+import static androidx.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getInstrumentation;
+import static androidx.test.InstrumentationRegistry.getTargetContext;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -72,9 +73,6 @@
import android.os.Handler;
import android.os.Looper;
import android.support.mediacompat.testlib.util.PollingCheck;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.media.MediaBrowserCompat;
import android.support.v4.media.MediaDescriptionCompat;
import android.support.v4.media.MediaMetadataCompat;
@@ -87,6 +85,10 @@
import android.support.v4.media.session.PlaybackStateCompat;
import android.util.Log;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/MediaItemTest.java b/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/MediaItemTest.java
index 179a178..49a45a4 100644
--- a/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/MediaItemTest.java
+++ b/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/MediaItemTest.java
@@ -20,10 +20,11 @@
import static org.junit.Assert.assertTrue;
import android.os.Parcel;
-import android.support.test.filters.SmallTest;
import android.support.v4.media.MediaBrowserCompat.MediaItem;
import android.support.v4.media.MediaDescriptionCompat;
+import androidx.test.filters.SmallTest;
+
import org.junit.Test;
/**
diff --git a/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/PlaybackStateCompatTest.java b/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/PlaybackStateCompatTest.java
index 7962731..811f179 100644
--- a/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/PlaybackStateCompatTest.java
+++ b/media/version-compat-tests/previous/client/src/androidTest/java/android/support/mediacompat/client/PlaybackStateCompatTest.java
@@ -22,11 +22,12 @@
import android.os.Bundle;
import android.os.Parcel;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.PlaybackStateCompat;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/media/version-compat-tests/previous/service/build.gradle b/media/version-compat-tests/previous/service/build.gradle
index 5ac5270..ebe0a30 100644
--- a/media/version-compat-tests/previous/service/build.gradle
+++ b/media/version-compat-tests/previous/service/build.gradle
@@ -24,5 +24,5 @@
androidTestImplementation(project(":support-media-compat-test-lib"))
androidTestImplementation "com.android.support:support-media-compat:27.1.0"
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
}
diff --git a/media/version-compat-tests/previous/service/src/androidTest/java/android/support/mediacompat/service/MediaSessionCompatCallbackTest.java b/media/version-compat-tests/previous/service/src/androidTest/java/android/support/mediacompat/service/MediaSessionCompatCallbackTest.java
index 5512f55..ef85f09 100644
--- a/media/version-compat-tests/previous/service/src/androidTest/java/android/support/mediacompat/service/MediaSessionCompatCallbackTest.java
+++ b/media/version-compat-tests/previous/service/src/androidTest/java/android/support/mediacompat/service/MediaSessionCompatCallbackTest.java
@@ -58,10 +58,11 @@
import static android.support.mediacompat.testlib.util.IntentUtil.callMediaControllerMethod;
import static android.support.mediacompat.testlib.util.IntentUtil.callTransportControlsMethod;
import static android.support.mediacompat.testlib.util.TestUtil.assertBundleEquals;
-import static android.support.test.InstrumentationRegistry.getArguments;
-import static android.support.test.InstrumentationRegistry.getContext;
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
-import static android.support.test.InstrumentationRegistry.getTargetContext;
+
+import static androidx.test.InstrumentationRegistry.getArguments;
+import static androidx.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getInstrumentation;
+import static androidx.test.InstrumentationRegistry.getTargetContext;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -85,10 +86,6 @@
import android.os.Parcel;
import android.os.ResultReceiver;
import android.os.SystemClock;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.media.MediaDescriptionCompat;
import android.support.v4.media.RatingCompat;
import android.support.v4.media.VolumeProviderCompat;
@@ -98,6 +95,11 @@
import android.util.Log;
import android.view.KeyEvent;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git a/media2/build.gradle b/media2/build.gradle
index 97bf806..fc67143 100644
--- a/media2/build.gradle
+++ b/media2/build.gradle
@@ -1,8 +1,9 @@
import androidx.build.LibraryGroups
import androidx.build.LibraryVersions
-import static androidx.build.dependencies.DependenciesKt.ESPRESSO_CORE_TMP
-import static androidx.build.dependencies.DependenciesKt.TEST_RUNNER_TMP
+import static androidx.build.dependencies.DependenciesKt.ESPRESSO_CORE
+import static androidx.build.dependencies.DependenciesKt.TEST_RULES
+import static androidx.build.dependencies.DependenciesKt.TEST_RUNNER
plugins {
id("SupportAndroidLibraryPlugin")
@@ -12,8 +13,9 @@
api(project(":media"))
api(project(':versionedparcelable'))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation project(':internal-testutils')
annotationProcessor(project(":versionedparcelable-annotation"))
}
diff --git a/media2/src/androidTest/java/androidx/media2/MediaBrowser2LegacyTest.java b/media2/src/androidTest/java/androidx/media2/MediaBrowser2LegacyTest.java
index 5c332de..c0ac523 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaBrowser2LegacyTest.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaBrowser2LegacyTest.java
@@ -26,7 +26,6 @@
import android.content.ComponentName;
import android.content.Context;
import android.os.Bundle;
-import android.support.test.filters.SmallTest;
import android.support.v4.media.MediaBrowserCompat;
import android.support.v4.media.MediaBrowserCompat.MediaItem;
import android.support.v4.media.MediaDescriptionCompat;
@@ -39,6 +38,7 @@
import androidx.media2.MediaBrowser2.BrowserCallback;
import androidx.media2.MediaController2.ControllerCallback;
import androidx.media2.MockMediaBrowserServiceCompat.Proxy;
+import androidx.test.filters.SmallTest;
import org.junit.After;
import org.junit.Before;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaBrowser2Test.java b/media2/src/androidTest/java/androidx/media2/MediaBrowser2Test.java
index 9db3897..7d3055d 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaBrowser2Test.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaBrowser2Test.java
@@ -32,10 +32,6 @@
import android.os.Build;
import android.os.Bundle;
import android.os.Process;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -44,6 +40,10 @@
import androidx.media2.MediaLibraryService2.MediaLibrarySession;
import androidx.media2.MediaLibraryService2.MediaLibrarySession.MediaLibrarySessionCallback;
import androidx.media2.MediaSession2.ControllerInfo;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import junit.framework.Assert;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaController2LegacyTest.java b/media2/src/androidTest/java/androidx/media2/MediaController2LegacyTest.java
index a6574de..1e38834 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaController2LegacyTest.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaController2LegacyTest.java
@@ -33,10 +33,6 @@
import android.os.Bundle;
import android.os.Process;
import android.os.ResultReceiver;
-import android.support.test.filters.FlakyTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.media.MediaDescriptionCompat;
import android.support.v4.media.MediaMetadataCompat;
import android.support.v4.media.RatingCompat;
@@ -46,6 +42,10 @@
import androidx.media.VolumeProviderCompat;
import androidx.media2.MediaController2.ControllerCallback;
+import androidx.test.filters.FlakyTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.testutils.PollingCheck;
import org.junit.After;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaController2Test.java b/media2/src/androidTest/java/androidx/media2/MediaController2Test.java
index 46c3340..9715480 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaController2Test.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaController2Test.java
@@ -35,10 +35,6 @@
import android.os.HandlerThread;
import android.os.Process;
import android.os.ResultReceiver;
-import android.support.test.filters.FlakyTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.NonNull;
import androidx.media.AudioAttributesCompat;
@@ -50,6 +46,10 @@
import androidx.media2.MediaSession2.SessionCallback;
import androidx.media2.TestServiceRegistry.SessionServiceCallback;
import androidx.media2.TestUtils.SyncHandler;
+import androidx.test.filters.FlakyTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.testutils.PollingCheck;
import org.junit.After;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaLibraryService2LegacyTest.java b/media2/src/androidTest/java/androidx/media2/MediaLibraryService2LegacyTest.java
index 15808b2..f70c3fc 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaLibraryService2LegacyTest.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaLibraryService2LegacyTest.java
@@ -27,7 +27,6 @@
import android.os.Bundle;
import android.os.Process;
import android.os.ResultReceiver;
-import android.support.test.filters.SmallTest;
import android.support.v4.media.MediaBrowserCompat;
import android.support.v4.media.MediaBrowserCompat.CustomActionCallback;
import android.support.v4.media.MediaBrowserCompat.ItemCallback;
@@ -41,6 +40,7 @@
import androidx.media2.MediaLibraryService2.MediaLibrarySession;
import androidx.media2.MediaLibraryService2.MediaLibrarySession.MediaLibrarySessionCallback;
import androidx.media2.MediaSession2.ControllerInfo;
+import androidx.test.filters.SmallTest;
import org.junit.Test;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaMetadata2Test.java b/media2/src/androidTest/java/androidx/media2/MediaMetadata2Test.java
index 893adbf..7c72776 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaMetadata2Test.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaMetadata2Test.java
@@ -21,11 +21,11 @@
import android.os.Build;
import android.os.Bundle;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.media2.MediaMetadata2.Builder;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaPlayer2DrmTest.java b/media2/src/androidTest/java/androidx/media2/MediaPlayer2DrmTest.java
index 1be8905..0f081aa 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaPlayer2DrmTest.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaPlayer2DrmTest.java
@@ -18,10 +18,11 @@
import android.Manifest;
import android.net.Uri;
import android.os.Environment;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.Suppress;
-import android.support.test.rule.GrantPermissionRule;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.Suppress;
+import androidx.test.rule.GrantPermissionRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaPlayer2DrmTestBase.java b/media2/src/androidTest/java/androidx/media2/MediaPlayer2DrmTestBase.java
index e0bd6d4..030611a 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaPlayer2DrmTestBase.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaPlayer2DrmTestBase.java
@@ -36,8 +36,6 @@
import android.net.Uri;
import android.os.PowerManager;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.ActivityTestRule;
import android.util.Base64;
import android.util.Log;
import android.view.SurfaceHolder;
@@ -46,6 +44,8 @@
import androidx.annotation.CallSuper;
import androidx.media2.MediaPlayer2.DrmInfo;
import androidx.media2.TestUtils.Monitor;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.rule.ActivityTestRule;
import org.json.JSONArray;
import org.json.JSONException;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaPlayer2StateTest.java b/media2/src/androidTest/java/androidx/media2/MediaPlayer2StateTest.java
index 7b09c3f..d012f6e 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaPlayer2StateTest.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaPlayer2StateTest.java
@@ -47,8 +47,6 @@
import static org.junit.Assert.fail;
import android.os.Build;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
import android.util.Pair;
import androidx.media.AudioAttributesCompat;
@@ -56,6 +54,8 @@
import androidx.media2.MediaPlayer2.TrackInfo;
import androidx.media2.TestUtils.Monitor;
import androidx.media2.test.R;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaPlayer2Test.java b/media2/src/androidTest/java/androidx/media2/MediaPlayer2Test.java
index 37a3915..8cf97bb 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaPlayer2Test.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaPlayer2Test.java
@@ -33,11 +33,6 @@
import android.net.Uri;
import android.os.Build;
import android.os.Environment;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import android.util.Pair;
@@ -46,6 +41,11 @@
import androidx.media2.BaseMediaPlayer.PlayerEventCallback;
import androidx.media2.TestUtils.Monitor;
import androidx.media2.test.R;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaPlayer2TestBase.java b/media2/src/androidTest/java/androidx/media2/MediaPlayer2TestBase.java
index 638a0ff..e52d3ce 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaPlayer2TestBase.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaPlayer2TestBase.java
@@ -31,14 +31,14 @@
import android.net.Uri;
import android.os.PersistableBundle;
import android.os.PowerManager;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.ActivityTestRule;
import android.view.SurfaceHolder;
import android.view.WindowManager;
import androidx.annotation.CallSuper;
import androidx.media.AudioAttributesCompat;
import androidx.media2.TestUtils.Monitor;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.rule.ActivityTestRule;
import org.junit.After;
import org.junit.Before;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaSession2LegacyCallbackTest.java b/media2/src/androidTest/java/androidx/media2/MediaSession2LegacyCallbackTest.java
index 46a18e0..9dcd624 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaSession2LegacyCallbackTest.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaSession2LegacyCallbackTest.java
@@ -36,11 +36,6 @@
import android.os.HandlerThread;
import android.os.Process;
import android.os.ResultReceiver;
-import android.support.test.filters.FlakyTest;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.media.MediaDescriptionCompat;
import android.support.v4.media.RatingCompat;
import android.support.v4.media.session.MediaControllerCompat;
@@ -53,6 +48,11 @@
import androidx.media2.MediaSession2.ControllerInfo;
import androidx.media2.MediaSession2.SessionCallback;
import androidx.media2.TestUtils.SyncHandler;
+import androidx.test.filters.FlakyTest;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.testutils.PollingCheck;
import org.junit.After;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaSession2LegacyTest.java b/media2/src/androidTest/java/androidx/media2/MediaSession2LegacyTest.java
index 85adcb1..47e7c59 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaSession2LegacyTest.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaSession2LegacyTest.java
@@ -26,9 +26,6 @@
import android.os.Build;
import android.os.Bundle;
import android.os.Process;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.support.v4.media.MediaMetadataCompat;
import android.support.v4.media.session.MediaControllerCompat;
import android.support.v4.media.session.MediaSessionCompat;
@@ -39,6 +36,9 @@
import androidx.media.VolumeProviderCompat;
import androidx.media2.MediaSession2.ControllerInfo;
import androidx.media2.MediaSession2.SessionCallback;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaSession2Test.java b/media2/src/androidTest/java/androidx/media2/MediaSession2Test.java
index 322beecd..27b6a54 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaSession2Test.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaSession2Test.java
@@ -37,9 +37,6 @@
import android.os.Bundle;
import android.os.Process;
import android.os.ResultReceiver;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -49,6 +46,9 @@
import androidx.media2.MediaSession2.CommandButton;
import androidx.media2.MediaSession2.ControllerInfo;
import androidx.media2.MediaSession2.SessionCallback;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import junit.framework.Assert;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaSession2TestBase.java b/media2/src/androidTest/java/androidx/media2/MediaSession2TestBase.java
index 38800b3..51332311 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaSession2TestBase.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaSession2TestBase.java
@@ -19,13 +19,13 @@
import android.content.Context;
import android.os.Build;
import android.os.HandlerThread;
-import android.support.test.InstrumentationRegistry;
import androidx.annotation.CallSuper;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.media2.MediaController2.ControllerCallback;
import androidx.media2.TestUtils.SyncHandler;
+import androidx.test.InstrumentationRegistry;
import org.junit.AfterClass;
import org.junit.BeforeClass;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaSession2_AudioFocusTest.java b/media2/src/androidTest/java/androidx/media2/MediaSession2_AudioFocusTest.java
index e7056714..1a17287 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaSession2_AudioFocusTest.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaSession2_AudioFocusTest.java
@@ -48,14 +48,14 @@
import android.os.Build;
import android.os.Build.VERSION;
import android.os.Process;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.GuardedBy;
import androidx.media.AudioAttributesCompat;
import androidx.media2.MediaSession2.ControllerInfo;
import androidx.media2.MediaSession2.SessionCallback;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaSession2_PermissionTest.java b/media2/src/androidTest/java/androidx/media2/MediaSession2_PermissionTest.java
index 69aa005..1bc0a4b 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaSession2_PermissionTest.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaSession2_PermissionTest.java
@@ -51,12 +51,12 @@
import android.os.Build;
import android.os.Bundle;
import android.os.Process;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.NonNull;
import androidx.media2.MediaSession2.ControllerInfo;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaSessionManager_MediaSession2Test.java b/media2/src/androidTest/java/androidx/media2/MediaSessionManager_MediaSession2Test.java
index cdbbbdb..9413a3b 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaSessionManager_MediaSession2Test.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaSessionManager_MediaSession2Test.java
@@ -18,11 +18,11 @@
import android.content.Context;
import android.media.session.MediaSessionManager;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.media2.MediaSession2.ControllerInfo;
import androidx.media2.MediaSession2.SessionCallback;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaSessionService2LegacyTest.java b/media2/src/androidTest/java/androidx/media2/MediaSessionService2LegacyTest.java
index 19fedaa..21bcf5e 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaSessionService2LegacyTest.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaSessionService2LegacyTest.java
@@ -22,13 +22,13 @@
import android.content.ComponentName;
import android.os.Build;
import android.os.Process;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
import android.support.v4.media.MediaBrowserCompat;
import android.support.v4.media.session.MediaControllerCompat;
import androidx.media2.MediaLibraryService2.MediaLibrarySession.MediaLibrarySessionCallback;
import androidx.media2.MediaSession2.ControllerInfo;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
import org.junit.After;
import org.junit.Before;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaTestBase.java b/media2/src/androidTest/java/androidx/media2/MediaTestBase.java
index 767cf19..af9e495 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaTestBase.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaTestBase.java
@@ -19,7 +19,8 @@
import android.content.Context;
import android.media.AudioManager;
import android.os.Looper;
-import android.support.test.InstrumentationRegistry;
+
+import androidx.test.InstrumentationRegistry;
import org.junit.BeforeClass;
diff --git a/media2/src/androidTest/java/androidx/media2/MediaTimestamp2Test.java b/media2/src/androidTest/java/androidx/media2/MediaTimestamp2Test.java
index 16b0d9c..77c3ab1 100644
--- a/media2/src/androidTest/java/androidx/media2/MediaTimestamp2Test.java
+++ b/media2/src/androidTest/java/androidx/media2/MediaTimestamp2Test.java
@@ -20,9 +20,10 @@
import android.media.MediaTimestamp;
import android.os.Build;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/media2/src/androidTest/java/androidx/media2/PlaybackParams2Test.java b/media2/src/androidTest/java/androidx/media2/PlaybackParams2Test.java
index e78d2b1..6f87e17 100644
--- a/media2/src/androidTest/java/androidx/media2/PlaybackParams2Test.java
+++ b/media2/src/androidTest/java/androidx/media2/PlaybackParams2Test.java
@@ -20,9 +20,10 @@
import android.media.PlaybackParams;
import android.os.Build;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/media2/src/androidTest/java/androidx/media2/SessionPlaylistAgentTest.java b/media2/src/androidTest/java/androidx/media2/SessionPlaylistAgentTest.java
index dbdaabb..5c61ace 100644
--- a/media2/src/androidTest/java/androidx/media2/SessionPlaylistAgentTest.java
+++ b/media2/src/androidTest/java/androidx/media2/SessionPlaylistAgentTest.java
@@ -25,13 +25,13 @@
import android.net.Uri;
import android.os.Build;
import android.os.Process;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.media2.MediaPlaylistAgent.PlaylistEventCallback;
import androidx.media2.MediaSession2.OnDataSourceMissingHelper;
import androidx.media2.test.R;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/media2/src/androidTest/java/androidx/media2/SessionToken2Test.java b/media2/src/androidTest/java/androidx/media2/SessionToken2Test.java
index 7d159f6..dac59932 100644
--- a/media2/src/androidTest/java/androidx/media2/SessionToken2Test.java
+++ b/media2/src/androidTest/java/androidx/media2/SessionToken2Test.java
@@ -22,10 +22,11 @@
import android.content.Context;
import android.os.Build;
import android.os.Process;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/media2/src/androidTest/java/androidx/media2/SubtitleData2Test.java b/media2/src/androidTest/java/androidx/media2/SubtitleData2Test.java
index 6ff5667..a71cc8f 100644
--- a/media2/src/androidTest/java/androidx/media2/SubtitleData2Test.java
+++ b/media2/src/androidTest/java/androidx/media2/SubtitleData2Test.java
@@ -18,8 +18,8 @@
import static junit.framework.Assert.assertEquals;
-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/media2/src/androidTest/java/androidx/media2/TimedMetaData2Test.java b/media2/src/androidTest/java/androidx/media2/TimedMetaData2Test.java
index c99e890..ac7e218 100644
--- a/media2/src/androidTest/java/androidx/media2/TimedMetaData2Test.java
+++ b/media2/src/androidTest/java/androidx/media2/TimedMetaData2Test.java
@@ -19,8 +19,8 @@
import static junit.framework.Assert.assertEquals;
import static junit.framework.TestCase.assertTrue;
-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/mediarouter/build.gradle b/mediarouter/build.gradle
index 25368db..bebc1a5 100644
--- a/mediarouter/build.gradle
+++ b/mediarouter/build.gradle
@@ -12,9 +12,9 @@
api(project(":palette"))
api(project(":recyclerview"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
- androidTestImplementation(TEST_RULES_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
}
android {
diff --git a/mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTest.java b/mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTest.java
index aa4e9ef..95c33f1 100644
--- a/mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTest.java
+++ b/mediarouter/src/androidTest/java/androidx/mediarouter/app/MediaRouteChooserDialogTest.java
@@ -20,11 +20,11 @@
import android.content.Context;
import android.content.res.TypedArray;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.mediarouter.media.MediaRouter.RouteInfo;
import androidx.mediarouter.media.TestUtils;
diff --git a/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouteProviderTest.java b/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouteProviderTest.java
index 44af534..82ca1d8 100644
--- a/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouteProviderTest.java
+++ b/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouteProviderTest.java
@@ -20,8 +20,8 @@
import static org.junit.Assert.assertTrue;
import android.os.Bundle;
-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/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouterTest.java b/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouterTest.java
index b7d9eb2..388a408 100644
--- a/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouterTest.java
+++ b/mediarouter/src/androidTest/java/androidx/mediarouter/media/MediaRouterTest.java
@@ -16,14 +16,14 @@
package androidx.mediarouter.media;
-import static android.support.test.InstrumentationRegistry.getContext;
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
+import static androidx.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getInstrumentation;
import static org.junit.Assert.assertTrue;
import android.content.Context;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.MediaControllerCompat;
diff --git a/navigation/common/ktx/src/androidTest/java/androidx/navigation/NavDestinationBuilderTest.kt b/navigation/common/ktx/src/androidTest/java/androidx/navigation/NavDestinationBuilderTest.kt
index dd52934..87c58cd 100644
--- a/navigation/common/ktx/src/androidTest/java/androidx/navigation/NavDestinationBuilderTest.kt
+++ b/navigation/common/ktx/src/androidTest/java/androidx/navigation/NavDestinationBuilderTest.kt
@@ -18,9 +18,9 @@
import android.os.Bundle
import android.support.annotation.IdRes
-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 androidx.navigation.testing.TestNavigator
import androidx.navigation.testing.TestNavigatorProvider
import org.junit.Assert.assertEquals
diff --git a/navigation/common/ktx/src/androidTest/java/androidx/navigation/NavGraphBuilderTest.kt b/navigation/common/ktx/src/androidTest/java/androidx/navigation/NavGraphBuilderTest.kt
index 9ecffe9..78bba47 100644
--- a/navigation/common/ktx/src/androidTest/java/androidx/navigation/NavGraphBuilderTest.kt
+++ b/navigation/common/ktx/src/androidTest/java/androidx/navigation/NavGraphBuilderTest.kt
@@ -17,9 +17,9 @@
package androidx.navigation
import android.support.annotation.IdRes
-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 androidx.navigation.testing.TestNavigator
import androidx.navigation.testing.TestNavigatorProvider
import org.junit.Assert.assertTrue
diff --git a/navigation/common/ktx/src/androidTest/java/androidx/navigation/NavGraphTest.kt b/navigation/common/ktx/src/androidTest/java/androidx/navigation/NavGraphTest.kt
index ebc11a7..c95e2b8 100644
--- a/navigation/common/ktx/src/androidTest/java/androidx/navigation/NavGraphTest.kt
+++ b/navigation/common/ktx/src/androidTest/java/androidx/navigation/NavGraphTest.kt
@@ -16,9 +16,9 @@
package androidx.navigation
-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 androidx.navigation.testing.TestNavigator
import org.junit.Assert.assertFalse
import org.junit.Assert.assertSame
diff --git a/navigation/common/ktx/src/androidTest/java/androidx/navigation/NavOptionsBuilderTest.kt b/navigation/common/ktx/src/androidTest/java/androidx/navigation/NavOptionsBuilderTest.kt
index 1b88ef04..3cd53a8 100644
--- a/navigation/common/ktx/src/androidTest/java/androidx/navigation/NavOptionsBuilderTest.kt
+++ b/navigation/common/ktx/src/androidTest/java/androidx/navigation/NavOptionsBuilderTest.kt
@@ -16,8 +16,8 @@
package androidx.navigation
-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.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
diff --git a/navigation/common/ktx/src/test/java/androidx/navigation/NavigatorProviderTest.kt b/navigation/common/ktx/src/test/java/androidx/navigation/NavigatorProviderTest.kt
index 95d7324..5ebadfedb 100644
--- a/navigation/common/ktx/src/test/java/androidx/navigation/NavigatorProviderTest.kt
+++ b/navigation/common/ktx/src/test/java/androidx/navigation/NavigatorProviderTest.kt
@@ -16,7 +16,7 @@
package androidx.navigation
-import android.support.test.filters.SmallTest
+import androidx.test.filters.SmallTest
import androidx.navigation.testing.TestNavigator
import org.junit.Assert.assertSame
import org.junit.Test
diff --git a/navigation/common/src/androidTest/java/androidx/navigation/NavDeepLinkTest.java b/navigation/common/src/androidTest/java/androidx/navigation/NavDeepLinkTest.java
index 4befa74..8688b10 100644
--- a/navigation/common/src/androidTest/java/androidx/navigation/NavDeepLinkTest.java
+++ b/navigation/common/src/androidTest/java/androidx/navigation/NavDeepLinkTest.java
@@ -23,7 +23,8 @@
import android.net.Uri;
import android.os.Bundle;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.filters.SmallTest;
import org.junit.Test;
diff --git a/navigation/common/src/androidTest/java/androidx/navigation/NavGraphNavigatorStateTest.java b/navigation/common/src/androidTest/java/androidx/navigation/NavGraphNavigatorStateTest.java
index c12bd19..f96d980 100644
--- a/navigation/common/src/androidTest/java/androidx/navigation/NavGraphNavigatorStateTest.java
+++ b/navigation/common/src/androidTest/java/androidx/navigation/NavGraphNavigatorStateTest.java
@@ -22,8 +22,9 @@
import android.os.Bundle;
import android.support.annotation.IdRes;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/navigation/common/src/test/java/androidx/navigation/NavActionTest.java b/navigation/common/src/test/java/androidx/navigation/NavActionTest.java
index 589a420..45dd594 100644
--- a/navigation/common/src/test/java/androidx/navigation/NavActionTest.java
+++ b/navigation/common/src/test/java/androidx/navigation/NavActionTest.java
@@ -21,7 +21,8 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.support.annotation.IdRes;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.filters.SmallTest;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/navigation/common/src/test/java/androidx/navigation/NavDestinationTest.java b/navigation/common/src/test/java/androidx/navigation/NavDestinationTest.java
index ce5ad32..59cbc11 100644
--- a/navigation/common/src/test/java/androidx/navigation/NavDestinationTest.java
+++ b/navigation/common/src/test/java/androidx/navigation/NavDestinationTest.java
@@ -23,7 +23,8 @@
import static org.mockito.Mockito.mock;
import android.support.annotation.IdRes;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.filters.SmallTest;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/navigation/common/src/test/java/androidx/navigation/NavGraphNavigatorTest.java b/navigation/common/src/test/java/androidx/navigation/NavGraphNavigatorTest.java
index ecfc1b0..9433d9c 100644
--- a/navigation/common/src/test/java/androidx/navigation/NavGraphNavigatorTest.java
+++ b/navigation/common/src/test/java/androidx/navigation/NavGraphNavigatorTest.java
@@ -24,7 +24,8 @@
import android.content.Context;
import android.support.annotation.IdRes;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.filters.SmallTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/navigation/common/src/test/java/androidx/navigation/NavGraphTest.java b/navigation/common/src/test/java/androidx/navigation/NavGraphTest.java
index beedfd9..f878c0d 100644
--- a/navigation/common/src/test/java/androidx/navigation/NavGraphTest.java
+++ b/navigation/common/src/test/java/androidx/navigation/NavGraphTest.java
@@ -26,7 +26,8 @@
import android.content.Context;
import android.support.annotation.IdRes;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.filters.SmallTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/navigation/common/src/test/java/androidx/navigation/NavigatorTest.java b/navigation/common/src/test/java/androidx/navigation/NavigatorTest.java
index d600c62..211474b 100644
--- a/navigation/common/src/test/java/androidx/navigation/NavigatorTest.java
+++ b/navigation/common/src/test/java/androidx/navigation/NavigatorTest.java
@@ -20,7 +20,7 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/navigation/common/src/test/java/androidx/navigation/SimpleNavigatorProviderTest.java b/navigation/common/src/test/java/androidx/navigation/SimpleNavigatorProviderTest.java
index ba7c648..916ad5d 100644
--- a/navigation/common/src/test/java/androidx/navigation/SimpleNavigatorProviderTest.java
+++ b/navigation/common/src/test/java/androidx/navigation/SimpleNavigatorProviderTest.java
@@ -20,7 +20,7 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/navigation/fragment/build.gradle b/navigation/fragment/build.gradle
index 397b526..6b1a98b 100644
--- a/navigation/fragment/build.gradle
+++ b/navigation/fragment/build.gradle
@@ -33,6 +33,7 @@
androidTestImplementation(project(":navigation:navigation-testing"))
androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
androidTestImplementation(ESPRESSO_CORE)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy)
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy)
diff --git a/navigation/fragment/ktx/build.gradle b/navigation/fragment/ktx/build.gradle
index 90d7e3b..438b821 100644
--- a/navigation/fragment/ktx/build.gradle
+++ b/navigation/fragment/ktx/build.gradle
@@ -38,6 +38,7 @@
api(project(":navigation:navigation-runtime-ktx"))
api(KOTLIN_STDLIB)
androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
androidTestImplementation(ESPRESSO_CORE)
}
diff --git a/navigation/fragment/ktx/src/androidTest/java/androidx/navigation/fragment/FragmentNavigatorDestinationBuilderTest.kt b/navigation/fragment/ktx/src/androidTest/java/androidx/navigation/fragment/FragmentNavigatorDestinationBuilderTest.kt
index 5c2a9c1..15730fe 100644
--- a/navigation/fragment/ktx/src/androidTest/java/androidx/navigation/fragment/FragmentNavigatorDestinationBuilderTest.kt
+++ b/navigation/fragment/ktx/src/androidTest/java/androidx/navigation/fragment/FragmentNavigatorDestinationBuilderTest.kt
@@ -16,14 +16,14 @@
package androidx.navigation.fragment
-import android.support.test.annotation.UiThreadTest
-import android.support.test.filters.SmallTest
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
import android.support.v4.app.Fragment
import androidx.navigation.contains
import androidx.navigation.createGraph
import androidx.navigation.get
+import androidx.test.annotation.UiThreadTest
+import androidx.test.filters.SmallTest
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Rule
diff --git a/navigation/fragment/ktx/src/androidTest/java/androidx/navigation/fragment/FragmentTest.kt b/navigation/fragment/ktx/src/androidTest/java/androidx/navigation/fragment/FragmentTest.kt
index 909d121..b1142f4 100644
--- a/navigation/fragment/ktx/src/androidTest/java/androidx/navigation/fragment/FragmentTest.kt
+++ b/navigation/fragment/ktx/src/androidTest/java/androidx/navigation/fragment/FragmentTest.kt
@@ -16,12 +16,12 @@
package androidx.navigation.fragment
-import android.support.test.annotation.UiThreadTest
-import android.support.test.filters.SmallTest
-import android.support.test.rule.ActivityTestRule
import android.support.v4.app.Fragment
import android.support.v4.app.FragmentActivity
import androidx.navigation.fragment.ktx.test.R
+import androidx.test.annotation.UiThreadTest
+import androidx.test.filters.SmallTest
+import androidx.test.rule.ActivityTestRule
import org.junit.Assert.assertTrue
import org.junit.Assert.fail
import org.junit.Rule
diff --git a/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/BaseNavControllerTest.java b/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/BaseNavControllerTest.java
index 24f257e..bdff906 100644
--- a/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/BaseNavControllerTest.java
+++ b/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/BaseNavControllerTest.java
@@ -27,9 +27,6 @@
import android.os.Bundle;
import android.support.annotation.IdRes;
import android.support.annotation.NavigationRes;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
import android.support.v4.app.TaskStackBuilder;
import androidx.navigation.NavController;
@@ -37,6 +34,9 @@
import androidx.navigation.fragment.test.BaseNavigationActivity;
import androidx.navigation.fragment.test.R;
import androidx.navigation.testing.TestNavigator;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
import org.junit.Before;
import org.junit.Rule;
diff --git a/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/DynamicNavControllerTest.java b/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/DynamicNavControllerTest.java
index 7996cd3..2f3f726 100644
--- a/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/DynamicNavControllerTest.java
+++ b/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/DynamicNavControllerTest.java
@@ -16,9 +16,8 @@
package androidx.navigation.fragment;
-import android.support.test.filters.SmallTest;
-
import androidx.navigation.fragment.test.DynamicNavigationActivity;
+import androidx.test.filters.SmallTest;
@SmallTest
public class DynamicNavControllerTest extends BaseNavControllerTest<DynamicNavigationActivity> {
diff --git a/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/EmbeddedXmlTest.java b/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/EmbeddedXmlTest.java
index bd0c36c..71aaf08 100644
--- a/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/EmbeddedXmlTest.java
+++ b/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/EmbeddedXmlTest.java
@@ -18,11 +18,11 @@
import android.app.Instrumentation;
import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
import androidx.navigation.fragment.test.EmbeddedXmlActivity;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
import org.junit.Rule;
import org.junit.Test;
diff --git a/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/FragmentNavigatorTest.java b/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/FragmentNavigatorTest.java
index 087eaa6..0039927 100644
--- a/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/FragmentNavigatorTest.java
+++ b/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/FragmentNavigatorTest.java
@@ -26,9 +26,6 @@
import static org.mockito.Mockito.verifyNoMoreInteractions;
import android.arch.lifecycle.Lifecycle;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
@@ -37,6 +34,9 @@
import androidx.navigation.fragment.test.EmptyActivity;
import androidx.navigation.fragment.test.EmptyFragment;
import androidx.navigation.fragment.test.R;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
import org.hamcrest.CoreMatchers;
import org.junit.Before;
diff --git a/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/ImmediateNavigationTest.java b/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/ImmediateNavigationTest.java
index 12369eb..6236d5f 100644
--- a/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/ImmediateNavigationTest.java
+++ b/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/ImmediateNavigationTest.java
@@ -21,13 +21,13 @@
import android.app.Instrumentation;
import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.rule.ActivityTestRule;
import androidx.navigation.NavController;
import androidx.navigation.fragment.test.ImmediateNavigationActivity;
import androidx.navigation.fragment.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
import org.junit.Rule;
import org.junit.Test;
diff --git a/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/XmlNavControllerTest.java b/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/XmlNavControllerTest.java
index d5e5a6ea..8df94c4 100644
--- a/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/XmlNavControllerTest.java
+++ b/navigation/fragment/src/androidTest/java/androidx/navigation/fragment/XmlNavControllerTest.java
@@ -16,9 +16,8 @@
package androidx.navigation.fragment;
-import android.support.test.filters.SmallTest;
-
import androidx.navigation.fragment.test.XmlNavigationActivity;
+import androidx.test.filters.SmallTest;
@SmallTest
public class XmlNavControllerTest extends BaseNavControllerTest<XmlNavigationActivity> {
diff --git a/navigation/runtime/ktx/build.gradle b/navigation/runtime/ktx/build.gradle
index e4de0c6..7811123 100644
--- a/navigation/runtime/ktx/build.gradle
+++ b/navigation/runtime/ktx/build.gradle
@@ -39,6 +39,7 @@
api(KOTLIN_STDLIB)
androidTestImplementation(project(":navigation:navigation-testing-ktx"))
androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
androidTestImplementation(ESPRESSO_CORE)
}
diff --git a/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/ActivityNavigatorDestinationBuilderTest.kt b/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/ActivityNavigatorDestinationBuilderTest.kt
index ad28423..d5f8a75 100644
--- a/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/ActivityNavigatorDestinationBuilderTest.kt
+++ b/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/ActivityNavigatorDestinationBuilderTest.kt
@@ -17,9 +17,9 @@
package androidx.navigation
import android.net.Uri
-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 org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Test
diff --git a/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/ActivityTest.kt b/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/ActivityTest.kt
index 0ac7430..e714145 100644
--- a/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/ActivityTest.kt
+++ b/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/ActivityTest.kt
@@ -18,8 +18,8 @@
import android.app.Activity
import android.os.Bundle
-import android.support.test.filters.SmallTest
-import android.support.test.rule.ActivityTestRule
+import androidx.test.filters.SmallTest
+import androidx.test.rule.ActivityTestRule
import android.view.View
import org.junit.Assert.assertTrue
import org.junit.Assert.fail
diff --git a/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/NavControllerTest.kt b/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/NavControllerTest.kt
index bf6f332..f7c243f 100644
--- a/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/NavControllerTest.kt
+++ b/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/NavControllerTest.kt
@@ -16,8 +16,8 @@
package androidx.navigation
-import android.support.test.InstrumentationRegistry
-import android.support.test.filters.SmallTest
+import androidx.test.InstrumentationRegistry
+import androidx.test.filters.SmallTest
import androidx.navigation.testing.TestNavigator
import androidx.navigation.testing.test
import org.junit.Assert.assertTrue
diff --git a/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/NavHostTest.kt b/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/NavHostTest.kt
index 7a74ab2..0663338 100644
--- a/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/NavHostTest.kt
+++ b/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/NavHostTest.kt
@@ -16,8 +16,8 @@
package androidx.navigation
-import android.support.test.InstrumentationRegistry
-import android.support.test.filters.SmallTest
+import androidx.test.InstrumentationRegistry
+import androidx.test.filters.SmallTest
import androidx.navigation.testing.TestNavigator
import androidx.navigation.testing.test
import org.junit.Assert.assertTrue
diff --git a/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/ViewTest.kt b/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/ViewTest.kt
index 84f54a6..0518a0d 100644
--- a/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/ViewTest.kt
+++ b/navigation/runtime/ktx/src/androidTest/java/androidx/navigation/ViewTest.kt
@@ -16,9 +16,9 @@
package androidx.navigation
-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 android.view.View
import org.junit.Assert.assertTrue
import org.junit.Assert.fail
diff --git a/navigation/runtime/src/androidTest/java/androidx/navigation/NavControllerTest.java b/navigation/runtime/src/androidTest/java/androidx/navigation/NavControllerTest.java
index 9e623ac..8b60a3c 100644
--- a/navigation/runtime/src/androidTest/java/androidx/navigation/NavControllerTest.java
+++ b/navigation/runtime/src/androidTest/java/androidx/navigation/NavControllerTest.java
@@ -25,12 +25,12 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.Parcel;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
import android.support.v4.app.TaskStackBuilder;
import androidx.navigation.test.R;
import androidx.navigation.testing.TestNavigator;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
import org.junit.Assert;
import org.junit.Test;
diff --git a/navigation/runtime/src/androidTest/java/androidx/navigation/NavInflaterTest.java b/navigation/runtime/src/androidTest/java/androidx/navigation/NavInflaterTest.java
index 33ff395..47595b5 100644
--- a/navigation/runtime/src/androidTest/java/androidx/navigation/NavInflaterTest.java
+++ b/navigation/runtime/src/androidTest/java/androidx/navigation/NavInflaterTest.java
@@ -24,13 +24,13 @@
import android.content.Context;
import android.net.Uri;
import android.os.Bundle;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
import android.support.v4.content.ContextCompat;
import android.support.v4.util.Pair;
import androidx.navigation.test.R;
import androidx.navigation.testing.TestNavigatorProvider;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/navigation/testing/ktx/src/androidTest/java/androidx/navigation/testing/TestNavigatorDestinationBuilderTest.kt b/navigation/testing/ktx/src/androidTest/java/androidx/navigation/testing/TestNavigatorDestinationBuilderTest.kt
index 20bba5a..7d43ef1 100644
--- a/navigation/testing/ktx/src/androidTest/java/androidx/navigation/testing/TestNavigatorDestinationBuilderTest.kt
+++ b/navigation/testing/ktx/src/androidTest/java/androidx/navigation/testing/TestNavigatorDestinationBuilderTest.kt
@@ -16,9 +16,9 @@
package androidx.navigation.testing
-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 androidx.navigation.contains
import androidx.navigation.get
import androidx.navigation.navigation
diff --git a/navigation/testing/ktx/src/test/java/androidx/navigation/testing/TestNavigatorTest.kt b/navigation/testing/ktx/src/test/java/androidx/navigation/testing/TestNavigatorTest.kt
index 80cdb4f..0b89414 100644
--- a/navigation/testing/ktx/src/test/java/androidx/navigation/testing/TestNavigatorTest.kt
+++ b/navigation/testing/ktx/src/test/java/androidx/navigation/testing/TestNavigatorTest.kt
@@ -17,7 +17,7 @@
package androidx.navigation.testing
import android.os.Bundle
-import android.support.test.filters.SmallTest
+import androidx.test.filters.SmallTest
import org.junit.Assert.assertEquals
import org.junit.Test
import org.junit.runner.RunWith
diff --git a/paging/runtime/src/androidTest/java/androidx/paging/AsyncPagedListDifferTest.kt b/paging/runtime/src/androidTest/java/androidx/paging/AsyncPagedListDifferTest.kt
index 8864bda..7b7bdcb 100644
--- a/paging/runtime/src/androidTest/java/androidx/paging/AsyncPagedListDifferTest.kt
+++ b/paging/runtime/src/androidTest/java/androidx/paging/AsyncPagedListDifferTest.kt
@@ -16,7 +16,7 @@
package androidx.paging
-import android.support.test.filters.SmallTest
+import androidx.test.filters.SmallTest
import androidx.arch.core.executor.ArchTaskExecutor
import androidx.recyclerview.widget.AsyncDifferConfig
import androidx.recyclerview.widget.DiffUtil
diff --git a/paging/runtime/src/androidTest/java/androidx/paging/LivePagedListBuilderTest.kt b/paging/runtime/src/androidTest/java/androidx/paging/LivePagedListBuilderTest.kt
index 14809c8..99edf8b 100644
--- a/paging/runtime/src/androidTest/java/androidx/paging/LivePagedListBuilderTest.kt
+++ b/paging/runtime/src/androidTest/java/androidx/paging/LivePagedListBuilderTest.kt
@@ -16,7 +16,7 @@
package androidx.paging
-import android.support.test.filters.SmallTest
+import androidx.test.filters.SmallTest
import androidx.arch.core.executor.ArchTaskExecutor
import androidx.arch.core.executor.TaskExecutor
import androidx.lifecycle.Lifecycle
diff --git a/paging/runtime/src/androidTest/java/androidx/paging/PagedStorageDiffHelperTest.kt b/paging/runtime/src/androidTest/java/androidx/paging/PagedStorageDiffHelperTest.kt
index ef0072a..e9b0eac 100644
--- a/paging/runtime/src/androidTest/java/androidx/paging/PagedStorageDiffHelperTest.kt
+++ b/paging/runtime/src/androidTest/java/androidx/paging/PagedStorageDiffHelperTest.kt
@@ -16,7 +16,7 @@
package androidx.paging
-import android.support.test.filters.SmallTest
+import androidx.test.filters.SmallTest
import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListUpdateCallback
import org.junit.Assert.assertEquals
diff --git a/paging/rxjava2/src/androidTest/java/androidx/paging/RxPagedListBuilderTest.kt b/paging/rxjava2/src/androidTest/java/androidx/paging/RxPagedListBuilderTest.kt
index 083cb96..f78b790 100644
--- a/paging/rxjava2/src/androidTest/java/androidx/paging/RxPagedListBuilderTest.kt
+++ b/paging/rxjava2/src/androidTest/java/androidx/paging/RxPagedListBuilderTest.kt
@@ -16,7 +16,7 @@
package androidx.paging
-import android.support.test.filters.SmallTest
+import androidx.test.filters.SmallTest
import io.reactivex.Observable
import io.reactivex.observers.TestObserver
import io.reactivex.schedulers.TestScheduler
diff --git a/palette/build.gradle b/palette/build.gradle
index 4037bf5..dfca475 100644
--- a/palette/build.gradle
+++ b/palette/build.gradle
@@ -12,7 +12,7 @@
annotationProcessor(NULLAWAY)
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
}
supportLibrary {
diff --git a/palette/ktx/build.gradle b/palette/ktx/build.gradle
index e5d5d43..f194955 100644
--- a/palette/ktx/build.gradle
+++ b/palette/ktx/build.gradle
@@ -35,7 +35,7 @@
api(project(":palette"))
api(KOTLIN_STDLIB)
androidTestImplementation(JUNIT)
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
}
supportLibrary {
diff --git a/palette/src/androidTest/java/androidx/palette/graphics/BucketTests.java b/palette/src/androidTest/java/androidx/palette/graphics/BucketTests.java
index 500b013..4760017 100644
--- a/palette/src/androidTest/java/androidx/palette/graphics/BucketTests.java
+++ b/palette/src/androidTest/java/androidx/palette/graphics/BucketTests.java
@@ -24,8 +24,9 @@
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
-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/palette/src/androidTest/java/androidx/palette/graphics/ConsistencyTest.java b/palette/src/androidTest/java/androidx/palette/graphics/ConsistencyTest.java
index 8ea0daf..7a0982c 100644
--- a/palette/src/androidTest/java/androidx/palette/graphics/ConsistencyTest.java
+++ b/palette/src/androidTest/java/androidx/palette/graphics/ConsistencyTest.java
@@ -19,8 +19,9 @@
import static org.junit.Assert.assertEquals;
import android.graphics.Bitmap;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/palette/src/androidTest/java/androidx/palette/graphics/MaxColorsTest.java b/palette/src/androidTest/java/androidx/palette/graphics/MaxColorsTest.java
index 0612348..4a164bb 100644
--- a/palette/src/androidTest/java/androidx/palette/graphics/MaxColorsTest.java
+++ b/palette/src/androidTest/java/androidx/palette/graphics/MaxColorsTest.java
@@ -18,8 +18,8 @@
import static org.junit.Assert.assertTrue;
-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/palette/src/androidTest/java/androidx/palette/graphics/SwatchTests.java b/palette/src/androidTest/java/androidx/palette/graphics/SwatchTests.java
index fa62303..c269141 100644
--- a/palette/src/androidTest/java/androidx/palette/graphics/SwatchTests.java
+++ b/palette/src/androidTest/java/androidx/palette/graphics/SwatchTests.java
@@ -25,8 +25,9 @@
import static org.junit.Assert.assertTrue;
import android.graphics.Color;
-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/palette/src/androidTest/java/androidx/palette/graphics/TestUtils.java b/palette/src/androidTest/java/androidx/palette/graphics/TestUtils.java
index 995cf3e..d138c71 100644
--- a/palette/src/androidTest/java/androidx/palette/graphics/TestUtils.java
+++ b/palette/src/androidTest/java/androidx/palette/graphics/TestUtils.java
@@ -21,9 +21,9 @@
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.Color;
-import android.support.test.InstrumentationRegistry;
import androidx.palette.test.R;
+import androidx.test.InstrumentationRegistry;
class TestUtils {
diff --git a/percent/build.gradle b/percent/build.gradle
index f80350e..7faabd5 100644
--- a/percent/build.gradle
+++ b/percent/build.gradle
@@ -9,8 +9,9 @@
dependencies {
api(project(":core"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
}
android {
diff --git a/percent/src/androidTest/java/androidx/percentlayout/widget/BaseInstrumentationTestCase.java b/percent/src/androidTest/java/androidx/percentlayout/widget/BaseInstrumentationTestCase.java
index 7bc48e6..1611444 100644
--- a/percent/src/androidTest/java/androidx/percentlayout/widget/BaseInstrumentationTestCase.java
+++ b/percent/src/androidTest/java/androidx/percentlayout/widget/BaseInstrumentationTestCase.java
@@ -19,8 +19,8 @@
import static org.junit.Assert.assertEquals;
import android.app.Activity;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.runner.RunWith;
diff --git a/percent/src/androidTest/java/androidx/percentlayout/widget/LayoutDirectionActions.java b/percent/src/androidTest/java/androidx/percentlayout/widget/LayoutDirectionActions.java
index 839e2ce..1204510 100755
--- a/percent/src/androidTest/java/androidx/percentlayout/widget/LayoutDirectionActions.java
+++ b/percent/src/androidTest/java/androidx/percentlayout/widget/LayoutDirectionActions.java
@@ -16,10 +16,10 @@
package androidx.percentlayout.widget;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
import android.view.View;
import androidx.core.view.ViewCompat;
diff --git a/percent/src/androidTest/java/androidx/percentlayout/widget/PercentDynamicLayoutTest.java b/percent/src/androidTest/java/androidx/percentlayout/widget/PercentDynamicLayoutTest.java
index 5a731e1..0389306 100755
--- a/percent/src/androidTest/java/androidx/percentlayout/widget/PercentDynamicLayoutTest.java
+++ b/percent/src/androidTest/java/androidx/percentlayout/widget/PercentDynamicLayoutTest.java
@@ -15,17 +15,17 @@
*/
package androidx.percentlayout.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.hamcrest.CoreMatchers.allOf;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.filters.SmallTest;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.filters.SmallTest;
import android.view.View;
import android.view.ViewStub;
diff --git a/percent/src/androidTest/java/androidx/percentlayout/widget/PercentFrameTest.java b/percent/src/androidTest/java/androidx/percentlayout/widget/PercentFrameTest.java
index 5a82552..5590b45 100644
--- a/percent/src/androidTest/java/androidx/percentlayout/widget/PercentFrameTest.java
+++ b/percent/src/androidTest/java/androidx/percentlayout/widget/PercentFrameTest.java
@@ -15,11 +15,11 @@
*/
package androidx.percentlayout.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import android.os.Build;
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
import android.view.View;
import androidx.core.view.ViewCompat;
diff --git a/percent/src/androidTest/java/androidx/percentlayout/widget/PercentRelativeRtlTest.java b/percent/src/androidTest/java/androidx/percentlayout/widget/PercentRelativeRtlTest.java
index d322555..86fb5df 100644
--- a/percent/src/androidTest/java/androidx/percentlayout/widget/PercentRelativeRtlTest.java
+++ b/percent/src/androidTest/java/androidx/percentlayout/widget/PercentRelativeRtlTest.java
@@ -15,11 +15,11 @@
*/
package androidx.percentlayout.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import android.os.Build;
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
import android.view.View;
import androidx.core.view.ViewCompat;
diff --git a/percent/src/androidTest/java/androidx/percentlayout/widget/PercentRelativeTest.java b/percent/src/androidTest/java/androidx/percentlayout/widget/PercentRelativeTest.java
index 63207f6..51165e2 100644
--- a/percent/src/androidTest/java/androidx/percentlayout/widget/PercentRelativeTest.java
+++ b/percent/src/androidTest/java/androidx/percentlayout/widget/PercentRelativeTest.java
@@ -15,7 +15,7 @@
*/
package androidx.percentlayout.widget;
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
import android.view.View;
import androidx.percentlayout.test.R;
diff --git a/preference/build.gradle b/preference/build.gradle
index 8518300..1df5c40 100644
--- a/preference/build.gradle
+++ b/preference/build.gradle
@@ -29,8 +29,9 @@
api(project(":appcompat"))
api(project(":recyclerview"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
}
diff --git a/preference/ktx/src/androidTest/java/androidx/preference/PreferenceGroupTest.kt b/preference/ktx/src/androidTest/java/androidx/preference/PreferenceGroupTest.kt
index 37de501..b734df7 100644
--- a/preference/ktx/src/androidTest/java/androidx/preference/PreferenceGroupTest.kt
+++ b/preference/ktx/src/androidTest/java/androidx/preference/PreferenceGroupTest.kt
@@ -16,8 +16,8 @@
package androidx.preference
-import android.support.test.InstrumentationRegistry
-import android.support.test.rule.ActivityTestRule
+import androidx.test.InstrumentationRegistry
+import androidx.test.rule.ActivityTestRule
import androidx.testutils.assertThrows
import androidx.testutils.fail
import com.google.common.truth.Truth.assertThat
diff --git a/preference/src/androidTest/java/androidx/preference/PreferenceGroupInitialExpandedChildrenCountTest.java b/preference/src/androidTest/java/androidx/preference/PreferenceGroupInitialExpandedChildrenCountTest.java
index 5d56f16..0d14734 100644
--- a/preference/src/androidTest/java/androidx/preference/PreferenceGroupInitialExpandedChildrenCountTest.java
+++ b/preference/src/androidTest/java/androidx/preference/PreferenceGroupInitialExpandedChildrenCountTest.java
@@ -30,10 +30,11 @@
import android.os.Handler;
import android.os.Message;
import android.os.Parcelable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/preference/src/androidTest/java/androidx/preference/tests/ExpandablePreferenceTest.java b/preference/src/androidTest/java/androidx/preference/tests/ExpandablePreferenceTest.java
index 6a04341..fc7b6d7 100644
--- a/preference/src/androidTest/java/androidx/preference/tests/ExpandablePreferenceTest.java
+++ b/preference/src/androidTest/java/androidx/preference/tests/ExpandablePreferenceTest.java
@@ -19,16 +19,16 @@
import static org.junit.Assert.assertEquals;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceGroupAdapter;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/preference/src/androidTest/java/androidx/preference/tests/PreferenceDataStoreTest.java b/preference/src/androidTest/java/androidx/preference/tests/PreferenceDataStoreTest.java
index d4b7dd5..c36b425 100644
--- a/preference/src/androidTest/java/androidx/preference/tests/PreferenceDataStoreTest.java
+++ b/preference/src/androidTest/java/androidx/preference/tests/PreferenceDataStoreTest.java
@@ -42,10 +42,6 @@
import android.content.Context;
import android.content.SharedPreferences;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.preference.CheckBoxPreference;
import androidx.preference.EditTextPreference;
@@ -55,6 +51,10 @@
import androidx.preference.PreferenceScreen;
import androidx.preference.SeekBarPreference;
import androidx.preference.tests.helpers.PreferenceWrapper;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/preference/src/androidTest/java/androidx/preference/tests/PreferenceIconSpaceTest.java b/preference/src/androidTest/java/androidx/preference/tests/PreferenceIconSpaceTest.java
index 9202490..5e7b138 100644
--- a/preference/src/androidTest/java/androidx/preference/tests/PreferenceIconSpaceTest.java
+++ b/preference/src/androidTest/java/androidx/preference/tests/PreferenceIconSpaceTest.java
@@ -21,10 +21,6 @@
import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
@@ -32,6 +28,10 @@
import androidx.preference.AndroidResources;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/preference/src/androidTest/java/androidx/preference/tests/PreferenceParentGroupTest.java b/preference/src/androidTest/java/androidx/preference/tests/PreferenceParentGroupTest.java
index df24211..8036f31 100644
--- a/preference/src/androidTest/java/androidx/preference/tests/PreferenceParentGroupTest.java
+++ b/preference/src/androidTest/java/androidx/preference/tests/PreferenceParentGroupTest.java
@@ -20,15 +20,15 @@
import static org.junit.Assert.assertNull;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.preference.CheckBoxPreference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/preference/src/androidTest/java/androidx/preference/tests/PreferencePersistTest.java b/preference/src/androidTest/java/androidx/preference/tests/PreferencePersistTest.java
index bd0f7bb..3c07c21 100644
--- a/preference/src/androidTest/java/androidx/preference/tests/PreferencePersistTest.java
+++ b/preference/src/androidTest/java/androidx/preference/tests/PreferencePersistTest.java
@@ -25,14 +25,14 @@
import android.content.Context;
import android.content.SharedPreferences;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.preference.tests.helpers.PreferenceWrapper;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/preference/src/androidTest/java/androidx/preference/tests/PreferenceSingleLineTitleTest.java b/preference/src/androidTest/java/androidx/preference/tests/PreferenceSingleLineTitleTest.java
index d6a0096..795746e 100644
--- a/preference/src/androidTest/java/androidx/preference/tests/PreferenceSingleLineTitleTest.java
+++ b/preference/src/androidTest/java/androidx/preference/tests/PreferenceSingleLineTitleTest.java
@@ -22,15 +22,15 @@
import static org.mockito.Mockito.verify;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.preference.Preference;
import androidx.preference.PreferenceViewHolder;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/preference/src/androidTest/java/androidx/preference/tests/PreferenceVisibilityTest.java b/preference/src/androidTest/java/androidx/preference/tests/PreferenceVisibilityTest.java
index dbd4871..29ccfbc 100644
--- a/preference/src/androidTest/java/androidx/preference/tests/PreferenceVisibilityTest.java
+++ b/preference/src/androidTest/java/androidx/preference/tests/PreferenceVisibilityTest.java
@@ -20,15 +20,15 @@
import static org.junit.Assert.assertTrue;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
import androidx.preference.PreferenceScreen;
import androidx.preference.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/preference/src/androidTest/java/androidx/preference/tests/SimplePreferenceComparisonCallbackTest.java b/preference/src/androidTest/java/androidx/preference/tests/SimplePreferenceComparisonCallbackTest.java
index e9402eb..016205f 100644
--- a/preference/src/androidTest/java/androidx/preference/tests/SimplePreferenceComparisonCallbackTest.java
+++ b/preference/src/androidTest/java/androidx/preference/tests/SimplePreferenceComparisonCallbackTest.java
@@ -23,15 +23,15 @@
import android.graphics.Canvas;
import android.graphics.ColorFilter;
import android.graphics.drawable.Drawable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.preference.CheckBoxPreference;
import androidx.preference.DropDownPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
import androidx.preference.TwoStatePreference;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview-selection/build.gradle b/recyclerview-selection/build.gradle
index dcda345..ab9b9eb 100644
--- a/recyclerview-selection/build.gradle
+++ b/recyclerview-selection/build.gradle
@@ -27,8 +27,8 @@
api(project(":annotation"))
api(project(":core"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it's own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it's own MockMaker
androidTestImplementation(JUNIT)
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/BandSelectionHelperTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/BandSelectionHelperTest.java
index cba9da9..b3f71b5 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/BandSelectionHelperTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/BandSelectionHelperTest.java
@@ -20,8 +20,6 @@
import static org.junit.Assert.assertTrue;
import android.graphics.Rect;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.MotionEvent;
import androidx.recyclerview.selection.testing.TestAdapter;
@@ -31,6 +29,8 @@
import androidx.recyclerview.selection.testing.TestEvents.Builder;
import androidx.recyclerview.selection.testing.TestItemKeyProvider;
import androidx.recyclerview.widget.RecyclerView.OnScrollListener;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/DefaultSelectionTrackerTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/DefaultSelectionTrackerTest.java
index f7512ca..d3fe064 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/DefaultSelectionTrackerTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/DefaultSelectionTrackerTest.java
@@ -22,8 +22,6 @@
import static org.junit.Assert.assertTrue;
import android.os.Bundle;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.util.SparseBooleanArray;
import androidx.recyclerview.selection.SelectionTracker.SelectionPredicate;
@@ -32,6 +30,8 @@
import androidx.recyclerview.selection.testing.TestAdapter;
import androidx.recyclerview.selection.testing.TestItemKeyProvider;
import androidx.recyclerview.selection.testing.TestSelectionObserver;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/DefaultSelectionTracker_SingleSelectTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/DefaultSelectionTracker_SingleSelectTest.java
index d5ed06d..cab58ed 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/DefaultSelectionTracker_SingleSelectTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/DefaultSelectionTracker_SingleSelectTest.java
@@ -18,13 +18,12 @@
import static org.junit.Assert.fail;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.recyclerview.selection.testing.SelectionProbe;
import androidx.recyclerview.selection.testing.TestAdapter;
import androidx.recyclerview.selection.testing.TestItemKeyProvider;
import androidx.recyclerview.selection.testing.TestSelectionObserver;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureRouterTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureRouterTest.java
index 3e8cf825..1167847 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureRouterTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureRouterTest.java
@@ -21,14 +21,14 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.GestureDetector.OnDoubleTapListener;
import android.view.GestureDetector.OnGestureListener;
import android.view.MotionEvent;
import androidx.recyclerview.selection.testing.TestEvents.Mouse;
import androidx.recyclerview.selection.testing.TestEvents.Touch;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureSelectionHelperTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureSelectionHelperTest.java
index 4575742..1f405ba 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureSelectionHelperTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureSelectionHelperTest.java
@@ -19,8 +19,6 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.MotionEvent;
import androidx.recyclerview.selection.testing.SelectionProbe;
@@ -29,6 +27,8 @@
import androidx.recyclerview.selection.testing.TestEvents;
import androidx.recyclerview.selection.testing.TestItemDetailsLookup;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureSelectionHelper_RecyclerViewDelegateTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureSelectionHelper_RecyclerViewDelegateTest.java
index 2499682..cca7dca 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureSelectionHelper_RecyclerViewDelegateTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GestureSelectionHelper_RecyclerViewDelegateTest.java
@@ -19,13 +19,13 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.MotionEvent;
import android.view.View;
import androidx.recyclerview.selection.GestureSelectionHelper.RecyclerViewDelegate;
import androidx.recyclerview.selection.testing.TestEvents;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GridModelTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GridModelTest.java
index f639307f..a5ce3f1 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GridModelTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/GridModelTest.java
@@ -24,12 +24,12 @@
import android.graphics.Point;
import android.graphics.Rect;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.recyclerview.selection.testing.TestAdapter;
import androidx.recyclerview.selection.testing.TestItemKeyProvider;
import androidx.recyclerview.widget.RecyclerView.OnScrollListener;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Test;
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/MouseInputHandlerTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/MouseInputHandlerTest.java
index cabe53b..670da51 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/MouseInputHandlerTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/MouseInputHandlerTest.java
@@ -26,8 +26,6 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.MotionEvent;
import androidx.recyclerview.selection.testing.SelectionProbe;
@@ -42,6 +40,8 @@
import androidx.recyclerview.selection.testing.TestOnContextClickListener;
import androidx.recyclerview.selection.testing.TestOnItemActivatedListener;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/MouseInputHandler_RangeTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/MouseInputHandler_RangeTest.java
index a355f2e..2b0915a 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/MouseInputHandler_RangeTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/MouseInputHandler_RangeTest.java
@@ -20,9 +20,6 @@
import static androidx.recyclerview.selection.testing.TestEvents.Mouse.SECONDARY_CLICK;
import static androidx.recyclerview.selection.testing.TestEvents.Mouse.SHIFT_CLICK;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.recyclerview.selection.testing.SelectionProbe;
import androidx.recyclerview.selection.testing.SelectionTrackers;
import androidx.recyclerview.selection.testing.TestAdapter;
@@ -33,6 +30,8 @@
import androidx.recyclerview.selection.testing.TestItemKeyProvider;
import androidx.recyclerview.selection.testing.TestOnContextClickListener;
import androidx.recyclerview.selection.testing.TestOnItemActivatedListener;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/OperationMonitorTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/OperationMonitorTest.java
index 0ef8d8a..b5d2fa0 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/OperationMonitorTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/OperationMonitorTest.java
@@ -20,8 +20,8 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-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.Before;
import org.junit.Test;
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/RangeTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/RangeTest.java
index e2919f4..6b0d189 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/RangeTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/RangeTest.java
@@ -21,10 +21,9 @@
import static org.junit.Assert.assertEquals;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.recyclerview.selection.testing.TestData;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/SelectionTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/SelectionTest.java
index b8c6583..bb0d6ad 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/SelectionTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/SelectionTest.java
@@ -20,8 +20,8 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-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.Before;
import org.junit.Test;
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/SelectionTracker_InstanceStateTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/SelectionTracker_InstanceStateTest.java
index 2715d0b..3639cc1 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/SelectionTracker_InstanceStateTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/SelectionTracker_InstanceStateTest.java
@@ -19,11 +19,11 @@
import static org.junit.Assert.assertEquals;
import android.os.Bundle;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.recyclerview.selection.testing.Bundles;
import androidx.recyclerview.selection.testing.SelectionTrackers;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_LongTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_LongTest.java
index 3a26895..8a89285 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_LongTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_LongTest.java
@@ -19,10 +19,10 @@
import static org.junit.Assert.assertEquals;
import android.os.Bundle;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.recyclerview.selection.testing.Bundles;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_ParcelableTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_ParcelableTest.java
index 1234023..41ae336 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_ParcelableTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_ParcelableTest.java
@@ -20,10 +20,10 @@
import android.net.Uri;
import android.os.Bundle;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.recyclerview.selection.testing.Bundles;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_StringTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_StringTest.java
index 5d680de..f0e29d4 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_StringTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/StorageStrategy_StringTest.java
@@ -19,10 +19,10 @@
import static org.junit.Assert.assertEquals;
import android.os.Bundle;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.recyclerview.selection.testing.Bundles;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/TouchInputHandlerTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/TouchInputHandlerTest.java
index c6e6475..409bba3 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/TouchInputHandlerTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/TouchInputHandlerTest.java
@@ -20,8 +20,6 @@
import static org.junit.Assert.assertFalse;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.MotionEvent;
import androidx.recyclerview.selection.ItemDetailsLookup.ItemDetails;
@@ -36,6 +34,8 @@
import androidx.recyclerview.selection.testing.TestRunnable;
import androidx.recyclerview.selection.testing.TestSelectionPredicate;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/ViewAutoScrollerTest.java b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/ViewAutoScrollerTest.java
index 1aaf495..35b851e 100644
--- a/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/ViewAutoScrollerTest.java
+++ b/recyclerview-selection/src/androidTest/java/androidx/recyclerview/selection/ViewAutoScrollerTest.java
@@ -21,11 +21,11 @@
import static org.junit.Assert.assertNull;
import android.graphics.Point;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.Nullable;
import androidx.recyclerview.selection.ViewAutoScroller.ScrollHost;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview/build.gradle b/recyclerview/build.gradle
index ab5b778..97bb230 100644
--- a/recyclerview/build.gradle
+++ b/recyclerview/build.gradle
@@ -12,8 +12,9 @@
api(project(":core"))
api(project(":legacy-support-core-ui"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(JUNIT)
@@ -22,7 +23,7 @@
testImplementation(JUNIT)
testImplementation(MOCKITO_CORE)
- testImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ testImplementation(TEST_RUNNER)
}
android {
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/test/RecyclerViewTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/test/RecyclerViewTest.java
index f96cbc2..985f181 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/test/RecyclerViewTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/test/RecyclerViewTest.java
@@ -24,10 +24,6 @@
import android.app.Activity;
import android.app.Instrumentation;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.ViewGroup;
import android.widget.LinearLayout;
@@ -35,6 +31,10 @@
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.StaggeredGridLayoutManager;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/AsyncListDifferTest.kt b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/AsyncListDifferTest.kt
index 8d4415e..1ecb7e7 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/AsyncListDifferTest.kt
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/AsyncListDifferTest.kt
@@ -16,21 +16,15 @@
package androidx.recyclerview.widget
-import android.support.test.filters.SmallTest
-import org.junit.Assert.assertEquals
-import org.junit.Assert.assertNotSame
-import org.junit.Assert.assertSame
-import org.junit.Assert.fail
+import androidx.test.filters.SmallTest
+import org.junit.Assert.*
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.JUnit4
-import org.mockito.Mockito.mock
-import org.mockito.Mockito.verify
-import org.mockito.Mockito.verifyNoMoreInteractions
-import org.mockito.Mockito.verifyZeroInteractions
+import org.mockito.Mockito.*
import java.lang.UnsupportedOperationException
+import java.util.*
import java.util.Collections.emptyList
-import java.util.LinkedList
import java.util.concurrent.Executor
class TestExecutor : Executor {
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/AsyncListUtilLayoutTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/AsyncListUtilLayoutTest.java
index beea8cc..fdcdf7e 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/AsyncListUtilLayoutTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/AsyncListUtilLayoutTest.java
@@ -22,14 +22,14 @@
import static java.util.concurrent.TimeUnit.SECONDS;
import android.content.Context;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.Suppress;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.Suppress;
+import androidx.test.runner.AndroidJUnit4;
import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/AsyncListUtilTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/AsyncListUtilTest.java
index f8fb2ac..1a84cfc 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/AsyncListUtilTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/AsyncListUtilTest.java
@@ -19,12 +19,12 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.Suppress;
-import android.support.test.rule.ActivityTestRule;
import android.util.SparseBooleanArray;
import androidx.annotation.UiThread;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.Suppress;
+import androidx.test.rule.ActivityTestRule;
import org.junit.After;
import org.junit.Before;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/BaseRecyclerViewInstrumentationTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/BaseRecyclerViewInstrumentationTest.java
index 038f1385..d4f90da 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/BaseRecyclerViewInstrumentationTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/BaseRecyclerViewInstrumentationTest.java
@@ -32,8 +32,6 @@
import android.app.Instrumentation;
import android.graphics.Rect;
import android.os.Looper;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.ActivityTestRule;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -45,6 +43,8 @@
import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat;
import androidx.recyclerview.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.rule.ActivityTestRule;
import androidx.testutils.PollingCheck;
import org.hamcrest.CoreMatchers;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/BucketTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/BucketTest.java
index 70360ae..fc19f537 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/BucketTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/BucketTest.java
@@ -20,7 +20,7 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ChildHelperTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ChildHelperTest.java
index 09ff096..8d92c32 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ChildHelperTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ChildHelperTest.java
@@ -23,12 +23,13 @@
import static org.junit.Assert.assertTrue;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.view.ViewGroup;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/CustomEdgeEffectTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/CustomEdgeEffectTest.java
index 373f402..3c22c34 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/CustomEdgeEffectTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/CustomEdgeEffectTest.java
@@ -27,14 +27,14 @@
import static org.junit.Assert.assertTrue;
import android.content.Context;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.MotionEvent;
import android.view.ViewGroup;
import android.widget.EdgeEffect;
import androidx.annotation.NonNull;
import androidx.core.view.InputDeviceCompat;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/DefaultItemAnimatorTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/DefaultItemAnimatorTest.java
index 2884f74..811e7af 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/DefaultItemAnimatorTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/DefaultItemAnimatorTest.java
@@ -21,14 +21,14 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
+import androidx.test.filters.LargeTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/DefaultMeasureSpecTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/DefaultMeasureSpecTest.java
index 6da71a9..da15088 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/DefaultMeasureSpecTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/DefaultMeasureSpecTest.java
@@ -22,10 +22,11 @@
import static android.view.View.MeasureSpec.makeMeasureSpec;
import android.graphics.Rect;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
import android.view.View;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+
import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
import org.junit.Before;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/DividerItemDecorationTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/DividerItemDecorationTest.java
index 2dd392a..4671d690 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/DividerItemDecorationTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/DividerItemDecorationTest.java
@@ -18,15 +18,15 @@
import android.content.Context;
import android.graphics.Canvas;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.ContextThemeWrapper;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.recyclerview.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/FocusSearchNavigationTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/FocusSearchNavigationTest.java
index b0c8f7f..535cf6b 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/FocusSearchNavigationTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/FocusSearchNavigationTest.java
@@ -29,9 +29,6 @@
import android.app.Activity;
import android.content.Context;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.rule.ActivityTestRule;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -42,6 +39,9 @@
import androidx.core.view.ViewCompat;
import androidx.recyclerview.test.R;
import androidx.recyclerview.test.RecyclerViewTestActivity;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
import org.hamcrest.BaseMatcher;
import org.hamcrest.CoreMatchers;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GapWorkerTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GapWorkerTest.java
index 6c94d28..ad945f7 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GapWorkerTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GapWorkerTest.java
@@ -23,10 +23,11 @@
import android.content.Context;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerBaseConfigSetTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerBaseConfigSetTest.java
index 6af4c64..38c1bec 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerBaseConfigSetTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerBaseConfigSetTest.java
@@ -20,10 +20,11 @@
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.MediumTest;
import android.util.Log;
import android.view.View;
+import androidx.test.filters.MediumTest;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerCacheTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerCacheTest.java
index 01270c8..1f2ee69 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerCacheTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerCacheTest.java
@@ -23,8 +23,9 @@
import static org.junit.Assert.assertTrue;
import android.os.Build;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
+
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerCachedBordersTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerCachedBordersTest.java
index b04e5c4..2b99138 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerCachedBordersTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerCachedBordersTest.java
@@ -21,9 +21,10 @@
import static org.junit.Assert.assertEquals;
-import android.support.test.filters.MediumTest;
import android.view.View;
+import androidx.test.filters.MediumTest;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerCustomSizeInScrollDirectionTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerCustomSizeInScrollDirectionTest.java
index 740d8c6..0f9078c 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerCustomSizeInScrollDirectionTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerCustomSizeInScrollDirectionTest.java
@@ -22,11 +22,11 @@
import static org.junit.Assert.assertTrue;
import android.graphics.Rect;
-import android.support.test.filters.MediumTest;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
+import androidx.test.filters.MediumTest;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerNoOpUpdateTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerNoOpUpdateTest.java
index c077088..235bd8e 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerNoOpUpdateTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerNoOpUpdateTest.java
@@ -20,9 +20,10 @@
import static org.junit.Assert.assertNotNull;
import android.graphics.Rect;
-import android.support.test.filters.MediumTest;
import android.view.View;
+import androidx.test.filters.MediumTest;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerRtlTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerRtlTest.java
index 989641c..dd44a55 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerRtlTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerRtlTest.java
@@ -23,11 +23,11 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.MediumTest;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
+import androidx.test.filters.MediumTest;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerSnappingTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerSnappingTest.java
index c3ef3de..9fcbf77 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerSnappingTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerSnappingTest.java
@@ -21,11 +21,11 @@
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.LargeTest;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.Nullable;
+import androidx.test.filters.LargeTest;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerTest.java
index c582b75..1d561d3 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerTest.java
@@ -34,10 +34,6 @@
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.StateListDrawable;
import android.os.Build;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.runner.AndroidJUnit4;
import android.util.SparseIntArray;
import android.util.StateSet;
import android.view.View;
@@ -46,6 +42,10 @@
import androidx.annotation.NonNull;
import androidx.core.view.AccessibilityDelegateCompat;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.runner.AndroidJUnit4;
import org.hamcrest.CoreMatchers;
import org.junit.Test;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerWrapContentTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerWrapContentTest.java
index 1c1cfaa..9fa1acc 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerWrapContentTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerWrapContentTest.java
@@ -24,11 +24,12 @@
import android.app.Activity;
import android.graphics.Rect;
import android.os.Build;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
import android.view.Gravity;
import android.view.View;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerWrapContentWithAspectRatioTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerWrapContentWithAspectRatioTest.java
index 764a874..612101c 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerWrapContentWithAspectRatioTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/GridLayoutManagerWrapContentWithAspectRatioTest.java
@@ -29,9 +29,10 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.graphics.Color;
-import android.support.test.filters.MediumTest;
import android.view.View;
+import androidx.test.filters.MediumTest;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ItemAnimatorV2ApiTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ItemAnimatorV2ApiTest.java
index b1b9a35..2fad114 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ItemAnimatorV2ApiTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ItemAnimatorV2ApiTest.java
@@ -29,11 +29,10 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import org.hamcrest.CoreMatchers;
import org.junit.Test;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ItemTouchHelperTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ItemTouchHelperTest.java
index 9c90d244..5ecc7cd 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ItemTouchHelperTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ItemTouchHelperTest.java
@@ -27,15 +27,15 @@
import static org.junit.Assert.assertTrue;
import android.os.Build;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.Suppress;
-import android.support.test.runner.AndroidJUnit4;
import android.view.Gravity;
import android.view.View;
import androidx.annotation.NonNull;
import androidx.core.util.Pair;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.Suppress;
+import androidx.test.runner.AndroidJUnit4;
import androidx.testutils.PollingCheck;
import org.junit.Test;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerBaseConfigSetTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerBaseConfigSetTest.java
index 5befbc9..eb970e9 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerBaseConfigSetTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerBaseConfigSetTest.java
@@ -29,12 +29,12 @@
import static org.junit.Assert.assertThat;
import android.graphics.Rect;
-import android.support.test.filters.LargeTest;
import android.util.Log;
import android.view.View;
import android.view.ViewParent;
import androidx.annotation.NonNull;
+import androidx.test.filters.LargeTest;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerCacheTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerCacheTest.java
index ed87350..f725157 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerCacheTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerCacheTest.java
@@ -22,8 +22,9 @@
import static org.junit.Assert.assertEquals;
import android.os.Build;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
+
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerPrepareForDropTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerPrepareForDropTest.java
index e84f8d2..58821c6 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerPrepareForDropTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerPrepareForDropTest.java
@@ -21,10 +21,10 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
-import android.support.test.filters.MediumTest;
import android.view.View;
import androidx.annotation.NonNull;
+import androidx.test.filters.MediumTest;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerResizeTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerResizeTest.java
index 48d2cee..e8dd49c 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerResizeTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerResizeTest.java
@@ -20,9 +20,10 @@
import static org.junit.Assert.assertEquals;
-import android.support.test.filters.MediumTest;
import android.widget.FrameLayout;
+import androidx.test.filters.MediumTest;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerSavedStateTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerSavedStateTest.java
index f91f843..8c5e912 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerSavedStateTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerSavedStateTest.java
@@ -21,10 +21,11 @@
import android.graphics.Rect;
import android.os.Parcel;
import android.os.Parcelable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
import android.util.Log;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerSnappingTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerSnappingTest.java
index d4df1b4..dcaa850 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerSnappingTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerSnappingTest.java
@@ -21,10 +21,10 @@
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.LargeTest;
import android.view.View;
import androidx.annotation.Nullable;
+import androidx.test.filters.LargeTest;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerTest.java
index 60eb6d24..97a19bc 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerTest.java
@@ -35,8 +35,6 @@
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.StateListDrawable;
import android.os.Build;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
import android.util.Log;
import android.util.StateSet;
import android.view.View;
@@ -46,6 +44,8 @@
import androidx.annotation.NonNull;
import androidx.core.view.AccessibilityDelegateCompat;
import androidx.core.view.ViewCompat;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
import org.junit.Test;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerWrapContentTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerWrapContentTest.java
index 65796863..07e10e5 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerWrapContentTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerWrapContentTest.java
@@ -21,11 +21,11 @@
import android.graphics.Rect;
import android.os.Build;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
import android.view.Gravity;
import androidx.core.view.ViewCompat;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerWrapContentWithAspectRatioTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerWrapContentWithAspectRatioTest.java
index 38444fc..39a488b 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerWrapContentWithAspectRatioTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/LinearLayoutManagerWrapContentWithAspectRatioTest.java
@@ -25,10 +25,11 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.graphics.Color;
-import android.support.test.filters.MediumTest;
import android.view.View;
import android.view.ViewGroup;
+import androidx.test.filters.MediumTest;
+
import org.hamcrest.CoreMatchers;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/MessageQueueTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/MessageQueueTest.java
index 7309a37..c3551b6 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/MessageQueueTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/MessageQueueTest.java
@@ -21,8 +21,8 @@
import static org.hamcrest.CoreMatchers.sameInstance;
import static org.hamcrest.MatcherAssert.assertThat;
-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.Before;
import org.junit.Test;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/MultiRecyclerViewPrefetchTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/MultiRecyclerViewPrefetchTest.java
index ce57df9..e8505ea 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/MultiRecyclerViewPrefetchTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/MultiRecyclerViewPrefetchTest.java
@@ -21,14 +21,14 @@
import android.content.Context;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/PagerSnapHelperTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/PagerSnapHelperTest.java
index cd0b336..d084e0a 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/PagerSnapHelperTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/PagerSnapHelperTest.java
@@ -21,12 +21,12 @@
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.LargeTest;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.annotation.Nullable;
+import androidx.test.filters.LargeTest;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecycledViewPoolTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecycledViewPoolTest.java
index 2ce2cce7..a6dd396 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecycledViewPoolTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecycledViewPoolTest.java
@@ -24,13 +24,13 @@
import static org.junit.Assert.assertThat;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewAccessibilityLifecycleTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewAccessibilityLifecycleTest.java
index 3ce82ea..fee808c 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewAccessibilityLifecycleTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewAccessibilityLifecycleTest.java
@@ -28,10 +28,6 @@
import static org.mockito.Mockito.verify;
import android.os.Build;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.view.ViewGroup;
import android.view.accessibility.AccessibilityNodeInfo;
@@ -40,6 +36,10 @@
import androidx.core.view.AccessibilityDelegateCompat;
import androidx.core.view.ViewCompat;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewAccessibilityTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewAccessibilityTest.java
index cbe7c96..706b3b2 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewAccessibilityTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewAccessibilityTest.java
@@ -22,12 +22,12 @@
import static org.junit.Assert.assertTrue;
import android.os.Build;
-import android.support.test.filters.MediumTest;
import android.view.View;
import android.view.accessibility.AccessibilityEvent;
import androidx.core.view.AccessibilityDelegateCompat;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
+import androidx.test.filters.MediumTest;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewAnimationsTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewAnimationsTest.java
index 6fbd577..6b6d161 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewAnimationsTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewAnimationsTest.java
@@ -27,15 +27,15 @@
import android.graphics.Rect;
import android.os.Build;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.core.view.ViewCompat;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.runner.AndroidJUnit4;
import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewAutofillTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewAutofillTest.java
index 3ccb11e..c9672f6 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewAutofillTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewAutofillTest.java
@@ -20,16 +20,16 @@
import android.content.Context;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.core.view.ViewCompat;
import androidx.recyclerview.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewBasicTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewBasicTest.java
index 8f21c89..fbb9b84 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewBasicTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewBasicTest.java
@@ -31,9 +31,6 @@
import android.os.Parcel;
import android.os.Parcelable;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.util.AttributeSet;
import android.util.SparseArray;
import android.view.LayoutInflater;
@@ -48,6 +45,9 @@
import androidx.annotation.NonNull;
import androidx.recyclerview.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewCacheTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewCacheTest.java
index d920def..c10bc95 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewCacheTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewCacheTest.java
@@ -38,16 +38,16 @@
import android.os.Build;
import android.os.Parcelable;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import androidx.annotation.NonNull;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewFastScrollerTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewFastScrollerTest.java
index 134f193..2b89bdf 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewFastScrollerTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewFastScrollerTest.java
@@ -26,10 +26,6 @@
import android.content.res.Resources;
import android.graphics.Color;
import android.graphics.drawable.StateListDrawable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
@@ -39,6 +35,10 @@
import androidx.annotation.NonNull;
import androidx.recyclerview.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.LargeTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewFocusRecoveryTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewFocusRecoveryTest.java
index 7a28fa7..8434c3ac9 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewFocusRecoveryTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewFocusRecoveryTest.java
@@ -22,7 +22,6 @@
import static org.hamcrest.CoreMatchers.sameInstance;
import static org.hamcrest.MatcherAssert.assertThat;
-import android.support.test.filters.MediumTest;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -31,6 +30,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.recyclerview.test.R;
+import androidx.test.filters.MediumTest;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewFocusTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewFocusTest.java
index 994ba5b..f310d1a 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewFocusTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewFocusTest.java
@@ -21,15 +21,16 @@
import static org.junit.Assert.assertThat;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewLayoutTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewLayoutTest.java
index 27b275f..5735584 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewLayoutTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewLayoutTest.java
@@ -53,11 +53,6 @@
import android.graphics.Rect;
import android.os.Build;
import android.os.SystemClock;
-import android.support.test.filters.FlakyTest;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.Suppress;
-import android.support.test.runner.AndroidJUnit4;
import android.util.AttributeSet;
import android.util.Log;
import android.view.Gravity;
@@ -74,6 +69,11 @@
import androidx.core.view.NestedScrollingParent2;
import androidx.core.view.ViewCompat;
import androidx.recyclerview.test.NestedScrollingParent2Adapter;
+import androidx.test.filters.FlakyTest;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.Suppress;
+import androidx.test.runner.AndroidJUnit4;
import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewOnGenericMotionEventTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewOnGenericMotionEventTest.java
index df73b562..8e382bb 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewOnGenericMotionEventTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewOnGenericMotionEventTest.java
@@ -20,9 +20,6 @@
import static org.junit.Assert.assertNotEquals;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewConfiguration;
@@ -32,6 +29,9 @@
import androidx.annotation.NonNull;
import androidx.core.view.InputDeviceCompat;
import androidx.core.view.ViewConfigurationCompat;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewPrefetchTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewPrefetchTest.java
index ec4f066..c0108eb 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewPrefetchTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewPrefetchTest.java
@@ -20,9 +20,10 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.os.Build;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewSmoothScrollerTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewSmoothScrollerTest.java
index c179f58..1582b38 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewSmoothScrollerTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/RecyclerViewSmoothScrollerTest.java
@@ -23,11 +23,12 @@
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ScrollToPositionWithAutoMeasure.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ScrollToPositionWithAutoMeasure.java
index 264a4ce..0ebd9ce 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ScrollToPositionWithAutoMeasure.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ScrollToPositionWithAutoMeasure.java
@@ -25,10 +25,11 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.graphics.Rect;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerBaseConfigSetTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerBaseConfigSetTest.java
index b035b7c..800248b 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerBaseConfigSetTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerBaseConfigSetTest.java
@@ -33,14 +33,14 @@
import android.os.Looper;
import android.os.Parcel;
import android.os.Parcelable;
-import android.support.test.filters.FlakyTest;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.Suppress;
import android.util.Log;
import android.view.View;
import android.view.ViewParent;
import androidx.annotation.NonNull;
+import androidx.test.filters.FlakyTest;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.Suppress;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerCacheTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerCacheTest.java
index 2d95aec..1545d58 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerCacheTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerCacheTest.java
@@ -23,8 +23,9 @@
import static org.junit.Assert.assertTrue;
import android.os.Build;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
+
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerGapTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerGapTest.java
index 9fe267e..e54cb95 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerGapTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerGapTest.java
@@ -21,7 +21,8 @@
import static org.junit.Assert.assertNull;
import android.graphics.Rect;
-import android.support.test.filters.LargeTest;
+
+import androidx.test.filters.LargeTest;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerSavedStateTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerSavedStateTest.java
index eca85e7..befe2c5 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerSavedStateTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerSavedStateTest.java
@@ -21,9 +21,10 @@
import android.graphics.Rect;
import android.os.Parcel;
import android.os.Parcelable;
-import android.support.test.filters.LargeTest;
import android.util.Log;
+import androidx.test.filters.LargeTest;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerSnappingTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerSnappingTest.java
index 90c9cc5..7fcb7df 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerSnappingTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerSnappingTest.java
@@ -21,10 +21,10 @@
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.LargeTest;
import android.view.View;
import androidx.annotation.Nullable;
+import androidx.test.filters.LargeTest;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerTest.java
index fcf9b79..44e2497 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerTest.java
@@ -38,7 +38,6 @@
import android.graphics.drawable.StateListDrawable;
import android.os.Parcel;
import android.os.Parcelable;
-import android.support.test.filters.LargeTest;
import android.text.TextUtils;
import android.util.Log;
import android.util.StateSet;
@@ -50,6 +49,7 @@
import androidx.annotation.NonNull;
import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.test.filters.LargeTest;
import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerWrapContentTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerWrapContentTest.java
index e631e3a..fae39e9 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerWrapContentTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/StaggeredGridLayoutManagerWrapContentTest.java
@@ -23,11 +23,12 @@
import android.graphics.Rect;
import android.os.Build;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
import android.view.Gravity;
import android.view.View;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/TestActivity.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/TestActivity.java
index 41a908e..abb2fd0 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/TestActivity.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/TestActivity.java
@@ -18,9 +18,10 @@
import android.app.Activity;
import android.os.Bundle;
-import android.support.test.runner.MonitoringInstrumentation;
import android.view.WindowManager;
+import androidx.test.runner.MonitoringInstrumentation;
+
public class TestActivity extends Activity {
// This is not great but the only way to do this until test runner adds support to not kill
// activities after tests.
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/TestResizingRelayoutWithAutoMeasure.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/TestResizingRelayoutWithAutoMeasure.java
index cb64b96..6256698 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/TestResizingRelayoutWithAutoMeasure.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/TestResizingRelayoutWithAutoMeasure.java
@@ -25,12 +25,12 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.graphics.Rect;
-import android.support.test.filters.MediumTest;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import androidx.annotation.NonNull;
+import androidx.test.filters.MediumTest;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ThreadUtilTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ThreadUtilTest.java
index cbbb7bc..e4b7d71 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ThreadUtilTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ThreadUtilTest.java
@@ -23,9 +23,10 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.os.Looper;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/TileListTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/TileListTest.java
index f1babe3..e6cdd70 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/TileListTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/TileListTest.java
@@ -23,8 +23,8 @@
import static org.hamcrest.CoreMatchers.sameInstance;
import static org.hamcrest.MatcherAssert.assertThat;
-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.Before;
import org.junit.Test;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ViewBoundsCheckTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ViewBoundsCheckTest.java
index 2274689..5393125 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ViewBoundsCheckTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/ViewBoundsCheckTest.java
@@ -20,10 +20,11 @@
import static org.junit.Assert.assertNull;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
import android.view.View;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/WrapContentBasicTest.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/WrapContentBasicTest.java
index 7fd80a3..1cfea2d 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/WrapContentBasicTest.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/WrapContentBasicTest.java
@@ -22,13 +22,13 @@
import static org.mockito.Mockito.when;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/WrappedRecyclerView.java b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/WrappedRecyclerView.java
index 0e25bcb..f322804 100644
--- a/recyclerview/src/androidTest/java/androidx/recyclerview/widget/WrappedRecyclerView.java
+++ b/recyclerview/src/androidTest/java/androidx/recyclerview/widget/WrappedRecyclerView.java
@@ -17,10 +17,10 @@
package androidx.recyclerview.widget;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
import android.util.AttributeSet;
import androidx.core.view.ViewCompat;
+import androidx.test.InstrumentationRegistry;
import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
diff --git a/recyclerview/src/test/java/androidx/recyclerview/widget/AdapterHelperTest.java b/recyclerview/src/test/java/androidx/recyclerview/widget/AdapterHelperTest.java
index 8ad6cfd..49a2d0c 100644
--- a/recyclerview/src/test/java/androidx/recyclerview/widget/AdapterHelperTest.java
+++ b/recyclerview/src/test/java/androidx/recyclerview/widget/AdapterHelperTest.java
@@ -22,9 +22,10 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
-import android.support.test.filters.SmallTest;
import android.view.View;
+import androidx.test.filters.SmallTest;
+
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/recyclerview/src/test/java/androidx/recyclerview/widget/BatchingListUpdateCallbackTest.java b/recyclerview/src/test/java/androidx/recyclerview/widget/BatchingListUpdateCallbackTest.java
index 9177fd7..09e31e7 100644
--- a/recyclerview/src/test/java/androidx/recyclerview/widget/BatchingListUpdateCallbackTest.java
+++ b/recyclerview/src/test/java/androidx/recyclerview/widget/BatchingListUpdateCallbackTest.java
@@ -19,7 +19,7 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview/src/test/java/androidx/recyclerview/widget/DiffUtilTest.java b/recyclerview/src/test/java/androidx/recyclerview/widget/DiffUtilTest.java
index 9a6d1d9..e77a3fc4 100644
--- a/recyclerview/src/test/java/androidx/recyclerview/widget/DiffUtilTest.java
+++ b/recyclerview/src/test/java/androidx/recyclerview/widget/DiffUtilTest.java
@@ -22,9 +22,8 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertFalse;
-import android.support.test.filters.SmallTest;
-
import androidx.annotation.Nullable;
+import androidx.test.filters.SmallTest;
import org.hamcrest.CoreMatchers;
import org.junit.Assert;
diff --git a/recyclerview/src/test/java/androidx/recyclerview/widget/OpReorderTest.java b/recyclerview/src/test/java/androidx/recyclerview/widget/OpReorderTest.java
index ebba059..4ac42fe 100644
--- a/recyclerview/src/test/java/androidx/recyclerview/widget/OpReorderTest.java
+++ b/recyclerview/src/test/java/androidx/recyclerview/widget/OpReorderTest.java
@@ -24,10 +24,10 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import android.support.test.filters.SmallTest;
import android.util.Log;
import androidx.recyclerview.widget.AdapterHelper.UpdateOp;
+import androidx.test.filters.SmallTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview/src/test/java/androidx/recyclerview/widget/SortedListBatchedCallbackTest.java b/recyclerview/src/test/java/androidx/recyclerview/widget/SortedListBatchedCallbackTest.java
index 9475359..82152d0 100644
--- a/recyclerview/src/test/java/androidx/recyclerview/widget/SortedListBatchedCallbackTest.java
+++ b/recyclerview/src/test/java/androidx/recyclerview/widget/SortedListBatchedCallbackTest.java
@@ -20,7 +20,7 @@
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.verifyZeroInteractions;
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview/src/test/java/androidx/recyclerview/widget/SortedListTest.java b/recyclerview/src/test/java/androidx/recyclerview/widget/SortedListTest.java
index 0e56136..16525f6 100644
--- a/recyclerview/src/test/java/androidx/recyclerview/widget/SortedListTest.java
+++ b/recyclerview/src/test/java/androidx/recyclerview/widget/SortedListTest.java
@@ -25,9 +25,8 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import android.support.test.filters.SmallTest;
-
import androidx.annotation.Nullable;
+import androidx.test.filters.SmallTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/recyclerview/src/test/java/androidx/recyclerview/widget/ViewInfoStoreTest.java b/recyclerview/src/test/java/androidx/recyclerview/widget/ViewInfoStoreTest.java
index 9f3e618..1a3d05c 100644
--- a/recyclerview/src/test/java/androidx/recyclerview/widget/ViewInfoStoreTest.java
+++ b/recyclerview/src/test/java/androidx/recyclerview/widget/ViewInfoStoreTest.java
@@ -28,7 +28,6 @@
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.SmallTest;
import android.view.View;
import androidx.annotation.NonNull;
@@ -36,6 +35,7 @@
import androidx.core.util.Pair;
import androidx.recyclerview.widget.RecyclerView.ItemAnimator.ItemHolderInfo;
import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+import androidx.test.filters.SmallTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/TestDatabase.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/TestDatabase.kt
index 8d6f9fb..9e6d9f3 100644
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/TestDatabase.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/TestDatabase.kt
@@ -21,13 +21,7 @@
import androidx.room.integration.kotlintestapp.dao.BooksDao
import androidx.room.integration.kotlintestapp.dao.DependencyDao
import androidx.room.integration.kotlintestapp.dao.DerivedDao
-import androidx.room.integration.kotlintestapp.vo.Author
-import androidx.room.integration.kotlintestapp.vo.Book
-import androidx.room.integration.kotlintestapp.vo.BookAuthor
-import androidx.room.integration.kotlintestapp.vo.DataClassFromDependency
-import androidx.room.integration.kotlintestapp.vo.JavaEntity
-import androidx.room.integration.kotlintestapp.vo.NoArgClass
-import androidx.room.integration.kotlintestapp.vo.Publisher
+import androidx.room.integration.kotlintestapp.vo.*
@Database(
entities = [Book::class, Author::class, Publisher::class, BookAuthor::class,
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/dao/BooksDao.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/dao/BooksDao.kt
index beb3781..f74d1bb 100644
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/dao/BooksDao.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/dao/BooksDao.kt
@@ -17,21 +17,8 @@
package androidx.room.integration.kotlintestapp.dao
import androidx.lifecycle.LiveData
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.Query
-import androidx.room.Transaction
-import androidx.room.TypeConverters
-import androidx.room.integration.kotlintestapp.vo.Author
-import androidx.room.integration.kotlintestapp.vo.Book
-import androidx.room.integration.kotlintestapp.vo.BookAuthor
-import androidx.room.integration.kotlintestapp.vo.BookWithPublisher
-import androidx.room.integration.kotlintestapp.vo.Lang
-import androidx.room.integration.kotlintestapp.vo.Publisher
-import androidx.room.integration.kotlintestapp.vo.PublisherWithBookSales
-import androidx.room.integration.kotlintestapp.vo.PublisherWithBooks
-import androidx.room.integration.kotlintestapp.vo.BookWithJavaEntity
+import androidx.room.*
+import androidx.room.integration.kotlintestapp.vo.*
import com.google.common.base.Optional
import com.google.common.util.concurrent.ListenableFuture
import io.reactivex.Flowable
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/migration/MigrationDbKotlin.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/migration/MigrationDbKotlin.kt
index b65acd0..65dee27 100644
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/migration/MigrationDbKotlin.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/migration/MigrationDbKotlin.kt
@@ -18,16 +18,7 @@
import android.content.ContentValues
import android.database.sqlite.SQLiteDatabase
-import androidx.room.Dao
-import androidx.room.Database
-import androidx.room.Entity
-import androidx.room.ForeignKey
-import androidx.room.Ignore
-import androidx.room.Index
-import androidx.room.Insert
-import androidx.room.PrimaryKey
-import androidx.room.Query
-import androidx.room.RoomDatabase
+import androidx.room.*
import androidx.sqlite.db.SupportSQLiteDatabase
@Database(version = MigrationDbKotlin.LATEST_VERSION,
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/migration/MigrationKotlinTest.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/migration/MigrationKotlinTest.kt
index 7185984..ff461f0 100644
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/migration/MigrationKotlinTest.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/migration/MigrationKotlinTest.kt
@@ -16,17 +16,14 @@
package androidx.room.integration.kotlintestapp.migration
-import android.support.test.InstrumentationRegistry
import androidx.room.Room
import androidx.room.migration.Migration
import androidx.room.testing.MigrationTestHelper
import androidx.room.util.TableInfo
import androidx.sqlite.db.SupportSQLiteDatabase
import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
-import org.hamcrest.CoreMatchers.`is`
-import org.hamcrest.CoreMatchers.containsString
-import org.hamcrest.CoreMatchers.instanceOf
-import org.hamcrest.CoreMatchers.nullValue
+import androidx.test.InstrumentationRegistry
+import org.hamcrest.CoreMatchers.*
import org.hamcrest.MatcherAssert.assertThat
import org.junit.Rule
import org.junit.Test
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/BooksDaoTest.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/BooksDaoTest.kt
index 6837ba6..5d25ec4 100644
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/BooksDaoTest.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/BooksDaoTest.kt
@@ -17,27 +17,26 @@
package androidx.room.integration.kotlintestapp.test
import android.database.sqlite.SQLiteConstraintException
-import android.support.test.filters.SdkSuppress
-import android.support.test.filters.SmallTest
import androidx.arch.core.executor.ArchTaskExecutor
-import androidx.room.integration.kotlintestapp.vo.Author
-import androidx.room.integration.kotlintestapp.vo.Book
-import androidx.room.integration.kotlintestapp.vo.BookWithPublisher
-import androidx.room.integration.kotlintestapp.vo.Lang
-import androidx.room.integration.kotlintestapp.vo.Publisher
+import androidx.room.integration.kotlintestapp.vo.*
+import androidx.test.filters.SdkSuppress
+import androidx.test.filters.SmallTest
import com.google.common.base.Optional
import io.reactivex.Flowable
import io.reactivex.schedulers.Schedulers
import io.reactivex.subscribers.TestSubscriber
import org.hamcrest.CoreMatchers
-import org.hamcrest.CoreMatchers.`is`
-import org.hamcrest.CoreMatchers.equalTo
-import org.hamcrest.CoreMatchers.instanceOf
-import org.hamcrest.CoreMatchers.notNullValue
+import org.hamcrest.CoreMatchers.*
import org.hamcrest.MatcherAssert.assertThat
import org.junit.Assert.assertNotNull
import org.junit.Test
import java.util.Date
+import kotlin.collections.ArrayList
+import kotlin.collections.List
+import kotlin.collections.arrayListOf
+import kotlin.collections.first
+import kotlin.collections.listOf
+import kotlin.collections.setOf
@SmallTest
class BooksDaoTest : TestDatabaseTest() {
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/DependencyDaoTest.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/DependencyDaoTest.kt
index 300695f..a08c843 100644
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/DependencyDaoTest.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/DependencyDaoTest.kt
@@ -16,15 +16,13 @@
package androidx.room.integration.kotlintestapp.test
import android.os.Build
-import android.support.test.filters.SdkSuppress
-import android.support.test.runner.AndroidJUnit4
import androidx.room.integration.kotlintestapp.dao.DependencyDao
import androidx.room.integration.kotlintestapp.vo.DataClassFromDependency
import androidx.room.integration.kotlintestapp.vo.EmbeddedFromDependency
import androidx.room.integration.kotlintestapp.vo.PojoFromDependency
-import org.hamcrest.CoreMatchers.`is`
-import org.hamcrest.CoreMatchers.notNullValue
-import org.hamcrest.CoreMatchers.nullValue
+import androidx.test.filters.SdkSuppress
+import androidx.test.runner.AndroidJUnit4
+import org.hamcrest.CoreMatchers.*
import org.hamcrest.MatcherAssert.assertThat
import org.junit.Before
import org.junit.Test
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/ItemWithNullableConstructor.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/ItemWithNullableConstructor.kt
index d5b787c..7c6b2df 100644
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/ItemWithNullableConstructor.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/ItemWithNullableConstructor.kt
@@ -15,17 +15,9 @@
*/
package androidx.room.integration.kotlintestapp.test
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
-import androidx.room.Dao
-import androidx.room.Database
-import androidx.room.Entity
-import androidx.room.Insert
-import androidx.room.PrimaryKey
-import androidx.room.Query
-import androidx.room.Room
-import androidx.room.RoomDatabase
-import androidx.room.RoomWarnings
+import androidx.room.*
+import androidx.test.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
import org.hamcrest.CoreMatchers.`is`
import org.hamcrest.MatcherAssert.assertThat
import org.junit.After
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/LiveDataQueryTest.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/LiveDataQueryTest.kt
index f39cea5..ae95207 100644
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/LiveDataQueryTest.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/LiveDataQueryTest.kt
@@ -16,10 +16,10 @@
package androidx.room.integration.kotlintestapp.test
-import android.support.test.filters.SmallTest
import androidx.room.integration.kotlintestapp.vo.Book
import androidx.room.integration.kotlintestapp.vo.BookWithPublisher
import androidx.room.integration.kotlintestapp.vo.Publisher
+import androidx.test.filters.SmallTest
import org.hamcrest.CoreMatchers.`is`
import org.hamcrest.MatcherAssert.assertThat
import org.junit.Test
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/RxJava2QueryTest.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/RxJava2QueryTest.kt
index f62dc70..ac7f7a5 100644
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/RxJava2QueryTest.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/RxJava2QueryTest.kt
@@ -16,9 +16,9 @@
package androidx.room.integration.kotlintestapp.test
-import android.support.test.filters.SmallTest
import androidx.room.EmptyResultSetException
import androidx.room.integration.kotlintestapp.vo.BookWithPublisher
+import androidx.test.filters.SmallTest
import org.junit.Test
@SmallTest
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/TestDatabaseTest.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/TestDatabaseTest.kt
index 0f213188..ab3f3f4 100644
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/TestDatabaseTest.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/TestDatabaseTest.kt
@@ -16,11 +16,11 @@
package androidx.room.integration.kotlintestapp.test
-import android.support.test.InstrumentationRegistry
import androidx.arch.core.executor.testing.InstantTaskExecutorRule
import androidx.room.Room
import androidx.room.integration.kotlintestapp.TestDatabase
import androidx.room.integration.kotlintestapp.dao.BooksDao
+import androidx.test.InstrumentationRegistry
import org.junit.After
import org.junit.Before
import org.junit.Rule
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/TestUtil.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/TestUtil.kt
index dfb4841..b06d753 100644
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/TestUtil.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/test/TestUtil.kt
@@ -16,11 +16,7 @@
package androidx.room.integration.kotlintestapp.test
-import androidx.room.integration.kotlintestapp.vo.Author
-import androidx.room.integration.kotlintestapp.vo.Book
-import androidx.room.integration.kotlintestapp.vo.BookAuthor
-import androidx.room.integration.kotlintestapp.vo.Lang
-import androidx.room.integration.kotlintestapp.vo.Publisher
+import androidx.room.integration.kotlintestapp.vo.*
class TestUtil {
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/vo/Author.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/vo/Author.kt
index 6ee662d..35d2919 100644
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/vo/Author.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/vo/Author.kt
@@ -19,7 +19,7 @@
import androidx.room.Entity
import androidx.room.PrimaryKey
import androidx.room.TypeConverters
-import java.util.Date
+import java.util.*
@Entity
@TypeConverters(DateConverter::class, StringToIntListConverters::class)
diff --git a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/vo/DateConverter.kt b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/vo/DateConverter.kt
index cfdeb87..0bedc15 100755
--- a/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/vo/DateConverter.kt
+++ b/room/integration-tests/kotlintestapp/src/androidTest/java/androidx/room/integration/kotlintestapp/vo/DateConverter.kt
@@ -17,8 +17,7 @@
package androidx.room.integration.kotlintestapp.vo
import androidx.room.TypeConverter
-
-import java.util.Date
+import java.util.*
class DateConverter {
@TypeConverter
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/dao/WithClauseDao.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/dao/WithClauseDao.java
index f4d43bc..7cef695 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/dao/WithClauseDao.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/dao/WithClauseDao.java
@@ -17,8 +17,8 @@
package androidx.room.integration.testapp.dao;
import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
import androidx.lifecycle.LiveData;
import androidx.room.Dao;
import androidx.room.Query;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/migration/JournalDbPostMigrationTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/migration/JournalDbPostMigrationTest.java
index beb1fce..0d62511 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/migration/JournalDbPostMigrationTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/migration/JournalDbPostMigrationTest.java
@@ -23,13 +23,9 @@
import android.content.Context;
import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
-import android.support.annotation.NonNull;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.TextUtils;
+import androidx.annotation.NonNull;
import androidx.arch.core.executor.testing.CountingTaskExecutorRule;
import androidx.lifecycle.LiveData;
import androidx.room.ColumnInfo;
@@ -44,6 +40,10 @@
import androidx.room.RoomDatabase;
import androidx.room.migration.Migration;
import androidx.sqlite.db.SupportSQLiteDatabase;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/migration/MigrationTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/migration/MigrationTest.java
index ce0e32a..5e70d88 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/migration/MigrationTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/migration/MigrationTest.java
@@ -27,9 +27,6 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.room.Room;
import androidx.room.migration.Migration;
@@ -37,6 +34,9 @@
import androidx.room.util.TableInfo;
import androidx.sqlite.db.SupportSQLiteDatabase;
import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.hamcrest.MatcherAssert;
import org.junit.Rule;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/paging/DataSourceFactoryTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/paging/DataSourceFactoryTest.java
index 4e7b6bb..e10d40f 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/paging/DataSourceFactoryTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/paging/DataSourceFactoryTest.java
@@ -22,9 +22,6 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertNotNull;
-import android.support.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.annotation.Nullable;
import androidx.arch.core.executor.ArchTaskExecutor;
import androidx.arch.core.executor.testing.CountingTaskExecutorRule;
@@ -42,6 +39,8 @@
import androidx.room.integration.testapp.vo.User;
import androidx.room.integration.testapp.vo.UserAndAllPets;
import androidx.sqlite.db.SimpleSQLiteQuery;
+import androidx.test.filters.LargeTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/paging/LimitOffsetDataSourceTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/paging/LimitOffsetDataSourceTest.java
index c4c6c16..76bc675 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/paging/LimitOffsetDataSourceTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/paging/LimitOffsetDataSourceTest.java
@@ -21,14 +21,13 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.annotation.NonNull;
import androidx.room.integration.testapp.test.TestDatabaseTest;
import androidx.room.integration.testapp.test.TestUtil;
import androidx.room.integration.testapp.vo.User;
import androidx.room.paging.LimitOffsetDataSource;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Test;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/ClearAllTablesTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/ClearAllTablesTest.java
index e367ada..b87a5f9 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/ClearAllTablesTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/ClearAllTablesTest.java
@@ -26,11 +26,6 @@
import android.content.Context;
import android.database.Cursor;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.NonNull;
import androidx.room.Dao;
@@ -44,6 +39,11 @@
import androidx.room.Query;
import androidx.room.Room;
import androidx.room.RoomDatabase;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/CollationTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/CollationTest.java
index ca0d2e0..e11373c 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/CollationTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/CollationTest.java
@@ -18,11 +18,6 @@
import static org.hamcrest.MatcherAssert.assertThat;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.room.ColumnInfo;
import androidx.room.Dao;
import androidx.room.Database;
@@ -31,6 +26,10 @@
import androidx.room.Query;
import androidx.room.Room;
import androidx.room.RoomDatabase;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.hamcrest.CoreMatchers;
import org.junit.After;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/ConstructorTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/ConstructorTest.java
index 53475b3..25fd79a 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/ConstructorTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/ConstructorTest.java
@@ -19,10 +19,6 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.room.Dao;
@@ -34,6 +30,9 @@
import androidx.room.Query;
import androidx.room.Room;
import androidx.room.RoomDatabase;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/CustomDatabaseTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/CustomDatabaseTest.java
index efe7bc1..3b9785c 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/CustomDatabaseTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/CustomDatabaseTest.java
@@ -25,9 +25,6 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteException;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.room.Room;
import androidx.room.RoomDatabase;
@@ -37,6 +34,9 @@
import androidx.sqlite.db.SupportSQLiteOpenHelper;
import androidx.sqlite.db.SupportSQLiteQuery;
import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/DaoNameConflictTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/DaoNameConflictTest.java
index d2a243e..72b6bff 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/DaoNameConflictTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/DaoNameConflictTest.java
@@ -19,10 +19,6 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.room.Dao;
import androidx.room.Database;
import androidx.room.Entity;
@@ -31,6 +27,9 @@
import androidx.room.Query;
import androidx.room.Room;
import androidx.room.RoomDatabase;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/DatabaseCallbackTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/DatabaseCallbackTest.java
index 5d48236..3163c36 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/DatabaseCallbackTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/DatabaseCallbackTest.java
@@ -25,10 +25,6 @@
import android.content.Context;
import android.database.Cursor;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.NonNull;
import androidx.room.Room;
@@ -36,6 +32,10 @@
import androidx.room.integration.testapp.TestDatabase;
import androidx.room.integration.testapp.vo.User;
import androidx.sqlite.db.SupportSQLiteDatabase;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/EmbeddedTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/EmbeddedTest.java
index 24c3376..2d23f4a 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/EmbeddedTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/EmbeddedTest.java
@@ -22,9 +22,6 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.room.Room;
import androidx.room.integration.testapp.TestDatabase;
@@ -42,6 +39,9 @@
import androidx.room.integration.testapp.vo.UserAndGenericPet;
import androidx.room.integration.testapp.vo.UserAndPet;
import androidx.room.integration.testapp.vo.UserAndPetNonNull;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/ForeignKeyTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/ForeignKeyTest.java
index 8f4c7bf..f96b4d1 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/ForeignKeyTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/ForeignKeyTest.java
@@ -27,9 +27,6 @@
import static org.hamcrest.core.Is.is;
import android.database.sqlite.SQLiteException;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.room.Dao;
import androidx.room.Database;
@@ -43,6 +40,9 @@
import androidx.room.Query;
import androidx.room.Room;
import androidx.room.RoomDatabase;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.hamcrest.Matcher;
import org.junit.Before;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/FunnyNamedDaoTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/FunnyNamedDaoTest.java
index 9d0da7f..365b681 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/FunnyNamedDaoTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/FunnyNamedDaoTest.java
@@ -21,12 +21,11 @@
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.arch.core.executor.testing.CountingTaskExecutorRule;
import androidx.room.integration.testapp.vo.FunnyNamedEntity;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/GenericEntityTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/GenericEntityTest.java
index ebae6cd..5697fd3 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/GenericEntityTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/GenericEntityTest.java
@@ -19,10 +19,6 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.annotation.NonNull;
import androidx.room.Dao;
import androidx.room.Database;
@@ -32,6 +28,9 @@
import androidx.room.Query;
import androidx.room.Room;
import androidx.room.RoomDatabase;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/IdentityDetectionTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/IdentityDetectionTest.java
index e02c459..806de1c 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/IdentityDetectionTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/IdentityDetectionTest.java
@@ -21,15 +21,15 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Log;
import androidx.room.Room;
import androidx.room.integration.testapp.TestDatabase;
import androidx.room.integration.testapp.vo.User;
import androidx.sqlite.db.SupportSQLiteDatabase;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/IndexingTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/IndexingTest.java
index 9ba62d5a..645a59a 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/IndexingTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/IndexingTest.java
@@ -20,9 +20,6 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.room.ColumnInfo;
import androidx.room.Dao;
@@ -33,6 +30,9 @@
import androidx.room.Query;
import androidx.room.Room;
import androidx.room.RoomDatabase;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/InvalidationTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/InvalidationTest.java
index fe66855..b4ff789 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/InvalidationTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/InvalidationTest.java
@@ -22,9 +22,6 @@
import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.NonNull;
import androidx.arch.core.executor.testing.CountingTaskExecutorRule;
@@ -33,6 +30,9 @@
import androidx.room.integration.testapp.TestDatabase;
import androidx.room.integration.testapp.dao.UserDao;
import androidx.room.integration.testapp.vo.User;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/LiveDataQueryTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/LiveDataQueryTest.java
index 2b32a62..b810eb7 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/LiveDataQueryTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/LiveDataQueryTest.java
@@ -22,11 +22,6 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.Nullable;
import androidx.arch.core.executor.ArchTaskExecutor;
@@ -43,6 +38,11 @@
import androidx.room.integration.testapp.vo.Toy;
import androidx.room.integration.testapp.vo.User;
import androidx.room.integration.testapp.vo.UserAndAllPets;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/MainThreadCheckTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/MainThreadCheckTest.java
index 8b85d95..85a6b89 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/MainThreadCheckTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/MainThreadCheckTest.java
@@ -22,14 +22,14 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.arch.core.util.Function;
import androidx.room.Room;
import androidx.room.RoomDatabase;
import androidx.room.integration.testapp.TestDatabase;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/PojoTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/PojoTest.java
index 9678d14..378811f 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/PojoTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/PojoTest.java
@@ -20,15 +20,15 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.room.Room;
import androidx.room.integration.testapp.TestDatabase;
import androidx.room.integration.testapp.dao.UserDao;
import androidx.room.integration.testapp.vo.AvgWeightByAge;
import androidx.room.integration.testapp.vo.User;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/PojoWithRelationTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/PojoWithRelationTest.java
index b09584c..eec6b78 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/PojoWithRelationTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/PojoWithRelationTest.java
@@ -20,9 +20,6 @@
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.room.integration.testapp.vo.EmbeddedUserAndAllPets;
import androidx.room.integration.testapp.vo.Pet;
import androidx.room.integration.testapp.vo.PetWithToyIds;
@@ -32,6 +29,8 @@
import androidx.room.integration.testapp.vo.UserAndPetAdoptionDates;
import androidx.room.integration.testapp.vo.UserIdAndPetNames;
import androidx.room.integration.testapp.vo.UserWithPetsAndToys;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/PrimaryKeyTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/PrimaryKeyTest.java
index 8eea68b..de480fd 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/PrimaryKeyTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/PrimaryKeyTest.java
@@ -23,9 +23,6 @@
import static org.junit.Assert.assertNotNull;
import android.database.sqlite.SQLiteConstraintException;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.room.Room;
import androidx.room.integration.testapp.PKeyTestDatabase;
@@ -33,6 +30,9 @@
import androidx.room.integration.testapp.vo.IntegerAutoIncPKeyEntity;
import androidx.room.integration.testapp.vo.IntegerPKeyEntity;
import androidx.room.integration.testapp.vo.ObjectPKeyEntity;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/QueryExecutorTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/QueryExecutorTest.java
index ef25d05..556d473 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/QueryExecutorTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/QueryExecutorTest.java
@@ -16,16 +16,12 @@
package androidx.room.integration.testapp.test;
-import static android.support.test.InstrumentationRegistry.getInstrumentation;
+import static androidx.test.InstrumentationRegistry.getInstrumentation;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.greaterThan;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.arch.core.executor.ArchTaskExecutor;
import androidx.arch.core.executor.DefaultTaskExecutor;
import androidx.lifecycle.LiveData;
@@ -33,6 +29,9 @@
import androidx.room.integration.testapp.TestDatabase;
import androidx.room.integration.testapp.dao.PetDao;
import androidx.room.integration.testapp.vo.Pet;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import com.google.common.base.Optional;
import com.google.common.util.concurrent.ListenableFuture;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/QueryTransactionTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/QueryTransactionTest.java
index 152141d..9e37360 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/QueryTransactionTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/QueryTransactionTest.java
@@ -20,9 +20,6 @@
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-
import androidx.annotation.NonNull;
import androidx.arch.core.executor.ArchTaskExecutor;
import androidx.arch.core.executor.testing.CountingTaskExecutorRule;
@@ -45,6 +42,8 @@
import androidx.room.RoomWarnings;
import androidx.room.Transaction;
import androidx.room.paging.LimitOffsetDataSource;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
import org.junit.After;
import org.junit.Before;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/RawQueryTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/RawQueryTest.java
index e577c5b..2bc641f 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/RawQueryTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/RawQueryTest.java
@@ -22,10 +22,6 @@
import static java.util.Collections.emptyList;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.arch.core.executor.testing.CountingTaskExecutorRule;
import androidx.lifecycle.LiveData;
import androidx.room.integration.testapp.dao.RawDao;
@@ -36,6 +32,9 @@
import androidx.room.integration.testapp.vo.UserAndPet;
import androidx.sqlite.db.SimpleSQLiteQuery;
import androidx.sqlite.db.SupportSQLiteQuery;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/RelationWithReservedKeywordTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/RelationWithReservedKeywordTest.java
index 774b879..529800e 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/RelationWithReservedKeywordTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/RelationWithReservedKeywordTest.java
@@ -21,10 +21,6 @@
import static java.util.Collections.singletonList;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.room.ColumnInfo;
import androidx.room.Dao;
import androidx.room.Database;
@@ -39,6 +35,9 @@
import androidx.room.Room;
import androidx.room.RoomDatabase;
import androidx.room.Transaction;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/RxJava2Test.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/RxJava2Test.java
index 78da24b..296b971 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/RxJava2Test.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/RxJava2Test.java
@@ -19,16 +19,15 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.arch.core.executor.ArchTaskExecutor;
import androidx.arch.core.executor.TaskExecutor;
import androidx.room.EmptyResultSetException;
import androidx.room.integration.testapp.vo.Pet;
import androidx.room.integration.testapp.vo.User;
import androidx.room.integration.testapp.vo.UserAndAllPets;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Assert;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/RxJava2WithInstantTaskExecutorTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/RxJava2WithInstantTaskExecutorTest.java
index 992d8f8..fa336e7 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/RxJava2WithInstantTaskExecutorTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/RxJava2WithInstantTaskExecutorTest.java
@@ -16,14 +16,13 @@
package androidx.room.integration.testapp.test;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.arch.core.executor.testing.InstantTaskExecutorRule;
import androidx.room.Room;
import androidx.room.integration.testapp.TestDatabase;
import androidx.room.integration.testapp.vo.User;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/SimpleEntityReadWriteTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/SimpleEntityReadWriteTest.java
index 8bea6ae..6bae145 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/SimpleEntityReadWriteTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/SimpleEntityReadWriteTest.java
@@ -31,9 +31,6 @@
import android.database.Cursor;
import android.database.sqlite.SQLiteConstraintException;
import android.database.sqlite.SQLiteException;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.room.Room;
import androidx.room.integration.testapp.TestDatabase;
@@ -49,6 +46,9 @@
import androidx.room.integration.testapp.vo.Product;
import androidx.room.integration.testapp.vo.User;
import androidx.room.integration.testapp.vo.UserAndAllPets;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import com.google.common.base.Charsets;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/TestDatabaseTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/TestDatabaseTest.java
index 56a0cbf..a9a1c19 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/TestDatabaseTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/TestDatabaseTest.java
@@ -17,7 +17,6 @@
package androidx.room.integration.testapp.test;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
import androidx.room.Room;
import androidx.room.integration.testapp.TestDatabase;
@@ -31,6 +30,7 @@
import androidx.room.integration.testapp.dao.UserDao;
import androidx.room.integration.testapp.dao.UserPetDao;
import androidx.room.integration.testapp.dao.WithClauseDao;
+import androidx.test.InstrumentationRegistry;
import org.junit.Before;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/WithClauseTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/WithClauseTest.java
index 85f7697..94a995a 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/WithClauseTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/WithClauseTest.java
@@ -20,11 +20,11 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.os.Build;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.room.integration.testapp.vo.User;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/WriteAheadLoggingTest.java b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/WriteAheadLoggingTest.java
index ba63768..fcdbc17 100644
--- a/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/WriteAheadLoggingTest.java
+++ b/room/integration-tests/testapp/src/androidTest/java/androidx/room/integration/testapp/test/WriteAheadLoggingTest.java
@@ -30,10 +30,6 @@
import android.content.Context;
import android.database.Cursor;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.NonNull;
import androidx.lifecycle.LiveData;
@@ -45,6 +41,10 @@
import androidx.room.integration.testapp.dao.UserDao;
import androidx.room.integration.testapp.vo.User;
import androidx.sqlite.db.SupportSQLiteDatabase;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/room/runtime/src/androidTest/java/androidx/room/RoomOpenHelperTest.java b/room/runtime/src/androidTest/java/androidx/room/RoomOpenHelperTest.java
index df69831..1a97366 100644
--- a/room/runtime/src/androidTest/java/androidx/room/RoomOpenHelperTest.java
+++ b/room/runtime/src/androidTest/java/androidx/room/RoomOpenHelperTest.java
@@ -23,11 +23,11 @@
import static org.mockito.Mockito.when;
import android.database.Cursor;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.sqlite.db.SupportSQLiteDatabase;
import androidx.sqlite.db.SupportSQLiteQuery;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Assert;
import org.junit.Before;
diff --git a/room/runtime/src/androidTest/java/androidx/room/migration/TableInfoTest.java b/room/runtime/src/androidTest/java/androidx/room/migration/TableInfoTest.java
index 8b145db..2c2a24d 100644
--- a/room/runtime/src/androidTest/java/androidx/room/migration/TableInfoTest.java
+++ b/room/runtime/src/androidTest/java/androidx/room/migration/TableInfoTest.java
@@ -24,15 +24,15 @@
import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.util.Pair;
import androidx.room.util.TableInfo;
import androidx.sqlite.db.SupportSQLiteDatabase;
import androidx.sqlite.db.SupportSQLiteOpenHelper;
import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Test;
diff --git a/slices/builders/ktx/build.gradle b/slices/builders/ktx/build.gradle
index c078b87..01bae21 100644
--- a/slices/builders/ktx/build.gradle
+++ b/slices/builders/ktx/build.gradle
@@ -36,8 +36,8 @@
api(project(":slice-builders"))
api(KOTLIN_STDLIB)
androidTestImplementation(JUNIT)
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(TEST_RULES_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
implementation project(":annotation")
implementation project(path: ':core')
}
diff --git a/slices/builders/ktx/src/androidTest/java/androidx/slice/builders/SliceBuildersKtxTest.kt b/slices/builders/ktx/src/androidTest/java/androidx/slice/builders/SliceBuildersKtxTest.kt
index 4a621b1..e5e10ab 100644
--- a/slices/builders/ktx/src/androidTest/java/androidx/slice/builders/SliceBuildersKtxTest.kt
+++ b/slices/builders/ktx/src/androidTest/java/androidx/slice/builders/SliceBuildersKtxTest.kt
@@ -19,8 +19,8 @@
import android.app.PendingIntent
import android.content.Intent
import android.net.Uri
-import android.support.test.InstrumentationRegistry
-import android.support.test.filters.SdkSuppress
+import androidx.test.InstrumentationRegistry
+import androidx.test.filters.SdkSuppress
import androidx.core.graphics.drawable.IconCompat
import androidx.slice.SliceProvider
import androidx.slice.SliceSpecs
diff --git a/slices/core/build.gradle b/slices/core/build.gradle
index b8e7590..70d2b08 100644
--- a/slices/core/build.gradle
+++ b/slices/core/build.gradle
@@ -27,7 +27,7 @@
implementation project(":annotation")
implementation project(":appcompat")
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy)
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy)
diff --git a/slices/core/src/androidTest/java/androidx/slice/SlicePermissionTest.java b/slices/core/src/androidTest/java/androidx/slice/SlicePermissionTest.java
index d01e1a6..9397dc0 100644
--- a/slices/core/src/androidTest/java/androidx/slice/SlicePermissionTest.java
+++ b/slices/core/src/androidTest/java/androidx/slice/SlicePermissionTest.java
@@ -26,12 +26,12 @@
import android.content.pm.PackageManager.NameNotFoundException;
import android.net.Uri;
import android.os.Process;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.slice.compat.CompatPermissionManager;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/slices/core/src/androidTest/java/androidx/slice/SliceTest.java b/slices/core/src/androidTest/java/androidx/slice/SliceTest.java
index 404e9aa..cf23db9 100644
--- a/slices/core/src/androidTest/java/androidx/slice/SliceTest.java
+++ b/slices/core/src/androidTest/java/androidx/slice/SliceTest.java
@@ -39,13 +39,13 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.net.Uri;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.core.graphics.drawable.IconCompat;
import androidx.slice.core.test.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/slices/core/src/androidTest/java/androidx/slice/SliceTestProvider.java b/slices/core/src/androidTest/java/androidx/slice/SliceTestProvider.java
index 468f57f..40edfcc 100644
--- a/slices/core/src/androidTest/java/androidx/slice/SliceTestProvider.java
+++ b/slices/core/src/androidTest/java/androidx/slice/SliceTestProvider.java
@@ -24,11 +24,11 @@
import android.app.PendingIntent;
import android.content.Intent;
import android.net.Uri;
-import android.support.test.filters.SdkSuppress;
import androidx.core.graphics.drawable.IconCompat;
import androidx.slice.Slice.Builder;
import androidx.slice.core.test.R;
+import androidx.test.filters.SdkSuppress;
@SdkSuppress(minSdkVersion = 19)
public class SliceTestProvider extends androidx.slice.SliceProvider {
diff --git a/slices/core/src/androidTest/java/androidx/slice/compat/CompatPermissionManagerTest.java b/slices/core/src/androidTest/java/androidx/slice/compat/CompatPermissionManagerTest.java
index bc9b07c..fc1fbaa 100644
--- a/slices/core/src/androidTest/java/androidx/slice/compat/CompatPermissionManagerTest.java
+++ b/slices/core/src/androidTest/java/androidx/slice/compat/CompatPermissionManagerTest.java
@@ -33,10 +33,11 @@
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.Process;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/slices/core/src/androidTest/java/androidx/slice/compat/CompatPinnedListTest.java b/slices/core/src/androidTest/java/androidx/slice/compat/CompatPinnedListTest.java
index bff3498..1b872df 100644
--- a/slices/core/src/androidTest/java/androidx/slice/compat/CompatPinnedListTest.java
+++ b/slices/core/src/androidTest/java/androidx/slice/compat/CompatPinnedListTest.java
@@ -24,13 +24,13 @@
import android.content.Context;
import android.net.Uri;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.collection.ArraySet;
import androidx.slice.SliceSpec;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import junit.framework.AssertionFailedError;
diff --git a/slices/core/src/androidTest/java/androidx/slice/compat/SliceProviderCompatTest.java b/slices/core/src/androidTest/java/androidx/slice/compat/SliceProviderCompatTest.java
index 3a655e3..459963d 100644
--- a/slices/core/src/androidTest/java/androidx/slice/compat/SliceProviderCompatTest.java
+++ b/slices/core/src/androidTest/java/androidx/slice/compat/SliceProviderCompatTest.java
@@ -34,14 +34,14 @@
import android.content.Context;
import android.net.Uri;
import android.os.Bundle;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.slice.Slice;
import androidx.slice.SliceProvider;
import androidx.slice.SliceSpec;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/slices/test/build.gradle b/slices/test/build.gradle
index 16c336d..e4da09f 100644
--- a/slices/test/build.gradle
+++ b/slices/test/build.gradle
@@ -28,8 +28,8 @@
implementation(project(":recyclerview"))
api(ARCH_LIFECYCLE_LIVEDATA_CORE, libs.exclude_annotations_transitive)
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy)
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy)
}
diff --git a/slices/view/build.gradle b/slices/view/build.gradle
index 30bbd7c..69648f4 100644
--- a/slices/view/build.gradle
+++ b/slices/view/build.gradle
@@ -29,8 +29,9 @@
androidTestImplementation(project(":slice-builders"))
androidTestImplementation(project(":slice-test"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy)
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy)
}
diff --git a/slices/view/src/androidTest/java/androidx/slice/SliceBuilderTest.java b/slices/view/src/androidTest/java/androidx/slice/SliceBuilderTest.java
index 373f1e2..845c6de 100644
--- a/slices/view/src/androidTest/java/androidx/slice/SliceBuilderTest.java
+++ b/slices/view/src/androidTest/java/androidx/slice/SliceBuilderTest.java
@@ -28,15 +28,15 @@
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.slice.builders.GridRowBuilder;
import androidx.slice.builders.ListBuilder;
import androidx.slice.render.SliceRenderActivity;
import androidx.slice.widget.SliceLiveData;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/slices/view/src/androidTest/java/androidx/slice/SliceMetadataTest.java b/slices/view/src/androidTest/java/androidx/slice/SliceMetadataTest.java
index 05d0cd6..487f662 100644
--- a/slices/view/src/androidTest/java/androidx/slice/SliceMetadataTest.java
+++ b/slices/view/src/androidTest/java/androidx/slice/SliceMetadataTest.java
@@ -43,10 +43,6 @@
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.net.Uri;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.core.graphics.drawable.IconCompat;
import androidx.core.util.Pair;
@@ -56,6 +52,10 @@
import androidx.slice.render.SliceRenderActivity;
import androidx.slice.widget.EventInfo;
import androidx.slice.widget.SliceLiveData;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Assert;
import org.junit.Before;
diff --git a/slices/view/src/androidTest/java/androidx/slice/SliceViewManagerTest.java b/slices/view/src/androidTest/java/androidx/slice/SliceViewManagerTest.java
index cb690f8..e0e1658 100644
--- a/slices/view/src/androidTest/java/androidx/slice/SliceViewManagerTest.java
+++ b/slices/view/src/androidTest/java/androidx/slice/SliceViewManagerTest.java
@@ -36,14 +36,14 @@
import android.content.pm.PackageManager;
import android.content.pm.ProviderInfo;
import android.net.Uri;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.annotation.NonNull;
import androidx.slice.render.SliceRenderActivity;
import androidx.slice.widget.SliceLiveData;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/slices/view/src/androidTest/java/androidx/slice/SliceViewTest.java b/slices/view/src/androidTest/java/androidx/slice/SliceViewTest.java
index e3f663b4..20885ea 100644
--- a/slices/view/src/androidTest/java/androidx/slice/SliceViewTest.java
+++ b/slices/view/src/androidTest/java/androidx/slice/SliceViewTest.java
@@ -28,11 +28,6 @@
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.net.Uri;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.core.graphics.drawable.IconCompat;
import androidx.slice.builders.ListBuilder;
@@ -40,6 +35,11 @@
import androidx.slice.render.SliceRenderActivity;
import androidx.slice.widget.SliceLiveData;
import androidx.slice.widget.SliceView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/slices/view/src/androidTest/java/androidx/slice/SliceXmlTest.java b/slices/view/src/androidTest/java/androidx/slice/SliceXmlTest.java
index ad66025..eb67fdb 100644
--- a/slices/view/src/androidTest/java/androidx/slice/SliceXmlTest.java
+++ b/slices/view/src/androidTest/java/androidx/slice/SliceXmlTest.java
@@ -36,14 +36,14 @@
import android.graphics.Canvas;
import android.net.Uri;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.core.graphics.drawable.IconCompat;
import androidx.slice.core.SliceQuery;
import androidx.slice.view.R;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/slices/view/src/androidTest/java/androidx/slice/render/RenderTest.java b/slices/view/src/androidTest/java/androidx/slice/render/RenderTest.java
index 02ffc75..4108397 100644
--- a/slices/view/src/androidTest/java/androidx/slice/render/RenderTest.java
+++ b/slices/view/src/androidTest/java/androidx/slice/render/RenderTest.java
@@ -29,11 +29,12 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.GrantPermissionRule;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.GrantPermissionRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/slices/view/src/androidTest/java/androidx/slice/widget/SliceLiveDataTest.java b/slices/view/src/androidTest/java/androidx/slice/widget/SliceLiveDataTest.java
index 5ff03e6..14fdabc 100644
--- a/slices/view/src/androidTest/java/androidx/slice/widget/SliceLiveDataTest.java
+++ b/slices/view/src/androidTest/java/androidx/slice/widget/SliceLiveDataTest.java
@@ -33,10 +33,6 @@
import android.content.Intent;
import android.net.Uri;
import android.os.AsyncTask;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.lifecycle.LiveData;
import androidx.lifecycle.Observer;
@@ -45,6 +41,10 @@
import androidx.slice.SliceUtils;
import androidx.slice.SliceViewManager;
import androidx.slice.SliceViewManager.SliceCallback;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/swiperefreshlayout/build.gradle b/swiperefreshlayout/build.gradle
index ab713e3..ace73d7 100644
--- a/swiperefreshlayout/build.gradle
+++ b/swiperefreshlayout/build.gradle
@@ -12,10 +12,10 @@
api(project(":interpolator"))
androidTestImplementation(JUNIT)
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(TEST_RULES_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CONTRIB_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
+ androidTestImplementation(ESPRESSO_CONTRIB, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':internal-testutils'), {
diff --git a/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/CircularProgressDrawableTest.java b/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/CircularProgressDrawableTest.java
index 6494627..e276d6a 100644
--- a/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/CircularProgressDrawableTest.java
+++ b/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/CircularProgressDrawableTest.java
@@ -29,9 +29,10 @@
import android.graphics.Paint;
import android.graphics.Rect;
import android.graphics.RectF;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Rule;
diff --git a/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayoutActions.java b/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayoutActions.java
index 5d823b5..61e927c 100644
--- a/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayoutActions.java
+++ b/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayoutActions.java
@@ -16,12 +16,13 @@
package androidx.swiperefreshlayout.widget;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
import android.view.View;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+
import org.hamcrest.Matcher;
diff --git a/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayoutTest.java b/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayoutTest.java
index 86ca937..0eb2af7 100644
--- a/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayoutTest.java
+++ b/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayoutTest.java
@@ -16,8 +16,8 @@
package androidx.swiperefreshlayout.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -29,15 +29,15 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.support.test.espresso.action.ViewActions;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import androidx.swiperefreshlayout.test.R;
+import androidx.test.espresso.action.ViewActions;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.testutils.PollingCheck;
import org.junit.Before;
diff --git a/testutils/build.gradle b/testutils/build.gradle
index f39248e..be56003 100644
--- a/testutils/build.gradle
+++ b/testutils/build.gradle
@@ -24,8 +24,9 @@
api(project(":fragment"))
api(project(":appcompat"))
- implementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- implementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ implementation(TEST_RUNNER)
+ implementation(TEST_RULES)
+ implementation(ESPRESSO_CORE, libs.exclude_for_espresso)
implementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
implementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
implementation(JUNIT)
diff --git a/testutils/src/main/java/androidx/testutils/AppCompatActivityUtils.java b/testutils/src/main/java/androidx/testutils/AppCompatActivityUtils.java
index 104fb44..988f95e 100644
--- a/testutils/src/main/java/androidx/testutils/AppCompatActivityUtils.java
+++ b/testutils/src/main/java/androidx/testutils/AppCompatActivityUtils.java
@@ -18,7 +18,8 @@
import static org.junit.Assert.assertTrue;
import android.os.Looper;
-import android.support.test.rule.ActivityTestRule;
+
+import androidx.test.rule.ActivityTestRule;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
diff --git a/testutils/src/main/java/androidx/testutils/FragmentActivityUtils.java b/testutils/src/main/java/androidx/testutils/FragmentActivityUtils.java
index 43404f0..7811b05 100644
--- a/testutils/src/main/java/androidx/testutils/FragmentActivityUtils.java
+++ b/testutils/src/main/java/androidx/testutils/FragmentActivityUtils.java
@@ -19,9 +19,9 @@
import android.app.Activity;
import android.os.Looper;
-import android.support.test.rule.ActivityTestRule;
import androidx.fragment.app.FragmentActivity;
+import androidx.test.rule.ActivityTestRule;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
diff --git a/testutils/src/main/java/androidx/testutils/RecreatedActivity.java b/testutils/src/main/java/androidx/testutils/RecreatedActivity.java
index 64f905c..34326a48 100644
--- a/testutils/src/main/java/androidx/testutils/RecreatedActivity.java
+++ b/testutils/src/main/java/androidx/testutils/RecreatedActivity.java
@@ -17,10 +17,10 @@
package androidx.testutils;
import android.os.Bundle;
-import android.support.test.rule.ActivityTestRule;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
+import androidx.test.rule.ActivityTestRule;
import java.util.concurrent.CountDownLatch;
diff --git a/testutils/src/main/java/androidx/testutils/RecreatedAppCompatActivity.java b/testutils/src/main/java/androidx/testutils/RecreatedAppCompatActivity.java
index 3381b13..ed0f182 100644
--- a/testutils/src/main/java/androidx/testutils/RecreatedAppCompatActivity.java
+++ b/testutils/src/main/java/androidx/testutils/RecreatedAppCompatActivity.java
@@ -17,10 +17,10 @@
package androidx.testutils;
import android.os.Bundle;
-import android.support.test.rule.ActivityTestRule;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.test.rule.ActivityTestRule;
import java.util.concurrent.CountDownLatch;
diff --git a/textclassifier/build.gradle b/textclassifier/build.gradle
index fcaa89d..41d828b 100644
--- a/textclassifier/build.gradle
+++ b/textclassifier/build.gradle
@@ -12,8 +12,8 @@
api(project(":collection"))
api(project(":core"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
}
supportLibrary {
diff --git a/textclassifier/src/androidTest/java/androidx/textclassifier/TextClassificationTest.java b/textclassifier/src/androidTest/java/androidx/textclassifier/TextClassificationTest.java
index 751aafc..f659dce 100644
--- a/textclassifier/src/androidTest/java/androidx/textclassifier/TextClassificationTest.java
+++ b/textclassifier/src/androidTest/java/androidx/textclassifier/TextClassificationTest.java
@@ -24,10 +24,10 @@
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ColorDrawable;
import android.os.Parcel;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.core.os.LocaleListCompat;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/textclassifier/src/androidTest/java/androidx/textclassifier/TextLinksTest.java b/textclassifier/src/androidTest/java/androidx/textclassifier/TextLinksTest.java
index c4dccb4..0226596 100644
--- a/textclassifier/src/androidTest/java/androidx/textclassifier/TextLinksTest.java
+++ b/textclassifier/src/androidTest/java/androidx/textclassifier/TextLinksTest.java
@@ -20,8 +20,6 @@
import static org.junit.Assert.assertTrue;
import android.os.Parcel;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.style.ClickableSpan;
@@ -30,6 +28,8 @@
import androidx.annotation.Nullable;
import androidx.collection.ArrayMap;
import androidx.core.os.LocaleListCompat;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/textclassifier/src/androidTest/java/androidx/textclassifier/TextSelectionTest.java b/textclassifier/src/androidTest/java/androidx/textclassifier/TextSelectionTest.java
index 0174cc0..f1b31c5 100644
--- a/textclassifier/src/androidTest/java/androidx/textclassifier/TextSelectionTest.java
+++ b/textclassifier/src/androidTest/java/androidx/textclassifier/TextSelectionTest.java
@@ -19,10 +19,10 @@
import static org.junit.Assert.assertEquals;
import android.os.Parcel;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import androidx.core.os.LocaleListCompat;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/transition/build.gradle b/transition/build.gradle
index 61c690f..ac75c3e 100644
--- a/transition/build.gradle
+++ b/transition/build.gradle
@@ -11,8 +11,9 @@
api(project(":core"))
compileOnly project(':fragment')
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(project(":legacy-support-v4"))
diff --git a/transition/src/androidTest/java/androidx/transition/ArcMotionTest.java b/transition/src/androidTest/java/androidx/transition/ArcMotionTest.java
index 14a704a..e9a5e69 100644
--- a/transition/src/androidTest/java/androidx/transition/ArcMotionTest.java
+++ b/transition/src/androidTest/java/androidx/transition/ArcMotionTest.java
@@ -19,8 +19,9 @@
import static org.junit.Assert.assertEquals;
import android.graphics.Path;
-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/transition/src/androidTest/java/androidx/transition/AutoTransitionTest.java b/transition/src/androidTest/java/androidx/transition/AutoTransitionTest.java
index b5df811..e6bd333 100644
--- a/transition/src/androidTest/java/androidx/transition/AutoTransitionTest.java
+++ b/transition/src/androidTest/java/androidx/transition/AutoTransitionTest.java
@@ -21,12 +21,13 @@
import static org.junit.Assert.fail;
import android.graphics.Color;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
import android.view.View;
import android.widget.LinearLayout;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
+
import org.junit.Before;
import org.junit.Test;
diff --git a/transition/src/androidTest/java/androidx/transition/BaseTest.java b/transition/src/androidTest/java/androidx/transition/BaseTest.java
index c54b4b3..2a9432f 100644
--- a/transition/src/androidTest/java/androidx/transition/BaseTest.java
+++ b/transition/src/androidTest/java/androidx/transition/BaseTest.java
@@ -16,8 +16,8 @@
package androidx.transition;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.runner.RunWith;
diff --git a/transition/src/androidTest/java/androidx/transition/BaseTransitionTest.java b/transition/src/androidTest/java/androidx/transition/BaseTransitionTest.java
index 3620100..a3aec7a 100644
--- a/transition/src/androidTest/java/androidx/transition/BaseTransitionTest.java
+++ b/transition/src/androidTest/java/androidx/transition/BaseTransitionTest.java
@@ -23,11 +23,11 @@
import android.animation.Animator;
import android.animation.ObjectAnimator;
-import android.support.test.InstrumentationRegistry;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
+import androidx.test.InstrumentationRegistry;
import androidx.transition.test.R;
import org.junit.Before;
diff --git a/transition/src/androidTest/java/androidx/transition/ChangeBoundsTest.java b/transition/src/androidTest/java/androidx/transition/ChangeBoundsTest.java
index 345ad0a..ce32900 100644
--- a/transition/src/androidTest/java/androidx/transition/ChangeBoundsTest.java
+++ b/transition/src/androidTest/java/androidx/transition/ChangeBoundsTest.java
@@ -19,10 +19,10 @@
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
-import android.support.test.filters.MediumTest;
import android.view.View;
import android.view.animation.LinearInterpolator;
+import androidx.test.filters.MediumTest;
import androidx.transition.test.R;
import org.hamcrest.Description;
diff --git a/transition/src/androidTest/java/androidx/transition/ChangeClipBoundsTest.java b/transition/src/androidTest/java/androidx/transition/ChangeClipBoundsTest.java
index 7a416b2..87b48c0 100644
--- a/transition/src/androidTest/java/androidx/transition/ChangeClipBoundsTest.java
+++ b/transition/src/androidTest/java/androidx/transition/ChangeClipBoundsTest.java
@@ -22,11 +22,11 @@
import static org.junit.Assert.assertTrue;
import android.graphics.Rect;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
import android.view.View;
import androidx.core.view.ViewCompat;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
import androidx.transition.test.R;
import org.junit.Test;
diff --git a/transition/src/androidTest/java/androidx/transition/ChangeImageTransformTest.java b/transition/src/androidTest/java/androidx/transition/ChangeImageTransformTest.java
index 5879976..1fc5422 100644
--- a/transition/src/androidTest/java/androidx/transition/ChangeImageTransformTest.java
+++ b/transition/src/androidTest/java/androidx/transition/ChangeImageTransformTest.java
@@ -28,8 +28,6 @@
import android.animation.AnimatorListenerAdapter;
import android.graphics.Matrix;
import android.graphics.drawable.Drawable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
import android.util.DisplayMetrics;
import android.util.TypedValue;
import android.view.ViewGroup;
@@ -37,6 +35,8 @@
import androidx.annotation.NonNull;
import androidx.core.app.ActivityCompat;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
import androidx.transition.test.R;
import org.junit.Test;
diff --git a/transition/src/androidTest/java/androidx/transition/ChangeScrollTest.java b/transition/src/androidTest/java/androidx/transition/ChangeScrollTest.java
index 4a01d16..23420de 100644
--- a/transition/src/androidTest/java/androidx/transition/ChangeScrollTest.java
+++ b/transition/src/androidTest/java/androidx/transition/ChangeScrollTest.java
@@ -23,9 +23,9 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
-import android.support.test.filters.MediumTest;
import android.view.View;
+import androidx.test.filters.MediumTest;
import androidx.transition.test.R;
import org.junit.Test;
diff --git a/transition/src/androidTest/java/androidx/transition/ChangeTransformTest.java b/transition/src/androidTest/java/androidx/transition/ChangeTransformTest.java
index b13f0b8..fa3d792 100644
--- a/transition/src/androidTest/java/androidx/transition/ChangeTransformTest.java
+++ b/transition/src/androidTest/java/androidx/transition/ChangeTransformTest.java
@@ -21,9 +21,9 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
-import android.support.test.filters.MediumTest;
import android.view.View;
+import androidx.test.filters.MediumTest;
import androidx.transition.test.R;
import org.junit.Test;
diff --git a/transition/src/androidTest/java/androidx/transition/ExplodeTest.java b/transition/src/androidTest/java/androidx/transition/ExplodeTest.java
index 330d0bc..6e93290 100644
--- a/transition/src/androidTest/java/androidx/transition/ExplodeTest.java
+++ b/transition/src/androidTest/java/androidx/transition/ExplodeTest.java
@@ -26,10 +26,10 @@
import static org.mockito.Mockito.verify;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
import android.view.View;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
import androidx.transition.test.R;
import org.junit.Test;
diff --git a/transition/src/androidTest/java/androidx/transition/FadeTest.java b/transition/src/androidTest/java/androidx/transition/FadeTest.java
index 46d046b..b4d2daa 100644
--- a/transition/src/androidTest/java/androidx/transition/FadeTest.java
+++ b/transition/src/androidTest/java/androidx/transition/FadeTest.java
@@ -35,14 +35,14 @@
import android.animation.ObjectAnimator;
import android.animation.ValueAnimator;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
import androidx.transition.test.R;
import org.junit.Before;
diff --git a/transition/src/androidTest/java/androidx/transition/FragmentTransitionTest.java b/transition/src/androidTest/java/androidx/transition/FragmentTransitionTest.java
index 4ad47aa..891263e 100644
--- a/transition/src/androidTest/java/androidx/transition/FragmentTransitionTest.java
+++ b/transition/src/androidTest/java/androidx/transition/FragmentTransitionTest.java
@@ -25,8 +25,6 @@
import android.app.Instrumentation;
import android.os.Bundle;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -39,6 +37,8 @@
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
import androidx.transition.test.R;
import org.junit.Test;
diff --git a/transition/src/androidTest/java/androidx/transition/PatternPathMotionTest.java b/transition/src/androidTest/java/androidx/transition/PatternPathMotionTest.java
index e4fe206..8fc0d24 100644
--- a/transition/src/androidTest/java/androidx/transition/PatternPathMotionTest.java
+++ b/transition/src/androidTest/java/androidx/transition/PatternPathMotionTest.java
@@ -20,8 +20,9 @@
import android.graphics.Path;
import android.graphics.RectF;
-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/transition/src/androidTest/java/androidx/transition/PropagationTest.java b/transition/src/androidTest/java/androidx/transition/PropagationTest.java
index 8efb85680..12b1654 100644
--- a/transition/src/androidTest/java/androidx/transition/PropagationTest.java
+++ b/transition/src/androidTest/java/androidx/transition/PropagationTest.java
@@ -21,10 +21,10 @@
import static org.junit.Assert.assertTrue;
import android.graphics.Rect;
-import android.support.test.filters.MediumTest;
import android.view.View;
import androidx.annotation.NonNull;
+import androidx.test.filters.MediumTest;
import androidx.transition.test.R;
import org.junit.Test;
diff --git a/transition/src/androidTest/java/androidx/transition/SceneTest.java b/transition/src/androidTest/java/androidx/transition/SceneTest.java
index 2c63b98..c5a2d18 100644
--- a/transition/src/androidTest/java/androidx/transition/SceneTest.java
+++ b/transition/src/androidTest/java/androidx/transition/SceneTest.java
@@ -20,12 +20,12 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.sameInstance;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
import androidx.transition.test.R;
import org.junit.Test;
diff --git a/transition/src/androidTest/java/androidx/transition/SlideBadEdgeTest.java b/transition/src/androidTest/java/androidx/transition/SlideBadEdgeTest.java
index 7e7c983..bb689a0 100644
--- a/transition/src/androidTest/java/androidx/transition/SlideBadEdgeTest.java
+++ b/transition/src/androidTest/java/androidx/transition/SlideBadEdgeTest.java
@@ -18,10 +18,11 @@
import static org.junit.Assert.fail;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.Gravity;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/transition/src/androidTest/java/androidx/transition/SlideDefaultEdgeTest.java b/transition/src/androidTest/java/androidx/transition/SlideDefaultEdgeTest.java
index 03b14eb..fd12c0a 100644
--- a/transition/src/androidTest/java/androidx/transition/SlideDefaultEdgeTest.java
+++ b/transition/src/androidTest/java/androidx/transition/SlideDefaultEdgeTest.java
@@ -18,10 +18,11 @@
import static org.junit.Assert.assertEquals;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.Gravity;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/transition/src/androidTest/java/androidx/transition/SlideEdgeTest.java b/transition/src/androidTest/java/androidx/transition/SlideEdgeTest.java
index 8f08288..9d60d22 100644
--- a/transition/src/androidTest/java/androidx/transition/SlideEdgeTest.java
+++ b/transition/src/androidTest/java/androidx/transition/SlideEdgeTest.java
@@ -24,13 +24,13 @@
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
import androidx.transition.test.R;
import org.junit.Test;
diff --git a/transition/src/androidTest/java/androidx/transition/TransitionInflaterTest.java b/transition/src/androidTest/java/androidx/transition/TransitionInflaterTest.java
index a0cc8d8..23295d0 100644
--- a/transition/src/androidTest/java/androidx/transition/TransitionInflaterTest.java
+++ b/transition/src/androidTest/java/androidx/transition/TransitionInflaterTest.java
@@ -25,13 +25,13 @@
import android.content.Context;
import android.graphics.Path;
import android.graphics.PathMeasure;
-import android.support.test.filters.MediumTest;
import android.util.AttributeSet;
import android.view.Gravity;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
+import androidx.test.filters.MediumTest;
import androidx.transition.test.R;
import org.junit.Test;
diff --git a/transition/src/androidTest/java/androidx/transition/TransitionManagerTest.java b/transition/src/androidTest/java/androidx/transition/TransitionManagerTest.java
index 87b490a..1adb6ba 100644
--- a/transition/src/androidTest/java/androidx/transition/TransitionManagerTest.java
+++ b/transition/src/androidTest/java/androidx/transition/TransitionManagerTest.java
@@ -26,10 +26,10 @@
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
import android.view.ViewGroup;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
import androidx.transition.test.R;
import org.junit.Before;
diff --git a/transition/src/androidTest/java/androidx/transition/TransitionSetTest.java b/transition/src/androidTest/java/androidx/transition/TransitionSetTest.java
index 01f96f9..e26d532 100644
--- a/transition/src/androidTest/java/androidx/transition/TransitionSetTest.java
+++ b/transition/src/androidTest/java/androidx/transition/TransitionSetTest.java
@@ -27,12 +27,12 @@
import android.animation.TimeInterpolator;
import android.graphics.Rect;
-import android.support.test.filters.MediumTest;
import android.view.View;
import android.view.ViewGroup;
import android.view.animation.AccelerateDecelerateInterpolator;
import android.view.animation.DecelerateInterpolator;
+import androidx.test.filters.MediumTest;
import androidx.transition.test.R;
import org.junit.Before;
diff --git a/transition/src/androidTest/java/androidx/transition/TransitionTest.java b/transition/src/androidTest/java/androidx/transition/TransitionTest.java
index 85602e5..a443f683 100644
--- a/transition/src/androidTest/java/androidx/transition/TransitionTest.java
+++ b/transition/src/androidTest/java/androidx/transition/TransitionTest.java
@@ -35,8 +35,6 @@
import android.animation.ObjectAnimator;
import android.animation.TimeInterpolator;
import android.graphics.Rect;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -48,6 +46,8 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
import androidx.transition.test.R;
import org.junit.Before;
diff --git a/transition/src/androidTest/java/androidx/transition/VisibilityTest.java b/transition/src/androidTest/java/androidx/transition/VisibilityTest.java
index 8c7a2fd..54c2e90 100644
--- a/transition/src/androidTest/java/androidx/transition/VisibilityTest.java
+++ b/transition/src/androidTest/java/androidx/transition/VisibilityTest.java
@@ -23,13 +23,13 @@
import android.animation.Animator;
import android.animation.ObjectAnimator;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/tv-provider/build.gradle b/tv-provider/build.gradle
index 469f06d..1df3a5b 100644
--- a/tv-provider/build.gradle
+++ b/tv-provider/build.gradle
@@ -10,8 +10,8 @@
api(project(":annotation"))
api(project(":core"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(TEST_RULES_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
androidTestImplementation(MOCKITO_CORE)
}
diff --git a/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelLogoUtilsTest.java b/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelLogoUtilsTest.java
index 10f2bd9..aad1bdc 100644
--- a/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelLogoUtilsTest.java
+++ b/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelLogoUtilsTest.java
@@ -16,7 +16,7 @@
package androidx.tvprovider.media.tv;
-import static android.support.test.InstrumentationRegistry.getContext;
+import static androidx.test.InstrumentationRegistry.getContext;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -31,10 +31,10 @@
import android.media.tv.TvContract;
import android.net.Uri;
import android.os.SystemClock;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.Suppress;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.Suppress;
+import androidx.test.runner.AndroidJUnit4;
import androidx.tvprovider.test.R;
import org.junit.After;
diff --git a/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelTest.java b/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelTest.java
index 2cd5470..8df68c1 100644
--- a/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelTest.java
+++ b/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ChannelTest.java
@@ -25,11 +25,11 @@
import android.database.MatrixCursor;
import android.net.Uri;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.tvprovider.media.tv.TvContractCompat.Channels;
import org.junit.After;
diff --git a/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelHelperTest.java b/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelHelperTest.java
index 5913bef..83b7cac 100644
--- a/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelHelperTest.java
+++ b/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelHelperTest.java
@@ -28,9 +28,10 @@
import android.media.tv.TvContentRating;
import android.net.Uri;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
import org.junit.After;
import org.junit.Before;
diff --git a/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelTest.java b/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelTest.java
index 91ae24e..0ec9b90 100644
--- a/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelTest.java
+++ b/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewChannelTest.java
@@ -24,10 +24,10 @@
import android.graphics.BitmapFactory;
import android.net.Uri;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
import androidx.tvprovider.media.tv.TvContractCompat.Channels;
import androidx.tvprovider.test.R;
diff --git a/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewProgramTest.java b/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewProgramTest.java
index 789eb4a..b6736f2 100644
--- a/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewProgramTest.java
+++ b/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/PreviewProgramTest.java
@@ -27,11 +27,11 @@
import android.database.MatrixCursor;
import android.media.tv.TvContentRating;
import android.net.Uri;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.tvprovider.media.tv.TvContractCompat.Channels;
import androidx.tvprovider.media.tv.TvContractCompat.PreviewPrograms;
diff --git a/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ProgramTest.java b/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ProgramTest.java
index c46de63..187fe60 100644
--- a/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ProgramTest.java
+++ b/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/ProgramTest.java
@@ -27,11 +27,11 @@
import android.media.tv.TvContentRating;
import android.net.Uri;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.tvprovider.media.tv.TvContractCompat.Channels;
import androidx.tvprovider.media.tv.TvContractCompat.Programs;
diff --git a/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/TvContractUtilsTest.java b/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/TvContractUtilsTest.java
index f9a1a10..e69cdeb 100644
--- a/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/TvContractUtilsTest.java
+++ b/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/TvContractUtilsTest.java
@@ -21,9 +21,10 @@
import android.media.tv.TvContentRating;
import android.os.Build;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/WatchNextProgramTest.java b/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/WatchNextProgramTest.java
index 90883de..eb2ca31 100644
--- a/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/WatchNextProgramTest.java
+++ b/tv-provider/src/androidTest/java/androidx/tvprovider/media/tv/WatchNextProgramTest.java
@@ -27,11 +27,11 @@
import android.database.MatrixCursor;
import android.media.tv.TvContentRating;
import android.net.Uri;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.tvprovider.media.tv.TvContractCompat.WatchNextPrograms;
import org.junit.Before;
diff --git a/versionedparcelable/build.gradle b/versionedparcelable/build.gradle
index c8baee8..ab40747 100644
--- a/versionedparcelable/build.gradle
+++ b/versionedparcelable/build.gradle
@@ -26,7 +26,7 @@
dependencies {
implementation project(":annotation")
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy)
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy)
androidTestAnnotationProcessor project(":versionedparcelable-annotation")
diff --git a/versionedparcelable/src/androidTest/java/androidx/versionedparcelable/VersionedParcelIntegTest.java b/versionedparcelable/src/androidTest/java/androidx/versionedparcelable/VersionedParcelIntegTest.java
index 6bd5721..f5bc402 100644
--- a/versionedparcelable/src/androidTest/java/androidx/versionedparcelable/VersionedParcelIntegTest.java
+++ b/versionedparcelable/src/androidTest/java/androidx/versionedparcelable/VersionedParcelIntegTest.java
@@ -33,11 +33,12 @@
import android.os.Bundle;
import android.os.IBinder;
import android.os.Parcel;
-import android.support.test.filters.SmallTest;
import android.util.Size;
import android.util.SizeF;
import android.util.SparseBooleanArray;
+import androidx.test.filters.SmallTest;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
diff --git a/versionedparcelable/src/androidTest/java/androidx/versionedparcelable/VersionedParcelStreamTest.java b/versionedparcelable/src/androidTest/java/androidx/versionedparcelable/VersionedParcelStreamTest.java
index 3df5b17..d5b3e27 100644
--- a/versionedparcelable/src/androidTest/java/androidx/versionedparcelable/VersionedParcelStreamTest.java
+++ b/versionedparcelable/src/androidTest/java/androidx/versionedparcelable/VersionedParcelStreamTest.java
@@ -19,7 +19,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
-import android.support.test.filters.SmallTest;
+import androidx.test.filters.SmallTest;
import org.junit.Before;
import org.junit.Test;
diff --git a/viewpager/build.gradle b/viewpager/build.gradle
index 6ba1d4d..1626d52 100644
--- a/viewpager/build.gradle
+++ b/viewpager/build.gradle
@@ -11,8 +11,9 @@
api(project(":core"))
api(project(":customview"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
}
diff --git a/viewpager/src/androidTest/java/android/support/v4/testutils/TestUtilsAssertions.java b/viewpager/src/androidTest/java/android/support/v4/testutils/TestUtilsAssertions.java
index b578d30..2f7e8de 100644
--- a/viewpager/src/androidTest/java/android/support/v4/testutils/TestUtilsAssertions.java
+++ b/viewpager/src/androidTest/java/android/support/v4/testutils/TestUtilsAssertions.java
@@ -16,13 +16,14 @@
package android.support.v4.testutils;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import android.support.test.espresso.NoMatchingViewException;
-import android.support.test.espresso.ViewAssertion;
import android.view.View;
import android.view.ViewGroup;
+import androidx.test.espresso.NoMatchingViewException;
+import androidx.test.espresso.ViewAssertion;
+
public class TestUtilsAssertions {
/**
diff --git a/viewpager/src/androidTest/java/android/support/v4/testutils/TestUtilsMatchers.java b/viewpager/src/androidTest/java/android/support/v4/testutils/TestUtilsMatchers.java
index 0cdbf73..8d3da52 100644
--- a/viewpager/src/androidTest/java/android/support/v4/testutils/TestUtilsMatchers.java
+++ b/viewpager/src/androidTest/java/android/support/v4/testutils/TestUtilsMatchers.java
@@ -19,13 +19,13 @@
import static org.junit.Assert.fail;
import android.graphics.drawable.Drawable;
-import android.support.test.espresso.matcher.BoundedMatcher;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewParent;
import androidx.annotation.ColorInt;
import androidx.core.view.ViewCompat;
+import androidx.test.espresso.matcher.BoundedMatcher;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
diff --git a/viewpager/src/androidTest/java/androidx/viewpager/widget/BaseViewPagerTest.java b/viewpager/src/androidTest/java/androidx/viewpager/widget/BaseViewPagerTest.java
index c570822..65408bf 100644
--- a/viewpager/src/androidTest/java/androidx/viewpager/widget/BaseViewPagerTest.java
+++ b/viewpager/src/androidTest/java/androidx/viewpager/widget/BaseViewPagerTest.java
@@ -15,21 +15,6 @@
*/
package androidx.viewpager.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.pressKey;
-import static android.support.test.espresso.action.ViewActions.swipeLeft;
-import static android.support.test.espresso.action.ViewActions.swipeRight;
-import static android.support.test.espresso.assertion.PositionAssertions.isBelow;
-import static android.support.test.espresso.assertion.PositionAssertions.isBottomAlignedWith;
-import static android.support.test.espresso.assertion.PositionAssertions.isLeftAlignedWith;
-import static android.support.test.espresso.assertion.PositionAssertions.isRightAlignedWith;
-import static android.support.test.espresso.assertion.PositionAssertions.isTopAlignedWith;
-import static android.support.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.hasDescendant;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
import static android.support.v4.testutils.TestUtilsAssertions.hasDisplayedChildren;
import static android.support.v4.testutils.TestUtilsMatchers.backgroundColor;
import static android.support.v4.testutils.TestUtilsMatchers.centerAlignedInParent;
@@ -37,6 +22,22 @@
import static android.support.v4.testutils.TestUtilsMatchers.isOfClass;
import static android.support.v4.testutils.TestUtilsMatchers.startAlignedToParent;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.pressKey;
+import static androidx.test.espresso.action.ViewActions.swipeLeft;
+import static androidx.test.espresso.action.ViewActions.swipeRight;
+import static androidx.test.espresso.assertion.PositionAssertions.isBelow;
+import static androidx.test.espresso.assertion.PositionAssertions.isBottomAlignedWith;
+import static androidx.test.espresso.assertion.PositionAssertions.isLeftAlignedWith;
+import static androidx.test.espresso.assertion.PositionAssertions.isRightAlignedWith;
+import static androidx.test.espresso.assertion.PositionAssertions.isTopAlignedWith;
+import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.is;
@@ -53,12 +54,6 @@
import android.app.Activity;
import android.graphics.Color;
-import android.support.test.espresso.ViewAction;
-import android.support.test.espresso.action.EspressoKey;
-import android.support.test.filters.FlakyTest;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
import android.support.v4.testutils.TestUtilsMatchers;
import android.text.TextUtils;
import android.util.Pair;
@@ -69,6 +64,12 @@
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.action.EspressoKey;
+import androidx.test.filters.FlakyTest;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
import androidx.viewpager.test.R;
import org.junit.After;
diff --git a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerActions.java b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerActions.java
index f12fcd3..ff7252d 100644
--- a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerActions.java
+++ b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerActions.java
@@ -16,21 +16,21 @@
package androidx.viewpager.widget;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
-import android.support.test.espresso.Espresso;
-import android.support.test.espresso.IdlingResource;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.espresso.action.CoordinatesProvider;
-import android.support.test.espresso.action.GeneralClickAction;
-import android.support.test.espresso.action.Press;
-import android.support.test.espresso.action.Tap;
import android.view.View;
import android.widget.TextView;
import androidx.annotation.Nullable;
+import androidx.test.espresso.Espresso;
+import androidx.test.espresso.IdlingResource;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.action.CoordinatesProvider;
+import androidx.test.espresso.action.GeneralClickAction;
+import androidx.test.espresso.action.Press;
+import androidx.test.espresso.action.Tap;
import org.hamcrest.Matcher;
diff --git a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerTest.java b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerTest.java
index 3b2bade..67906cad 100644
--- a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerTest.java
+++ b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerTest.java
@@ -21,14 +21,14 @@
import android.app.Activity;
import android.os.Bundle;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
import org.junit.Rule;
import org.junit.Test;
diff --git a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTabStripTest.java b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTabStripTest.java
index 9dc7cfb..245d255 100644
--- a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTabStripTest.java
+++ b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTabStripTest.java
@@ -15,11 +15,11 @@
*/
package androidx.viewpager.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.Matchers.allOf;
import static org.junit.Assert.assertEquals;
diff --git a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTitleStripTest.java b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTitleStripTest.java
index a4fc7b5..ab50e8f 100644
--- a/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTitleStripTest.java
+++ b/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTitleStripTest.java
@@ -15,11 +15,11 @@
*/
package androidx.viewpager.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.Matchers.allOf;
import static org.junit.Assert.assertEquals;
diff --git a/viewpager2/build.gradle b/viewpager2/build.gradle
index 73693c1..7118d70 100644
--- a/viewpager2/build.gradle
+++ b/viewpager2/build.gradle
@@ -26,8 +26,9 @@
api(project(":fragment"))
api(project(":recyclerview"))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation project(':internal-testutils'), {
diff --git a/viewpager2/src/androidTest/java/androidx/viewpager2/widget/BasicTest.java b/viewpager2/src/androidTest/java/androidx/viewpager2/widget/BasicTest.java
index 483317b..e9714f0 100644
--- a/viewpager2/src/androidTest/java/androidx/viewpager2/widget/BasicTest.java
+++ b/viewpager2/src/androidTest/java/androidx/viewpager2/widget/BasicTest.java
@@ -24,14 +24,14 @@
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Rule;
import org.junit.Test;
diff --git a/viewpager2/src/androidTest/java/androidx/viewpager2/widget/OrientationTest.java b/viewpager2/src/androidTest/java/androidx/viewpager2/widget/OrientationTest.java
index 52182a7..10699f7 100644
--- a/viewpager2/src/androidTest/java/androidx/viewpager2/widget/OrientationTest.java
+++ b/viewpager2/src/androidTest/java/androidx/viewpager2/widget/OrientationTest.java
@@ -22,11 +22,11 @@
import static org.hamcrest.Matchers.equalTo;
import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.view.LayoutInflater;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.viewpager2.test.R;
import androidx.viewpager2.widget.ViewPager2.Orientation;
diff --git a/viewpager2/src/androidTest/java/androidx/viewpager2/widget/SwipeTest.java b/viewpager2/src/androidTest/java/androidx/viewpager2/widget/SwipeTest.java
index 82b4fee..deaebc6 100644
--- a/viewpager2/src/androidTest/java/androidx/viewpager2/widget/SwipeTest.java
+++ b/viewpager2/src/androidTest/java/androidx/viewpager2/widget/SwipeTest.java
@@ -16,14 +16,14 @@
package androidx.viewpager2.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.assertThat;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
import static android.view.View.OVER_SCROLL_NEVER;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.assertThat;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static androidx.viewpager2.widget.ViewPager2.Orientation.HORIZONTAL;
import static androidx.viewpager2.widget.ViewPager2.Orientation.VERTICAL;
@@ -35,12 +35,12 @@
import static java.util.Collections.singletonList;
import android.os.Build;
-import android.support.test.filters.LargeTest;
-import android.support.test.rule.ActivityTestRule;
import android.util.Log;
import android.util.Pair;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
import androidx.testutils.FragmentActivityUtils;
import androidx.viewpager2.test.R;
import androidx.viewpager2.widget.swipe.BaseActivity;
diff --git a/viewpager2/src/androidTest/java/androidx/viewpager2/widget/swipe/PageSwiper.java b/viewpager2/src/androidTest/java/androidx/viewpager2/widget/swipe/PageSwiper.java
index e8f0514..95ca2b6 100644
--- a/viewpager2/src/androidTest/java/androidx/viewpager2/widget/swipe/PageSwiper.java
+++ b/viewpager2/src/androidTest/java/androidx/viewpager2/widget/swipe/PageSwiper.java
@@ -16,19 +16,17 @@
package androidx.viewpager2.widget.swipe;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
import static androidx.core.util.Preconditions.checkArgumentNonnegative;
import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static org.hamcrest.CoreMatchers.allOf;
-import android.support.test.espresso.ViewAction;
-import android.support.test.espresso.action.ViewActions;
-
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.action.ViewActions;
import androidx.viewpager2.test.R;
import androidx.viewpager2.widget.ViewPager2;
diff --git a/wear/build.gradle b/wear/build.gradle
index 32e7c84..4dfb67d 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -13,8 +13,9 @@
api(project(":recyclerview"))
api(CONSTRAINT_LAYOUT, { transitive = true })
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
- androidTestImplementation(ESPRESSO_CORE_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
+ androidTestImplementation(TEST_RULES)
+ androidTestImplementation(ESPRESSO_CORE, libs.exclude_for_espresso)
androidTestImplementation(MOCKITO_CORE, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
androidTestImplementation(DEXMAKER_MOCKITO, libs.exclude_bytebuddy) // DexMaker has it"s own MockMaker
diff --git a/wear/src/androidTest/java/androidx/wear/ambient/AmbientDelegateTest.java b/wear/src/androidTest/java/androidx/wear/ambient/AmbientDelegateTest.java
index 1f211f6d..fc8877d 100644
--- a/wear/src/androidTest/java/androidx/wear/ambient/AmbientDelegateTest.java
+++ b/wear/src/androidTest/java/androidx/wear/ambient/AmbientDelegateTest.java
@@ -21,10 +21,9 @@
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.fragment.app.FragmentActivity;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import com.google.android.wearable.compat.WearableActivityController;
diff --git a/wear/src/androidTest/java/androidx/wear/ambient/AmbientModeResumeTest.java b/wear/src/androidTest/java/androidx/wear/ambient/AmbientModeResumeTest.java
index ee1e68e..17f3516 100644
--- a/wear/src/androidTest/java/androidx/wear/ambient/AmbientModeResumeTest.java
+++ b/wear/src/androidTest/java/androidx/wear/ambient/AmbientModeResumeTest.java
@@ -19,10 +19,9 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.wear.widget.util.WakeLockRule;
import com.google.android.wearable.compat.WearableActivityController;
diff --git a/wear/src/androidTest/java/androidx/wear/ambient/AmbientModeSupportResumeTest.java b/wear/src/androidTest/java/androidx/wear/ambient/AmbientModeSupportResumeTest.java
index ad74587..0da82a0 100644
--- a/wear/src/androidTest/java/androidx/wear/ambient/AmbientModeSupportResumeTest.java
+++ b/wear/src/androidTest/java/androidx/wear/ambient/AmbientModeSupportResumeTest.java
@@ -19,10 +19,9 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.wear.widget.util.WakeLockRule;
import com.google.android.wearable.compat.WearableActivityController;
diff --git a/wear/src/androidTest/java/androidx/wear/ambient/AmbientModeSupportTest.java b/wear/src/androidTest/java/androidx/wear/ambient/AmbientModeSupportTest.java
index fc908c8..dbea70d 100644
--- a/wear/src/androidTest/java/androidx/wear/ambient/AmbientModeSupportTest.java
+++ b/wear/src/androidTest/java/androidx/wear/ambient/AmbientModeSupportTest.java
@@ -19,10 +19,9 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.wear.widget.util.WakeLockRule;
import com.google.android.wearable.compat.WearableActivityController;
diff --git a/wear/src/androidTest/java/androidx/wear/ambient/AmbientModeTest.java b/wear/src/androidTest/java/androidx/wear/ambient/AmbientModeTest.java
index 7f05df7..60436fb 100644
--- a/wear/src/androidTest/java/androidx/wear/ambient/AmbientModeTest.java
+++ b/wear/src/androidTest/java/androidx/wear/ambient/AmbientModeTest.java
@@ -19,10 +19,9 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
-
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.wear.widget.util.WakeLockRule;
import com.google.android.wearable.compat.WearableActivityController;
diff --git a/wear/src/androidTest/java/androidx/wear/widget/BoxInsetLayoutTest.java b/wear/src/androidTest/java/androidx/wear/widget/BoxInsetLayoutTest.java
index 524ebbb..0e5dde1 100644
--- a/wear/src/androidTest/java/androidx/wear/widget/BoxInsetLayoutTest.java
+++ b/wear/src/androidTest/java/androidx/wear/widget/BoxInsetLayoutTest.java
@@ -16,9 +16,8 @@
package androidx.wear.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static androidx.wear.widget.util.MoreViewAssertions.approximateBottom;
import static androidx.wear.widget.util.MoreViewAssertions.approximateTop;
import static androidx.wear.widget.util.MoreViewAssertions.bottom;
@@ -35,13 +34,13 @@
import static org.hamcrest.Matchers.is;
import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.util.DisplayMetrics;
import android.view.View;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.wear.test.R;
import androidx.wear.widget.util.WakeLockRule;
diff --git a/wear/src/androidTest/java/androidx/wear/widget/CircularProgressLayoutControllerTest.java b/wear/src/androidTest/java/androidx/wear/widget/CircularProgressLayoutControllerTest.java
index a4a3840..ddba817 100644
--- a/wear/src/androidTest/java/androidx/wear/widget/CircularProgressLayoutControllerTest.java
+++ b/wear/src/androidTest/java/androidx/wear/widget/CircularProgressLayoutControllerTest.java
@@ -21,12 +21,11 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
-
import androidx.swiperefreshlayout.widget.CircularProgressDrawable;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/wear/src/androidTest/java/androidx/wear/widget/CircularProgressLayoutTest.java b/wear/src/androidTest/java/androidx/wear/widget/CircularProgressLayoutTest.java
index 897ef7a..419ed32 100644
--- a/wear/src/androidTest/java/androidx/wear/widget/CircularProgressLayoutTest.java
+++ b/wear/src/androidTest/java/androidx/wear/widget/CircularProgressLayoutTest.java
@@ -21,10 +21,10 @@
import static org.junit.Assert.assertTrue;
import android.content.Intent;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.wear.test.R;
import org.junit.Before;
diff --git a/wear/src/androidTest/java/androidx/wear/widget/ConfirmationOverlayTest.java b/wear/src/androidTest/java/androidx/wear/widget/ConfirmationOverlayTest.java
index 4553440..720590b 100644
--- a/wear/src/androidTest/java/androidx/wear/widget/ConfirmationOverlayTest.java
+++ b/wear/src/androidTest/java/androidx/wear/widget/ConfirmationOverlayTest.java
@@ -22,15 +22,15 @@
import static org.junit.Assert.fail;
import android.app.Activity;
-import android.support.test.annotation.UiThreadTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.wear.R;
import androidx.wear.widget.util.WakeLockRule;
diff --git a/wear/src/androidTest/java/androidx/wear/widget/RoundedDrawableTest.java b/wear/src/androidTest/java/androidx/wear/widget/RoundedDrawableTest.java
index dda00dac..c01c293 100644
--- a/wear/src/androidTest/java/androidx/wear/widget/RoundedDrawableTest.java
+++ b/wear/src/androidTest/java/androidx/wear/widget/RoundedDrawableTest.java
@@ -33,11 +33,11 @@
import android.graphics.RectF;
import android.graphics.drawable.BitmapDrawable;
import android.os.Build;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.wear.test.R;
import org.junit.Before;
diff --git a/wear/src/androidTest/java/androidx/wear/widget/ScrollManagerTest.java b/wear/src/androidTest/java/androidx/wear/widget/ScrollManagerTest.java
index 36b0c0a..ca4856b 100644
--- a/wear/src/androidTest/java/androidx/wear/widget/ScrollManagerTest.java
+++ b/wear/src/androidTest/java/androidx/wear/widget/ScrollManagerTest.java
@@ -23,11 +23,11 @@
import static java.lang.Math.sin;
import android.os.SystemClock;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.MotionEvent;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.wear.widget.util.WakeLockRule;
import org.junit.Before;
diff --git a/wear/src/androidTest/java/androidx/wear/widget/SwipeDismissFrameLayoutTest.java b/wear/src/androidTest/java/androidx/wear/widget/SwipeDismissFrameLayoutTest.java
index 399390d..ae86d04 100644
--- a/wear/src/androidTest/java/androidx/wear/widget/SwipeDismissFrameLayoutTest.java
+++ b/wear/src/androidTest/java/androidx/wear/widget/SwipeDismissFrameLayoutTest.java
@@ -16,11 +16,10 @@
package androidx.wear.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.swipeRight;
-import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.swipeRight;
+import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static androidx.wear.widget.util.AsyncViewActions.waitForMatchingView;
import static androidx.wear.widget.util.MoreViewAssertions.withPositiveVerticalScrollOffset;
@@ -31,20 +30,20 @@
import android.app.Activity;
import android.content.Intent;
import android.graphics.RectF;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.ViewAction;
-import android.support.test.espresso.action.GeneralLocation;
-import android.support.test.espresso.action.GeneralSwipeAction;
-import android.support.test.espresso.action.Press;
-import android.support.test.espresso.action.Swipe;
-import android.support.test.espresso.matcher.ViewMatchers;
-import android.support.test.filters.SmallTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import androidx.annotation.IdRes;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.action.GeneralLocation;
+import androidx.test.espresso.action.GeneralSwipeAction;
+import androidx.test.espresso.action.Press;
+import androidx.test.espresso.action.Swipe;
+import androidx.test.espresso.matcher.ViewMatchers;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.wear.test.R;
import androidx.wear.widget.util.ArcSwipe;
import androidx.wear.widget.util.WakeLockRule;
diff --git a/wear/src/androidTest/java/androidx/wear/widget/WearableLinearLayoutManagerTest.java b/wear/src/androidTest/java/androidx/wear/widget/WearableLinearLayoutManagerTest.java
index 81f64d4..a72a5d0 100644
--- a/wear/src/androidTest/java/androidx/wear/widget/WearableLinearLayoutManagerTest.java
+++ b/wear/src/androidTest/java/androidx/wear/widget/WearableLinearLayoutManagerTest.java
@@ -19,13 +19,13 @@
import static org.junit.Assert.assertEquals;
import android.app.Activity;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import android.widget.FrameLayout;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.wear.test.R;
import androidx.wear.widget.util.WakeLockRule;
diff --git a/wear/src/androidTest/java/androidx/wear/widget/WearableRecyclerViewTest.java b/wear/src/androidTest/java/androidx/wear/widget/WearableRecyclerViewTest.java
index a7ebde3..b2f95c4 100644
--- a/wear/src/androidTest/java/androidx/wear/widget/WearableRecyclerViewTest.java
+++ b/wear/src/androidTest/java/androidx/wear/widget/WearableRecyclerViewTest.java
@@ -16,9 +16,8 @@
package androidx.wear.widget;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static androidx.wear.widget.util.AsyncViewActions.waitForMatchingView;
import static androidx.wear.widget.util.MoreViewAssertions.withNoVerticalScrollOffset;
import static androidx.wear.widget.util.MoreViewAssertions.withPositiveVerticalScrollOffset;
@@ -30,19 +29,19 @@
import static org.junit.Assert.assertTrue;
import android.app.Activity;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.ViewAction;
-import android.support.test.espresso.action.GeneralLocation;
-import android.support.test.espresso.action.GeneralSwipeAction;
-import android.support.test.espresso.action.Press;
-import android.support.test.espresso.action.Swipe;
-import android.support.test.filters.MediumTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.View;
import androidx.annotation.IdRes;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.action.GeneralLocation;
+import androidx.test.espresso.action.GeneralSwipeAction;
+import androidx.test.espresso.action.Press;
+import androidx.test.espresso.action.Swipe;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.wear.test.R;
import androidx.wear.widget.util.WakeLockRule;
diff --git a/wear/src/androidTest/java/androidx/wear/widget/drawer/WearableDrawerLayoutEspressoTest.java b/wear/src/androidTest/java/androidx/wear/widget/drawer/WearableDrawerLayoutEspressoTest.java
index 6e7f5e1..2b382f8 100644
--- a/wear/src/androidTest/java/androidx/wear/widget/drawer/WearableDrawerLayoutEspressoTest.java
+++ b/wear/src/androidTest/java/androidx/wear/widget/drawer/WearableDrawerLayoutEspressoTest.java
@@ -16,17 +16,16 @@
package androidx.wear.widget.drawer;
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.action.ViewActions.swipeDown;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import static android.support.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withParent;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.swipeDown;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withParent;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static androidx.wear.widget.util.AsyncViewActions.waitForMatchingView;
import static org.hamcrest.Matchers.allOf;
@@ -39,14 +38,6 @@
import static org.mockito.Mockito.verify;
import android.content.Intent;
-import android.support.test.espresso.PerformException;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.espresso.util.HumanReadables;
-import android.support.test.espresso.util.TreeIterables;
-import android.support.test.filters.LargeTest;
-import android.support.test.rule.ActivityTestRule;
-import android.support.test.runner.AndroidJUnit4;
import android.view.Menu;
import android.view.MenuItem;
import android.view.MenuItem.OnMenuItemClickListener;
@@ -55,6 +46,14 @@
import android.widget.TextView;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.espresso.PerformException;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.util.HumanReadables;
+import androidx.test.espresso.util.TreeIterables;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
import androidx.wear.test.R;
import androidx.wear.widget.drawer.DrawerTestActivity.DrawerStyle;
diff --git a/wear/src/androidTest/java/androidx/wear/widget/util/ArcSwipe.java b/wear/src/androidTest/java/androidx/wear/widget/util/ArcSwipe.java
index 240e13e..33488eee 100644
--- a/wear/src/androidTest/java/androidx/wear/widget/util/ArcSwipe.java
+++ b/wear/src/androidTest/java/androidx/wear/widget/util/ArcSwipe.java
@@ -20,14 +20,14 @@
import android.graphics.PathMeasure;
import android.graphics.RectF;
import android.os.SystemClock;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.action.MotionEvents;
-import android.support.test.espresso.action.Swiper;
import android.util.Log;
import android.view.MotionEvent;
import androidx.annotation.VisibleForTesting;
import androidx.core.util.Preconditions;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.action.MotionEvents;
+import androidx.test.espresso.action.Swiper;
/**
* Swiper for gestures meant to be performed on an arc - part of a circle - not a straight line.
diff --git a/wear/src/androidTest/java/androidx/wear/widget/util/ArcSwipeTest.java b/wear/src/androidTest/java/androidx/wear/widget/util/ArcSwipeTest.java
index 0f4ae7b4..f3fced92 100644
--- a/wear/src/androidTest/java/androidx/wear/widget/util/ArcSwipeTest.java
+++ b/wear/src/androidTest/java/androidx/wear/widget/util/ArcSwipeTest.java
@@ -19,8 +19,9 @@
import static org.junit.Assert.assertEquals;
import android.graphics.RectF;
-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.Before;
import org.junit.Test;
diff --git a/wear/src/androidTest/java/androidx/wear/widget/util/AsyncViewActions.java b/wear/src/androidTest/java/androidx/wear/widget/util/AsyncViewActions.java
index 52f9584..07f5749 100644
--- a/wear/src/androidTest/java/androidx/wear/widget/util/AsyncViewActions.java
+++ b/wear/src/androidTest/java/androidx/wear/widget/util/AsyncViewActions.java
@@ -16,13 +16,14 @@
package androidx.wear.widget.util;
-import android.support.test.espresso.PerformException;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.espresso.util.HumanReadables;
-import android.support.test.espresso.util.TreeIterables;
import android.view.View;
+import androidx.test.espresso.PerformException;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.util.HumanReadables;
+import androidx.test.espresso.util.TreeIterables;
+
import org.hamcrest.Matchers;
import org.hamcrest.StringDescription;
diff --git a/wear/src/androidTest/java/androidx/wear/widget/util/MoreViewAssertions.java b/wear/src/androidTest/java/androidx/wear/widget/util/MoreViewAssertions.java
index 2c11736..0cd2275 100644
--- a/wear/src/androidTest/java/androidx/wear/widget/util/MoreViewAssertions.java
+++ b/wear/src/androidTest/java/androidx/wear/widget/util/MoreViewAssertions.java
@@ -16,14 +16,14 @@
package androidx.wear.widget.util;
-import static android.support.test.espresso.matcher.ViewMatchers.assertThat;
+import static androidx.test.espresso.matcher.ViewMatchers.assertThat;
-import android.support.test.espresso.NoMatchingViewException;
-import android.support.test.espresso.ViewAssertion;
-import android.support.test.espresso.util.HumanReadables;
import android.view.View;
import androidx.recyclerview.widget.RecyclerView;
+import androidx.test.espresso.NoMatchingViewException;
+import androidx.test.espresso.ViewAssertion;
+import androidx.test.espresso.util.HumanReadables;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
diff --git a/wear/src/androidTest/java/androidx/wear/widget/util/WakeLockRule.java b/wear/src/androidTest/java/androidx/wear/widget/util/WakeLockRule.java
index 29e25fc..60bdc21 100644
--- a/wear/src/androidTest/java/androidx/wear/widget/util/WakeLockRule.java
+++ b/wear/src/androidTest/java/androidx/wear/widget/util/WakeLockRule.java
@@ -19,7 +19,8 @@
import android.content.Context;
import android.os.PowerManager;
import android.os.PowerManager.WakeLock;
-import android.support.test.InstrumentationRegistry;
+
+import androidx.test.InstrumentationRegistry;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
diff --git a/webkit/build.gradle b/webkit/build.gradle
index baed9cb..21c52dd 100644
--- a/webkit/build.gradle
+++ b/webkit/build.gradle
@@ -26,7 +26,7 @@
api(project(":annotation"))
api(project(':core'))
- androidTestImplementation(TEST_RUNNER_TMP, libs.exclude_for_espresso)
+ androidTestImplementation(TEST_RUNNER)
}
ext {
diff --git a/webkit/src/androidTest/java/androidx/webkit/BoundaryInterfaceTest.java b/webkit/src/androidTest/java/androidx/webkit/BoundaryInterfaceTest.java
index 3f9857c..36c7122 100644
--- a/webkit/src/androidTest/java/androidx/webkit/BoundaryInterfaceTest.java
+++ b/webkit/src/androidTest/java/androidx/webkit/BoundaryInterfaceTest.java
@@ -16,9 +16,8 @@
package androidx.webkit;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.webkit.internal.WebViewFeatureInternal;
import androidx.webkit.internal.WebViewGlueCommunicator;
import androidx.webkit.internal.WebkitToCompatConverter;
diff --git a/webkit/src/androidTest/java/androidx/webkit/IncompatibilityTest.java b/webkit/src/androidTest/java/androidx/webkit/IncompatibilityTest.java
index 09424c6..71fb69e 100644
--- a/webkit/src/androidTest/java/androidx/webkit/IncompatibilityTest.java
+++ b/webkit/src/androidTest/java/androidx/webkit/IncompatibilityTest.java
@@ -19,10 +19,9 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.runner.AndroidJUnit4;
-
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.runner.AndroidJUnit4;
import androidx.webkit.internal.WebViewFeatureInternal;
import org.junit.Test;
diff --git a/webkit/src/androidTest/java/androidx/webkit/PostMessageTest.java b/webkit/src/androidTest/java/androidx/webkit/PostMessageTest.java
index 920157a..056271f3a 100644
--- a/webkit/src/androidTest/java/androidx/webkit/PostMessageTest.java
+++ b/webkit/src/androidTest/java/androidx/webkit/PostMessageTest.java
@@ -22,12 +22,12 @@
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import android.webkit.WebView;
import androidx.annotation.NonNull;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.webkit.WebMessagePortCompat.WebMessageCallbackCompat;
import junit.framework.Assert;
diff --git a/webkit/src/androidTest/java/androidx/webkit/ServiceWorkerClientCompatTest.java b/webkit/src/androidTest/java/androidx/webkit/ServiceWorkerClientCompatTest.java
index e6c11f9..2f58710 100644
--- a/webkit/src/androidTest/java/androidx/webkit/ServiceWorkerClientCompatTest.java
+++ b/webkit/src/androidTest/java/androidx/webkit/ServiceWorkerClientCompatTest.java
@@ -19,14 +19,14 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assume.assumeTrue;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import android.webkit.JavascriptInterface;
import android.webkit.WebResourceRequest;
import android.webkit.WebResourceResponse;
import android.webkit.WebView;
import androidx.annotation.NonNull;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
diff --git a/webkit/src/androidTest/java/androidx/webkit/ServiceWorkerWebSettingsCompatTest.java b/webkit/src/androidTest/java/androidx/webkit/ServiceWorkerWebSettingsCompatTest.java
index 909a899..2932616 100644
--- a/webkit/src/androidTest/java/androidx/webkit/ServiceWorkerWebSettingsCompatTest.java
+++ b/webkit/src/androidTest/java/androidx/webkit/ServiceWorkerWebSettingsCompatTest.java
@@ -18,10 +18,11 @@
import static org.junit.Assume.assumeTrue;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
import android.webkit.WebSettings;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatTest.java b/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatTest.java
index 5dd9b54..b949f5b 100644
--- a/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatTest.java
+++ b/webkit/src/androidTest/java/androidx/webkit/WebSettingsCompatTest.java
@@ -21,10 +21,11 @@
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import android.webkit.WebSettings;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
+
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/webkit/src/androidTest/java/androidx/webkit/WebViewApkTest.java b/webkit/src/androidTest/java/androidx/webkit/WebViewApkTest.java
index 99020ce6..d8dd04d 100644
--- a/webkit/src/androidTest/java/androidx/webkit/WebViewApkTest.java
+++ b/webkit/src/androidTest/java/androidx/webkit/WebViewApkTest.java
@@ -18,11 +18,11 @@
import android.content.Context;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.webkit.internal.WebViewGlueCommunicator;
import org.chromium.support_lib_boundary.util.Features;
diff --git a/webkit/src/androidTest/java/androidx/webkit/WebViewClientCompatTest.java b/webkit/src/androidTest/java/androidx/webkit/WebViewClientCompatTest.java
index cfe9d61..c7536e2 100644
--- a/webkit/src/androidTest/java/androidx/webkit/WebViewClientCompatTest.java
+++ b/webkit/src/androidTest/java/androidx/webkit/WebViewClientCompatTest.java
@@ -18,9 +18,6 @@
import android.graphics.Bitmap;
import android.net.Uri;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.runner.AndroidJUnit4;
import android.webkit.ValueCallback;
import android.webkit.WebResourceRequest;
import android.webkit.WebResourceResponse;
@@ -28,6 +25,9 @@
import android.webkit.WebViewClient;
import androidx.annotation.NonNull;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Assert;
import org.junit.Assume;
diff --git a/webkit/src/androidTest/java/androidx/webkit/WebViewCompatTest.java b/webkit/src/androidTest/java/androidx/webkit/WebViewCompatTest.java
index 66c5078..08aafed 100644
--- a/webkit/src/androidTest/java/androidx/webkit/WebViewCompatTest.java
+++ b/webkit/src/androidTest/java/androidx/webkit/WebViewCompatTest.java
@@ -28,14 +28,14 @@
import android.content.ContextWrapper;
import android.os.Build;
import android.os.Looper;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
import android.webkit.ValueCallback;
import android.webkit.WebResourceRequest;
import android.webkit.WebView;
import androidx.annotation.NonNull;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Assert;
import org.junit.Before;
diff --git a/webkit/src/androidTest/java/androidx/webkit/WebViewOnUiThread.java b/webkit/src/androidTest/java/androidx/webkit/WebViewOnUiThread.java
index dea7ece..9d19340 100644
--- a/webkit/src/androidTest/java/androidx/webkit/WebViewOnUiThread.java
+++ b/webkit/src/androidTest/java/androidx/webkit/WebViewOnUiThread.java
@@ -23,7 +23,6 @@
import android.net.Uri;
import android.os.Looper;
import android.os.SystemClock;
-import android.support.test.InstrumentationRegistry;
import android.webkit.ValueCallback;
import android.webkit.WebChromeClient;
import android.webkit.WebSettings;
@@ -31,6 +30,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import androidx.test.InstrumentationRegistry;
import java.util.concurrent.Callable;
diff --git a/work/workmanager-firebase/src/androidTest/java/androidx/work/impl/background/firebase/FirebaseJobConverterTest.java b/work/workmanager-firebase/src/androidTest/java/androidx/work/impl/background/firebase/FirebaseJobConverterTest.java
index bad07d5..4f3308d 100644
--- a/work/workmanager-firebase/src/androidTest/java/androidx/work/impl/background/firebase/FirebaseJobConverterTest.java
+++ b/work/workmanager-firebase/src/androidTest/java/androidx/work/impl/background/firebase/FirebaseJobConverterTest.java
@@ -28,11 +28,11 @@
import android.content.Context;
import android.net.Uri;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.BackoffPolicy;
import androidx.work.Constraints;
import androidx.work.OneTimeWorkRequest;
diff --git a/work/workmanager-firebase/src/androidTest/java/androidx/work/impl/background/firebase/FirebaseJobServiceTest.java b/work/workmanager-firebase/src/androidTest/java/androidx/work/impl/background/firebase/FirebaseJobServiceTest.java
index 2023d71..ec6128d 100644
--- a/work/workmanager-firebase/src/androidTest/java/androidx/work/impl/background/firebase/FirebaseJobServiceTest.java
+++ b/work/workmanager-firebase/src/androidTest/java/androidx/work/impl/background/firebase/FirebaseJobServiceTest.java
@@ -16,17 +16,16 @@
package androidx.work.impl.background.firebase;
-import static android.support.test.espresso.matcher.ViewMatchers.assertThat;
+import static androidx.test.espresso.matcher.ViewMatchers.assertThat;
import static org.hamcrest.CoreMatchers.is;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.OneTimeWorkRequest;
import androidx.work.State;
import androidx.work.WorkRequest;
diff --git a/work/workmanager-ktx/src/androidTest/java/androidx/work/DataTest.kt b/work/workmanager-ktx/src/androidTest/java/androidx/work/DataTest.kt
index 0cd1eda..a57abeb 100644
--- a/work/workmanager-ktx/src/androidTest/java/androidx/work/DataTest.kt
+++ b/work/workmanager-ktx/src/androidTest/java/androidx/work/DataTest.kt
@@ -16,8 +16,8 @@
package androidx.work
-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.Assert.assertEquals
import org.junit.Assert.assertNotNull
import org.junit.Test
diff --git a/work/workmanager-ktx/src/androidTest/java/androidx/work/OneTimeWorkRequestTest.kt b/work/workmanager-ktx/src/androidTest/java/androidx/work/OneTimeWorkRequestTest.kt
index c4c6d0c..45fa3f4 100644
--- a/work/workmanager-ktx/src/androidTest/java/androidx/work/OneTimeWorkRequestTest.kt
+++ b/work/workmanager-ktx/src/androidTest/java/androidx/work/OneTimeWorkRequestTest.kt
@@ -16,8 +16,8 @@
package androidx.work
-import android.support.test.filters.SmallTest
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.filters.SmallTest
+import androidx.test.runner.AndroidJUnit4
import androidx.work.workers.TestWorker
import org.junit.Assert.assertEquals
import org.junit.Test
diff --git a/work/workmanager-ktx/src/androidTest/java/androidx/work/PeriodicWorkRequestTest.kt b/work/workmanager-ktx/src/androidTest/java/androidx/work/PeriodicWorkRequestTest.kt
index 69c236d..5317464 100644
--- a/work/workmanager-ktx/src/androidTest/java/androidx/work/PeriodicWorkRequestTest.kt
+++ b/work/workmanager-ktx/src/androidTest/java/androidx/work/PeriodicWorkRequestTest.kt
@@ -16,9 +16,9 @@
package androidx.work
-import android.support.test.filters.SdkSuppress
-import android.support.test.filters.SmallTest
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.filters.SdkSuppress
+import androidx.test.filters.SmallTest
+import androidx.test.runner.AndroidJUnit4
import androidx.work.workers.TestWorker
import org.junit.Assert.assertEquals
import org.junit.Test
diff --git a/work/workmanager-test/src/androidTest/java/androidx/work/test/TestSchedulerTest.java b/work/workmanager-test/src/androidTest/java/androidx/work/test/TestSchedulerTest.java
index 1458689..39f4749 100644
--- a/work/workmanager-test/src/androidTest/java/androidx/work/test/TestSchedulerTest.java
+++ b/work/workmanager-test/src/androidTest/java/androidx/work/test/TestSchedulerTest.java
@@ -20,9 +20,9 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.content.Context;
-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 androidx.work.Constraints;
import androidx.work.NetworkType;
diff --git a/work/workmanager-test/src/androidTest/java/androidx/work/test/WorkManagerInitHelperTest.java b/work/workmanager-test/src/androidTest/java/androidx/work/test/WorkManagerInitHelperTest.java
index 497e235..2a465fb 100644
--- a/work/workmanager-test/src/androidTest/java/androidx/work/test/WorkManagerInitHelperTest.java
+++ b/work/workmanager-test/src/androidTest/java/androidx/work/test/WorkManagerInitHelperTest.java
@@ -21,9 +21,9 @@
import static org.hamcrest.MatcherAssert.assertThat;
import android.content.Context;
-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 androidx.work.WorkManager;
import androidx.work.impl.WorkManagerImpl;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/DatabaseTest.java b/work/workmanager/src/androidTest/java/androidx/work/DatabaseTest.java
index 0c0f865..56b3631 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/DatabaseTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/DatabaseTest.java
@@ -16,8 +16,7 @@
package androidx.work;
-import android.support.test.InstrumentationRegistry;
-
+import androidx.test.InstrumentationRegistry;
import androidx.work.impl.WorkDatabase;
import org.junit.After;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/PeriodicWorkTest.java b/work/workmanager/src/androidTest/java/androidx/work/PeriodicWorkTest.java
index f25e8ff..3cc6216 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/PeriodicWorkTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/PeriodicWorkTest.java
@@ -18,10 +18,9 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.worker.TestWorker;
import org.junit.Rule;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/WorkDatabaseMigrationTest.java b/work/workmanager/src/androidTest/java/androidx/work/WorkDatabaseMigrationTest.java
index 0cba3cf..0105889 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/WorkDatabaseMigrationTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/WorkDatabaseMigrationTest.java
@@ -36,10 +36,10 @@
import android.database.sqlite.SQLiteException;
import android.os.Build;
import android.support.annotation.NonNull;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.impl.WorkDatabase;
import androidx.work.impl.WorkDatabaseMigrations;
import androidx.work.impl.WorkManagerImpl;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/WorkManagerTest.java b/work/workmanager/src/androidTest/java/androidx/work/WorkManagerTest.java
index 7fd469b..1771eaa 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/WorkManagerTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/WorkManagerTest.java
@@ -19,8 +19,8 @@
import android.app.job.JobScheduler;
import android.content.Context;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
+import androidx.test.InstrumentationRegistry;
import androidx.work.impl.WorkManagerImpl;
import androidx.work.impl.model.WorkSpec;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/WorkSpecDaoTest.java b/work/workmanager/src/androidTest/java/androidx/work/WorkSpecDaoTest.java
index 6dd23cb..c2437bd 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/WorkSpecDaoTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/WorkSpecDaoTest.java
@@ -27,9 +27,8 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.impl.model.WorkSpec;
import androidx.work.impl.model.WorkSpecDao;
import androidx.work.worker.TestWorker;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/WorkSpecTest.java b/work/workmanager/src/androidTest/java/androidx/work/WorkSpecTest.java
index 6385b1c..5cfde80 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/WorkSpecTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/WorkSpecTest.java
@@ -20,9 +20,8 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.greaterThan;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.worker.InfiniteTestWorker;
import org.junit.Test;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/WorkTest.java b/work/workmanager/src/androidTest/java/androidx/work/WorkTest.java
index 93ae792..8f37d02 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/WorkTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/WorkTest.java
@@ -19,9 +19,8 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
import androidx.work.worker.TestWorker;
import org.junit.Before;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/ProcessorTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/ProcessorTest.java
index 1e178b1..e4d9b27 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/ProcessorTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/ProcessorTest.java
@@ -21,10 +21,10 @@
import static org.mockito.Mockito.mock;
import android.content.Context;
-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 androidx.work.Configuration;
import androidx.work.DatabaseTest;
import androidx.work.OneTimeWorkRequest;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/SchedulersTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/SchedulersTest.java
index d579394..358a7ee 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/SchedulersTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/SchedulersTest.java
@@ -25,11 +25,11 @@
import android.content.Context;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.impl.background.systemalarm.SystemAlarmScheduler;
import androidx.work.impl.background.systemalarm.SystemAlarmService;
import androidx.work.impl.background.systemjob.SystemJobScheduler;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/WorkContinuationImplTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/WorkContinuationImplTest.java
index f4a3a7b..e947e99 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/WorkContinuationImplTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/WorkContinuationImplTest.java
@@ -33,11 +33,11 @@
import android.arch.lifecycle.Lifecycle;
import android.content.Context;
import android.support.annotation.NonNull;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.Configuration;
import androidx.work.Data;
import androidx.work.OneTimeWorkRequest;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/WorkManagerImplLargeExecutorTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/WorkManagerImplLargeExecutorTest.java
index 23996eb..84bda57 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/WorkManagerImplLargeExecutorTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/WorkManagerImplLargeExecutorTest.java
@@ -31,11 +31,11 @@
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.Configuration;
import androidx.work.Data;
import androidx.work.OneTimeWorkRequest;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/WorkManagerImplTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/WorkManagerImplTest.java
index 4e1dc8f..7b028a8 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/WorkManagerImplTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/WorkManagerImplTest.java
@@ -57,13 +57,13 @@
import android.os.Build;
import android.provider.MediaStore;
import android.support.annotation.NonNull;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.BackoffPolicy;
import androidx.work.Configuration;
import androidx.work.Constraints;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/WorkerWrapperTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/WorkerWrapperTest.java
index 44e65f8..b039f59 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/WorkerWrapperTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/WorkerWrapperTest.java
@@ -40,11 +40,11 @@
import android.content.Context;
import android.net.Uri;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.ArrayCreatingInputMerger;
import androidx.work.Configuration;
import androidx.work.Data;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/background/greedy/GreedySchedulerTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/background/greedy/GreedySchedulerTest.java
index 0e4d16a..8d7f5f4 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/background/greedy/GreedySchedulerTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/background/greedy/GreedySchedulerTest.java
@@ -23,9 +23,8 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.Constraints;
import androidx.work.OneTimeWorkRequest;
import androidx.work.PeriodicWorkRequest;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/AlarmsTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/AlarmsTest.java
index 7bcf52e..e3f133d 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/AlarmsTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/AlarmsTest.java
@@ -24,10 +24,10 @@
import static org.mockito.Mockito.when;
import android.content.Context;
-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 androidx.work.DatabaseTest;
import androidx.work.OneTimeWorkRequest;
import androidx.work.impl.WorkManagerImpl;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/SystemAlarmDispatcherTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/SystemAlarmDispatcherTest.java
index 2944087..9a383cb 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/SystemAlarmDispatcherTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/SystemAlarmDispatcherTest.java
@@ -29,11 +29,11 @@
import android.content.Intent;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.Configuration;
import androidx.work.Constraints;
import androidx.work.DatabaseTest;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/WorkTimerTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/WorkTimerTest.java
index 700071a..5ff8d94 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/WorkTimerTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/WorkTimerTest.java
@@ -23,8 +23,9 @@
import static org.mockito.Mockito.verify;
import android.support.annotation.NonNull;
-import android.support.test.filters.LargeTest;
-import android.support.test.runner.AndroidJUnit4;
+
+import androidx.test.filters.LargeTest;
+import androidx.test.runner.AndroidJUnit4;
import org.junit.Before;
import org.junit.Test;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobInfoConverterTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobInfoConverterTest.java
index b0d499e..33a4b05 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobInfoConverterTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobInfoConverterTest.java
@@ -29,11 +29,11 @@
import android.app.job.JobInfo;
import android.net.Uri;
import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.BackoffPolicy;
import androidx.work.Constraints;
import androidx.work.NetworkType;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobSchedulerTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobSchedulerTest.java
index 44f82d5..26aaefe 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobSchedulerTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobSchedulerTest.java
@@ -36,11 +36,11 @@
import android.app.job.JobScheduler;
import android.content.Context;
import android.os.PersistableBundle;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.Configuration;
import androidx.work.OneTimeWorkRequest;
import androidx.work.WorkManagerTest;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobServiceTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobServiceTest.java
index 2bb1271..3d45462 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobServiceTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobServiceTest.java
@@ -16,7 +16,7 @@
package androidx.work.impl.background.systemjob;
-import static android.support.test.espresso.matcher.ViewMatchers.assertThat;
+import static androidx.test.espresso.matcher.ViewMatchers.assertThat;
import static org.hamcrest.CoreMatchers.is;
import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -35,12 +35,12 @@
import android.os.Build;
import android.os.PersistableBundle;
import android.support.annotation.NonNull;
-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.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.Configuration;
import androidx.work.OneTimeWorkRequest;
import androidx.work.State;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/WorkConstraintsTrackerTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/WorkConstraintsTrackerTest.java
index 0e693d4..eafda8c 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/WorkConstraintsTrackerTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/WorkConstraintsTrackerTest.java
@@ -25,9 +25,9 @@
import static org.mockito.Mockito.when;
import android.support.annotation.NonNull;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.impl.constraints.controllers.ConstraintController;
import androidx.work.impl.model.WorkSpec;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/controllers/ConstraintControllerTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/controllers/ConstraintControllerTest.java
index 116670f..f65d2ab 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/controllers/ConstraintControllerTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/controllers/ConstraintControllerTest.java
@@ -25,10 +25,10 @@
import static org.mockito.Mockito.verifyZeroInteractions;
import android.support.annotation.NonNull;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.Constraints;
import androidx.work.OneTimeWorkRequest;
import androidx.work.WorkManagerTest;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/BatteryChargingTrackerTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/BatteryChargingTrackerTest.java
index aa7d378..b23bb9f 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/BatteryChargingTrackerTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/BatteryChargingTrackerTest.java
@@ -35,11 +35,11 @@
import android.os.BatteryManager;
import android.os.Build;
import android.support.annotation.RequiresApi;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.impl.constraints.ConstraintListener;
import org.junit.Before;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/BatteryNotLowTrackerTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/BatteryNotLowTrackerTest.java
index a3c8f0b2..6313bea 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/BatteryNotLowTrackerTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/BatteryNotLowTrackerTest.java
@@ -32,9 +32,9 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.os.BatteryManager;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.impl.constraints.ConstraintListener;
import org.junit.Before;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/ConstraintTrackerTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/ConstraintTrackerTest.java
index cbee74f..d7841af 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/ConstraintTrackerTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/ConstraintTrackerTest.java
@@ -23,9 +23,9 @@
import static org.mockito.Mockito.when;
import android.content.Context;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.impl.constraints.ConstraintListener;
import org.junit.After;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/NetworkStateTrackerTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/NetworkStateTrackerTest.java
index 40bd59b..8416a49 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/NetworkStateTrackerTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/NetworkStateTrackerTest.java
@@ -27,10 +27,10 @@
import android.content.Context;
import android.content.IntentFilter;
import android.net.ConnectivityManager;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.impl.constraints.NetworkState;
import org.junit.Before;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/StorageNotLowTrackerTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/StorageNotLowTrackerTest.java
index 05626a1..23b3a01 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/StorageNotLowTrackerTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/constraints/trackers/StorageNotLowTrackerTest.java
@@ -30,9 +30,9 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.impl.constraints.ConstraintListener;
import org.junit.Before;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/utils/EnqueueRunnableTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/utils/EnqueueRunnableTest.java
index 23669e2..b1e0ab4 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/utils/EnqueueRunnableTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/utils/EnqueueRunnableTest.java
@@ -23,9 +23,8 @@
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.impl.WorkContinuationImpl;
import org.junit.Before;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/utils/ForceStopRunnableTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/utils/ForceStopRunnableTest.java
index 3d6b4c0..ced3a8e 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/utils/ForceStopRunnableTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/utils/ForceStopRunnableTest.java
@@ -27,10 +27,10 @@
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
-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 androidx.work.impl.WorkDatabase;
import androidx.work.impl.WorkManagerImpl;
import androidx.work.impl.model.WorkSpecDao;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/utils/IdGeneratorTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/utils/IdGeneratorTest.java
index f7416a2..2ba2a9f 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/utils/IdGeneratorTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/utils/IdGeneratorTest.java
@@ -29,10 +29,10 @@
import android.content.Context;
import android.content.SharedPreferences;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.impl.WorkManagerImpl;
import org.junit.Before;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/utils/LiveDataUtilsTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/utils/LiveDataUtilsTest.java
index 9a0526a..dedbeba 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/utils/LiveDataUtilsTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/utils/LiveDataUtilsTest.java
@@ -26,9 +26,9 @@
import android.arch.lifecycle.MutableLiveData;
import android.arch.lifecycle.Observer;
import android.support.annotation.Nullable;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.TestLifecycleOwner;
import org.junit.Rule;
diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/workers/ConstraintTrackingWorkerTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/workers/ConstraintTrackingWorkerTest.java
index 6f136bf..dc3aa73 100644
--- a/work/workmanager/src/androidTest/java/androidx/work/impl/workers/ConstraintTrackingWorkerTest.java
+++ b/work/workmanager/src/androidTest/java/androidx/work/impl/workers/ConstraintTrackingWorkerTest.java
@@ -26,11 +26,11 @@
import android.os.Handler;
import android.os.Looper;
import android.support.annotation.NonNull;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.SdkSuppress;
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
import androidx.work.Configuration;
import androidx.work.Constraints;
import androidx.work.Data;
