Merge "Demote flaky Split Screen tests" (44f13312) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/DismissSplitScreenByGoHome.kt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -106,7 +106,7 @@ class DismissSplitScreenByGoHome(
	fun secondaryAppWindowBecomesInvisible() = testSpec.appWindowBecomesInvisible(secondaryApp)		fun secondaryAppWindowBecomesInvisible() = testSpec.appWindowBecomesInvisible(secondaryApp)

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

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/EnterSplitScreenFromOverview.kt

+3 −3

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (C) 2022 The Android Open Source Project		* Copyright (C) 2022 The Android Source Project
	*		*
	* Licensed under the Apache License, Version 2.0 (the "License");		* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.		* you may not use this file except in compliance with the License.
	@@ -34,6 +34,7 @@ import com.android.wm.shell.flicker.splitAppLayerBoundsIsVisibleAtEnd
	import com.android.wm.shell.flicker.splitScreenDividerBecomesVisible		import com.android.wm.shell.flicker.splitScreenDividerBecomesVisible
	import com.android.wm.shell.flicker.splitScreenEntered		import com.android.wm.shell.flicker.splitScreenEntered
	import org.junit.Assume		import org.junit.Assume
			import org.junit.Before
	import org.junit.FixMethodOrder		import org.junit.FixMethodOrder
	import org.junit.Test		import org.junit.Test
	import org.junit.runner.RunWith		import org.junit.runner.RunWith
	@@ -50,7 +51,6 @@ import org.junit.runners.Parameterized
	@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
	@FixMethodOrder(MethodSorters.NAME_ASCENDING)		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
	class EnterSplitScreenFromOverview(testSpec: FlickerTestParameter) : SplitScreenBase(testSpec) {		class EnterSplitScreenFromOverview(testSpec: FlickerTestParameter) : SplitScreenBase(testSpec) {

	override val transition: FlickerBuilder.() -> Unit		override val transition: FlickerBuilder.() -> Unit
	get() = {		get() = {
	super.transition(this)		super.transition(this)
	@@ -117,7 +117,7 @@ class EnterSplitScreenFromOverview(testSpec: FlickerTestParameter) : SplitScreen
	fun secondaryAppWindowBecomesVisible() = testSpec.appWindowBecomesVisible(secondaryApp)		fun secondaryAppWindowBecomesVisible() = testSpec.appWindowBecomesVisible(secondaryApp)

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

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBackToSplitFromAnotherApp.kt

+2 −1

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

	package com.android.wm.shell.flicker.splitscreen		package com.android.wm.shell.flicker.splitscreen

			import android.platform.test.annotations.FlakyTest
	import android.platform.test.annotations.IwTest		import android.platform.test.annotations.IwTest
	import android.platform.test.annotations.Presubmit		import android.platform.test.annotations.Presubmit
	import android.view.WindowManagerPolicyConstants		import android.view.WindowManagerPolicyConstants
	@@ -104,7 +105,7 @@ class SwitchBackToSplitFromAnotherApp(testSpec: FlickerTestParameter) : SplitScr
	fun secondaryAppWindowBecomesVisible() = testSpec.appWindowBecomesVisible(secondaryApp)		fun secondaryAppWindowBecomesVisible() = testSpec.appWindowBecomesVisible(secondaryApp)

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

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBackToSplitFromHome.kt

+2 −1

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

	package com.android.wm.shell.flicker.splitscreen		package com.android.wm.shell.flicker.splitscreen

			import android.platform.test.annotations.FlakyTest
	import android.platform.test.annotations.IwTest		import android.platform.test.annotations.IwTest
	import android.platform.test.annotations.Presubmit		import android.platform.test.annotations.Presubmit
	import android.view.WindowManagerPolicyConstants		import android.view.WindowManagerPolicyConstants
	@@ -103,7 +104,7 @@ class SwitchBackToSplitFromHome(testSpec: FlickerTestParameter) : SplitScreenBas
	fun secondaryAppWindowBecomesVisible() = testSpec.appWindowBecomesVisible(secondaryApp)		fun secondaryAppWindowBecomesVisible() = testSpec.appWindowBecomesVisible(secondaryApp)

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

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/splitscreen/SwitchBackToSplitFromRecent.kt

+2 −1

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

	package com.android.wm.shell.flicker.splitscreen		package com.android.wm.shell.flicker.splitscreen

			import android.platform.test.annotations.FlakyTest
	import android.platform.test.annotations.IwTest		import android.platform.test.annotations.IwTest
	import android.platform.test.annotations.Presubmit		import android.platform.test.annotations.Presubmit
	import android.view.WindowManagerPolicyConstants		import android.view.WindowManagerPolicyConstants
	@@ -150,7 +151,7 @@ class SwitchBackToSplitFromRecent(testSpec: FlickerTestParameter) : SplitScreenB
	override fun taskBarWindowIsAlwaysVisible() = super.taskBarWindowIsAlwaysVisible()		override fun taskBarWindowIsAlwaysVisible() = super.taskBarWindowIsAlwaysVisible()

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