Merge "Disable some failing flicker tests" (aab3fd11) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -108,6 +108,14 @@ class AutoEnterPipOnGoToHomeTest(testSpec: FlickerTestParameter) : EnterPipTest(
	}		}
	}		}

			@FlakyTest(bugId = 239807171)
			@Test
			override fun pipAppLayerAlwaysVisible() = super.pipAppLayerAlwaysVisible()

			@FlakyTest(bugId = 239807171)
			@Test
			override fun pipLayerRemainInsideVisibleBounds() = super.pipLayerRemainInsideVisibleBounds()

	@Presubmit		@Presubmit
	@Test		@Test
	override fun focusChanges() {		override fun focusChanges() {

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

+3 −7

Original line number	Original line	Diff line number	Diff line
	@@ -16,9 +16,9 @@

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

			import android.platform.test.annotations.FlakyTest
	import android.platform.test.annotations.IwTest		import android.platform.test.annotations.IwTest
	import android.platform.test.annotations.Presubmit		import android.platform.test.annotations.Presubmit
	import android.view.WindowManagerPolicyConstants
	import androidx.test.filters.RequiresDevice		import androidx.test.filters.RequiresDevice
	import com.android.server.wm.flicker.FlickerParametersRunnerFactory		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
	import com.android.server.wm.flicker.FlickerTestParameter		import com.android.server.wm.flicker.FlickerTestParameter
	@@ -121,7 +121,7 @@ class CopyContentInSplit(testSpec: FlickerTestParameter) : SplitScreenBase(testS
	override fun navBarLayerIsVisibleAtStartAndEnd() = super.navBarLayerIsVisibleAtStartAndEnd()		override fun navBarLayerIsVisibleAtStartAndEnd() = super.navBarLayerIsVisibleAtStartAndEnd()

	/** {@inheritDoc} */		/** {@inheritDoc} */
	@Presubmit		@FlakyTest(bugId = 206753786)
	@Test		@Test
	override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd()		override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd()

	@@ -173,11 +173,7 @@ class CopyContentInSplit(testSpec: FlickerTestParameter) : SplitScreenBase(testS
	@JvmStatic		@JvmStatic
	fun getParams(): List<FlickerTestParameter> {		fun getParams(): List<FlickerTestParameter> {
	return FlickerTestParameterFactory.getInstance()		return FlickerTestParameterFactory.getInstance()
	.getConfigNonRotationTests(		.getConfigNonRotationTests()
	// TODO(b/176061063):The 3 buttons of nav bar do not exist in the hierarchy.
	supportedNavigationModes =
	listOf(WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY)
	)
	}		}
	}		}
	}		}

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

+2 −6

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,6 @@ import android.platform.test.annotations.FlakyTest
	import android.platform.test.annotations.IwTest		import android.platform.test.annotations.IwTest
	import android.platform.test.annotations.Postsubmit		import android.platform.test.annotations.Postsubmit
	import android.platform.test.annotations.Presubmit		import android.platform.test.annotations.Presubmit
	import android.view.WindowManagerPolicyConstants
	import androidx.test.filters.RequiresDevice		import androidx.test.filters.RequiresDevice
	import com.android.server.wm.flicker.FlickerParametersRunnerFactory		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
	import com.android.server.wm.flicker.FlickerTestParameter		import com.android.server.wm.flicker.FlickerTestParameter
	@@ -151,7 +150,7 @@ class DismissSplitScreenByDivider (testSpec: FlickerTestParameter) : SplitScreen
	super.navBarLayerIsVisibleAtStartAndEnd()		super.navBarLayerIsVisibleAtStartAndEnd()

	/** {@inheritDoc} */		/** {@inheritDoc} */
	@Postsubmit		@FlakyTest(bugId = 206753786)
	@Test		@Test
	override fun navBarLayerPositionAtStartAndEnd() =		override fun navBarLayerPositionAtStartAndEnd() =
	super.navBarLayerPositionAtStartAndEnd()		super.navBarLayerPositionAtStartAndEnd()
	@@ -208,10 +207,7 @@ class DismissSplitScreenByDivider (testSpec: FlickerTestParameter) : SplitScreen
	@Parameterized.Parameters(name = "{0}")		@Parameterized.Parameters(name = "{0}")
	@JvmStatic		@JvmStatic
	fun getParams(): List<FlickerTestParameter> {		fun getParams(): List<FlickerTestParameter> {
	return FlickerTestParameterFactory.getInstance().getConfigNonRotationTests(		return FlickerTestParameterFactory.getInstance().getConfigNonRotationTests()
	// TODO(b/176061063):The 3 buttons of nav bar do not exist in the hierarchy.
	supportedNavigationModes =
	listOf(WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY))
	}		}
	}		}
	}		}

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

+3 −8

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,6 @@ package com.android.wm.shell.flicker.splitscreen
	import android.platform.test.annotations.FlakyTest		import android.platform.test.annotations.FlakyTest
	import android.platform.test.annotations.IwTest		import android.platform.test.annotations.IwTest
	import android.platform.test.annotations.Presubmit		import android.platform.test.annotations.Presubmit
	import android.view.WindowManagerPolicyConstants
	import androidx.test.filters.RequiresDevice		import androidx.test.filters.RequiresDevice
	import com.android.server.wm.flicker.FlickerParametersRunnerFactory		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
	import com.android.server.wm.flicker.FlickerTestParameter		import com.android.server.wm.flicker.FlickerTestParameter
	@@ -118,7 +117,7 @@ class DismissSplitScreenByGoHome(
	super.navBarLayerIsVisibleAtStartAndEnd()		super.navBarLayerIsVisibleAtStartAndEnd()

	/** {@inheritDoc} */		/** {@inheritDoc} */
	@Presubmit		@FlakyTest(bugId = 206753786)
	@Test		@Test
	override fun navBarLayerPositionAtStartAndEnd() =		override fun navBarLayerPositionAtStartAndEnd() =
	super.navBarLayerPositionAtStartAndEnd()		super.navBarLayerPositionAtStartAndEnd()
	@@ -160,7 +159,7 @@ class DismissSplitScreenByGoHome(
	super.taskBarWindowIsAlwaysVisible()		super.taskBarWindowIsAlwaysVisible()

	/** {@inheritDoc} */		/** {@inheritDoc} */
	@Presubmit		@FlakyTest
	@Test		@Test
	override fun visibleLayersShownMoreThanOneConsecutiveEntry() =		override fun visibleLayersShownMoreThanOneConsecutiveEntry() =
	super.visibleLayersShownMoreThanOneConsecutiveEntry()		super.visibleLayersShownMoreThanOneConsecutiveEntry()
	@@ -175,11 +174,7 @@ class DismissSplitScreenByGoHome(
	@Parameterized.Parameters(name = "{0}")		@Parameterized.Parameters(name = "{0}")
	@JvmStatic		@JvmStatic
	fun getParams(): List<FlickerTestParameter> {		fun getParams(): List<FlickerTestParameter> {
	return FlickerTestParameterFactory.getInstance().getConfigNonRotationTests(		return FlickerTestParameterFactory.getInstance().getConfigNonRotationTests()
	// TODO(b/176061063):The 3 buttons of nav bar do not exist in the hierarchy.
	supportedNavigationModes =
	listOf(WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY)
	)
	}		}
	}		}
	}		}

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

+17 −10

Original line number	Original line	Diff line number	Diff line
	@@ -20,8 +20,6 @@ import android.platform.test.annotations.FlakyTest
	import android.platform.test.annotations.IwTest		import android.platform.test.annotations.IwTest
	import android.platform.test.annotations.Postsubmit		import android.platform.test.annotations.Postsubmit
	import android.platform.test.annotations.Presubmit		import android.platform.test.annotations.Presubmit
	import android.view.Surface
	import android.view.WindowManagerPolicyConstants
	import androidx.test.filters.RequiresDevice		import androidx.test.filters.RequiresDevice
	import com.android.server.wm.flicker.FlickerParametersRunnerFactory		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
	import com.android.server.wm.flicker.FlickerTestParameter		import com.android.server.wm.flicker.FlickerTestParameter
	@@ -35,6 +33,8 @@ import com.android.wm.shell.flicker.layerKeepVisible
	import com.android.wm.shell.flicker.splitAppLayerBoundsChanges		import com.android.wm.shell.flicker.splitAppLayerBoundsChanges
	import com.android.wm.shell.flicker.splitScreenDividerIsVisibleAtEnd		import com.android.wm.shell.flicker.splitScreenDividerIsVisibleAtEnd
	import com.android.wm.shell.flicker.splitScreenDividerIsVisibleAtStart		import com.android.wm.shell.flicker.splitScreenDividerIsVisibleAtStart
			import org.junit.Assume
			import org.junit.Before
	import org.junit.FixMethodOrder		import org.junit.FixMethodOrder
	import org.junit.Test		import org.junit.Test
	import org.junit.runner.RunWith		import org.junit.runner.RunWith
	@@ -63,6 +63,11 @@ class DragDividerToResize (testSpec: FlickerTestParameter) : SplitScreenBase(tes
	}		}
	}		}

			@Before
			fun before() {
			Assume.assumeTrue(tapl.isTablet \|\| !testSpec.isLandscapeOrSeascapeAtStart)
			}

	@IwTest(focusArea = "sysui")		@IwTest(focusArea = "sysui")
	@Presubmit		@Presubmit
	@Test		@Test
	@@ -110,12 +115,18 @@ class DragDividerToResize (testSpec: FlickerTestParameter) : SplitScreenBase(tes
	@Presubmit		@Presubmit
	@Test		@Test
	fun primaryAppBoundsChanges() = testSpec.splitAppLayerBoundsChanges(		fun primaryAppBoundsChanges() = testSpec.splitAppLayerBoundsChanges(
	primaryApp, landscapePosLeft = true, portraitPosTop = false)		primaryApp,
			landscapePosLeft = true,
			portraitPosTop = false
			)

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

	/** {@inheritDoc} */		/** {@inheritDoc} */
	@Postsubmit		@Postsubmit
	@@ -187,11 +198,7 @@ class DragDividerToResize (testSpec: FlickerTestParameter) : SplitScreenBase(tes
	@Parameterized.Parameters(name = "{0}")		@Parameterized.Parameters(name = "{0}")
	@JvmStatic		@JvmStatic
	fun getParams(): List<FlickerTestParameter> {		fun getParams(): List<FlickerTestParameter> {
	return FlickerTestParameterFactory.getInstance().getConfigNonRotationTests(		return FlickerTestParameterFactory.getInstance().getConfigNonRotationTests()
	supportedRotations = listOf(Surface.ROTATION_0),
	// TODO(b/176061063):The 3 buttons of nav bar do not exist in the hierarchy.
	supportedNavigationModes =
	listOf(WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY))
	}		}
	}		}
	}		}