diff options
44 files changed, 78 insertions, 78 deletions
diff --git a/tests/common/Android.mk b/tests/common/Android.mk index 2e80aa2b..a76414d8 100644 --- a/tests/common/Android.mk +++ b/tests/common/Android.mk @@ -8,7 +8,7 @@ LOCAL_SRC_FILES := \ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-annotations \ - android-support-test \ + androidx-test \ guava \ mockito-target \ platform-robolectric-3.6.1-prebuilt \ diff --git a/tests/common/src/com/android/tv/testing/activities/BaseMainActivityTestCase.java b/tests/common/src/com/android/tv/testing/activities/BaseMainActivityTestCase.java index 666f8181..495ff20d 100644 --- a/tests/common/src/com/android/tv/testing/activities/BaseMainActivityTestCase.java +++ b/tests/common/src/com/android/tv/testing/activities/BaseMainActivityTestCase.java @@ -15,12 +15,12 @@ */ package com.android.tv.testing.activities; -import static android.support.test.InstrumentationRegistry.getInstrumentation; +import static androidx.test.InstrumentationRegistry.getInstrumentation; import android.content.Context; import android.os.SystemClock; -import android.support.test.rule.ActivityTestRule; import android.text.TextUtils; +import androidx.test.rule.ActivityTestRule; import com.android.tv.MainActivity; import com.android.tv.data.ChannelDataManager; import com.android.tv.data.api.Channel; diff --git a/tests/func/Android.mk b/tests/func/Android.mk index 855e8ebf..354e02f8 100644 --- a/tests/func/Android.mk +++ b/tests/func/Android.mk @@ -10,7 +10,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := TVFuncTests LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx-test \ tv-test-common \ ub-uiautomator \ diff --git a/tests/func/src/com/android/tv/tests/ui/ChannelBannerViewTest.java b/tests/func/src/com/android/tv/tests/ui/ChannelBannerViewTest.java index 600b52b6..c06c859c 100644 --- a/tests/func/src/com/android/tv/tests/ui/ChannelBannerViewTest.java +++ b/tests/func/src/com/android/tv/tests/ui/ChannelBannerViewTest.java @@ -16,8 +16,8 @@ package com.android.tv.tests.ui; -import android.support.test.filters.MediumTest; import android.support.test.uiautomator.Until; +import androidx.test.filters.MediumTest; import com.android.tv.R; import com.android.tv.testing.uihelper.Constants; import org.junit.Before; diff --git a/tests/func/src/com/android/tv/tests/ui/ChannelSourcesTest.java b/tests/func/src/com/android/tv/tests/ui/ChannelSourcesTest.java index 53e27f1b..2467de21 100644 --- a/tests/func/src/com/android/tv/tests/ui/ChannelSourcesTest.java +++ b/tests/func/src/com/android/tv/tests/ui/ChannelSourcesTest.java @@ -15,9 +15,9 @@ */ package com.android.tv.tests.ui; -import android.support.test.filters.MediumTest; import android.support.test.uiautomator.BySelector; import android.support.test.uiautomator.Until; +import androidx.test.filters.MediumTest; import com.android.tv.R; import com.android.tv.testing.uihelper.ByResource; import org.junit.Before; diff --git a/tests/func/src/com/android/tv/tests/ui/LiveChannelsAppTest.java b/tests/func/src/com/android/tv/tests/ui/LiveChannelsAppTest.java index 1a5ceb45..ac2aad43 100644 --- a/tests/func/src/com/android/tv/tests/ui/LiveChannelsAppTest.java +++ b/tests/func/src/com/android/tv/tests/ui/LiveChannelsAppTest.java @@ -16,9 +16,9 @@ package com.android.tv.tests.ui; -import android.support.test.filters.MediumTest; import android.support.test.uiautomator.BySelector; import android.support.test.uiautomator.Until; +import androidx.test.filters.MediumTest; import com.android.tv.R; import com.android.tv.testing.testinput.ChannelStateData; import com.android.tv.testing.testinput.TvTestInputConstants; diff --git a/tests/func/src/com/android/tv/tests/ui/LiveChannelsTestController.java b/tests/func/src/com/android/tv/tests/ui/LiveChannelsTestController.java index 03d30ca4..fa3335d9 100644 --- a/tests/func/src/com/android/tv/tests/ui/LiveChannelsTestController.java +++ b/tests/func/src/com/android/tv/tests/ui/LiveChannelsTestController.java @@ -23,7 +23,6 @@ import android.content.Context; import android.content.res.Resources; import android.os.Build; import android.os.SystemClock; -import android.support.test.InstrumentationRegistry; import android.support.test.uiautomator.BySelector; import android.support.test.uiautomator.Configurator; import android.support.test.uiautomator.SearchCondition; @@ -31,6 +30,7 @@ import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.Until; import android.view.InputDevice; import android.view.KeyEvent; +import androidx.test.InstrumentationRegistry; import com.android.tv.testing.data.ChannelInfo; import com.android.tv.testing.testinput.ChannelStateData; import com.android.tv.testing.testinput.TestInputControlConnection; diff --git a/tests/func/src/com/android/tv/tests/ui/ParentalControlsTest.java b/tests/func/src/com/android/tv/tests/ui/ParentalControlsTest.java index ee039d7c..bff0e7d7 100644 --- a/tests/func/src/com/android/tv/tests/ui/ParentalControlsTest.java +++ b/tests/func/src/com/android/tv/tests/ui/ParentalControlsTest.java @@ -19,10 +19,10 @@ package com.android.tv.tests.ui; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; -import android.support.test.filters.MediumTest; import android.support.test.uiautomator.BySelector; import android.support.test.uiautomator.UiObject2; import android.support.test.uiautomator.Until; +import androidx.test.filters.MediumTest; import com.android.tv.R; import com.android.tv.testing.uihelper.ByResource; import com.android.tv.testing.uihelper.DialogHelper; diff --git a/tests/func/src/com/android/tv/tests/ui/PlayControlsRowViewTest.java b/tests/func/src/com/android/tv/tests/ui/PlayControlsRowViewTest.java index 7c982782..efc7ecf4 100644 --- a/tests/func/src/com/android/tv/tests/ui/PlayControlsRowViewTest.java +++ b/tests/func/src/com/android/tv/tests/ui/PlayControlsRowViewTest.java @@ -22,11 +22,11 @@ import static com.android.tv.testing.uihelper.Constants.MENU; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; -import android.support.test.filters.SmallTest; import android.support.test.uiautomator.BySelector; import android.support.test.uiautomator.UiObject2; import android.support.test.uiautomator.Until; import android.view.KeyEvent; +import androidx.test.filters.SmallTest; import com.android.tv.R; import com.android.tv.testing.testinput.TvTestInputConstants; import com.android.tv.testing.uihelper.Constants; diff --git a/tests/func/src/com/android/tv/tests/ui/ProgramGuideTest.java b/tests/func/src/com/android/tv/tests/ui/ProgramGuideTest.java index 4adf448a..0a6a85d6 100644 --- a/tests/func/src/com/android/tv/tests/ui/ProgramGuideTest.java +++ b/tests/func/src/com/android/tv/tests/ui/ProgramGuideTest.java @@ -15,8 +15,8 @@ */ package com.android.tv.tests.ui; -import android.support.test.filters.MediumTest; import android.support.test.uiautomator.Until; +import androidx.test.filters.MediumTest; import com.android.tv.guide.ProgramGuide; import com.android.tv.testing.uihelper.Constants; import org.junit.Rule; diff --git a/tests/func/src/com/android/tv/tests/ui/TimeoutTest.java b/tests/func/src/com/android/tv/tests/ui/TimeoutTest.java index 4b6befe4..73e869f1 100644 --- a/tests/func/src/com/android/tv/tests/ui/TimeoutTest.java +++ b/tests/func/src/com/android/tv/tests/ui/TimeoutTest.java @@ -15,8 +15,8 @@ */ package com.android.tv.tests.ui; -import android.support.test.filters.LargeTest; import android.support.test.uiautomator.Until; +import androidx.test.filters.LargeTest; import com.android.tv.R; import com.android.tv.testing.uihelper.Constants; import org.junit.Ignore; diff --git a/tests/func/src/com/android/tv/tests/ui/dvr/DvrLibraryTest.java b/tests/func/src/com/android/tv/tests/ui/dvr/DvrLibraryTest.java index d0ebed91..8998b458 100644 --- a/tests/func/src/com/android/tv/tests/ui/dvr/DvrLibraryTest.java +++ b/tests/func/src/com/android/tv/tests/ui/dvr/DvrLibraryTest.java @@ -19,11 +19,11 @@ package com.android.tv.tests.ui.dvr; import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertWaitUntilFocused; import android.os.Build; -import android.support.test.filters.MediumTest; -import android.support.test.filters.SdkSuppress; import android.support.test.uiautomator.By; import android.support.test.uiautomator.BySelector; import android.support.test.uiautomator.Until; +import androidx.test.filters.MediumTest; +import androidx.test.filters.SdkSuppress; import com.android.tv.R; import com.android.tv.testing.uihelper.ByResource; import com.android.tv.testing.uihelper.Constants; diff --git a/tests/func/src/com/android/tv/tests/ui/sidepanel/CustomizeChannelListFragmentTest.java b/tests/func/src/com/android/tv/tests/ui/sidepanel/CustomizeChannelListFragmentTest.java index 09b855e2..d035874a 100644 --- a/tests/func/src/com/android/tv/tests/ui/sidepanel/CustomizeChannelListFragmentTest.java +++ b/tests/func/src/com/android/tv/tests/ui/sidepanel/CustomizeChannelListFragmentTest.java @@ -21,11 +21,11 @@ import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertTrue; import android.graphics.Point; -import android.support.test.filters.MediumTest; import android.support.test.uiautomator.BySelector; import android.support.test.uiautomator.Direction; import android.support.test.uiautomator.UiObject2; import android.support.test.uiautomator.Until; +import androidx.test.filters.MediumTest; import com.android.tv.R; import com.android.tv.testing.uihelper.Constants; import com.android.tv.tests.ui.LiveChannelsTestController; diff --git a/tests/jank/Android.mk b/tests/jank/Android.mk index 1b67ac3f..7f7a18d0 100644 --- a/tests/jank/Android.mk +++ b/tests/jank/Android.mk @@ -10,7 +10,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := TVJankTests LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx-test \ tv-test-common \ ub-janktesthelper \ ub-uiautomator \ diff --git a/tests/jank/AndroidManifest.xml b/tests/jank/AndroidManifest.xml index 66e57e14..7c0997ac 100644 --- a/tests/jank/AndroidManifest.xml +++ b/tests/jank/AndroidManifest.xml @@ -21,7 +21,7 @@ <uses-sdk android:targetSdkVersion="27" android:minSdkVersion="23" /> <instrumentation - android:name="android.support.test.runner.AndroidJUnitRunner" + android:name="androidx.test.runner.AndroidJUnitRunner" android:label="Live Channel Jank Tests" android:targetPackage="com.android.tv" /> diff --git a/tests/jank/src/com/android/tv/tests/jank/ChannelZappingJankTest.java b/tests/jank/src/com/android/tv/tests/jank/ChannelZappingJankTest.java index eee2328b..02ca6730 100644 --- a/tests/jank/src/com/android/tv/tests/jank/ChannelZappingJankTest.java +++ b/tests/jank/src/com/android/tv/tests/jank/ChannelZappingJankTest.java @@ -15,9 +15,9 @@ */ package com.android.tv.tests.jank; -import android.support.test.filters.MediumTest; import android.support.test.jank.GfxMonitor; import android.support.test.jank.JankTest; +import androidx.test.filters.MediumTest; /** Jank tests for channel zapping. */ @MediumTest diff --git a/tests/jank/src/com/android/tv/tests/jank/MenuJankTest.java b/tests/jank/src/com/android/tv/tests/jank/MenuJankTest.java index ea80eb3d..6b0dcd0e 100644 --- a/tests/jank/src/com/android/tv/tests/jank/MenuJankTest.java +++ b/tests/jank/src/com/android/tv/tests/jank/MenuJankTest.java @@ -15,9 +15,9 @@ */ package com.android.tv.tests.jank; -import android.support.test.filters.MediumTest; import android.support.test.jank.GfxMonitor; import android.support.test.jank.JankTest; +import androidx.test.filters.MediumTest; import com.android.tv.testing.uihelper.MenuHelper; /** Jank tests for the program guide. */ diff --git a/tests/jank/src/com/android/tv/tests/jank/ProgramGuideJankTest.java b/tests/jank/src/com/android/tv/tests/jank/ProgramGuideJankTest.java index 57d38ba9..da2eb9cb 100644 --- a/tests/jank/src/com/android/tv/tests/jank/ProgramGuideJankTest.java +++ b/tests/jank/src/com/android/tv/tests/jank/ProgramGuideJankTest.java @@ -17,10 +17,10 @@ package com.android.tv.tests.jank; import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertWaitForCondition; -import android.support.test.filters.MediumTest; import android.support.test.jank.GfxMonitor; import android.support.test.jank.JankTest; import android.support.test.uiautomator.Until; +import androidx.test.filters.MediumTest; import com.android.tv.R; import com.android.tv.testing.uihelper.ByResource; import com.android.tv.testing.uihelper.Constants; diff --git a/tests/unit/Android.mk b/tests/unit/Android.mk index a425bcfe..1cf958f4 100644 --- a/tests/unit/Android.mk +++ b/tests/unit/Android.mk @@ -8,7 +8,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ + androidx-test \ mockito-target \ tv-test-common \ diff --git a/tests/unit/src/com/android/tv/CurrentPositionMediatorTest.java b/tests/unit/src/com/android/tv/CurrentPositionMediatorTest.java index abadde31..4b85eaae 100644 --- a/tests/unit/src/com/android/tv/CurrentPositionMediatorTest.java +++ b/tests/unit/src/com/android/tv/CurrentPositionMediatorTest.java @@ -20,9 +20,9 @@ import static com.android.tv.TimeShiftManager.INVALID_TIME; import static com.android.tv.TimeShiftManager.REQUEST_TIMEOUT_MS; import static com.google.common.truth.Truth.assertWithMessage; -import android.support.test.annotation.UiThreadTest; -import android.support.test.filters.MediumTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.annotation.UiThreadTest; +import androidx.test.filters.MediumTest; +import androidx.test.runner.AndroidJUnit4; import com.android.tv.testing.activities.BaseMainActivityTestCase; import org.junit.Before; import org.junit.Test; diff --git a/tests/unit/src/com/android/tv/FeaturesTest.java b/tests/unit/src/com/android/tv/FeaturesTest.java index e19f4b7c..9492eb2a 100644 --- a/tests/unit/src/com/android/tv/FeaturesTest.java +++ b/tests/unit/src/com/android/tv/FeaturesTest.java @@ -18,8 +18,8 @@ package com.android.tv; import static com.google.common.truth.Truth.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/tests/unit/src/com/android/tv/MainActivityTest.java b/tests/unit/src/com/android/tv/MainActivityTest.java index c5df21a9..f6223ec6 100644 --- a/tests/unit/src/com/android/tv/MainActivityTest.java +++ b/tests/unit/src/com/android/tv/MainActivityTest.java @@ -15,14 +15,14 @@ */ package com.android.tv; -import static android.support.test.InstrumentationRegistry.getInstrumentation; +import static androidx.test.InstrumentationRegistry.getInstrumentation; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; -import android.support.test.filters.MediumTest; -import android.support.test.runner.AndroidJUnit4; import android.view.View; import android.widget.TextView; +import androidx.test.filters.MediumTest; +import androidx.test.runner.AndroidJUnit4; import com.android.tv.data.api.Channel; import com.android.tv.testing.activities.BaseMainActivityTestCase; import com.android.tv.testing.testinput.TvTestInputConstants; diff --git a/tests/unit/src/com/android/tv/TimeShiftManagerTest.java b/tests/unit/src/com/android/tv/TimeShiftManagerTest.java index cb523045..7adee385 100644 --- a/tests/unit/src/com/android/tv/TimeShiftManagerTest.java +++ b/tests/unit/src/com/android/tv/TimeShiftManagerTest.java @@ -24,8 +24,8 @@ import static com.android.tv.TimeShiftManager.TIME_SHIFT_ACTION_ID_PLAY; import static com.android.tv.TimeShiftManager.TIME_SHIFT_ACTION_ID_REWIND; import static com.google.common.truth.Truth.assertWithMessage; -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.tv.testing.activities.BaseMainActivityTestCase; import org.junit.Before; import org.junit.Test; diff --git a/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java b/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java index 7ce96103..71ccaf35 100644 --- a/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java +++ b/tests/unit/src/com/android/tv/data/ChannelDataManagerTest.java @@ -16,8 +16,8 @@ package com.android.tv.data; -import static android.support.test.InstrumentationRegistry.getInstrumentation; -import static android.support.test.InstrumentationRegistry.getTargetContext; +import static androidx.test.InstrumentationRegistry.getInstrumentation; +import static androidx.test.InstrumentationRegistry.getTargetContext; import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; @@ -33,8 +33,6 @@ import android.media.tv.TvContract.Channels; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.test.MoreAsserts; import android.test.mock.MockContentProvider; import android.test.mock.MockContentResolver; @@ -42,6 +40,8 @@ import android.test.mock.MockCursor; import android.text.TextUtils; import android.util.Log; import android.util.SparseArray; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.tv.data.api.Channel; import com.android.tv.testing.constants.Constants; import com.android.tv.testing.data.ChannelInfo; diff --git a/tests/unit/src/com/android/tv/data/ChannelImplTest.java b/tests/unit/src/com/android/tv/data/ChannelImplTest.java index b791a7e4..86cfab66 100644 --- a/tests/unit/src/com/android/tv/data/ChannelImplTest.java +++ b/tests/unit/src/com/android/tv/data/ChannelImplTest.java @@ -25,8 +25,8 @@ import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; -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.tv.data.api.Channel; import com.android.tv.testing.ComparatorTester; import com.android.tv.util.TvInputManagerHelper; diff --git a/tests/unit/src/com/android/tv/data/TvInputNewComparatorTest.java b/tests/unit/src/com/android/tv/data/TvInputNewComparatorTest.java index 8e892cce..ae31188f 100644 --- a/tests/unit/src/com/android/tv/data/TvInputNewComparatorTest.java +++ b/tests/unit/src/com/android/tv/data/TvInputNewComparatorTest.java @@ -18,9 +18,9 @@ package com.android.tv.data; import android.content.pm.ResolveInfo; import android.media.tv.TvInputInfo; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.util.Pair; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.tv.testing.ComparatorTester; import com.android.tv.testing.utils.TestUtils; import com.android.tv.util.SetupUtils; diff --git a/tests/unit/src/com/android/tv/data/WatchedHistoryManagerTest.java b/tests/unit/src/com/android/tv/data/WatchedHistoryManagerTest.java index 43bfde09..7340f694 100644 --- a/tests/unit/src/com/android/tv/data/WatchedHistoryManagerTest.java +++ b/tests/unit/src/com/android/tv/data/WatchedHistoryManagerTest.java @@ -16,12 +16,12 @@ package com.android.tv.data; -import static android.support.test.InstrumentationRegistry.getTargetContext; +import static androidx.test.InstrumentationRegistry.getTargetContext; import static com.google.common.truth.Truth.assertThat; import android.os.Looper; -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.tv.data.WatchedHistoryManager.WatchedRecord; import java.util.concurrent.TimeUnit; import org.junit.Before; diff --git a/tests/unit/src/com/android/tv/dvr/recorder/DvrRecordingServiceTest.java b/tests/unit/src/com/android/tv/dvr/recorder/DvrRecordingServiceTest.java index d510da32..546f074f 100644 --- a/tests/unit/src/com/android/tv/dvr/recorder/DvrRecordingServiceTest.java +++ b/tests/unit/src/com/android/tv/dvr/recorder/DvrRecordingServiceTest.java @@ -20,9 +20,9 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Intent; import android.os.Build; -import android.support.test.filters.SdkSuppress; -import android.support.test.filters.SmallTest; import android.test.ServiceTestCase; +import androidx.test.filters.SdkSuppress; +import androidx.test.filters.SmallTest; import com.android.tv.common.feature.CommonFeatures; import com.android.tv.common.feature.TestableFeature; import org.mockito.MockitoAnnotations; diff --git a/tests/unit/src/com/android/tv/menu/MenuTest.java b/tests/unit/src/com/android/tv/menu/MenuTest.java index 028a185d..e384c398 100644 --- a/tests/unit/src/com/android/tv/menu/MenuTest.java +++ b/tests/unit/src/com/android/tv/menu/MenuTest.java @@ -15,11 +15,11 @@ */ package com.android.tv.menu; -import static android.support.test.InstrumentationRegistry.getTargetContext; +import static androidx.test.InstrumentationRegistry.getTargetContext; import static com.google.common.truth.Truth.assertWithMessage; -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.tv.menu.Menu.OnMenuVisibilityChangeListener; import org.junit.Before; import org.junit.Ignore; diff --git a/tests/unit/src/com/android/tv/menu/TvOptionsRowAdapterTest.java b/tests/unit/src/com/android/tv/menu/TvOptionsRowAdapterTest.java index 0f815a7a..5ecbdf02 100644 --- a/tests/unit/src/com/android/tv/menu/TvOptionsRowAdapterTest.java +++ b/tests/unit/src/com/android/tv/menu/TvOptionsRowAdapterTest.java @@ -15,15 +15,15 @@ */ package com.android.tv.menu; -import static android.support.test.InstrumentationRegistry.getInstrumentation; +import static androidx.test.InstrumentationRegistry.getInstrumentation; import static com.google.common.truth.Truth.assertWithMessage; import static org.junit.Assert.fail; import android.media.tv.TvTrackInfo; import android.os.SystemClock; -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.tv.testing.activities.BaseMainActivityTestCase; import com.android.tv.testing.constants.Constants; import com.android.tv.testing.testinput.ChannelState; diff --git a/tests/unit/src/com/android/tv/recommendation/ChannelRecordTest.java b/tests/unit/src/com/android/tv/recommendation/ChannelRecordTest.java index e63bdc3a..c217222f 100644 --- a/tests/unit/src/com/android/tv/recommendation/ChannelRecordTest.java +++ b/tests/unit/src/com/android/tv/recommendation/ChannelRecordTest.java @@ -16,11 +16,11 @@ package com.android.tv.recommendation; -import static android.support.test.InstrumentationRegistry.getContext; +import static androidx.test.InstrumentationRegistry.getContext; import static com.google.common.truth.Truth.assertThat; -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.tv.testing.utils.Utils; import java.util.Random; import java.util.concurrent.TimeUnit; diff --git a/tests/unit/src/com/android/tv/recommendation/EvaluatorTestCase.java b/tests/unit/src/com/android/tv/recommendation/EvaluatorTestCase.java index f62a5e05..9696d8b6 100644 --- a/tests/unit/src/com/android/tv/recommendation/EvaluatorTestCase.java +++ b/tests/unit/src/com/android/tv/recommendation/EvaluatorTestCase.java @@ -16,7 +16,7 @@ package com.android.tv.recommendation; -import static android.support.test.InstrumentationRegistry.getContext; +import static androidx.test.InstrumentationRegistry.getContext; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/tests/unit/src/com/android/tv/recommendation/FavoriteChannelEvaluatorTest.java b/tests/unit/src/com/android/tv/recommendation/FavoriteChannelEvaluatorTest.java index e14320f0..773d3358 100644 --- a/tests/unit/src/com/android/tv/recommendation/FavoriteChannelEvaluatorTest.java +++ b/tests/unit/src/com/android/tv/recommendation/FavoriteChannelEvaluatorTest.java @@ -18,8 +18,8 @@ package com.android.tv.recommendation; import static com.google.common.truth.Truth.assertThat; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import java.util.List; import java.util.concurrent.TimeUnit; import org.junit.Test; diff --git a/tests/unit/src/com/android/tv/recommendation/RecentChannelEvaluatorTest.java b/tests/unit/src/com/android/tv/recommendation/RecentChannelEvaluatorTest.java index f8d6b220..15a3726a 100644 --- a/tests/unit/src/com/android/tv/recommendation/RecentChannelEvaluatorTest.java +++ b/tests/unit/src/com/android/tv/recommendation/RecentChannelEvaluatorTest.java @@ -18,8 +18,8 @@ package com.android.tv.recommendation; import static com.google.common.truth.Truth.assertThat; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/tests/unit/src/com/android/tv/recommendation/RecommenderTest.java b/tests/unit/src/com/android/tv/recommendation/RecommenderTest.java index 812a3eb1..01208d27 100644 --- a/tests/unit/src/com/android/tv/recommendation/RecommenderTest.java +++ b/tests/unit/src/com/android/tv/recommendation/RecommenderTest.java @@ -16,12 +16,12 @@ package com.android.tv.recommendation; -import static android.support.test.InstrumentationRegistry.getContext; +import static androidx.test.InstrumentationRegistry.getContext; import static com.google.common.truth.Truth.assertThat; -import android.support.test.filters.SmallTest; -import android.support.test.runner.AndroidJUnit4; import android.test.MoreAsserts; +import androidx.test.filters.SmallTest; +import androidx.test.runner.AndroidJUnit4; import com.android.tv.data.api.Channel; import com.android.tv.recommendation.RecommendationUtils.ChannelRecordSortedMapHelper; import com.android.tv.testing.utils.Utils; diff --git a/tests/unit/src/com/android/tv/recommendation/RoutineWatchEvaluatorTest.java b/tests/unit/src/com/android/tv/recommendation/RoutineWatchEvaluatorTest.java index 39e6e9c5..d9149050 100644 --- a/tests/unit/src/com/android/tv/recommendation/RoutineWatchEvaluatorTest.java +++ b/tests/unit/src/com/android/tv/recommendation/RoutineWatchEvaluatorTest.java @@ -19,8 +19,8 @@ package com.android.tv.recommendation; import static com.google.common.truth.Truth.assertThat; 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 com.android.tv.data.Program; import com.android.tv.recommendation.RoutineWatchEvaluator.ProgramTime; import java.util.Calendar; diff --git a/tests/unit/src/com/android/tv/util/TvInputManagerHelperTest.java b/tests/unit/src/com/android/tv/util/TvInputManagerHelperTest.java index 6dfed64a..7e35d76b 100644 --- a/tests/unit/src/com/android/tv/util/TvInputManagerHelperTest.java +++ b/tests/unit/src/com/android/tv/util/TvInputManagerHelperTest.java @@ -16,12 +16,12 @@ package com.android.tv.util; -import static android.support.test.InstrumentationRegistry.getContext; +import static androidx.test.InstrumentationRegistry.getContext; import android.content.pm.ResolveInfo; import android.media.tv.TvInputInfo; -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.tv.testing.ComparatorTester; import com.android.tv.testing.utils.TestUtils; import java.util.ArrayList; diff --git a/tests/unit/src/com/android/tv/util/images/ImageCacheTest.java b/tests/unit/src/com/android/tv/util/images/ImageCacheTest.java index b7715c4a..41722135 100644 --- a/tests/unit/src/com/android/tv/util/images/ImageCacheTest.java +++ b/tests/unit/src/com/android/tv/util/images/ImageCacheTest.java @@ -20,8 +20,8 @@ import static com.android.tv.util.images.BitmapUtils.createScaledBitmapInfo; import static com.google.common.truth.Truth.assertWithMessage; 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 com.android.tv.util.images.BitmapUtils.ScaledBitmapInfo; import org.junit.Before; import org.junit.Test; diff --git a/tests/unit/src/com/android/tv/util/images/ScaledBitmapInfoTest.java b/tests/unit/src/com/android/tv/util/images/ScaledBitmapInfoTest.java index 005775b6..1bb650fb 100644 --- a/tests/unit/src/com/android/tv/util/images/ScaledBitmapInfoTest.java +++ b/tests/unit/src/com/android/tv/util/images/ScaledBitmapInfoTest.java @@ -18,8 +18,8 @@ package com.android.tv.util.images; import static com.google.common.truth.Truth.assertWithMessage; import android.graphics.Bitmap; -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.tv.util.images.BitmapUtils.ScaledBitmapInfo; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tuner/tests/testing/Android.mk b/tuner/tests/testing/Android.mk index 0d71b739..df19bfe5 100644 --- a/tuner/tests/testing/Android.mk +++ b/tuner/tests/testing/Android.mk @@ -8,7 +8,7 @@ LOCAL_SRC_FILES := \ LOCAL_STATIC_JAVA_LIBRARIES := \ android-support-annotations \ - android-support-test \ + androidx-test \ guava \ mockito-target \ platform-robolectric-3.6.1-prebuilt \ diff --git a/tuner/tests/unittests/javatests/com/android/tv/tuner/AndroidManifest.xml b/tuner/tests/unittests/javatests/com/android/tv/tuner/AndroidManifest.xml index 4f934f24..6fe0b85a 100644 --- a/tuner/tests/unittests/javatests/com/android/tv/tuner/AndroidManifest.xml +++ b/tuner/tests/unittests/javatests/com/android/tv/tuner/AndroidManifest.xml @@ -21,7 +21,7 @@ <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="27" /> <instrumentation - android:name="android.support.test.runner.AndroidJUnitRunner" + android:name="androidx.test.runner.AndroidJUnitRunner" android:targetPackage="com.android.tv" /> <application android:label="TunerTvInputTests" > diff --git a/tuner/tests/unittests/javatests/com/android/tv/tuner/ZappingTimeTest.java b/tuner/tests/unittests/javatests/com/android/tv/tuner/ZappingTimeTest.java index 0e9bd357..27f0e4c1 100644 --- a/tuner/tests/unittests/javatests/com/android/tv/tuner/ZappingTimeTest.java +++ b/tuner/tests/unittests/javatests/com/android/tv/tuner/ZappingTimeTest.java @@ -21,10 +21,10 @@ import android.graphics.SurfaceTexture; import android.os.Handler; import android.os.HandlerThread; import android.os.Message; -import android.support.test.filters.LargeTest; import android.test.InstrumentationTestCase; import android.util.Log; import android.view.Surface; +import androidx.test.filters.LargeTest; import com.android.tv.tuner.data.Cea708Data; import com.android.tv.tuner.data.PsiData; import com.android.tv.tuner.data.PsipData; diff --git a/tuner/tests/unittests/javatests/com/android/tv/tuner/layout/tests/ScaledLayoutTest.java b/tuner/tests/unittests/javatests/com/android/tv/tuner/layout/tests/ScaledLayoutTest.java index 214b0631..c2a23f2f 100644 --- a/tuner/tests/unittests/javatests/com/android/tv/tuner/layout/tests/ScaledLayoutTest.java +++ b/tuner/tests/unittests/javatests/com/android/tv/tuner/layout/tests/ScaledLayoutTest.java @@ -20,11 +20,11 @@ import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertNotNull; import android.content.Intent; -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.test.filters.SmallTest; +import androidx.test.rule.ActivityTestRule; +import androidx.test.runner.AndroidJUnit4; import com.android.tv.tuner.layout.ScaledLayout; import org.junit.After; import org.junit.Before; diff --git a/tuner/tests/unittests/javatests/com/android/tv/tuner/setup/TunerHalFactoryTest.java b/tuner/tests/unittests/javatests/com/android/tv/tuner/setup/TunerHalFactoryTest.java index 2354c827..48bd058b 100644 --- a/tuner/tests/unittests/javatests/com/android/tv/tuner/setup/TunerHalFactoryTest.java +++ b/tuner/tests/unittests/javatests/com/android/tv/tuner/setup/TunerHalFactoryTest.java @@ -21,8 +21,8 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import android.os.AsyncTask; -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.tv.tuner.TunerHal; import com.android.tv.tuner.setup.BaseTunerSetupActivity.TunerHalFactory; import java.util.concurrent.Executor; |