Merge "Disable flaky split screen assertion" into main (d39cc3df) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DragDividerToResize.kt

+10 −4

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ class DragDividerToResize(override val flicker: LegacyFlickerTest) :
		@Test
		fun splitScreenDividerKeepVisible() = flicker.layerKeepVisible(SPLIT_SCREEN_DIVIDER_COMPONENT)

		@Presubmit
		@FlakyTest(bugId = 291678271)
		@Test
		fun primaryAppLayerVisibilityChanges() {
		flicker.assertLayers {
		@@ -69,7 +69,7 @@ class DragDividerToResize(override val flicker: LegacyFlickerTest) :
		}
		}

		@Presubmit
		@FlakyTest(bugId = 291678271)
		@Test
		fun secondaryAppLayerVisibilityChanges() {
		flicker.assertLayers {
		@@ -87,7 +87,7 @@ class DragDividerToResize(override val flicker: LegacyFlickerTest) :
		@Test
		fun secondaryAppWindowKeepVisible() = flicker.appWindowKeepVisible(secondaryApp)

		@FlakyTest(bugId = 245472831)
		@FlakyTest(bugId = 291678271)
		@Test
		fun primaryAppBoundsChanges() {
		flicker.splitAppLayerBoundsChanges(
		@@ -97,7 +97,7 @@ class DragDividerToResize(override val flicker: LegacyFlickerTest) :
		)
		}

		@Presubmit
		@FlakyTest(bugId = 291678271)
		@Test
		fun secondaryAppBoundsChanges() =
		flicker.splitAppLayerBoundsChanges(
		@@ -106,6 +106,12 @@ class DragDividerToResize(override val flicker: LegacyFlickerTest) :
		portraitPosTop = true
		)

		@FlakyTest(bugId = 291678271)
		@Test
		override fun visibleLayersShownMoreThanOneConsecutiveEntry() {
		super.visibleLayersShownMoreThanOneConsecutiveEntry()
		}

		companion object {
		@Parameterized.Parameters(name = "{0}")
		@JvmStatic