Merge "Suppress flaky tests" into androidx-main
diff --git a/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTest.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTest.java
index 1c3f923..35ef107 100644
--- a/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTest.java
+++ b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorLayoutTest.java
@@ -58,6 +58,7 @@
import androidx.core.view.WindowInsetsCompat;
import androidx.test.annotation.UiThreadTest;
import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.FlakyTest;
import androidx.test.filters.LargeTest;
import androidx.test.filters.SdkSuppress;
@@ -431,6 +432,7 @@
});
}
+ @FlakyTest(bugId = 190609035)
@Test
public void testGetDependencies() throws Throwable {
final Instrumentation instrumentation = getInstrumentation();
@@ -732,6 +734,7 @@
any(View.class)); // target
}
+ @FlakyTest(bugId = 190609885)
@Test
public void testNestedScrollingTriggeringDependentViewChanged() throws Throwable {
final CoordinatorLayoutActivity activity = mActivityTestRule.getActivity();
diff --git a/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorSnackbarWithButtonTest.java b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorSnackbarWithButtonTest.java
index 01d5bd8..203ba8b 100644
--- a/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorSnackbarWithButtonTest.java
+++ b/coordinatorlayout/coordinatorlayout/src/androidTest/java/androidx/coordinatorlayout/widget/CoordinatorSnackbarWithButtonTest.java
@@ -35,6 +35,7 @@
import androidx.test.annotation.UiThreadTest;
import androidx.test.espresso.UiController;
import androidx.test.espresso.ViewAction;
+import androidx.test.filters.FlakyTest;
import androidx.test.filters.LargeTest;
import org.hamcrest.Matcher;
@@ -116,6 +117,7 @@
}
}
+ @FlakyTest(bugId = 190609153)
@Test
public void testBehaviorBasedSlidingFromLayoutAttribute() {
// Use a layout in which a TextView child has Behavior object configured via
diff --git a/lifecycle/lifecycle-viewmodel-compose/src/androidTest/java/androidx/lifecycle/viewmodel/compose/ViewModelInComponentActivityTest.kt b/lifecycle/lifecycle-viewmodel-compose/src/androidTest/java/androidx/lifecycle/viewmodel/compose/ViewModelInComponentActivityTest.kt
index fbc90b5..594a2e2 100644
--- a/lifecycle/lifecycle-viewmodel-compose/src/androidTest/java/androidx/lifecycle/viewmodel/compose/ViewModelInComponentActivityTest.kt
+++ b/lifecycle/lifecycle-viewmodel-compose/src/androidTest/java/androidx/lifecycle/viewmodel/compose/ViewModelInComponentActivityTest.kt
@@ -22,6 +22,7 @@
import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.lifecycle.LifecycleOwner
import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
import androidx.test.filters.MediumTest
import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
@@ -62,6 +63,7 @@
assertEquals(activity, owner)
}
+ @FlakyTest(bugId = 190609144)
@Test
public fun lifecycleOwnerIsAvailableWhenComposedIntoViewGroup() {
val latch = CountDownLatch(1)
diff --git a/lifecycle/lifecycle-viewmodel-compose/src/androidTest/java/androidx/lifecycle/viewmodel/compose/ViewModelInFragmentTest.kt b/lifecycle/lifecycle-viewmodel-compose/src/androidTest/java/androidx/lifecycle/viewmodel/compose/ViewModelInFragmentTest.kt
index a6ba005..1e7ebc0 100644
--- a/lifecycle/lifecycle-viewmodel-compose/src/androidTest/java/androidx/lifecycle/viewmodel/compose/ViewModelInFragmentTest.kt
+++ b/lifecycle/lifecycle-viewmodel-compose/src/androidTest/java/androidx/lifecycle/viewmodel/compose/ViewModelInFragmentTest.kt
@@ -24,6 +24,7 @@
import androidx.fragment.app.FragmentActivity
import androidx.fragment.app.FragmentContainerView
import androidx.lifecycle.ViewModel
+import androidx.test.filters.FlakyTest
import androidx.test.filters.MediumTest
import org.junit.Assert.assertTrue
import org.junit.Before
@@ -55,6 +56,7 @@
activity = activityTestRule.activity
}
+ @FlakyTest(bugId = 190608770)
@Test
public fun viewModelCreatedInFragment() {
val fragment = TestFragment(viewModelClass)
diff --git a/navigation/navigation-compose/src/androidTest/java/androidx/navigation/compose/NavGraphBuilderTest.kt b/navigation/navigation-compose/src/androidTest/java/androidx/navigation/compose/NavGraphBuilderTest.kt
index 776d4a2..f0bdc4d 100644
--- a/navigation/navigation-compose/src/androidTest/java/androidx/navigation/compose/NavGraphBuilderTest.kt
+++ b/navigation/navigation-compose/src/androidTest/java/androidx/navigation/compose/NavGraphBuilderTest.kt
@@ -20,12 +20,13 @@
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.core.net.toUri
-import androidx.navigation.contains
import androidx.navigation.NavDeepLinkRequest
+import androidx.navigation.contains
import androidx.navigation.navDeepLink
import androidx.navigation.navigation
import androidx.navigation.testing.TestNavHostController
import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
import androidx.test.filters.LargeTest
import com.google.common.truth.Truth.assertThat
import com.google.common.truth.Truth.assertWithMessage
@@ -88,6 +89,7 @@
}
}
+ @FlakyTest(bugId = 190608403)
@Test
fun testDeepLink() {
lateinit var navController: TestNavHostController
@@ -134,6 +136,7 @@
}
}
+ @FlakyTest(bugId = 190608403)
@Test
fun testNavigationNestedInGraph() {
lateinit var navController: TestNavHostController
diff --git a/paging/paging-compose/src/androidTest/java/androidx/paging/compose/LazyPagingItemsTest.kt b/paging/paging-compose/src/androidTest/java/androidx/paging/compose/LazyPagingItemsTest.kt
index 186fb30..e641eb0 100644
--- a/paging/paging-compose/src/androidTest/java/androidx/paging/compose/LazyPagingItemsTest.kt
+++ b/paging/paging-compose/src/androidTest/java/androidx/paging/compose/LazyPagingItemsTest.kt
@@ -34,6 +34,7 @@
import androidx.paging.PagingSource
import androidx.paging.TestPagingSource
import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
import androidx.test.filters.LargeTest
import com.google.common.truth.Truth.assertThat
import org.junit.Rule
@@ -63,6 +64,7 @@
return Pager(config = config, pagingSourceFactory = pagingSourceFactory)
}
+ @FlakyTest(bugId = 190609811)
@Test
fun lazyPagingColumnShowsItems() {
val pager = createPager()
@@ -120,6 +122,7 @@
.assertDoesNotExist()
}
+ @FlakyTest(bugId = 190609811)
@Test
fun lazyPagingRowShowsItems() {
val pager = createPager()
@@ -366,6 +369,7 @@
.assertDoesNotExist()
}
+ @FlakyTest(bugId = 190609811)
@Test
fun updatingItem() {
val items = mutableListOf(1, 2, 3)
diff --git a/room/room-runtime/src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt b/room/room-runtime/src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt
index dd0693c..2da5170 100644
--- a/room/room-runtime/src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt
+++ b/room/room-runtime/src/androidTest/java/androidx/room/AutoClosingRoomOpenHelperTest.kt
@@ -24,13 +24,13 @@
import androidx.sqlite.db.SupportSQLiteOpenHelper
import androidx.sqlite.db.framework.FrameworkSQLiteOpenHelperFactory
import androidx.test.core.app.ApplicationProvider
+import androidx.test.filters.FlakyTest
import androidx.test.filters.SdkSuppress
import androidx.testutils.assertThrows
import com.google.common.truth.Truth.assertThat
import org.junit.Before
import org.junit.Test
import java.io.IOException
-import java.lang.UnsupportedOperationException
import java.util.concurrent.Executors
import java.util.concurrent.TimeUnit
@@ -138,6 +138,7 @@
}
}
+ @FlakyTest(bugId = 190607416)
@Test
public fun testOnOpenCalledOnEachOpen() {
val countingCallback = object : Callback() {
diff --git a/slidingpanelayout/slidingpanelayout/src/androidTest/java/androidx/slidingpanelayout/widget/FoldTest.kt b/slidingpanelayout/slidingpanelayout/src/androidTest/java/androidx/slidingpanelayout/widget/FoldTest.kt
index b245d3d..2c110f6 100644
--- a/slidingpanelayout/slidingpanelayout/src/androidTest/java/androidx/slidingpanelayout/widget/FoldTest.kt
+++ b/slidingpanelayout/slidingpanelayout/src/androidTest/java/androidx/slidingpanelayout/widget/FoldTest.kt
@@ -24,6 +24,7 @@
import androidx.slidingpanelayout.widget.helpers.findViewX
import androidx.test.core.app.ActivityScenario
import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
import androidx.test.filters.LargeTest
import androidx.testutils.withActivity
import androidx.window.WindowManager
@@ -47,6 +48,7 @@
/**
* Test split views in middle when fold vertically
*/
+ @FlakyTest(bugId = 190609880)
@Test
public fun testFoldVertical() {
TestActivity.onActivityCreated = { activity ->
@@ -107,6 +109,7 @@
/**
* Test split views when fold pane is smaller than required min width
*/
+ @FlakyTest(bugId = 190609880)
@Test
public fun testFoldExceedMinWidth() {
val detailViewExtraWidth = 200
diff --git a/swiperefreshlayout/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayoutRequestDisallowInterceptBaseTest.java b/swiperefreshlayout/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayoutRequestDisallowInterceptBaseTest.java
index 87d8cde..9af786e 100644
--- a/swiperefreshlayout/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayoutRequestDisallowInterceptBaseTest.java
+++ b/swiperefreshlayout/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayoutRequestDisallowInterceptBaseTest.java
@@ -24,6 +24,7 @@
import android.view.ViewConfiguration;
+import androidx.test.filters.FlakyTest;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.testutils.SwipeInjector;
@@ -65,6 +66,7 @@
assertThat(mRecyclerView.mRequestDisallowInterceptFalseCalled, equalTo(false));
}
+ @FlakyTest(bugId = 190613223)
@Test
public void swipeMoreThanTouchSlop_requestDisallowIsCalled() {
assertThat(mRecyclerView.mRequestDisallowInterceptTrueCalled, equalTo(false));
diff --git a/swiperefreshlayout/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayoutTest.java b/swiperefreshlayout/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayoutTest.java
index bf17eca..af8af21 100644
--- a/swiperefreshlayout/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayoutTest.java
+++ b/swiperefreshlayout/swiperefreshlayout/src/androidTest/java/androidx/swiperefreshlayout/widget/SwipeRefreshLayoutTest.java
@@ -69,6 +69,7 @@
mSwipeRefresh = mActivityTestRule.getActivity().findViewById(R.id.swipe_refresh);
}
+ @FlakyTest(bugId = 113347851)
@Test
@LargeTest
public void testStartAndStopRefreshing() throws Throwable {
diff --git a/viewpager/viewpager/src/androidTest/java/androidx/viewpager/widget/BaseViewPagerTest.java b/viewpager/viewpager/src/androidTest/java/androidx/viewpager/widget/BaseViewPagerTest.java
index c1baf88..50a69c9 100644
--- a/viewpager/viewpager/src/androidTest/java/androidx/viewpager/widget/BaseViewPagerTest.java
+++ b/viewpager/viewpager/src/androidTest/java/androidx/viewpager/widget/BaseViewPagerTest.java
@@ -410,6 +410,7 @@
ViewPagerActions.arrowScroll(View.FOCUS_RIGHT), ViewPagerActions.arrowScroll(View.FOCUS_LEFT));
}
+ @FlakyTest(bugId = 112265192)
@Test
@LargeTest
public void testPageSwipesComposite() {
@@ -649,12 +650,14 @@
assertStripInteraction(smoothScroll);
}
+ @FlakyTest(bugId = 112265192)
@Test
@LargeTest
public void testPagerStripImmediate() {
verifyPagerStrip(false);
}
+ @FlakyTest(bugId = 112265192)
@Test
@LargeTest
public void testPagerStripSmooth() {
@@ -1030,6 +1033,7 @@
mViewPager.removeOnPageChangeListener(mockPageChangeListener);
}
+ @FlakyTest(bugId = 112265192)
@Test
@MediumTest
public void testPageScrollPositionChangesImmediate() {
@@ -1068,7 +1072,7 @@
@Test
@LargeTest
- @FlakyTest(bugId = 188565856)
+ @FlakyTest(bugId = 112265192)
public void testPageScrollPositionChangesSwipe() {
// Swipe one page to the left
verifyScrollCallbacksToHigherPage(ViewPagerActions.wrap(swipeLeft()), 1);
@@ -1080,7 +1084,7 @@
verifyScrollCallbacksToLowerPage(ViewPagerActions.wrap(swipeRight()), 0);
}
- @FlakyTest(bugId = 38260187)
+ @FlakyTest(bugId = 112265192)
@Test
@LargeTest
public void testKeyboardNavigation() {
diff --git a/viewpager/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTabStripTest.java b/viewpager/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTabStripTest.java
index 4a0c74c..4e89e33 100644
--- a/viewpager/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTabStripTest.java
+++ b/viewpager/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTabStripTest.java
@@ -30,7 +30,6 @@
/**
* Provides assertions that depend on the interactive nature of <code>PagerTabStrip</code>.
*/
-@FlakyTest(bugId = 112265192)
public class ViewPagerWithTabStripTest extends BaseViewPagerTest<ViewPagerWithTabStripActivity> {
public ViewPagerWithTabStripTest() {
super(ViewPagerWithTabStripActivity.class);
diff --git a/viewpager/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTitleStripTest.java b/viewpager/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTitleStripTest.java
index 7f3f941..ae5c889 100644
--- a/viewpager/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTitleStripTest.java
+++ b/viewpager/viewpager/src/androidTest/java/androidx/viewpager/widget/ViewPagerWithTitleStripTest.java
@@ -30,7 +30,6 @@
/**
* Provides assertions that depend on the non-interactive nature of <code>PagerTabStrip</code>.
*/
-@FlakyTest(bugId = 112265192)
public class ViewPagerWithTitleStripTest
extends BaseViewPagerTest<ViewPagerWithTitleStripActivity> {
public ViewPagerWithTitleStripTest() {
diff --git a/viewpager2/integration-tests/testapp/src/androidTest/java/androidx/viewpager2/integration/testapp/test/MarginPageTransformerTest.kt b/viewpager2/integration-tests/testapp/src/androidTest/java/androidx/viewpager2/integration/testapp/test/MarginPageTransformerTest.kt
index 5e65603..15a13ba 100644
--- a/viewpager2/integration-tests/testapp/src/androidTest/java/androidx/viewpager2/integration/testapp/test/MarginPageTransformerTest.kt
+++ b/viewpager2/integration-tests/testapp/src/androidTest/java/androidx/viewpager2/integration/testapp/test/MarginPageTransformerTest.kt
@@ -24,6 +24,7 @@
import androidx.test.espresso.action.ViewActions.click
import androidx.test.espresso.matcher.ViewMatchers
import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.FlakyTest
import androidx.test.filters.LargeTest
import androidx.viewpager2.integration.testapp.PageTransformerActivity
import androidx.viewpager2.integration.testapp.R
@@ -55,6 +56,7 @@
testMargin(null)
}
+ @FlakyTest(bugId = 190611098)
@Test
fun testMargin_offscreenLimit_default() {
testMargin(ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT)
