Merge "Add corner radius at end assertion" into main (fd2e99cc) · Commits · e / os / android_frameworks_base

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -181,6 +181,13 @@ class PipDragThenSnapTest(flicker: LegacyFlickerTest) : PipTransition(flicker) {
		super.taskBarWindowIsAlwaysVisible()
		}

		// Overridden to remove @Postsubmit annotation
		@Test
		@FlakyTest(bugId = 294993100)
		override fun pipLayerHasCorrectCornersAtEnd() {
		// No rounded corners as we go back to fullscreen in new orientation.
		}

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -147,6 +147,12 @@ open class SetRequestedOrientationWhilePinned(flicker: LegacyFlickerTest) : PipT
		@Test
		override fun entireScreenCovered() = super.entireScreenCovered()

		@Postsubmit
		@Test
		override fun pipLayerHasCorrectCornersAtEnd() {
		flicker.assertLayersEnd { hasNoRoundedCorners(pipApp) }
		}

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,11 @@ abstract class ClosePipTransition(flicker: LegacyFlickerTest) : PipTransition(fl
		}
		}

		@Test
		override fun pipLayerHasCorrectCornersAtEnd() {
		// PiP might have completely faded out by this point, so corner radii not applicable.
		}

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

+7 −0

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

		package com.android.wm.shell.flicker.pip.common

		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.Presubmit
		import android.tools.Rotation
		import android.tools.flicker.legacy.LegacyFlickerTest
		@@ -123,6 +124,12 @@ abstract class ExitPipToAppTransition(flicker: LegacyFlickerTest) : PipTransitio
		}
		}

		@Postsubmit
		@Test
		override fun pipLayerHasCorrectCornersAtEnd() {
		flicker.assertLayersEnd { hasNoRoundedCorners(pipApp) }
		}

		/** {@inheritDoc} */
		@Presubmit @Test override fun entireScreenCovered() = super.entireScreenCovered()

+7 −0

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

		import android.app.Instrumentation
		import android.content.Intent
		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.Presubmit
		import android.tools.Rotation
		import android.tools.flicker.legacy.FlickerBuilder
		@@ -105,4 +106,10 @@ abstract class PipTransition(flicker: LegacyFlickerTest) : BaseTest(flicker) {
		.doesNotContain(false)
		}
		}

		@Postsubmit
		@Test
		open fun pipLayerHasCorrectCornersAtEnd() {
		flicker.assertLayersEnd { hasRoundedCorners(pipApp) }
		}
		}