diff options
91 files changed, 301 insertions, 255 deletions
diff --git a/perf-tests/Android.bp b/perf-tests/Android.bp index 4a509d545..963a6da6c 100644 --- a/perf-tests/Android.bp +++ b/perf-tests/Android.bp @@ -20,7 +20,7 @@ android_test { static_libs: [ "androidx.legacy_legacy-support-v4", - "espresso-core", + "androidx.test.espresso.core", "mockito-target", "ub-janktesthelper", "ub-uiautomator", diff --git a/tests/Android.bp b/tests/Android.bp index 9d6a11673..d6247016b 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -32,8 +32,8 @@ android_test { ], static_libs: [ - "android-support-test", - "espresso-core", + "androidx.test.rules", + "androidx.test.espresso.core", "guava", "mockito-target", "truth-prebuilt", diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index 082dad68d..69513b5b7 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -136,7 +136,7 @@ </application> - <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner" + <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.documentsui" android:label="Tests for DocumentsUI" /> diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml index 07968aec0..7893150d0 100644 --- a/tests/AndroidTest.xml +++ b/tests/AndroidTest.xml @@ -22,7 +22,7 @@ <option name="test-tag" value="DocumentsUITests" /> <test class="com.android.tradefed.testtype.AndroidJUnitTest" > <option name="package" value="com.android.documentsui.tests" /> - <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" /> + <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" /> <option name="hidden-api-checks" value="false"/> </test> </configuration> diff --git a/tests/README b/tests/README index 711237655..d8ea236cb 100644 --- a/tests/README +++ b/tests/README @@ -8,6 +8,6 @@ device has SD Card slot. If SD Card is not inserted or supported, the test creat and uses it instead. To run just small tests" -adb shell am instrument -w -e debug false -e log false -e timeout_msec 300000 -e size small com.android.documentsui.tests/android.support.test.runner.AndroidJUnitRunner +adb shell am instrument -w -e debug false -e log false -e timeout_msec 300000 -e size small com.android.documentsui.tests/androidx.test.runner.AndroidJUnitRunner Replace '-e size small' with '-e size large'. diff --git a/tests/common/com/android/documentsui/bots/BreadBot.java b/tests/common/com/android/documentsui/bots/BreadBot.java index 7ec64e28e..23a4f812b 100644 --- a/tests/common/com/android/documentsui/bots/BreadBot.java +++ b/tests/common/com/android/documentsui/bots/BreadBot.java @@ -16,23 +16,25 @@ package com.android.documentsui.bots; -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.ViewMatchers.isAssignableFrom; -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.ViewMatchers.isAssignableFrom; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; + import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.is; import android.content.Context; -import android.support.test.espresso.ViewInteraction; -import android.support.test.espresso.matcher.BoundedMatcher; import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.UiObjectNotFoundException; import android.view.View; +import androidx.test.espresso.ViewInteraction; +import androidx.test.espresso.matcher.BoundedMatcher; + import com.android.documentsui.DragOverTextView; import com.android.documentsui.DropdownBreadcrumb; import com.android.documentsui.R; diff --git a/tests/common/com/android/documentsui/bots/KeyboardBot.java b/tests/common/com/android/documentsui/bots/KeyboardBot.java index 2e715777c..6167acfc0 100644 --- a/tests/common/com/android/documentsui/bots/KeyboardBot.java +++ b/tests/common/com/android/documentsui/bots/KeyboardBot.java @@ -16,9 +16,9 @@ package com.android.documentsui.bots; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.pressImeActionButton; -import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.pressImeActionButton; +import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom; import android.content.Context; import android.support.test.uiautomator.UiDevice; diff --git a/tests/common/com/android/documentsui/bots/Matchers.java b/tests/common/com/android/documentsui/bots/Matchers.java index 9d33adc48..9fc676e19 100644 --- a/tests/common/com/android/documentsui/bots/Matchers.java +++ b/tests/common/com/android/documentsui/bots/Matchers.java @@ -16,13 +16,14 @@ package com.android.documentsui.bots; -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.isDisplayed; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; -import android.support.test.espresso.ViewInteraction; import android.view.View; +import androidx.test.espresso.ViewInteraction; + import junit.framework.AssertionFailedError; import org.hamcrest.Matcher; diff --git a/tests/common/com/android/documentsui/bots/NotificationsBot.java b/tests/common/com/android/documentsui/bots/NotificationsBot.java index 363726c42..5ab872df5 100644 --- a/tests/common/com/android/documentsui/bots/NotificationsBot.java +++ b/tests/common/com/android/documentsui/bots/NotificationsBot.java @@ -19,9 +19,10 @@ package com.android.documentsui.bots; import android.app.Activity; import android.content.ComponentName; import android.content.Context; -import android.support.test.InstrumentationRegistry; import android.support.test.uiautomator.UiDevice; +import androidx.test.InstrumentationRegistry; + import com.android.documentsui.services.TestNotificationService; import java.io.IOException; diff --git a/tests/common/com/android/documentsui/bots/SearchBot.java b/tests/common/com/android/documentsui/bots/SearchBot.java index 0e2b7b132..b26025efd 100644 --- a/tests/common/com/android/documentsui/bots/SearchBot.java +++ b/tests/common/com/android/documentsui/bots/SearchBot.java @@ -16,15 +16,17 @@ package com.android.documentsui.bots; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.typeText; -import static android.support.test.espresso.matcher.ViewMatchers.hasDescendant; -import static android.support.test.espresso.matcher.ViewMatchers.isClickable; -import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.typeText; +import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant; +import static androidx.test.espresso.matcher.ViewMatchers.isClickable; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.withId; + import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.anyOf; @@ -32,9 +34,10 @@ import android.content.Context; import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.UiObject; import android.support.test.uiautomator.UiObjectNotFoundException; -import androidx.recyclerview.R; import android.view.View; +import androidx.recyclerview.R; + import org.hamcrest.Matcher; /** diff --git a/tests/common/com/android/documentsui/bots/SidebarBot.java b/tests/common/com/android/documentsui/bots/SidebarBot.java index 9d95a93a0..0e9fe8eda 100644 --- a/tests/common/com/android/documentsui/bots/SidebarBot.java +++ b/tests/common/com/android/documentsui/bots/SidebarBot.java @@ -16,10 +16,10 @@ package com.android.documentsui.bots; -import static android.support.test.espresso.Espresso.onView; -import static android.support.test.espresso.action.ViewActions.swipeLeft; -import static android.support.test.espresso.action.ViewActions.swipeRight; -import static android.support.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.swipeLeft; +import static androidx.test.espresso.action.ViewActions.swipeRight; +import static androidx.test.espresso.matcher.ViewMatchers.withId; import android.content.Context; import android.support.test.uiautomator.UiDevice; diff --git a/tests/common/com/android/documentsui/bots/SortBot.java b/tests/common/com/android/documentsui/bots/SortBot.java index 291f428d7..6b6f81788 100644 --- a/tests/common/com/android/documentsui/bots/SortBot.java +++ b/tests/common/com/android/documentsui/bots/SortBot.java @@ -16,14 +16,14 @@ package com.android.documentsui.bots; -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.withChild; -import static android.support.test.espresso.matcher.ViewMatchers.withContentDescription; -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.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.withChild; +import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription; +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 com.android.documentsui.sorting.SortDimension.SORT_DIRECTION_ASCENDING; diff --git a/tests/common/com/android/documentsui/bots/UiBot.java b/tests/common/com/android/documentsui/bots/UiBot.java index 0d28c058c..241a0a81b 100644 --- a/tests/common/com/android/documentsui/bots/UiBot.java +++ b/tests/common/com/android/documentsui/bots/UiBot.java @@ -16,25 +16,23 @@ package com.android.documentsui.bots; -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.ViewMatchers.hasFocus; -import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom; -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.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.assertion.ViewAssertions.matches; +import static androidx.test.espresso.matcher.ViewMatchers.hasFocus; +import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom; +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 junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; + import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.endsWith; import android.content.Context; -import android.support.test.espresso.Espresso; -import android.support.test.espresso.action.ViewActions; -import android.support.test.espresso.matcher.BoundedMatcher; -import android.support.test.espresso.matcher.ViewMatchers; import android.support.test.uiautomator.By; import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.UiObject; @@ -46,6 +44,10 @@ import android.util.TypedValue; import android.view.View; import androidx.appcompat.widget.Toolbar; +import androidx.test.espresso.Espresso; +import androidx.test.espresso.action.ViewActions; +import androidx.test.espresso.matcher.BoundedMatcher; +import androidx.test.espresso.matcher.ViewMatchers; import com.android.documentsui.R; diff --git a/tests/common/com/android/documentsui/testing/TestEnv.java b/tests/common/com/android/documentsui/testing/TestEnv.java index d30453649..6ddd0470a 100644 --- a/tests/common/com/android/documentsui/testing/TestEnv.java +++ b/tests/common/com/android/documentsui/testing/TestEnv.java @@ -17,9 +17,10 @@ package com.android.documentsui.testing; import android.content.Context; import android.provider.DocumentsContract.Document; -import android.support.test.InstrumentationRegistry; import android.test.mock.MockContentResolver; +import androidx.test.InstrumentationRegistry; + import com.android.documentsui.DocsSelectionHelper; import com.android.documentsui.FocusManager; import com.android.documentsui.Injector; diff --git a/tests/common/com/android/documentsui/testing/TestMenuInflater.java b/tests/common/com/android/documentsui/testing/TestMenuInflater.java index 1b8f09371..27a8aa458 100644 --- a/tests/common/com/android/documentsui/testing/TestMenuInflater.java +++ b/tests/common/com/android/documentsui/testing/TestMenuInflater.java @@ -16,11 +16,12 @@ package com.android.documentsui.testing; -import androidx.annotation.MenuRes; -import android.support.test.InstrumentationRegistry; import android.view.Menu; import android.view.MenuInflater; +import androidx.annotation.MenuRes; +import androidx.test.InstrumentationRegistry; + public class TestMenuInflater extends MenuInflater { public int lastInflatedMenuId; diff --git a/tests/common/com/android/documentsui/testing/TestRecyclerView.java b/tests/common/com/android/documentsui/testing/TestRecyclerView.java index d5adc6676..e209d94ad 100644 --- a/tests/common/com/android/documentsui/testing/TestRecyclerView.java +++ b/tests/common/com/android/documentsui/testing/TestRecyclerView.java @@ -17,10 +17,11 @@ package com.android.documentsui.testing; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; +import androidx.recyclerview.widget.RecyclerView; +import androidx.test.InstrumentationRegistry; + import com.android.documentsui.dirlist.TestDocumentsAdapter; import org.mockito.Mockito; @@ -28,7 +29,6 @@ import org.mockito.Mockito; import java.util.ArrayList; import java.util.List; - public class TestRecyclerView extends RecyclerView { private List<RecyclerView.ViewHolder> holders = new ArrayList<>(); diff --git a/tests/functional/com/android/documentsui/ArchiveUiTest.java b/tests/functional/com/android/documentsui/ArchiveUiTest.java index 5c1be72bd..b3bebb62e 100644 --- a/tests/functional/com/android/documentsui/ArchiveUiTest.java +++ b/tests/functional/com/android/documentsui/ArchiveUiTest.java @@ -16,7 +16,7 @@ package com.android.documentsui; -import android.support.test.filters.LargeTest; +import androidx.test.filters.LargeTest; import com.android.documentsui.files.FilesActivity; diff --git a/tests/functional/com/android/documentsui/BandSelectionUiTest.java b/tests/functional/com/android/documentsui/BandSelectionUiTest.java index be2554b48..81b703cec 100644 --- a/tests/functional/com/android/documentsui/BandSelectionUiTest.java +++ b/tests/functional/com/android/documentsui/BandSelectionUiTest.java @@ -18,7 +18,8 @@ package com.android.documentsui; import android.graphics.Point; import android.graphics.Rect; -import android.support.test.filters.LargeTest; + +import androidx.test.filters.LargeTest; import com.android.documentsui.files.FilesActivity; diff --git a/tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java b/tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java index 3351308d5..1d7bfc937 100644 --- a/tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java +++ b/tests/functional/com/android/documentsui/CancelFromNotificationUiTest.java @@ -27,9 +27,10 @@ import android.content.IntentFilter; import android.net.Uri; import android.os.Bundle; import android.os.RemoteException; -import android.support.test.filters.LargeTest; import android.util.Log; +import androidx.test.filters.LargeTest; + import com.android.documentsui.files.FilesActivity; import com.android.documentsui.services.TestNotificationService; diff --git a/tests/functional/com/android/documentsui/ContextMenuUiTest.java b/tests/functional/com/android/documentsui/ContextMenuUiTest.java index 8f4fedbaa..eb0653865 100644 --- a/tests/functional/com/android/documentsui/ContextMenuUiTest.java +++ b/tests/functional/com/android/documentsui/ContextMenuUiTest.java @@ -20,7 +20,8 @@ import android.graphics.Point; import android.graphics.Rect; import android.net.Uri; import android.os.RemoteException; -import android.support.test.filters.LargeTest; + +import androidx.test.filters.LargeTest; import com.android.documentsui.files.FilesActivity; diff --git a/tests/functional/com/android/documentsui/DirectoryMessagesUiTest.java b/tests/functional/com/android/documentsui/DirectoryMessagesUiTest.java index fda130817..93eefd2fd 100644 --- a/tests/functional/com/android/documentsui/DirectoryMessagesUiTest.java +++ b/tests/functional/com/android/documentsui/DirectoryMessagesUiTest.java @@ -16,7 +16,7 @@ package com.android.documentsui; -import android.support.test.filters.LargeTest; +import androidx.test.filters.LargeTest; import com.android.documentsui.files.FilesActivity; diff --git a/tests/functional/com/android/documentsui/FileCopyUiTest.java b/tests/functional/com/android/documentsui/FileCopyUiTest.java index 96b66909e..ef2aa1653 100644 --- a/tests/functional/com/android/documentsui/FileCopyUiTest.java +++ b/tests/functional/com/android/documentsui/FileCopyUiTest.java @@ -20,8 +20,8 @@ import static com.android.documentsui.base.Providers.AUTHORITY_STORAGE; import static com.android.documentsui.base.Providers.ROOT_ID_DEVICE; import android.content.BroadcastReceiver; -import android.content.Context; import android.content.ContentProviderClient; +import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.res.Resources; @@ -31,21 +31,22 @@ import android.os.Bundle; import android.os.RemoteException; import android.os.SystemClock; import android.provider.Settings; -import android.support.test.filters.LargeTest; import android.text.TextUtils; import android.util.Log; +import androidx.test.filters.LargeTest; + import com.android.documentsui.base.DocumentInfo; import com.android.documentsui.base.RootInfo; import com.android.documentsui.base.State; import com.android.documentsui.files.FilesActivity; import com.android.documentsui.services.TestNotificationService; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; diff --git a/tests/functional/com/android/documentsui/FileDeleteUiTest.java b/tests/functional/com/android/documentsui/FileDeleteUiTest.java index fbeaf3463..717b749ab 100644 --- a/tests/functional/com/android/documentsui/FileDeleteUiTest.java +++ b/tests/functional/com/android/documentsui/FileDeleteUiTest.java @@ -25,19 +25,20 @@ import android.content.IntentFilter; import android.net.Uri; import android.os.Bundle; import android.os.RemoteException; -import android.support.test.filters.LargeTest; import android.util.Log; +import androidx.test.filters.LargeTest; + import com.android.documentsui.base.DocumentInfo; import com.android.documentsui.files.FilesActivity; import com.android.documentsui.services.TestNotificationService; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import java.util.List; -import java.util.ArrayList; /** * This class test the below points diff --git a/tests/functional/com/android/documentsui/FileManagementUiTest.java b/tests/functional/com/android/documentsui/FileManagementUiTest.java index 5b91ae8a5..e03bdf2a2 100644 --- a/tests/functional/com/android/documentsui/FileManagementUiTest.java +++ b/tests/functional/com/android/documentsui/FileManagementUiTest.java @@ -22,10 +22,11 @@ import static com.android.documentsui.StubProvider.ROOT_1_ID; import android.net.Uri; import android.os.Bundle; import android.os.RemoteException; -import android.support.test.filters.LargeTest; -import android.support.test.filters.Suppress; import android.view.KeyEvent; +import androidx.test.filters.LargeTest; +import androidx.test.filters.Suppress; + import com.android.documentsui.base.DocumentInfo; import com.android.documentsui.base.Shared; import com.android.documentsui.files.FilesActivity; diff --git a/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java b/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java index 0f918cac9..d056612f2 100644 --- a/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java +++ b/tests/functional/com/android/documentsui/FilesActivityDefaultsUiTest.java @@ -20,8 +20,9 @@ import static com.android.documentsui.StubProvider.ROOT_0_ID; import static com.android.documentsui.StubProvider.ROOT_1_ID; import android.os.RemoteException; -import android.support.test.filters.LargeTest; + import androidx.recyclerview.R; +import androidx.test.filters.LargeTest; import com.android.documentsui.base.RootInfo; import com.android.documentsui.base.Shared; diff --git a/tests/functional/com/android/documentsui/FilesActivityUiTest.java b/tests/functional/com/android/documentsui/FilesActivityUiTest.java index 4577fb2e3..16665c0ef 100644 --- a/tests/functional/com/android/documentsui/FilesActivityUiTest.java +++ b/tests/functional/com/android/documentsui/FilesActivityUiTest.java @@ -19,7 +19,8 @@ package com.android.documentsui; import android.app.Instrumentation; import android.net.Uri; import android.os.RemoteException; -import android.support.test.filters.LargeTest; + +import androidx.test.filters.LargeTest; import com.android.documentsui.files.FilesActivity; import com.android.documentsui.inspector.InspectorActivity; diff --git a/tests/functional/com/android/documentsui/GestureSelectionUiTest.java b/tests/functional/com/android/documentsui/GestureSelectionUiTest.java index a8a1aeca4..4c2b40391 100644 --- a/tests/functional/com/android/documentsui/GestureSelectionUiTest.java +++ b/tests/functional/com/android/documentsui/GestureSelectionUiTest.java @@ -16,7 +16,7 @@ package com.android.documentsui; -import android.support.test.filters.LargeTest; +import androidx.test.filters.LargeTest; import com.android.documentsui.files.FilesActivity; diff --git a/tests/functional/com/android/documentsui/InspectorUiTest.java b/tests/functional/com/android/documentsui/InspectorUiTest.java index e18875cfd..8879f1c2d 100644 --- a/tests/functional/com/android/documentsui/InspectorUiTest.java +++ b/tests/functional/com/android/documentsui/InspectorUiTest.java @@ -18,7 +18,8 @@ package com.android.documentsui; import android.content.Intent; import android.net.Uri; import android.provider.DocumentsContract; -import android.support.test.filters.LargeTest; + +import androidx.test.filters.LargeTest; import com.android.documentsui.bots.UiBot; import com.android.documentsui.inspector.InspectorActivity; diff --git a/tests/functional/com/android/documentsui/IntegratedDownloadsUiTest.java b/tests/functional/com/android/documentsui/IntegratedDownloadsUiTest.java index 62e5fb601..9302e52aa 100644 --- a/tests/functional/com/android/documentsui/IntegratedDownloadsUiTest.java +++ b/tests/functional/com/android/documentsui/IntegratedDownloadsUiTest.java @@ -20,12 +20,13 @@ import android.app.DownloadManager; import android.app.DownloadManager.Request; import android.content.Context; import android.net.Uri; -import android.support.test.filters.LargeTest; -import android.support.test.filters.Suppress; import android.support.test.uiautomator.Configurator; import android.support.test.uiautomator.UiObject; import android.view.MotionEvent; +import androidx.test.filters.LargeTest; +import androidx.test.filters.Suppress; + import com.android.documentsui.files.FilesActivity; // TODO: As of this writing all tests in this class are disabled. Please fix. diff --git a/tests/functional/com/android/documentsui/InternalStorageUiTest.java b/tests/functional/com/android/documentsui/InternalStorageUiTest.java index deceb8d0c..d6a0c61cc 100644 --- a/tests/functional/com/android/documentsui/InternalStorageUiTest.java +++ b/tests/functional/com/android/documentsui/InternalStorageUiTest.java @@ -16,7 +16,7 @@ package com.android.documentsui; -import android.support.test.filters.LargeTest; +import androidx.test.filters.LargeTest; import com.android.documentsui.base.Providers; import com.android.documentsui.base.RootInfo; diff --git a/tests/functional/com/android/documentsui/KeyboardNavigationUiTest.java b/tests/functional/com/android/documentsui/KeyboardNavigationUiTest.java index cef7913b4..91364fa92 100644 --- a/tests/functional/com/android/documentsui/KeyboardNavigationUiTest.java +++ b/tests/functional/com/android/documentsui/KeyboardNavigationUiTest.java @@ -17,10 +17,11 @@ package com.android.documentsui; import android.os.RemoteException; -import android.support.test.filters.LargeTest; -import android.support.test.filters.Suppress; import android.view.KeyEvent; +import androidx.test.filters.LargeTest; +import androidx.test.filters.Suppress; + import com.android.documentsui.files.FilesActivity; @LargeTest diff --git a/tests/functional/com/android/documentsui/RenameDocumentUiTest.java b/tests/functional/com/android/documentsui/RenameDocumentUiTest.java index 90f1a828e..58b2e5810 100644 --- a/tests/functional/com/android/documentsui/RenameDocumentUiTest.java +++ b/tests/functional/com/android/documentsui/RenameDocumentUiTest.java @@ -16,9 +16,10 @@ package com.android.documentsui; -import android.support.test.filters.LargeTest; import android.support.test.uiautomator.UiObjectNotFoundException; +import androidx.test.filters.LargeTest; + import com.android.documentsui.files.FilesActivity; @LargeTest diff --git a/tests/functional/com/android/documentsui/SearchViewUiTest.java b/tests/functional/com/android/documentsui/SearchViewUiTest.java index e84136149..8806c9960 100644 --- a/tests/functional/com/android/documentsui/SearchViewUiTest.java +++ b/tests/functional/com/android/documentsui/SearchViewUiTest.java @@ -19,9 +19,9 @@ package com.android.documentsui; import static com.android.documentsui.StubProvider.ROOT_0_ID; import static com.android.documentsui.StubProvider.ROOT_1_ID; -import android.support.test.filters.LargeTest; -import android.support.test.filters.Suppress; import androidx.recyclerview.R; +import androidx.test.filters.LargeTest; +import androidx.test.filters.Suppress; import com.android.documentsui.files.FilesActivity; diff --git a/tests/functional/com/android/documentsui/SidebarUiTest.java b/tests/functional/com/android/documentsui/SidebarUiTest.java index c21c853f3..816ef04a4 100644 --- a/tests/functional/com/android/documentsui/SidebarUiTest.java +++ b/tests/functional/com/android/documentsui/SidebarUiTest.java @@ -19,8 +19,8 @@ package com.android.documentsui; import static com.android.documentsui.StubProvider.ROOT_0_ID; import static com.android.documentsui.StubProvider.ROOT_1_ID; -import android.support.test.filters.LargeTest; -import android.support.test.filters.Suppress; +import androidx.test.filters.LargeTest; +import androidx.test.filters.Suppress; import com.android.documentsui.files.FilesActivity; diff --git a/tests/functional/com/android/documentsui/SortDocumentUiTest.java b/tests/functional/com/android/documentsui/SortDocumentUiTest.java index f0e6f9cbe..05878bbe7 100644 --- a/tests/functional/com/android/documentsui/SortDocumentUiTest.java +++ b/tests/functional/com/android/documentsui/SortDocumentUiTest.java @@ -17,7 +17,8 @@ package com.android.documentsui; import android.net.Uri; -import android.support.test.filters.LargeTest; + +import androidx.test.filters.LargeTest; import com.android.documentsui.files.FilesActivity; import com.android.documentsui.sorting.SortDimension; diff --git a/tests/unit/com/android/documentsui/AbstractActionHandlerTest.java b/tests/unit/com/android/documentsui/AbstractActionHandlerTest.java index cb18279ad..4012bdd0c 100644 --- a/tests/unit/com/android/documentsui/AbstractActionHandlerTest.java +++ b/tests/unit/com/android/documentsui/AbstractActionHandlerTest.java @@ -18,6 +18,7 @@ package com.android.documentsui; import static junit.framework.Assert.assertTrue; import static junit.framework.Assert.fail; + import static org.junit.Assert.assertEquals; import android.content.Intent; @@ -25,10 +26,10 @@ import android.net.Uri; import android.os.Parcelable; import android.provider.DocumentsContract; import android.provider.DocumentsContract.Path; -import android.support.test.filters.MediumTest; -import android.support.test.runner.AndroidJUnit4; import androidx.recyclerview.selection.ItemDetailsLookup.ItemDetails; +import androidx.test.filters.MediumTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.base.DocumentStack; import com.android.documentsui.base.RootInfo; diff --git a/tests/unit/com/android/documentsui/DocsSelectionHelperTest.java b/tests/unit/com/android/documentsui/DocsSelectionHelperTest.java index de536f581..c06201b9f 100644 --- a/tests/unit/com/android/documentsui/DocsSelectionHelperTest.java +++ b/tests/unit/com/android/documentsui/DocsSelectionHelperTest.java @@ -21,11 +21,10 @@ import static org.junit.Assert.assertFalse; 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.recyclerview.selection.Selection; import androidx.recyclerview.selection.SelectionTracker; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.DocsSelectionHelper.DelegateFactory; diff --git a/tests/unit/com/android/documentsui/DragAndDropManagerTests.java b/tests/unit/com/android/documentsui/DragAndDropManagerTests.java index deea97137..3c30bf391 100644 --- a/tests/unit/com/android/documentsui/DragAndDropManagerTests.java +++ b/tests/unit/com/android/documentsui/DragAndDropManagerTests.java @@ -26,14 +26,15 @@ import android.content.ClipData; import android.content.ClipDescription; import android.graphics.drawable.Drawable; import android.os.PersistableBundle; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.Pair; import android.view.KeyEvent; import android.view.View; -import com.android.documentsui.DragAndDropManager.State; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.documentsui.DragAndDropManager.RuntimeDragAndDropManager; +import com.android.documentsui.DragAndDropManager.State; import com.android.documentsui.base.DocumentStack; import com.android.documentsui.base.RootInfo; import com.android.documentsui.services.FileOperationService; diff --git a/tests/unit/com/android/documentsui/DragScrollListenerTest.java b/tests/unit/com/android/documentsui/DragScrollListenerTest.java index 029228bfa..9519cae10 100644 --- a/tests/unit/com/android/documentsui/DragScrollListenerTest.java +++ b/tests/unit/com/android/documentsui/DragScrollListenerTest.java @@ -18,11 +18,12 @@ package com.android.documentsui; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.DragEvent; import android.view.View; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.documentsui.ViewAutoScroller.ScrollerCallbacks; import com.android.documentsui.testing.DragEvents; import com.android.documentsui.testing.Views; diff --git a/tests/unit/com/android/documentsui/FileTypeMapTest.java b/tests/unit/com/android/documentsui/FileTypeMapTest.java index f564c2372..1d71431b2 100644 --- a/tests/unit/com/android/documentsui/FileTypeMapTest.java +++ b/tests/unit/com/android/documentsui/FileTypeMapTest.java @@ -18,12 +18,13 @@ package com.android.documentsui; import static junit.framework.Assert.assertEquals; -import androidx.annotation.StringRes; import android.content.Context; import android.content.res.Resources; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.annotation.StringRes; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import libcore.net.MimeUtils; diff --git a/tests/unit/com/android/documentsui/GlobalSearchLoaderTest.java b/tests/unit/com/android/documentsui/GlobalSearchLoaderTest.java index a0663f5f9..36a36ea7f 100644 --- a/tests/unit/com/android/documentsui/GlobalSearchLoaderTest.java +++ b/tests/unit/com/android/documentsui/GlobalSearchLoaderTest.java @@ -22,13 +22,12 @@ import static junit.framework.Assert.assertTrue; import android.database.Cursor; import android.provider.DocumentsContract; import android.provider.DocumentsContract.Document; -import android.support.test.filters.MediumTest; -import android.support.test.runner.AndroidJUnit4; -import android.text.TextUtils; + +import androidx.test.filters.MediumTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.base.DocumentInfo; import com.android.documentsui.base.State; -import com.android.documentsui.roots.RootCursorWrapper; import com.android.documentsui.sorting.SortDimension; import com.android.documentsui.sorting.SortModel; import com.android.documentsui.testing.ActivityManagers; diff --git a/tests/unit/com/android/documentsui/ItemDragListenerTest.java b/tests/unit/com/android/documentsui/ItemDragListenerTest.java index 2a5532e1a..94a867ac6 100644 --- a/tests/unit/com/android/documentsui/ItemDragListenerTest.java +++ b/tests/unit/com/android/documentsui/ItemDragListenerTest.java @@ -18,17 +18,17 @@ package com.android.documentsui; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import android.content.ClipData; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.DragEvent; import android.view.View; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.documentsui.testing.ClipDatas; import com.android.documentsui.testing.DragEvents; import com.android.documentsui.testing.TestDrawable; diff --git a/tests/unit/com/android/documentsui/MetricsTest.java b/tests/unit/com/android/documentsui/MetricsTest.java index c6beb345d..fea347124 100644 --- a/tests/unit/com/android/documentsui/MetricsTest.java +++ b/tests/unit/com/android/documentsui/MetricsTest.java @@ -1,13 +1,11 @@ package com.android.documentsui; -import static junit.framework.Assert.fail; - -import android.content.Context; import android.content.Intent; 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 com.android.documentsui.base.Providers; import com.android.documentsui.base.State; diff --git a/tests/unit/com/android/documentsui/ModelTest.java b/tests/unit/com/android/documentsui/ModelTest.java index 8d3a33ba2..7d44477c5 100644 --- a/tests/unit/com/android/documentsui/ModelTest.java +++ b/tests/unit/com/android/documentsui/ModelTest.java @@ -23,8 +23,9 @@ import android.database.Cursor; import android.database.MatrixCursor; import android.database.MergeCursor; import android.provider.DocumentsContract.Document; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.base.DocumentInfo; import com.android.documentsui.roots.RootCursorWrapper; diff --git a/tests/unit/com/android/documentsui/RecentsLoaderTests.java b/tests/unit/com/android/documentsui/RecentsLoaderTests.java index eb7528019..f044b92e1 100644 --- a/tests/unit/com/android/documentsui/RecentsLoaderTests.java +++ b/tests/unit/com/android/documentsui/RecentsLoaderTests.java @@ -22,8 +22,9 @@ import static junit.framework.Assert.assertTrue; import android.database.Cursor; import android.provider.DocumentsContract.Document; -import android.support.test.filters.MediumTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.MediumTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.base.DocumentInfo; import com.android.documentsui.base.State; diff --git a/tests/unit/com/android/documentsui/SharedInputHandlerTest.java b/tests/unit/com/android/documentsui/SharedInputHandlerTest.java index 4b6151969..d774b85f8 100644 --- a/tests/unit/com/android/documentsui/SharedInputHandlerTest.java +++ b/tests/unit/com/android/documentsui/SharedInputHandlerTest.java @@ -20,12 +20,12 @@ import static org.junit.Assert.assertEquals; 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.KeyEvent; import android.view.MotionEvent; import androidx.recyclerview.selection.SelectionTracker; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.base.Procedure; import com.android.documentsui.dirlist.TestFocusHandler; diff --git a/tests/unit/com/android/documentsui/ThumbnailCacheTest.java b/tests/unit/com/android/documentsui/ThumbnailCacheTest.java index ee6ab01c2..570cefccf 100644 --- a/tests/unit/com/android/documentsui/ThumbnailCacheTest.java +++ b/tests/unit/com/android/documentsui/ThumbnailCacheTest.java @@ -25,8 +25,9 @@ import android.content.ComponentCallbacks2; import android.graphics.Bitmap; import android.graphics.Point; import android.net.Uri; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.ThumbnailCache.Result; import com.android.documentsui.testing.Bitmaps; diff --git a/tests/unit/com/android/documentsui/ViewAutoScrollerTest.java b/tests/unit/com/android/documentsui/ViewAutoScrollerTest.java index b3426d30d..44ebadd89 100644 --- a/tests/unit/com/android/documentsui/ViewAutoScrollerTest.java +++ b/tests/unit/com/android/documentsui/ViewAutoScrollerTest.java @@ -20,8 +20,9 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import android.graphics.Point; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.ViewAutoScroller; import com.android.documentsui.ViewAutoScroller.ScrollHost; diff --git a/tests/unit/com/android/documentsui/archives/ArchivesProviderTest.java b/tests/unit/com/android/documentsui/archives/ArchivesProviderTest.java index cd7bda299..57fda37ce 100644 --- a/tests/unit/com/android/documentsui/archives/ArchivesProviderTest.java +++ b/tests/unit/com/android/documentsui/archives/ArchivesProviderTest.java @@ -34,17 +34,17 @@ import android.os.Bundle; import android.os.ParcelFileDescriptor; import android.os.RemoteException; import android.provider.DocumentsContract; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.MediumTest; -import android.support.test.runner.AndroidJUnit4; import android.text.TextUtils; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.MediumTest; +import androidx.test.runner.AndroidJUnit4; + import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import java.io.FileNotFoundException; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/tests/unit/com/android/documentsui/archives/ReadableArchiveTest.java b/tests/unit/com/android/documentsui/archives/ReadableArchiveTest.java index 49878db64..e786657ed 100644 --- a/tests/unit/com/android/documentsui/archives/ReadableArchiveTest.java +++ b/tests/unit/com/android/documentsui/archives/ReadableArchiveTest.java @@ -24,27 +24,28 @@ import android.database.Cursor; import android.net.Uri; import android.os.ParcelFileDescriptor; import android.provider.DocumentsContract.Document; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.MediumTest; -import android.support.test.runner.AndroidJUnit4; import android.system.ErrnoException; import android.system.Os; import android.system.OsConstants; import android.text.TextUtils; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.MediumTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.documentsui.tests.R; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + import java.io.IOException; import java.util.Scanner; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - @RunWith(AndroidJUnit4.class) @MediumTest public class ReadableArchiveTest { diff --git a/tests/unit/com/android/documentsui/archives/WriteableArchiveTest.java b/tests/unit/com/android/documentsui/archives/WriteableArchiveTest.java index 93383c0de..f066dc650 100644 --- a/tests/unit/com/android/documentsui/archives/WriteableArchiveTest.java +++ b/tests/unit/com/android/documentsui/archives/WriteableArchiveTest.java @@ -16,20 +16,18 @@ package com.android.documentsui.archives; -import com.android.documentsui.archives.WriteableArchive; -import com.android.documentsui.tests.R; - import android.database.Cursor; -import android.content.Context; import android.net.Uri; import android.os.ParcelFileDescriptor; import android.provider.DocumentsContract.Document; -import android.support.test.InstrumentationRegistry; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.MediumTest; +import androidx.test.InstrumentationRegistry; + +import com.android.documentsui.archives.WriteableArchive; + import java.io.File; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.util.Enumeration; diff --git a/tests/unit/com/android/documentsui/base/DocumentStackTest.java b/tests/unit/com/android/documentsui/base/DocumentStackTest.java index bce96a6e1..e2c0adc8c 100644 --- a/tests/unit/com/android/documentsui/base/DocumentStackTest.java +++ b/tests/unit/com/android/documentsui/base/DocumentStackTest.java @@ -22,8 +22,9 @@ import static junit.framework.TestCase.assertNull; import static junit.framework.TestCase.assertTrue; import android.provider.DocumentsContract; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.testing.Parcelables; diff --git a/tests/unit/com/android/documentsui/base/StateTest.java b/tests/unit/com/android/documentsui/base/StateTest.java index 1cbfc4953..9631ada2d 100644 --- a/tests/unit/com/android/documentsui/base/StateTest.java +++ b/tests/unit/com/android/documentsui/base/StateTest.java @@ -20,8 +20,9 @@ package com.android.documentsui.base; import static org.junit.Assert.assertArrayEquals; import android.content.Intent; -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/tests/unit/com/android/documentsui/clipping/ClipStorageTest.java b/tests/unit/com/android/documentsui/clipping/ClipStorageTest.java index 836c79474..3e97a30f2 100644 --- a/tests/unit/com/android/documentsui/clipping/ClipStorageTest.java +++ b/tests/unit/com/android/documentsui/clipping/ClipStorageTest.java @@ -17,6 +17,7 @@ package com.android.documentsui.clipping; import static com.android.documentsui.clipping.ClipStorage.NUM_OF_SLOTS; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -24,9 +25,10 @@ import static org.junit.Assert.assertTrue; import android.content.SharedPreferences; import android.net.Uri; import android.os.AsyncTask; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.testing.TestScheduledExecutorService; diff --git a/tests/unit/com/android/documentsui/clipping/UrisSupplierTest.java b/tests/unit/com/android/documentsui/clipping/UrisSupplierTest.java index 1cdb09979..60428e958 100644 --- a/tests/unit/com/android/documentsui/clipping/UrisSupplierTest.java +++ b/tests/unit/com/android/documentsui/clipping/UrisSupplierTest.java @@ -23,9 +23,10 @@ import android.content.SharedPreferences; import android.net.Uri; import android.os.AsyncTask; import android.provider.DocumentsContract; -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 com.android.documentsui.base.Shared; import com.android.documentsui.testing.TestScheduledExecutorService; diff --git a/tests/unit/com/android/documentsui/dirlist/DirectoryAddonsAdapterTest.java b/tests/unit/com/android/documentsui/dirlist/DirectoryAddonsAdapterTest.java index 06912e13d..7a7b00e29 100644 --- a/tests/unit/com/android/documentsui/dirlist/DirectoryAddonsAdapterTest.java +++ b/tests/unit/com/android/documentsui/dirlist/DirectoryAddonsAdapterTest.java @@ -20,11 +20,12 @@ import android.content.Context; import android.database.Cursor; import android.os.Bundle; import android.provider.DocumentsContract; -import android.support.test.filters.MediumTest; -import androidx.recyclerview.widget.RecyclerView; import android.test.AndroidTestCase; import android.view.ViewGroup; +import androidx.recyclerview.widget.RecyclerView; +import androidx.test.filters.MediumTest; + import com.android.documentsui.ActionHandler; import com.android.documentsui.Model; import com.android.documentsui.ModelId; diff --git a/tests/unit/com/android/documentsui/dirlist/DocumentHolderTest.java b/tests/unit/com/android/documentsui/dirlist/DocumentHolderTest.java index d201a54af..2574f73bd 100644 --- a/tests/unit/com/android/documentsui/dirlist/DocumentHolderTest.java +++ b/tests/unit/com/android/documentsui/dirlist/DocumentHolderTest.java @@ -20,8 +20,6 @@ import android.content.Context; import android.database.Cursor; import android.graphics.Rect; import android.os.SystemClock; -import android.support.test.filters.SmallTest; -import android.support.test.filters.Suppress; import android.test.AndroidTestCase; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -29,6 +27,9 @@ import android.view.MotionEvent; import android.view.MotionEvent.PointerCoords; import android.view.MotionEvent.PointerProperties; +import androidx.test.filters.SmallTest; +import androidx.test.filters.Suppress; + import com.android.documentsui.R; @SmallTest diff --git a/tests/unit/com/android/documentsui/dirlist/DragHostTest.java b/tests/unit/com/android/documentsui/dirlist/DragHostTest.java index bb760ad25..4fc53c1ea 100644 --- a/tests/unit/com/android/documentsui/dirlist/DragHostTest.java +++ b/tests/unit/com/android/documentsui/dirlist/DragHostTest.java @@ -20,12 +20,12 @@ import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; import android.content.ClipData; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.DragEvent; import android.view.View; import androidx.recyclerview.selection.SelectionTracker; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.SelectionHelpers; import com.android.documentsui.base.DocumentInfo; diff --git a/tests/unit/com/android/documentsui/dirlist/DragStartListenerTest.java b/tests/unit/com/android/documentsui/dirlist/DragStartListenerTest.java index b5739763b..5bac03350 100644 --- a/tests/unit/com/android/documentsui/dirlist/DragStartListenerTest.java +++ b/tests/unit/com/android/documentsui/dirlist/DragStartListenerTest.java @@ -20,13 +20,13 @@ import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; import android.provider.DocumentsContract; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.MotionEvent; import android.view.View; import androidx.recyclerview.selection.MutableSelection; import androidx.recyclerview.selection.Selection; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.DocsSelectionHelper; import com.android.documentsui.MenuManager.SelectionDetails; diff --git a/tests/unit/com/android/documentsui/dirlist/KeyInputHandlerTest.java b/tests/unit/com/android/documentsui/dirlist/KeyInputHandlerTest.java index 58ecf8be9..bce45e093 100644 --- a/tests/unit/com/android/documentsui/dirlist/KeyInputHandlerTest.java +++ b/tests/unit/com/android/documentsui/dirlist/KeyInputHandlerTest.java @@ -18,13 +18,13 @@ package com.android.documentsui.dirlist; import static org.junit.Assert.assertEquals; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.KeyEvent; import androidx.annotation.Nullable; import androidx.recyclerview.selection.Selection; import androidx.recyclerview.selection.SelectionTracker; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.SelectionHelpers; diff --git a/tests/unit/com/android/documentsui/dirlist/ModelBackedDocumentsAdapterTest.java b/tests/unit/com/android/documentsui/dirlist/ModelBackedDocumentsAdapterTest.java index 88ea13d99..9fd6b2d49 100644 --- a/tests/unit/com/android/documentsui/dirlist/ModelBackedDocumentsAdapterTest.java +++ b/tests/unit/com/android/documentsui/dirlist/ModelBackedDocumentsAdapterTest.java @@ -16,12 +16,12 @@ package com.android.documentsui.dirlist; -import android.app.PendingIntent; import android.content.Context; import android.database.Cursor; -import android.support.test.filters.MediumTest; import android.test.AndroidTestCase; +import androidx.test.filters.MediumTest; + import com.android.documentsui.ActionHandler; import com.android.documentsui.Model; import com.android.documentsui.base.Features; diff --git a/tests/unit/com/android/documentsui/files/ActionHandlerTest.java b/tests/unit/com/android/documentsui/files/ActionHandlerTest.java index 24f8d7d85..6a9776629 100644 --- a/tests/unit/com/android/documentsui/files/ActionHandlerTest.java +++ b/tests/unit/com/android/documentsui/files/ActionHandlerTest.java @@ -23,6 +23,7 @@ import static com.android.documentsui.testing.IntentAsserts.assertHasExtraIntent import static com.android.documentsui.testing.IntentAsserts.assertHasExtraList; import static com.android.documentsui.testing.IntentAsserts.assertHasExtraUri; import static com.android.documentsui.testing.IntentAsserts.assertTargetsComponent; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -38,12 +39,14 @@ import android.net.Uri; import android.os.Parcelable; import android.provider.DocumentsContract; import android.provider.DocumentsContract.Path; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.MediumTest; -import android.support.test.runner.AndroidJUnit4; import android.util.Pair; import android.view.DragEvent; +import androidx.core.util.Preconditions; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.MediumTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.documentsui.AbstractActionHandler; import com.android.documentsui.ModelId; import com.android.documentsui.R; @@ -64,7 +67,6 @@ import com.android.documentsui.testing.TestEnv; import com.android.documentsui.testing.TestFeatures; import com.android.documentsui.testing.TestProvidersAccess; import com.android.documentsui.ui.TestDialogController; -import androidx.core.util.Preconditions; import org.junit.Before; import org.junit.Test; diff --git a/tests/unit/com/android/documentsui/files/ActivityInputHandlerTest.java b/tests/unit/com/android/documentsui/files/ActivityInputHandlerTest.java index b579dbe39..b184e3657 100644 --- a/tests/unit/com/android/documentsui/files/ActivityInputHandlerTest.java +++ b/tests/unit/com/android/documentsui/files/ActivityInputHandlerTest.java @@ -18,11 +18,12 @@ package com.android.documentsui.files; import static org.junit.Assert.assertTrue; -import android.support.test.filters.MediumTest; -import android.support.test.runner.AndroidJUnit4; import android.view.KeyEvent; import android.view.MotionEvent; +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/tests/unit/com/android/documentsui/files/MenuManagerTest.java b/tests/unit/com/android/documentsui/files/MenuManagerTest.java index daa1c4c55..b9a8dc0c2 100644 --- a/tests/unit/com/android/documentsui/files/MenuManagerTest.java +++ b/tests/unit/com/android/documentsui/files/MenuManagerTest.java @@ -17,15 +17,16 @@ package com.android.documentsui.files; import static junit.framework.Assert.assertEquals; + import static org.junit.Assert.assertTrue; import android.net.Uri; import android.provider.DocumentsContract.Document; import android.provider.DocumentsContract.Root; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import androidx.recyclerview.selection.SelectionTracker; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.R; import com.android.documentsui.SelectionHelpers; diff --git a/tests/unit/com/android/documentsui/files/QuickViewIntentBuilderTest.java b/tests/unit/com/android/documentsui/files/QuickViewIntentBuilderTest.java index ad877264e..95485276d 100644 --- a/tests/unit/com/android/documentsui/files/QuickViewIntentBuilderTest.java +++ b/tests/unit/com/android/documentsui/files/QuickViewIntentBuilderTest.java @@ -6,8 +6,9 @@ import static junit.framework.Assert.assertTrue; import android.content.Intent; import android.content.QuickViewConstants; import android.content.pm.PackageManager; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.testing.TestEnv; import com.android.documentsui.testing.TestPackageManager; diff --git a/tests/unit/com/android/documentsui/inspector/DocumentLoaderTest.java b/tests/unit/com/android/documentsui/inspector/DocumentLoaderTest.java index 243bb8860..5f2b2a29f 100644 --- a/tests/unit/com/android/documentsui/inspector/DocumentLoaderTest.java +++ b/tests/unit/com/android/documentsui/inspector/DocumentLoaderTest.java @@ -22,9 +22,10 @@ import android.net.Uri; import android.os.Bundle; import android.os.Looper; import android.provider.DocumentsContract; -import android.support.test.InstrumentationRegistry; import android.test.suitebuilder.annotation.MediumTest; +import androidx.test.InstrumentationRegistry; + import com.android.documentsui.InspectorProvider; import com.android.documentsui.base.DocumentInfo; import com.android.documentsui.inspector.InspectorController.DataSupplier; diff --git a/tests/unit/com/android/documentsui/inspector/GpsCoordinatesTextClassifierTest.java b/tests/unit/com/android/documentsui/inspector/GpsCoordinatesTextClassifierTest.java index d43466864..e25d227e7 100644 --- a/tests/unit/com/android/documentsui/inspector/GpsCoordinatesTextClassifierTest.java +++ b/tests/unit/com/android/documentsui/inspector/GpsCoordinatesTextClassifierTest.java @@ -17,17 +17,19 @@ package com.android.documentsui.inspector; import static junit.framework.Assert.assertEquals; +import android.content.Context; import android.content.pm.PackageManager; import android.os.LocaleList; -import android.support.test.InstrumentationRegistry; - -import android.content.Context; -import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; import android.view.textclassifier.TextClassification; import android.view.textclassifier.TextClassificationManager; import android.view.textclassifier.TextClassifier; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + import com.android.documentsui.testing.TestPackageManager; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/unit/com/android/documentsui/inspector/HeaderTextSelectorTest.java b/tests/unit/com/android/documentsui/inspector/HeaderTextSelectorTest.java index 58b533bb7..30178cedc 100644 --- a/tests/unit/com/android/documentsui/inspector/HeaderTextSelectorTest.java +++ b/tests/unit/com/android/documentsui/inspector/HeaderTextSelectorTest.java @@ -19,14 +19,16 @@ import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; - import android.test.suitebuilder.annotation.SmallTest; import android.text.Spannable; import android.text.SpannableString; import android.widget.TextView; + +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; + import com.android.documentsui.inspector.HeaderTextSelector.Selector; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/unit/com/android/documentsui/inspector/InspectorControllerTest.java b/tests/unit/com/android/documentsui/inspector/InspectorControllerTest.java index b4f38acd7..33693ed4d 100644 --- a/tests/unit/com/android/documentsui/inspector/InspectorControllerTest.java +++ b/tests/unit/com/android/documentsui/inspector/InspectorControllerTest.java @@ -15,7 +15,6 @@ */ package com.android.documentsui.inspector; -import static junit.framework.Assert.fail; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNotNull; @@ -29,16 +28,16 @@ import android.os.Bundle; import android.os.Looper; import android.provider.DocumentsContract; import android.provider.DocumentsContract.Document; -import androidx.annotation.Nullable; -import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; import android.view.View.OnClickListener; +import androidx.annotation.Nullable; +import androidx.test.runner.AndroidJUnit4; + import com.android.documentsui.InspectorProvider; import com.android.documentsui.R; import com.android.documentsui.TestProviderActivity; import com.android.documentsui.base.DocumentInfo; -import com.android.documentsui.base.Shared; import com.android.documentsui.inspector.InspectorController.ActionDisplay; import com.android.documentsui.inspector.InspectorController.DataSupplier; import com.android.documentsui.inspector.InspectorController.DebugDisplay; @@ -46,11 +45,9 @@ import com.android.documentsui.inspector.InspectorController.DetailsDisplay; import com.android.documentsui.inspector.InspectorController.HeaderDisplay; import com.android.documentsui.inspector.InspectorController.MediaDisplay; import com.android.documentsui.inspector.actions.Action; -import com.android.documentsui.testing.TestConsumer; import com.android.documentsui.testing.TestEnv; import com.android.documentsui.testing.TestLoaderManager; import com.android.documentsui.testing.TestPackageManager; -import com.android.documentsui.testing.TestPackageManager.TestResolveInfo; import com.android.documentsui.testing.TestProvidersAccess; import org.junit.Assert; @@ -58,7 +55,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import java.util.ArrayList; import java.util.function.Consumer; @RunWith(AndroidJUnit4.class) diff --git a/tests/unit/com/android/documentsui/inspector/MediaViewTest.java b/tests/unit/com/android/documentsui/inspector/MediaViewTest.java index 7cf7b2130..80c3c4729 100644 --- a/tests/unit/com/android/documentsui/inspector/MediaViewTest.java +++ b/tests/unit/com/android/documentsui/inspector/MediaViewTest.java @@ -19,9 +19,10 @@ import android.media.ExifInterface; import android.media.MediaMetadata; import android.os.Bundle; import android.provider.DocumentsContract; -import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.documentsui.R; import com.android.documentsui.base.Shared; import com.android.documentsui.testing.TestEnv; diff --git a/tests/unit/com/android/documentsui/picker/ActionHandlerTest.java b/tests/unit/com/android/documentsui/picker/ActionHandlerTest.java index 5d4156558..69cfa3eb2 100644 --- a/tests/unit/com/android/documentsui/picker/ActionHandlerTest.java +++ b/tests/unit/com/android/documentsui/picker/ActionHandlerTest.java @@ -16,8 +16,6 @@ package com.android.documentsui.picker; -import static junit.framework.Assert.assertTrue; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -28,8 +26,9 @@ import android.net.Uri; import android.os.AsyncTask; import android.provider.DocumentsContract; import android.provider.DocumentsContract.Path; -import android.support.test.filters.MediumTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.MediumTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.AbstractActionHandler; import com.android.documentsui.R; @@ -40,8 +39,8 @@ import com.android.documentsui.base.State; import com.android.documentsui.base.State.ActionType; import com.android.documentsui.testing.DocumentStackAsserts; import com.android.documentsui.testing.TestEnv; -import com.android.documentsui.testing.TestProvidersAccess; import com.android.documentsui.testing.TestLastAccessedStorage; +import com.android.documentsui.testing.TestProvidersAccess; import com.android.documentsui.testing.TestResolveInfo; import org.junit.AfterClass; diff --git a/tests/unit/com/android/documentsui/picker/MenuManagerTest.java b/tests/unit/com/android/documentsui/picker/MenuManagerTest.java index 382c061bc..5d1764bb9 100644 --- a/tests/unit/com/android/documentsui/picker/MenuManagerTest.java +++ b/tests/unit/com/android/documentsui/picker/MenuManagerTest.java @@ -17,14 +17,16 @@ package com.android.documentsui.picker; import static com.android.documentsui.base.State.ACTION_CREATE; -import static com.android.documentsui.base.State.ACTION_OPEN; import static com.android.documentsui.base.State.ACTION_GET_CONTENT; +import static com.android.documentsui.base.State.ACTION_OPEN; + import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.provider.DocumentsContract.Root; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.R; import com.android.documentsui.base.DocumentInfo; diff --git a/tests/unit/com/android/documentsui/prefs/PreferencesMonitorTest.java b/tests/unit/com/android/documentsui/prefs/PreferencesMonitorTest.java index 7332513ab..1ff346451 100644 --- a/tests/unit/com/android/documentsui/prefs/PreferencesMonitorTest.java +++ b/tests/unit/com/android/documentsui/prefs/PreferencesMonitorTest.java @@ -17,9 +17,10 @@ package com.android.documentsui.prefs; import android.content.SharedPreferences; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.testing.TestConsumer; diff --git a/tests/unit/com/android/documentsui/prefs/PrefsBackupHelperTest.java b/tests/unit/com/android/documentsui/prefs/PrefsBackupHelperTest.java index 3c421c3b2..08c72c539 100644 --- a/tests/unit/com/android/documentsui/prefs/PrefsBackupHelperTest.java +++ b/tests/unit/com/android/documentsui/prefs/PrefsBackupHelperTest.java @@ -18,24 +18,23 @@ package com.android.documentsui.prefs; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; -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.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import java.io.IOException; -import java.util.Map; import java.util.HashMap; import java.util.HashSet; +import java.util.Map; import java.util.Set; @RunWith(AndroidJUnit4.class) diff --git a/tests/unit/com/android/documentsui/queries/CommandInterceptorTest.java b/tests/unit/com/android/documentsui/queries/CommandInterceptorTest.java index ca68ff76c..459831815 100644 --- a/tests/unit/com/android/documentsui/queries/CommandInterceptorTest.java +++ b/tests/unit/com/android/documentsui/queries/CommandInterceptorTest.java @@ -18,8 +18,8 @@ package com.android.documentsui.queries; import static com.android.documentsui.queries.CommandInterceptor.COMMAND_PREFIX; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.testing.TestEventHandler; import com.android.documentsui.testing.TestFeatures; diff --git a/tests/unit/com/android/documentsui/queries/SearchViewManagerTest.java b/tests/unit/com/android/documentsui/queries/SearchViewManagerTest.java index 850933e17..00a2166f6 100644 --- a/tests/unit/com/android/documentsui/queries/SearchViewManagerTest.java +++ b/tests/unit/com/android/documentsui/queries/SearchViewManagerTest.java @@ -16,30 +16,24 @@ package com.android.documentsui.queries; -import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; -import static junit.framework.Assert.fail; -import androidx.annotation.Nullable; import android.os.Bundle; import android.os.Handler; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.annotation.Nullable; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; -import com.android.documentsui.R; import com.android.documentsui.base.EventHandler; -import com.android.documentsui.queries.SearchViewManager.SearchManagerListener; import com.android.documentsui.queries.SearchViewManager; +import com.android.documentsui.queries.SearchViewManager.SearchManagerListener; import com.android.documentsui.testing.TestEventHandler; import com.android.documentsui.testing.TestHandler; import com.android.documentsui.testing.TestMenu; import com.android.documentsui.testing.TestTimer; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/unit/com/android/documentsui/services/AbstractJobTest.java b/tests/unit/com/android/documentsui/services/AbstractJobTest.java index 60a0eb07b..bb29daad1 100644 --- a/tests/unit/com/android/documentsui/services/AbstractJobTest.java +++ b/tests/unit/com/android/documentsui/services/AbstractJobTest.java @@ -24,10 +24,11 @@ import android.content.ContentResolver; import android.content.Context; import android.net.Uri; import android.os.RemoteException; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.MediumTest; import android.test.AndroidTestCase; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.MediumTest; + import com.android.documentsui.DocumentsProviderHelper; import com.android.documentsui.R; import com.android.documentsui.StubProvider; diff --git a/tests/unit/com/android/documentsui/services/CopyJobTest.java b/tests/unit/com/android/documentsui/services/CopyJobTest.java index 23bb80bec..8d98b2704 100644 --- a/tests/unit/com/android/documentsui/services/CopyJobTest.java +++ b/tests/unit/com/android/documentsui/services/CopyJobTest.java @@ -17,12 +17,12 @@ package com.android.documentsui.services; import static com.android.documentsui.services.FileOperationService.OPERATION_COPY; - import static com.google.common.collect.Lists.newArrayList; import android.net.Uri; import android.provider.DocumentsContract.Document; -import android.support.test.filters.MediumTest; + +import androidx.test.filters.MediumTest; @MediumTest public class CopyJobTest extends AbstractCopyJobTest<CopyJob> { diff --git a/tests/unit/com/android/documentsui/services/DeleteJobTest.java b/tests/unit/com/android/documentsui/services/DeleteJobTest.java index 0d8d39be8..a200b3edb 100644 --- a/tests/unit/com/android/documentsui/services/DeleteJobTest.java +++ b/tests/unit/com/android/documentsui/services/DeleteJobTest.java @@ -17,12 +17,12 @@ package com.android.documentsui.services; import static com.android.documentsui.services.FileOperationService.OPERATION_DELETE; - import static com.google.common.collect.Lists.newArrayList; import android.net.Uri; import android.provider.DocumentsContract; -import android.support.test.filters.MediumTest; + +import androidx.test.filters.MediumTest; import java.util.List; diff --git a/tests/unit/com/android/documentsui/services/FileOperationServiceTest.java b/tests/unit/com/android/documentsui/services/FileOperationServiceTest.java index ae51dd174..9670747f0 100644 --- a/tests/unit/com/android/documentsui/services/FileOperationServiceTest.java +++ b/tests/unit/com/android/documentsui/services/FileOperationServiceTest.java @@ -20,6 +20,7 @@ import static com.android.documentsui.services.FileOperationService.OPERATION_CO import static com.android.documentsui.services.FileOperationService.OPERATION_DELETE; import static com.android.documentsui.services.FileOperations.createBaseIntent; import static com.android.documentsui.services.FileOperations.createJobId; + import static org.junit.Assert.fail; import android.content.Context; @@ -27,10 +28,11 @@ import android.content.Intent; import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.MediumTest; import android.test.ServiceTestCase; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.MediumTest; + import com.android.documentsui.R; import com.android.documentsui.base.DocumentInfo; import com.android.documentsui.base.DocumentStack; diff --git a/tests/unit/com/android/documentsui/services/JobErrorHandlingTest.java b/tests/unit/com/android/documentsui/services/JobErrorHandlingTest.java index 89b34bc42..680f9456a 100644 --- a/tests/unit/com/android/documentsui/services/JobErrorHandlingTest.java +++ b/tests/unit/com/android/documentsui/services/JobErrorHandlingTest.java @@ -21,7 +21,8 @@ import static com.google.common.collect.Lists.newArrayList; import android.net.Uri; import android.provider.DocumentsContract; -import android.support.test.filters.MediumTest; + +import androidx.test.filters.MediumTest; import java.util.List; diff --git a/tests/unit/com/android/documentsui/services/MoveJobTest.java b/tests/unit/com/android/documentsui/services/MoveJobTest.java index 37445a6ce..1fc2fd3b2 100644 --- a/tests/unit/com/android/documentsui/services/MoveJobTest.java +++ b/tests/unit/com/android/documentsui/services/MoveJobTest.java @@ -21,7 +21,8 @@ import static com.google.common.collect.Lists.newArrayList; import android.net.Uri; import android.provider.DocumentsContract.Document; -import android.support.test.filters.MediumTest; + +import androidx.test.filters.MediumTest; @MediumTest public class MoveJobTest extends AbstractCopyJobTest<MoveJob> { diff --git a/tests/unit/com/android/documentsui/sidebar/RootsFragmentTest.java b/tests/unit/com/android/documentsui/sidebar/RootsFragmentTest.java index 16414e55b..6dd03093b 100644 --- a/tests/unit/com/android/documentsui/sidebar/RootsFragmentTest.java +++ b/tests/unit/com/android/documentsui/sidebar/RootsFragmentTest.java @@ -21,8 +21,9 @@ import static junit.framework.Assert.assertTrue; import static org.junit.Assert.assertEquals; import android.content.pm.ResolveInfo; -import android.support.test.filters.MediumTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.MediumTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.base.RootInfo; import com.android.documentsui.testing.TestProvidersAccess; diff --git a/tests/unit/com/android/documentsui/sorting/SortControllerTest.java b/tests/unit/com/android/documentsui/sorting/SortControllerTest.java index 157783760..7cc781f27 100644 --- a/tests/unit/com/android/documentsui/sorting/SortControllerTest.java +++ b/tests/unit/com/android/documentsui/sorting/SortControllerTest.java @@ -18,13 +18,13 @@ package com.android.documentsui.sorting; import static org.junit.Assert.assertTrue; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.View; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.documentsui.base.State; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/unit/com/android/documentsui/sorting/SortController_TabletLayoutTest.java b/tests/unit/com/android/documentsui/sorting/SortController_TabletLayoutTest.java index d7595c06e..171dbc2f6 100644 --- a/tests/unit/com/android/documentsui/sorting/SortController_TabletLayoutTest.java +++ b/tests/unit/com/android/documentsui/sorting/SortController_TabletLayoutTest.java @@ -16,8 +16,8 @@ package com.android.documentsui.sorting; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.base.State; import com.android.documentsui.sorting.SortControllerTest.TestWidget; diff --git a/tests/unit/com/android/documentsui/sorting/SortDimensionTest.java b/tests/unit/com/android/documentsui/sorting/SortDimensionTest.java index c7abb9af2..1a6678b6d 100644 --- a/tests/unit/com/android/documentsui/sorting/SortDimensionTest.java +++ b/tests/unit/com/android/documentsui/sorting/SortDimensionTest.java @@ -18,10 +18,11 @@ package com.android.documentsui.sorting; import static junit.framework.Assert.assertEquals; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.View; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.documentsui.R; import com.android.documentsui.sorting.SortDimension.SortCapability; import com.android.documentsui.sorting.SortDimension.SortDirection; diff --git a/tests/unit/com/android/documentsui/sorting/SortModelTest.java b/tests/unit/com/android/documentsui/sorting/SortModelTest.java index 07bf9ae0f..da8903022 100644 --- a/tests/unit/com/android/documentsui/sorting/SortModelTest.java +++ b/tests/unit/com/android/documentsui/sorting/SortModelTest.java @@ -20,11 +20,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; import static org.junit.Assert.fail; -import androidx.annotation.Nullable; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.view.View; +import androidx.annotation.Nullable; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; + import com.android.documentsui.R; import com.android.documentsui.sorting.SortModel.UpdateListener; import com.android.documentsui.sorting.SortModel.UpdateType; diff --git a/tests/unit/com/android/documentsui/sorting/SortingCursorWrapperTest.java b/tests/unit/com/android/documentsui/sorting/SortingCursorWrapperTest.java index 6705c4dff..e323dc8e8 100644 --- a/tests/unit/com/android/documentsui/sorting/SortingCursorWrapperTest.java +++ b/tests/unit/com/android/documentsui/sorting/SortingCursorWrapperTest.java @@ -17,6 +17,7 @@ package com.android.documentsui.sorting; import static com.android.documentsui.base.DocumentInfo.getCursorString; + import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; @@ -26,8 +27,9 @@ import android.database.MatrixCursor; import android.os.Bundle; import android.provider.DocumentsContract; import android.provider.DocumentsContract.Document; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.base.DocumentInfo; import com.android.documentsui.base.Shared; diff --git a/tests/unit/com/android/documentsui/ui/DarkThemeUiTest.java b/tests/unit/com/android/documentsui/ui/DarkThemeUiTest.java index f644bb144..2e3302e3d 100644 --- a/tests/unit/com/android/documentsui/ui/DarkThemeUiTest.java +++ b/tests/unit/com/android/documentsui/ui/DarkThemeUiTest.java @@ -19,9 +19,10 @@ package com.android.documentsui.ui; import android.content.Context; import android.content.res.Configuration; import android.graphics.Color; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.documentsui.R; diff --git a/tests/unit/com/android/documentsui/ui/ThemeUiTest.java b/tests/unit/com/android/documentsui/ui/ThemeUiTest.java index 20026eb88..ea3f1d2d9 100644 --- a/tests/unit/com/android/documentsui/ui/ThemeUiTest.java +++ b/tests/unit/com/android/documentsui/ui/ThemeUiTest.java @@ -18,8 +18,9 @@ package com.android.documentsui.ui; import android.content.res.Configuration; 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 com.android.documentsui.R; diff --git a/tests/unit/com/android/documentsui/ui/ThemeUiTestBase.java b/tests/unit/com/android/documentsui/ui/ThemeUiTestBase.java index 8c96a16f4..70282aaa3 100644 --- a/tests/unit/com/android/documentsui/ui/ThemeUiTestBase.java +++ b/tests/unit/com/android/documentsui/ui/ThemeUiTestBase.java @@ -23,15 +23,13 @@ import android.content.res.CompatibilityInfo; import android.content.res.Configuration; import android.content.res.Resources; import android.content.res.TypedArray; -import android.support.test.InstrumentationRegistry; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.DisplayMetrics; -import com.android.documentsui.R; +import androidx.test.InstrumentationRegistry; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; -import com.google.common.truth.BooleanSubject; -import com.google.common.truth.IntegerSubject; +import com.android.documentsui.R; import org.junit.After; import org.junit.Before; |