Merge "Remove PipDragThenSnapTest from presubmit (flaky)" into main (2e680535) · Commits · e / os / android_frameworks_base

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

+85 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.wm.shell.flicker.pip

		import android.graphics.Rect
		import android.platform.test.annotations.Presubmit
		import android.tools.common.Rotation
		import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.device.flicker.legacy.FlickerBuilder
		@@ -82,8 +81,8 @@ class PipDragThenSnapTest(flicker: LegacyFlickerTest) : PipTransition(flicker) {
		/**
		* Checks that the visible region area of [pipApp] moves to closest edge during the animation.
		*/
		@Presubmit
		@Test
		@FlakyTest(bugId = 294993100)
		fun pipLayerMovesToClosestEdge() {
		flicker.assertLayers {
		val pipLayerList = layers { pipApp.layerMatchesAnyOf(it) && it.isVisible }
		@@ -97,6 +96,90 @@ class PipDragThenSnapTest(flicker: LegacyFlickerTest) : PipTransition(flicker) {
		}
		}

		// Overridden to remove @Presubmit annotation
		@Test
		@FlakyTest(bugId = 294993100)
		override fun entireScreenCovered() {
		super.entireScreenCovered()
		}

		// Overridden to remove @Presubmit annotation
		@Test
		@FlakyTest(bugId = 294993100)
		override fun hasAtMostOnePipDismissOverlayWindow() {
		super.hasAtMostOnePipDismissOverlayWindow()
		}

		// Overridden to remove @Presubmit annotation
		@Test
		@FlakyTest(bugId = 294993100)
		override fun navBarLayerIsVisibleAtStartAndEnd() {
		super.navBarLayerIsVisibleAtStartAndEnd()
		}

		// Overridden to remove @Presubmit annotation
		@Test
		@FlakyTest(bugId = 294993100)
		override fun navBarLayerPositionAtStartAndEnd() {
		super.navBarLayerPositionAtStartAndEnd()
		}

		// Overridden to remove @Presubmit annotation
		@Test
		@FlakyTest(bugId = 294993100)
		override fun navBarWindowIsAlwaysVisible() {
		super.navBarWindowIsAlwaysVisible()
		}

		// Overridden to remove @Presubmit annotation
		@Test
		@FlakyTest(bugId = 294993100)
		override fun statusBarLayerIsVisibleAtStartAndEnd() {
		super.statusBarLayerIsVisibleAtStartAndEnd()
		}

		// Overridden to remove @Presubmit annotation
		@Test
		@FlakyTest(bugId = 294993100)
		override fun statusBarLayerPositionAtStartAndEnd() {
		super.statusBarLayerPositionAtStartAndEnd()
		}

		// Overridden to remove @Presubmit annotation
		@Test
		@FlakyTest(bugId = 294993100)
		override fun statusBarWindowIsAlwaysVisible() {
		super.statusBarWindowIsAlwaysVisible()
		}

		// Overridden to remove @Presubmit annotation
		@Test
		@FlakyTest(bugId = 294993100)
		override fun visibleLayersShownMoreThanOneConsecutiveEntry() {
		super.visibleLayersShownMoreThanOneConsecutiveEntry()
		}

		// Overridden to remove @Presubmit annotation
		@Test
		@FlakyTest(bugId = 294993100)
		override fun visibleWindowsShownMoreThanOneConsecutiveEntry() {
		super.visibleWindowsShownMoreThanOneConsecutiveEntry()
		}

		// Overridden to remove @Presubmit annotation
		@Test
		@FlakyTest(bugId = 294993100)
		override fun taskBarLayerIsVisibleAtStartAndEnd() {
		super.taskBarLayerIsVisibleAtStartAndEnd()
		}

		// Overridden to remove @Presubmit annotation
		@Test
		@FlakyTest(bugId = 294993100)
		override fun taskBarWindowIsAlwaysVisible() {
		super.taskBarWindowIsAlwaysVisible()
		}

		companion object {
		/**
		* Creates the test configurations.

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -92,7 +92,7 @@ abstract class PipTransition(flicker: LegacyFlickerTest) : BaseTest(flicker) {

		@Presubmit
		@Test
		fun hasAtMostOnePipDismissOverlayWindow() {
		open fun hasAtMostOnePipDismissOverlayWindow() {
		val matcher = ComponentNameMatcher("", "pip-dismiss-overlay")
		flicker.assertWm {
		val overlaysPerState =