Merge "Promote stable flicker tests (app launch)" into sc-dev (128a9fdb) · Commits · e / os / android_frameworks_base

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

+20 −3

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ import org.junit.runners.Parameterized
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@FlakyTest(bugId = 185400889)
		@Group1
		class OpenAppColdTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSpec) {
		override val transition: FlickerBuilder.(Map<String, Any?>) -> Unit
		@@ -69,6 +68,12 @@ class OpenAppColdTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp
		super.visibleLayersShownMoreThanOneConsecutiveEntry()
		}

		@FlakyTest
		@Test
		override fun navBarLayerIsAlwaysVisible() {
		super.navBarLayerIsAlwaysVisible()
		}

		@FlakyTest
		@Test
		override fun navBarLayerRotatesAndScales() {
		@@ -77,8 +82,20 @@ class OpenAppColdTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp

		@FlakyTest
		@Test
		override fun focusChanges() {
		super.focusChanges()
		override fun statusBarLayerIsAlwaysVisible() {
		super.statusBarLayerIsAlwaysVisible()
		}

		@FlakyTest
		@Test
		override fun appLayerReplacesLauncher() {
		super.appLayerReplacesLauncher()
		}

		@FlakyTest
		@Test
		override fun appWindowReplacesLauncherAsTopWindow() {
		super.appWindowReplacesLauncherAsTopWindow()
		}

		companion object {

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

+7 −20

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

		package com.android.server.wm.flicker.launch

		import android.platform.test.annotations.Presubmit
		import androidx.test.filters.FlakyTest
		import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		@@ -26,7 +25,6 @@ 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.startRotation
		import com.android.server.wm.flicker.launcherWindowBecomesInvisible
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import org.junit.FixMethodOrder
		import org.junit.Test
		@@ -65,15 +63,16 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio
		}
		}

		@Presubmit
		@FlakyTest
		@Test
		override fun appWindowReplacesLauncherAsTopWindow() =
		super.appWindowReplacesLauncherAsTopWindow()
		override fun navBarLayerIsAlwaysVisible() {
		super.navBarLayerIsAlwaysVisible()
		}

		@Presubmit
		@FlakyTest
		@Test
		override fun launcherWindowBecomesInvisible() {
		testSpec.launcherWindowBecomesInvisible()
		override fun statusBarLayerIsAlwaysVisible() {
		super.statusBarLayerIsAlwaysVisible()
		}

		@FlakyTest
		@@ -94,18 +93,6 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio
		super.visibleLayersShownMoreThanOneConsecutiveEntry()
		}

		@FlakyTest
		@Test
		override fun focusChanges() {
		super.focusChanges()
		}

		@FlakyTest(bugId = 185400889)
		@Test
		override fun noUncoveredRegions() {
		super.noUncoveredRegions()
		}

		companion object {
		@Parameterized.Parameters(name = "{0}")
		@JvmStatic

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

+5 −6

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.server.wm.flicker.launch
		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
		@@ -76,13 +75,13 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) {
		testSpec.navBarWindowIsAlwaysVisible()
		}

		@FlakyTest
		@Presubmit
		@Test
		open fun navBarLayerIsAlwaysVisible() {
		testSpec.navBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated)
		}

		@FlakyTest
		@Presubmit
		@Test
		open fun navBarLayerRotatesAndScales() {
		testSpec.navBarLayerRotatesAndScales(Surface.ROTATION_0, testSpec.config.endRotation)
		@@ -94,7 +93,7 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) {
		testSpec.statusBarWindowIsAlwaysVisible()
		}

		@FlakyTest
		@Presubmit
		@Test
		open fun statusBarLayerIsAlwaysVisible() {
		testSpec.statusBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated)
		@@ -135,13 +134,13 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) {
		testSpec.focusChanges("NexusLauncherActivity", testApp.`package`)
		}

		@FlakyTest
		@Presubmit
		@Test
		open fun appLayerReplacesLauncher() {
		testSpec.appLayerReplacesLauncher(testApp.`package`)
		}

		@FlakyTest
		@Presubmit
		@Test
		open fun appWindowReplacesLauncherAsTopWindow() {
		testSpec.appWindowReplacesLauncherAsTopWindow(testApp)

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

+2 −21

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

		package com.android.server.wm.flicker.launch

		import android.platform.test.annotations.Presubmit
		import androidx.test.filters.FlakyTest
		import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		@@ -68,8 +67,8 @@ class OpenAppWarmTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp

		@FlakyTest
		@Test
		override fun focusChanges() {
		super.focusChanges()
		override fun navBarLayerIsAlwaysVisible() {
		super.navBarLayerIsAlwaysVisible()
		}

		@FlakyTest
		@@ -78,24 +77,6 @@ class OpenAppWarmTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp
		super.navBarLayerRotatesAndScales()
		}

		@FlakyTest
		@Test
		override fun visibleLayersShownMoreThanOneConsecutiveEntry() {
		super.visibleLayersShownMoreThanOneConsecutiveEntry()
		}

		@Presubmit
		@Test
		override fun launcherWindowBecomesInvisible() {
		super.launcherWindowBecomesInvisible()
		}

		@FlakyTest
		@Test
		override fun noUncoveredRegions() {
		super.noUncoveredRegions()
		}

		companion object {
		@Parameterized.Parameters(name = "{0}")
		@JvmStatic