Merge "Demote 15%+ flaky tests on Raven from Presubmit" (c65a42f8) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt

+16 −3

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory
		import com.android.server.wm.flicker.annotation.Group4
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.helpers.WindowUtils
		import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled
		import com.android.server.wm.flicker.helpers.setRotation
		import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen
		import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule.Companion.removeAllTasksButHome
		@@ -144,12 +145,24 @@ open class SetRequestedOrientationWhilePinnedTest(
		}
		}

		private fun pipLayerInsideDisplay_internal() {
		testSpec.assertLayersStart {
		visibleRegion(pipApp).coversAtMost(startingBounds)
		}
		}

		@Presubmit
		@Test
		fun pipLayerInsideDisplay() {
		testSpec.assertLayersStart {
		visibleRegion(pipApp).coversAtMost(startingBounds)
		Assume.assumeFalse(isShellTransitionsEnabled)
		pipLayerInsideDisplay_internal()
		}

		@FlakyTest(bugId = 250527829)
		@Test
		fun pipLayerInsideDisplay_shellTransit() {
		Assume.assumeTrue(isShellTransitionsEnabled)
		pipLayerInsideDisplay_internal()
		}

		@Presubmit

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

+18 −3

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.wm.shell.flicker.splitscreen

		import android.platform.test.annotations.FlakyTest
		import android.platform.test.annotations.IwTest
		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.Presubmit
		@@ -27,6 +28,7 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory
		import com.android.server.wm.flicker.annotation.Group1
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.helpers.WindowUtils
		import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled
		import com.android.wm.shell.flicker.SPLIT_SCREEN_DIVIDER_COMPONENT
		import com.android.wm.shell.flicker.appWindowBecomesInvisible
		import com.android.wm.shell.flicker.appWindowIsVisibleAtEnd
		@@ -35,6 +37,7 @@ import com.android.wm.shell.flicker.layerIsVisibleAtEnd
		import com.android.wm.shell.flicker.splitAppLayerBoundsBecomesInvisible
		import com.android.wm.shell.flicker.splitScreenDismissed
		import com.android.wm.shell.flicker.splitScreenDividerBecomesInvisible
		import org.junit.Assume
		import org.junit.FixMethodOrder
		import org.junit.Test
		import org.junit.runner.RunWith
		@@ -95,9 +98,7 @@ class DismissSplitScreenByDivider (testSpec: FlickerTestParameter) : SplitScreen
		fun primaryAppBoundsBecomesInvisible() = testSpec.splitAppLayerBoundsBecomesInvisible(
		primaryApp, landscapePosLeft = tapl.isTablet, portraitPosTop = false)

		@Presubmit
		@Test
		fun secondaryAppBoundsIsFullscreenAtEnd() {
		private fun secondaryAppBoundsIsFullscreenAtEnd_internal() {
		testSpec.assertLayers {
		this.isVisible(secondaryApp)
		.isVisible(SPLIT_SCREEN_DIVIDER_COMPONENT)
		@@ -117,6 +118,20 @@ class DismissSplitScreenByDivider (testSpec: FlickerTestParameter) : SplitScreen
		}
		}

		@Presubmit
		@Test
		fun secondaryAppBoundsIsFullscreenAtEnd() {
		Assume.assumeFalse(isShellTransitionsEnabled)
		secondaryAppBoundsIsFullscreenAtEnd_internal()
		}

		@FlakyTest(bugId = 250528485)
		@Test
		fun secondaryAppBoundsIsFullscreenAtEnd_shellTransit() {
		Assume.assumeTrue(isShellTransitionsEnabled)
		secondaryAppBoundsIsFullscreenAtEnd_internal()
		}

		@Presubmit
		@Test
		fun primaryAppWindowBecomesInvisible() = testSpec.appWindowBecomesInvisible(primaryApp)

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ class DismissSplitScreenByGoHome(
		portraitPosTop = false
		)

		@FlakyTest(bugId = 241525302)
		@FlakyTest(bugId = 250530241)
		@Test
		fun secondaryAppBoundsBecomesInvisible() = testSpec.splitAppLayerBoundsBecomesInvisible(
		secondaryApp,

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.wm.shell.flicker.splitscreen

		import android.platform.test.annotations.FlakyTest
		import android.platform.test.annotations.IwTest
		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.Presubmit
		@@ -113,7 +114,7 @@ class DragDividerToResize (testSpec: FlickerTestParameter) : SplitScreenBase(tes
		fun primaryAppBoundsChanges() = testSpec.splitAppLayerBoundsChanges(
		primaryApp, landscapePosLeft = true, portraitPosTop = false)

		@Presubmit
		@FlakyTest(bugId = 250530664)
		@Test
		fun secondaryAppBoundsChanges() = testSpec.splitAppLayerBoundsChanges(
		secondaryApp, landscapePosLeft = false, portraitPosTop = true)

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

+16 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.wm.shell.flicker.splitscreen

		import android.platform.test.annotations.FlakyTest
		import android.platform.test.annotations.IwTest
		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.Presubmit
		@@ -25,6 +26,7 @@ import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.FlickerTestParameterFactory
		import com.android.server.wm.flicker.annotation.Group1
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled
		import com.android.wm.shell.flicker.appWindowBecomesVisible
		import com.android.wm.shell.flicker.layerBecomesVisible
		import com.android.wm.shell.flicker.layerIsVisibleAtEnd
		@@ -32,6 +34,7 @@ import com.android.wm.shell.flicker.splitAppLayerBoundsBecomesVisible
		import com.android.wm.shell.flicker.splitAppLayerBoundsIsVisibleAtEnd
		import com.android.wm.shell.flicker.splitScreenDividerBecomesVisible
		import com.android.wm.shell.flicker.splitScreenEntered
		import org.junit.Assume
		import org.junit.FixMethodOrder
		import org.junit.Test
		import org.junit.runner.RunWith
		@@ -93,8 +96,19 @@ class EnterSplitScreenFromOverview(testSpec: FlickerTestParameter) : SplitScreen

		@Presubmit
		@Test
		fun secondaryAppBoundsBecomesVisible() = testSpec.splitAppLayerBoundsBecomesVisible(
		fun secondaryAppBoundsBecomesVisible() {
		Assume.assumeFalse(isShellTransitionsEnabled)
		testSpec.splitAppLayerBoundsBecomesVisible(
		secondaryApp, landscapePosLeft = !tapl.isTablet, portraitPosTop = true)
		}

		@FlakyTest(bugId = 244407465)
		@Test
		fun secondaryAppBoundsBecomesVisible_shellTransit() {
		Assume.assumeTrue(isShellTransitionsEnabled)
		testSpec.splitAppLayerBoundsBecomesVisible(
		secondaryApp, landscapePosLeft = !tapl.isTablet, portraitPosTop = true)
		}

		@Presubmit
		@Test