Merge "Promote stable postsubmit tests to presubmit" (d8a0e22e) · Commits · e / os / android_frameworks_base

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

+2 −3

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

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

		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.Presubmit
		import android.view.Surface
		import androidx.test.filters.FlakyTest
		@@ -105,7 +104,7 @@ class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) {
		* Checks that the pip app layer remains inside the display bounds throughout the whole
		* animation
		*/
		@Postsubmit
		@Presubmit
		@Test
		fun pipLayerRemainInsideVisibleBounds() {
		testSpec.assertLayers {
		@@ -116,7 +115,7 @@ class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) {
		/**
		* Checks that the visible region of [pipApp] always reduces during the animation
		*/
		@Postsubmit
		@Presubmit
		@Test
		fun pipLayerReduces() {
		val layerName = pipApp.component.toLayerName()

+1 −2

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

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

		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.Presubmit
		import android.view.Surface
		import androidx.test.filters.FlakyTest
		@@ -119,7 +118,7 @@ class EnterPipToOtherOrientationTest(
		* Checks that the [WindowManagerStateHelper.STATUS_BAR_COMPONENT] has the correct position at
		* the start and end of the transition
		*/
		@Postsubmit
		@Presubmit
		@Test
		override fun statusBarLayerRotatesScales() =
		testSpec.statusBarLayerRotatesScales(Surface.ROTATION_90, Surface.ROTATION_0)

+0 −14

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

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

		import android.platform.test.annotations.Postsubmit
		import android.view.Surface
		import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		@@ -26,7 +25,6 @@ import com.android.server.wm.flicker.annotation.Group3
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.traces.parser.toWindowName
		import org.junit.FixMethodOrder
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.junit.runners.MethodSorters
		import org.junit.runners.Parameterized
		@@ -78,18 +76,6 @@ class ExitPipViaExpandButtonClickTest(
		}
		}

		@Postsubmit
		@Test
		override fun pipAppCoversFullScreenAtEnd() = super.pipAppCoversFullScreenAtEnd()

		@Postsubmit
		@Test
		override fun showBothAppLayersThenHidePip() = super.showBothAppLayersThenHidePip()

		@Postsubmit
		@Test
		override fun showBothAppWindowsThenHidePip() = super.showBothAppWindowsThenHidePip()

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

+4 −3

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ class ExpandPipOnDoubleClickTest(testSpec: FlickerTestParameter) : PipTransition
		* Checks that the pip app layer remains inside the display bounds throughout the whole
		* animation
		*/
		@Postsubmit
		@Presubmit
		@Test
		fun pipLayerRemainInsideVisibleBounds() {
		testSpec.assertLayers {
		@@ -91,6 +91,7 @@ class ExpandPipOnDoubleClickTest(testSpec: FlickerTestParameter) : PipTransition
		/**
		* Checks [pipApp] window remains visible throughout the animation
		*/
		@Postsubmit
		@Test
		fun pipWindowIsAlwaysVisible() {
		testSpec.assertWm {
		@@ -101,7 +102,7 @@ class ExpandPipOnDoubleClickTest(testSpec: FlickerTestParameter) : PipTransition
		/**
		* Checks [pipApp] layer remains visible throughout the animation
		*/
		@Postsubmit
		@Presubmit
		@Test
		fun pipLayerIsAlwaysVisible() {
		testSpec.assertLayers {
		@@ -112,7 +113,7 @@ class ExpandPipOnDoubleClickTest(testSpec: FlickerTestParameter) : PipTransition
		/**
		* Checks that the visible region of [pipApp] always expands during the animation
		*/
		@Postsubmit
		@Presubmit
		@Test
		fun pipLayerExpands() {
		val layerName = pipApp.component.toLayerName()

+4 −5

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

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

		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.Presubmit
		import com.android.launcher3.tapl.LauncherInstrumentation
		import com.android.server.wm.flicker.FlickerTestParameter
		@@ -43,7 +42,7 @@ abstract class MovePipShelfHeightTransition(
		/**
		* Checks [pipApp] window remains visible throughout the animation
		*/
		@Postsubmit
		@Presubmit
		@Test
		open fun pipWindowIsAlwaysVisible() {
		testSpec.assertWm {
		@@ -54,7 +53,7 @@ abstract class MovePipShelfHeightTransition(
		/**
		* Checks [pipApp] layer remains visible throughout the animation
		*/
		@Postsubmit
		@Presubmit
		@Test
		open fun pipLayerIsAlwaysVisible() {
		testSpec.assertLayers {
		@@ -66,7 +65,7 @@ abstract class MovePipShelfHeightTransition(
		* Checks that the pip app window remains inside the display bounds throughout the whole
		* animation
		*/
		@Postsubmit
		@Presubmit
		@Test
		open fun pipWindowRemainInsideVisibleBounds() {
		testSpec.assertWm {
		@@ -78,7 +77,7 @@ abstract class MovePipShelfHeightTransition(
		* Checks that the pip app layer remains inside the display bounds throughout the whole
		* animation
		*/
		@Postsubmit
		@Presubmit
		@Test
		open fun pipLayerRemainInsideVisibleBounds() {
		testSpec.assertLayers {