Merge "Demote OpenAppFromOverviewTest#appWindowReplacesLauncherAsTopWindow to flaky test" (d378d627) · Commits · e / os / android_frameworks_base

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt

+19 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,10 @@ import com.android.server.wm.flicker.annotation.Group1
		import com.android.server.wm.flicker.helpers.reopenAppFromOverview
		import com.android.server.wm.flicker.helpers.setRotation
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import com.android.server.wm.flicker.helpers.isShellTransitionsEnabled
		import com.android.server.wm.traces.common.WindowManagerConditionsFactory
		import org.junit.Assume.assumeFalse
		import org.junit.Assume.assumeTrue
		import org.junit.FixMethodOrder
		import org.junit.Test
		import org.junit.runner.RunWith
		@@ -125,6 +128,21 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio
		@Test
		override fun navBarWindowIsVisible() = super.navBarWindowIsVisible()

		/** {@inheritDoc} */
		@Presubmit
		@Test
		override fun appWindowReplacesLauncherAsTopWindow() {
		assumeFalse(isShellTransitionsEnabled)
		super.appWindowReplacesLauncherAsTopWindow()
		}

		@FlakyTest(bugId = 216266712)
		@Test
		fun appWindowReplacesLauncherAsTopWindow_shellTransit() {
		assumeTrue(isShellTransitionsEnabled)
		super.appWindowReplacesLauncherAsTopWindow()
		}

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