diff options
Diffstat (limited to 'tests/func/src/com')
8 files changed, 8 insertions, 8 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 61939fdb..d8a4aec1 100644 --- a/tests/func/src/com/android/tv/tests/ui/ChannelBannerViewTest.java +++ b/tests/func/src/com/android/tv/tests/ui/ChannelBannerViewTest.java @@ -18,8 +18,8 @@ package com.android.tv.tests.ui; import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertWaitForCondition; +import android.support.test.filters.SmallTest; import android.support.test.uiautomator.Until; -import android.test.suitebuilder.annotation.SmallTest; import com.android.tv.R; import com.android.tv.testing.uihelper.Constants; 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 27d8824e..e4f612e3 100644 --- a/tests/func/src/com/android/tv/tests/ui/ChannelSourcesTest.java +++ b/tests/func/src/com/android/tv/tests/ui/ChannelSourcesTest.java @@ -17,9 +17,9 @@ package com.android.tv.tests.ui; import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertWaitForCondition; +import android.support.test.filters.LargeTest; import android.support.test.uiautomator.BySelector; import android.support.test.uiautomator.Until; -import android.test.suitebuilder.annotation.LargeTest; import com.android.tv.R; import com.android.tv.testing.uihelper.ByResource; 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 b48968ad..48224123 100644 --- a/tests/func/src/com/android/tv/tests/ui/LiveChannelsAppTest.java +++ b/tests/func/src/com/android/tv/tests/ui/LiveChannelsAppTest.java @@ -19,9 +19,9 @@ package com.android.tv.tests.ui; import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertHas; import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertWaitForCondition; +import android.support.test.filters.LargeTest; import android.support.test.uiautomator.BySelector; import android.support.test.uiautomator.Until; -import android.test.suitebuilder.annotation.LargeTest; import com.android.tv.R; import com.android.tv.testing.testinput.ChannelStateData; 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 19861c1f..93d14bde 100644 --- a/tests/func/src/com/android/tv/tests/ui/ParentalControlsTest.java +++ b/tests/func/src/com/android/tv/tests/ui/ParentalControlsTest.java @@ -18,10 +18,10 @@ package com.android.tv.tests.ui; import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertWaitForCondition; +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.test.suitebuilder.annotation.SmallTest; import com.android.tv.R; import com.android.tv.testing.uihelper.ByResource; 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 40ccf267..bbc7aa81 100644 --- a/tests/func/src/com/android/tv/tests/ui/PlayControlsRowViewTest.java +++ b/tests/func/src/com/android/tv/tests/ui/PlayControlsRowViewTest.java @@ -21,10 +21,10 @@ import static com.android.tv.testing.uihelper.Constants.MENU; import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertWaitForCondition; import android.support.test.filters.SdkSuppress; +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.test.suitebuilder.annotation.SmallTest; import android.view.KeyEvent; import com.android.tv.R; diff --git a/tests/func/src/com/android/tv/tests/ui/ProgramGuidePerformanceTest.java b/tests/func/src/com/android/tv/tests/ui/ProgramGuidePerformanceTest.java index 5c09dd61..95921df9 100644 --- a/tests/func/src/com/android/tv/tests/ui/ProgramGuidePerformanceTest.java +++ b/tests/func/src/com/android/tv/tests/ui/ProgramGuidePerformanceTest.java @@ -18,8 +18,8 @@ package com.android.tv.tests.ui; import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertWaitForCondition; import android.os.SystemClock; +import android.support.test.filters.LargeTest; import android.support.test.uiautomator.Until; -import android.test.suitebuilder.annotation.LargeTest; import android.util.Log; import com.android.tv.R; 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 a018f012..06c76b3b 100644 --- a/tests/func/src/com/android/tv/tests/ui/ProgramGuideTest.java +++ b/tests/func/src/com/android/tv/tests/ui/ProgramGuideTest.java @@ -18,8 +18,8 @@ package com.android.tv.tests.ui; import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertHas; import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertWaitForCondition; +import android.support.test.filters.LargeTest; import android.support.test.uiautomator.Until; -import android.test.suitebuilder.annotation.LargeTest; import com.android.tv.guide.ProgramGuide; import com.android.tv.testing.uihelper.Constants; 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 413a783e..9bf2ac50 100644 --- a/tests/func/src/com/android/tv/tests/ui/TimeoutTest.java +++ b/tests/func/src/com/android/tv/tests/ui/TimeoutTest.java @@ -18,8 +18,8 @@ package com.android.tv.tests.ui; import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertHas; import static com.android.tv.testing.uihelper.UiDeviceAsserts.assertWaitForCondition; +import android.support.test.filters.LargeTest; import android.support.test.uiautomator.Until; -import android.test.suitebuilder.annotation.LargeTest; import com.android.tv.R; import com.android.tv.testing.uihelper.Constants; |