diff options
Diffstat (limited to 'tests/func/src/com/android/tv')
10 files changed, 11 insertions, 11 deletions
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; |