From a191bfa48f9d2e8888df253f47b2458c5721b183 Mon Sep 17 00:00:00 2001 From: Aurimas Liutikas Date: Wed, 18 Jul 2018 18:07:27 -0700 Subject: [PATCH] Mark all the test >3s as @LargeTest Mark the tests that take longer than 3s to complete as @LargeTest. Source of data: https://dashboards.corp.google.com/google::_550f6bcf_09dd_4963_b94c_d243e37d002f?f=branch:in:ub-supportlib-master&f=test_tag:in:support_lib_presubmit Test: None Change-Id: I354d5a2367659bd5e93e481265784f54568e83be --- .../java/androidx/car/widget/PagedListViewTest.java | 2 ++ .../androidx/emoji/widget/EmojiEditTextHelperPre19Test.java | 2 ++ .../androidx/exifinterface/media/ExifInterfaceTest.java | 2 +- .../java/androidx/leanback/app/PlaybackFragmentTest.java | 2 ++ .../androidx/leanback/app/PlaybackSupportFragmentTest.java | 2 ++ .../java/androidx/leanback/widget/ImageCardViewTest.java | 4 ++-- .../java/androidx/leanback/widget/ThumbsBarTest.java | 2 ++ .../java/androidx/media2/MediaController2Test.java | 6 ++++++ .../androidTest/java/androidx/slice/render/RenderTest.java | 4 ++-- .../java/androidx/wear/ambient/AmbientDelegateTest.java | 2 ++ .../wear/widget/CircularProgressLayoutControllerTest.java | 1 + .../java/androidx/wear/widget/ScrollManagerTest.java | 2 ++ .../background/systemalarm/SystemAlarmDispatcherTest.java | 1 + .../impl/background/systemjob/SystemJobServiceTest.java | 2 +- 14 files changed, 28 insertions(+), 6 deletions(-) diff --git a/car/src/androidTest/java/androidx/car/widget/PagedListViewTest.java b/car/src/androidTest/java/androidx/car/widget/PagedListViewTest.java index a530001f5a1f..56c55d8d9d9e 100644 --- a/car/src/androidTest/java/androidx/car/widget/PagedListViewTest.java +++ b/car/src/androidTest/java/androidx/car/widget/PagedListViewTest.java @@ -57,6 +57,7 @@ import androidx.test.espresso.Espresso; import androidx.test.espresso.IdlingResource; import androidx.test.espresso.matcher.ViewMatchers; +import androidx.test.filters.LargeTest; import androidx.test.filters.MediumTest; import androidx.test.rule.ActivityTestRule; import androidx.test.runner.AndroidJUnit4; @@ -228,6 +229,7 @@ public void testSwipeUpKeepsItemSnappedToTopOfList() { verifyItemSnappedToListTop(); } + @LargeTest @Test public void testPageUpAndDownMoveSameDistance() { setUpPagedListView(ITEMS_PER_PAGE * 10); diff --git a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperPre19Test.java b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperPre19Test.java index e231a99f7f71..594b7f93bdb0 100644 --- a/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperPre19Test.java +++ b/emoji/core/src/androidTest/java/androidx/emoji/widget/EmojiEditTextHelperPre19Test.java @@ -30,6 +30,7 @@ import android.view.inputmethod.InputConnection; import android.widget.EditText; +import androidx.test.filters.LargeTest; import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -60,6 +61,7 @@ public void testGetKeyListener_returnsSameKeyListener() { assertSame(param, keyListener); } + @LargeTest @Test public void testGetOnCreateInputConnection_returnsSameInputConnection() { final InputConnection param = mock(InputConnection.class); diff --git a/exifinterface/src/androidTest/java/androidx/exifinterface/media/ExifInterfaceTest.java b/exifinterface/src/androidTest/java/androidx/exifinterface/media/ExifInterfaceTest.java index 3c6535456cbd..3100bda7adf6 100644 --- a/exifinterface/src/androidTest/java/androidx/exifinterface/media/ExifInterfaceTest.java +++ b/exifinterface/src/androidTest/java/androidx/exifinterface/media/ExifInterfaceTest.java @@ -558,7 +558,7 @@ public void testSetDateTime() throws IOException { } @Test - @SmallTest + @LargeTest public void testRotation() throws IOException { File imageFile = new File( Environment.getExternalStorageDirectory(), EXIF_BYTE_ORDER_II_JPEG); diff --git a/leanback/src/androidTest/java/androidx/leanback/app/PlaybackFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/PlaybackFragmentTest.java index cbb716e8d8d7..308d1319f508 100644 --- a/leanback/src/androidTest/java/androidx/leanback/app/PlaybackFragmentTest.java +++ b/leanback/src/androidTest/java/androidx/leanback/app/PlaybackFragmentTest.java @@ -46,6 +46,7 @@ import androidx.leanback.widget.RowPresenter; import androidx.leanback.widget.SparseArrayObjectAdapter; import androidx.test.filters.FlakyTest; +import androidx.test.filters.LargeTest; import androidx.test.filters.MediumTest; import androidx.test.filters.Suppress; import androidx.test.runner.AndroidJUnit4; @@ -392,6 +393,7 @@ public void onCreate(Bundle savedInstanceState) { } } + @LargeTest @Test public void autohideAfterPlaying() throws Throwable { SingleFragmentTestActivity activity = diff --git a/leanback/src/androidTest/java/androidx/leanback/app/PlaybackSupportFragmentTest.java b/leanback/src/androidTest/java/androidx/leanback/app/PlaybackSupportFragmentTest.java index 1c42133f56cd..77c32df0805b 100644 --- a/leanback/src/androidTest/java/androidx/leanback/app/PlaybackSupportFragmentTest.java +++ b/leanback/src/androidTest/java/androidx/leanback/app/PlaybackSupportFragmentTest.java @@ -43,6 +43,7 @@ import androidx.leanback.widget.RowPresenter; import androidx.leanback.widget.SparseArrayObjectAdapter; import androidx.test.filters.FlakyTest; +import androidx.test.filters.LargeTest; import androidx.test.filters.MediumTest; import androidx.test.filters.Suppress; import androidx.test.runner.AndroidJUnit4; @@ -389,6 +390,7 @@ public void onCreate(Bundle savedInstanceState) { } } + @LargeTest @Test public void autohideAfterPlaying() throws Throwable { SingleSupportFragmentTestActivity activity = diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ImageCardViewTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ImageCardViewTest.java index 13d008eaf707..8ff54503db6e 100644 --- a/leanback/src/androidTest/java/androidx/leanback/widget/ImageCardViewTest.java +++ b/leanback/src/androidTest/java/androidx/leanback/widget/ImageCardViewTest.java @@ -33,7 +33,7 @@ import androidx.leanback.R; import androidx.leanback.app.TestActivity; import androidx.leanback.testutils.PollingCheck; -import androidx.test.filters.SmallTest; +import androidx.test.filters.LargeTest; import androidx.test.runner.AndroidJUnit4; import org.junit.Before; @@ -44,7 +44,7 @@ import java.util.Random; -@SmallTest +@LargeTest @RunWith(AndroidJUnit4.class) public class ImageCardViewTest { diff --git a/leanback/src/androidTest/java/androidx/leanback/widget/ThumbsBarTest.java b/leanback/src/androidTest/java/androidx/leanback/widget/ThumbsBarTest.java index ad425955e5e3..b954f6a3cce3 100644 --- a/leanback/src/androidTest/java/androidx/leanback/widget/ThumbsBarTest.java +++ b/leanback/src/androidTest/java/androidx/leanback/widget/ThumbsBarTest.java @@ -25,6 +25,7 @@ import androidx.leanback.R; import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -217,6 +218,7 @@ public void run() { * be 1. According to the algorithm of calculateNumOfThumbs, it should be reassigned to 2 and * the final result should be 3 after counting the hero thumb. */ + @LargeTest @Test public void checkCalculateNumberOfThumbs1() { mContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); diff --git a/media2/src/androidTest/java/androidx/media2/MediaController2Test.java b/media2/src/androidTest/java/androidx/media2/MediaController2Test.java index de878fa27f12..a52091a2a3d7 100644 --- a/media2/src/androidTest/java/androidx/media2/MediaController2Test.java +++ b/media2/src/androidTest/java/androidx/media2/MediaController2Test.java @@ -47,6 +47,7 @@ import androidx.media2.TestServiceRegistry.SessionServiceCallback; import androidx.media2.TestUtils.SyncHandler; import androidx.test.filters.FlakyTest; +import androidx.test.filters.LargeTest; import androidx.test.filters.SdkSuppress; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -1298,12 +1299,14 @@ public void onCustomCommand(MediaController2 controller, assertTrue(controllerLatch.await(WAIT_TIME_MS, TimeUnit.MILLISECONDS)); } + @LargeTest @Test public void testControllerAfterSessionIsGone_session() throws InterruptedException { prepareLooper(); testControllerAfterSessionIsClosed(mSession.getToken().getId()); } + @LargeTest @Test public void testControllerAfterSessionIsClosed_sessionService() throws InterruptedException { prepareLooper(); @@ -1382,6 +1385,7 @@ public void testClose_twice() { mController.close(); } + @LargeTest @Test public void testClose_session() throws InterruptedException { prepareLooper(); @@ -1395,12 +1399,14 @@ public void testClose_session() throws InterruptedException { testControllerAfterSessionIsClosed(id); } + @LargeTest @Test public void testClose_sessionService() throws InterruptedException { prepareLooper(); testCloseFromService(MockMediaSessionService2.ID); } + @LargeTest @Test public void testClose_libraryService() throws InterruptedException { prepareLooper(); diff --git a/slices/view/src/androidTest/java/androidx/slice/render/RenderTest.java b/slices/view/src/androidTest/java/androidx/slice/render/RenderTest.java index 4108397392b2..381df6edc5c5 100644 --- a/slices/view/src/androidTest/java/androidx/slice/render/RenderTest.java +++ b/slices/view/src/androidTest/java/androidx/slice/render/RenderTest.java @@ -31,8 +31,8 @@ import android.os.Build; import androidx.test.InstrumentationRegistry; +import androidx.test.filters.LargeTest; import androidx.test.filters.SdkSuppress; -import androidx.test.filters.SmallTest; import androidx.test.rule.GrantPermissionRule; import androidx.test.runner.AndroidJUnit4; @@ -48,7 +48,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -@SmallTest +@LargeTest @RunWith(AndroidJUnit4.class) @SdkSuppress(minSdkVersion = 19) public class RenderTest { diff --git a/wear/src/androidTest/java/androidx/wear/ambient/AmbientDelegateTest.java b/wear/src/androidTest/java/androidx/wear/ambient/AmbientDelegateTest.java index fc8877d0db1f..c936fb64a1ea 100644 --- a/wear/src/androidTest/java/androidx/wear/ambient/AmbientDelegateTest.java +++ b/wear/src/androidTest/java/androidx/wear/ambient/AmbientDelegateTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.when; import androidx.fragment.app.FragmentActivity; +import androidx.test.filters.LargeTest; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; @@ -61,6 +62,7 @@ public void setUp() { .thenReturn(mMockWearableController); } + @LargeTest @Test public void testNullActivity() { mAmbientDelegateUnderTest = new AmbientDelegate(null, diff --git a/wear/src/androidTest/java/androidx/wear/widget/CircularProgressLayoutControllerTest.java b/wear/src/androidTest/java/androidx/wear/widget/CircularProgressLayoutControllerTest.java index ddba817c0fb9..9044136ba42d 100644 --- a/wear/src/androidTest/java/androidx/wear/widget/CircularProgressLayoutControllerTest.java +++ b/wear/src/androidTest/java/androidx/wear/widget/CircularProgressLayoutControllerTest.java @@ -95,6 +95,7 @@ public void testIsTimerRunningAfterStop() { assertEquals(false, mControllerUnderTest.isTimerRunning()); } + @LargeTest @Test @UiThreadTest public void testSwitchFromIndeterminateToDeterminate() { diff --git a/wear/src/androidTest/java/androidx/wear/widget/ScrollManagerTest.java b/wear/src/androidTest/java/androidx/wear/widget/ScrollManagerTest.java index ca4856b33e99..00fd22f343e8 100644 --- a/wear/src/androidTest/java/androidx/wear/widget/ScrollManagerTest.java +++ b/wear/src/androidTest/java/androidx/wear/widget/ScrollManagerTest.java @@ -25,6 +25,7 @@ import android.os.SystemClock; import android.view.MotionEvent; +import androidx.test.filters.LargeTest; import androidx.test.filters.MediumTest; import androidx.test.rule.ActivityTestRule; import androidx.test.runner.AndroidJUnit4; @@ -75,6 +76,7 @@ public void testStraightUpScrollingGestureLeft() throws Throwable { .scrollBy(0, 1); } + @LargeTest @Test public void testStraightDownScrollingGestureLeft() throws Throwable { // Pretend to scroll in a straight line upper left to center left diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/SystemAlarmDispatcherTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/SystemAlarmDispatcherTest.java index 9a383cb8dd6f..4a2cbc0b045d 100644 --- a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/SystemAlarmDispatcherTest.java +++ b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemalarm/SystemAlarmDispatcherTest.java @@ -279,6 +279,7 @@ public void testConstraintsChanged_withNoConstraints() throws InterruptedExcepti assertThat(mLatch.getCount(), is(0L)); } + @LargeTest @Test public void testConstraintsChangedMarkedNotScheduled_withNoConstraints() throws InterruptedException { diff --git a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobServiceTest.java b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobServiceTest.java index 3d45462ca857..5e0850052eb6 100644 --- a/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobServiceTest.java +++ b/work/workmanager/src/androidTest/java/androidx/work/impl/background/systemjob/SystemJobServiceTest.java @@ -163,7 +163,7 @@ public void testOnStopJob_ReschedulesWhenNotCancelled() { } @Test - @SmallTest + @LargeTest public void testOnStopJob_DoesNotRescheduleWhenCancelled() { // TODO: Remove after we figure out why these tests execute on API 17 emulators. if (Build.VERSION.SDK_INT < WorkManagerImpl.MIN_JOB_SCHEDULER_API_LEVEL) {