Merge "Demote and promote flicker tests" (0b2c1a80) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleScreen.kt

+4 −4

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

		package com.android.wm.shell.flicker.bubble

		import android.platform.test.annotations.Presubmit
		import androidx.test.filters.RequiresDevice
		import android.platform.test.annotations.FlakyTest
		import android.platform.test.annotations.RequiresDevice
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.annotation.Group4
		@@ -25,8 +25,8 @@ import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled
		import org.junit.Assume
		import org.junit.Before
		import org.junit.runner.RunWith
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.junit.runners.Parameterized

		/**
		@@ -57,7 +57,7 @@ open class LaunchBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen
		}
		}

		@Presubmit
		@FlakyTest(bugId = 218642026)
		@Test
		open fun testAppIsAlwaysVisible() {
		testSpec.assertLayers {

+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
		@@ -167,7 +166,7 @@ class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) {
		* Checks that the focus changes between the [pipApp] window and the launcher when
		* closing the pip window
		*/
		@Postsubmit
		@Presubmit
		@Test
		fun focusChanges() {
		testSpec.assertEventLog {

+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 com.android.server.wm.flicker.FlickerTestParameter
		@@ -98,7 +97,7 @@ abstract class ExitPipTransition(testSpec: FlickerTestParameter) : PipTransition
		/**
		* Checks that the focus doesn't change between windows during the transition
		*/
		@Postsubmit
		@Presubmit
		@Test
		open fun focusDoesNotChange() {
		testSpec.assertEventLog {

+2 −3

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

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

		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.FlakyTest
		import android.platform.test.annotations.Presubmit
		import android.view.Surface
		import androidx.test.filters.FlakyTest
		import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		@@ -149,7 +148,7 @@ class ExpandPipOnDoubleClickTest(testSpec: FlickerTestParameter) : PipTransition
		/**
		* Checks that the focus doesn't change between windows during the transition
		*/
		@Postsubmit
		@FlakyTest(bugId = 216306753)
		@Test
		fun focusDoesNotChange() {
		testSpec.assertEventLog {

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ import org.junit.runners.Parameterized
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@Group3
		class MovePipDownShelfHeightChangeTest(
		open class MovePipDownShelfHeightChangeTest(
		testSpec: FlickerTestParameter
		) : MovePipShelfHeightTransition(testSpec) {
		/**