Merge "Re-enable several open app flicker tests for shell transition." (47601e06) · Commits · e / os / android_frameworks_base

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

+1 −5

Original line number	Diff line number	Diff line
		@@ -99,11 +99,7 @@ class OpenAppColdTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp
		/** {@inheritDoc} */
		@Presubmit
		@Test
		override fun appLayerReplacesLauncher() {
		// This test doesn't work in shell transitions because of b/206094140
		assumeFalse(isShellTransitionsEnabled)
		super.appLayerReplacesLauncher()
		}
		override fun appLayerReplacesLauncher() = super.appLayerReplacesLauncher()

		/** {@inheritDoc} */
		@Presubmit

+5 −15

Original line number	Diff line number	Diff line
		@@ -96,20 +96,14 @@ class OpenAppWarmTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp
		/** {@inheritDoc} */
		@Presubmit
		@Test
		override fun appWindowReplacesLauncherAsTopWindow() {
		// This test doesn't work in shell transitions because of b/206094140
		assumeFalse(isShellTransitionsEnabled)
		override fun appWindowReplacesLauncherAsTopWindow() =
		super.appWindowReplacesLauncherAsTopWindow()
		}

		/** {@inheritDoc} */
		@Presubmit
		@Test
		override fun visibleLayersShownMoreThanOneConsecutiveEntry() {
		// This test doesn't work in shell transitions because of b/206094140
		assumeFalse(isShellTransitionsEnabled)
		override fun visibleLayersShownMoreThanOneConsecutiveEntry() =
		super.visibleLayersShownMoreThanOneConsecutiveEntry()
		}

		/** {@inheritDoc} */
		@FlakyTest
		@@ -119,11 +113,7 @@ class OpenAppWarmTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp
		/** {@inheritDoc} */
		@Presubmit
		@Test
		override fun appLayerReplacesLauncher() {
		// This test doesn't work in shell transitions because of b/206094140
		assumeFalse(isShellTransitionsEnabled)
		super.appLayerReplacesLauncher()
		}
		override fun appLayerReplacesLauncher() = super.appLayerReplacesLauncher()

		/** {@inheritDoc} */
		@Presubmit