Merge "Disable flaky flicker tests" into sc-dev (fdafdbd4) · Commits · e / os / android_frameworks_base

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

+26 −0

Original line number	Diff line number	Diff line
		@@ -16,12 +16,14 @@

		package com.android.server.wm.flicker.close

		import androidx.test.filters.FlakyTest
		import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		import com.android.server.wm.flicker.FlickerTestParameter
		import com.android.server.wm.flicker.FlickerTestParameterFactory
		import com.android.server.wm.flicker.dsl.FlickerBuilder
		import org.junit.FixMethodOrder
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.junit.runners.MethodSorters
		import org.junit.runners.Parameterized
		@@ -44,6 +46,30 @@ class CloseAppBackButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio
		}
		}

		@FlakyTest(bugId = 185401242)
		@Test
		override fun launcherLayerReplacesApp() {
		super.launcherLayerReplacesApp()
		}

		@FlakyTest(bugId = 185401242)
		@Test
		override fun launcherReplacesAppWindowAsTopWindow() {
		super.launcherReplacesAppWindowAsTopWindow()
		}

		@FlakyTest(bugId = 185401242)
		@Test
		override fun launcherWindowBecomesVisible() {
		super.launcherWindowBecomesVisible()
		}

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

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ import org.junit.runners.Parameterized
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@FlakyTest(bugId = 185400889)
		class CloseImeAutoOpenWindowToAppTest(private val testSpec: FlickerTestParameter) {
		private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
		private val testApp = ImeAppAutoFocusHelper(instrumentation, testSpec.config.startRotation)

+6 −0

Original line number	Diff line number	Diff line
		@@ -98,6 +98,12 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio
		super.focusChanges()
		}

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

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

+3 −4

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

		package com.android.server.wm.flicker.rotation

		import android.platform.test.annotations.Presubmit
		import androidx.test.filters.FlakyTest
		import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.FlickerParametersRunnerFactory
		@@ -69,13 +68,13 @@ class SeamlessAppRotationTest(
		super.statusBarLayerIsAlwaysVisible()
		}

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

		@Presubmit
		@FlakyTest(bugId = 185400889)
		@Test
		fun appLayerAlwaysVisible() {
		testSpec.assertLayers {
		@@ -83,7 +82,7 @@ class SeamlessAppRotationTest(
		}
		}

		@Presubmit
		@FlakyTest(bugId = 185400889)
		@Test
		fun appLayerRotates() {
		testSpec.assertLayers {