Merge "[PiP2] Disable Flicker tests for pip2" into main (7bc0eb3b) · Commits · e / os / android_frameworks_base

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

+6 −2

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

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

		import android.platform.test.annotations.FlakyTest
		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.Presubmit
		import android.platform.test.annotations.RequiresDevice
		import android.platform.test.annotations.RequiresFlagsDisabled
		import android.tools.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.flicker.legacy.FlickerBuilder
		import android.tools.flicker.legacy.LegacyFlickerTest
		import android.tools.flicker.subject.exceptions.ExceptionMessageBuilder
		import android.tools.flicker.subject.exceptions.IncorrectRegionException
		import android.tools.flicker.subject.layers.LayerSubject
		import androidx.test.filters.FlakyTest
		import androidx.test.filters.RequiresDevice
		import com.android.wm.shell.Flags
		import com.android.wm.shell.flicker.pip.common.EnterPipTransition
		import org.junit.Assume
		import org.junit.FixMethodOrder
		@@ -35,6 +37,7 @@ import org.junit.runners.MethodSorters
		import org.junit.runners.Parameterized
		import kotlin.math.abs


		/**
		* Test entering pip from an app via auto-enter property when navigating to home.
		*
		@@ -60,6 +63,7 @@ import kotlin.math.abs
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@RequiresFlagsDisabled(Flags.FLAG_ENABLE_PIP2)
		open class AutoEnterPipOnGoToHomeTest(flicker: LegacyFlickerTest) : EnterPipTransition(flicker) {
		override val thisTransition: FlickerBuilder.() -> Unit = { transitions { tapl.goHome() } }

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

+3 −0

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

		import android.platform.test.annotations.Presubmit
		import android.platform.test.annotations.RequiresFlagsDisabled
		import android.tools.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.flicker.legacy.FlickerBuilder
		import android.tools.flicker.legacy.LegacyFlickerTest
		import android.tools.traces.component.ComponentNameMatcher
		import com.android.wm.shell.Flags
		import org.junit.FixMethodOrder
		import org.junit.Test
		import org.junit.runner.RunWith
		@@ -52,6 +54,7 @@ import org.junit.runners.Parameterized
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@RequiresFlagsDisabled(Flags.FLAG_ENABLE_PIP2)
		class AutoEnterPipWithSourceRectHintTest(flicker: LegacyFlickerTest) :
		AutoEnterPipOnGoToHomeTest(flicker) {
		override val defaultEnterPip: FlickerBuilder.() -> Unit = {

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

+2 −0

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

		import android.platform.test.annotations.Presubmit
		import android.platform.test.annotations.RequiresFlagsDisabled
		import android.tools.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.flicker.legacy.FlickerBuilder
		import android.tools.flicker.legacy.LegacyFlickerTest
		@@ -53,6 +54,7 @@ import org.junit.runners.Parameterized
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@RequiresFlagsDisabled(Flags.FLAG_ENABLE_PIP2)
		class ClosePipBySwipingDownTest(flicker: LegacyFlickerTest) : ClosePipTransition(flicker) {
		override val thisTransition: FlickerBuilder.() -> Unit = {
		transitions {

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

+3 −0

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

		import android.platform.test.annotations.Presubmit
		import android.platform.test.annotations.RequiresFlagsDisabled
		import android.tools.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.flicker.legacy.FlickerBuilder
		import android.tools.flicker.legacy.LegacyFlickerTest
		import com.android.wm.shell.Flags
		import com.android.wm.shell.flicker.pip.common.ClosePipTransition
		import org.junit.FixMethodOrder
		import org.junit.Test
		@@ -52,6 +54,7 @@ import org.junit.runners.Parameterized
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@RequiresFlagsDisabled(Flags.FLAG_ENABLE_PIP2)
		class ClosePipWithDismissButtonTest(flicker: LegacyFlickerTest) : ClosePipTransition(flicker) {
		override val thisTransition: FlickerBuilder.() -> Unit = {
		transitions { pipApp.closePipWindow(wmHelper) }

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

+3 −0

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

		import android.platform.test.annotations.Presubmit
		import android.platform.test.annotations.RequiresFlagsDisabled
		import android.tools.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.flicker.legacy.FlickerBuilder
		import android.tools.flicker.legacy.LegacyFlickerTest
		import com.android.wm.shell.Flags
		import com.android.wm.shell.flicker.pip.common.EnterPipTransition
		import org.junit.Assume
		import org.junit.FixMethodOrder
		@@ -43,6 +45,7 @@ import org.junit.runners.Parameterized
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@RequiresFlagsDisabled(Flags.FLAG_ENABLE_PIP2)
		class EnterPipOnUserLeaveHintTest(flicker: LegacyFlickerTest) : EnterPipTransition(flicker) {
		override val thisTransition: FlickerBuilder.() -> Unit = { transitions { tapl.goHome() } }