Merge "Promote stable close app tests to presubmit" into sc-dev (0fc7834f) · Commits · e / os / android_frameworks_base

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppTransition.kt

+2 −20

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.server.wm.flicker.close
		import android.app.Instrumentation
		import android.platform.test.annotations.Presubmit
		import android.view.Surface
		import androidx.test.filters.FlakyTest
		import androidx.test.platform.app.InstrumentationRegistry
		import com.android.server.wm.flicker.FlickerBuilderProvider
		import com.android.server.wm.flicker.FlickerTestParameter
		@@ -38,7 +37,6 @@ import com.android.server.wm.flicker.statusBarLayerRotatesScales
		import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible
		import com.android.server.wm.flicker.wallpaperLayerReplacesAppLayer
		import com.android.server.wm.flicker.wallpaperWindowBecomesVisible
		import org.junit.Assume
		import org.junit.Test

		abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) {
		@@ -92,32 +90,16 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter)
		@Presubmit
		@Test
		open fun navBarLayerRotatesAndScales() {
		Assume.assumeFalse(testSpec.isRotated)
		testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation, Surface.ROTATION_0)
		}

		@FlakyTest
		@Test
		open fun navBarLayerRotatesAndScales_Flaky() {
		Assume.assumeTrue(testSpec.isRotated)
		testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation, Surface.ROTATION_0)
		}

		@Presubmit
		@Test
		open fun statusBarLayerRotatesScales() {
		Assume.assumeFalse(testSpec.isRotated)
		testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0)
		}

		@FlakyTest
		@Test
		open fun statusBarLayerRotatesScales_Flaky() {
		Assume.assumeTrue(testSpec.isRotated)
		testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0)
		}

		@FlakyTest(bugId = 173689015)
		@Presubmit
		@Test
		open fun visibleWindowsShownMoreThanOneConsecutiveEntry() {
		testSpec.assertWm {
		@@ -125,7 +107,7 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter)
		}
		}

		@FlakyTest(bugId = 173689015)
		@Presubmit
		@Test
		open fun visibleLayersShownMoreThanOneConsecutiveEntry() {
		testSpec.assertLayers {