Merge "Promote stable flicker tests (ime)" into sc-dev (a50b0352) · Commits · e / os / android_frameworks_base

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt

+4 −5

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.server.wm.flicker.ime

		import android.app.Instrumentation
		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.Presubmit
		import android.view.Surface
		import android.view.WindowManagerPolicyConstants
		@@ -107,7 +106,7 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete
		@Test
		fun imeAppWindowBecomesInvisible() = testSpec.imeAppWindowBecomesInvisible(testApp)

		@Postsubmit
		@Presubmit
		@Test
		fun noUncoveredRegions() = testSpec.noUncoveredRegions(testSpec.config.startRotation,
		Surface.ROTATION_0)
		@@ -116,7 +115,7 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete
		@Test
		fun imeLayerBecomesInvisible() = testSpec.imeLayerBecomesInvisible()

		@Postsubmit
		@Presubmit
		@Test
		fun imeAppLayerBecomesInvisible() = testSpec.imeAppLayerBecomesInvisible(testApp)

		@@ -126,7 +125,7 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete
		testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation, Surface.ROTATION_0)
		}

		@Postsubmit
		@Presubmit
		@Test
		fun statusBarLayerRotatesScales() {
		testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0)
		@@ -140,7 +139,7 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete
		@Test
		fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible()

		@Postsubmit
		@Presubmit
		@Test
		fun visibleLayersShownMoreThanOneConsecutiveEntry() {
		testSpec.assertLayers {

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt

+4 −13

Original line number	Diff line number	Diff line
		@@ -51,7 +51,6 @@ import org.junit.runners.Parameterized
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@FlakyTest(bugId = 185400889)
		@Group2
		class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) {
		private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
		@@ -79,11 +78,11 @@ class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) {
		}
		}

		@FlakyTest
		@Presubmit
		@Test
		fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible()

		@FlakyTest
		@Presubmit
		@Test
		fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()

		@@ -109,7 +108,7 @@ class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) {
		@Test
		fun statusBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()

		@FlakyTest
		@Presubmit
		@Test
		fun noUncoveredRegions() = testSpec.noUncoveredRegions(testSpec.config.startRotation)

		@@ -130,18 +129,10 @@ class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) {
		@Presubmit
		@Test
		fun statusBarLayerRotatesScales() {
		Assume.assumeFalse(testSpec.isRotated)
		testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation)
		}

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

		@FlakyTest
		@Presubmit
		@Test
		fun visibleLayersShownMoreThanOneConsecutiveEntry() {
		testSpec.assertLayers {

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt

+1 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.server.wm.flicker.ime

		import android.app.Instrumentation
		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.Presubmit
		import android.view.Surface
		import android.view.WindowManagerPolicyConstants
		@@ -101,7 +100,7 @@ class CloseImeWindowToHomeTest(private val testSpec: FlickerTestParameter) {
		}
		}

		@Postsubmit
		@Presubmit
		@Test
		fun imeWindowBecomesInvisible() = testSpec.imeWindowBecomesInvisible()

tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt

+1 −2

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.server.wm.flicker.ime

		import android.app.Instrumentation
		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.Presubmit
		import android.view.Surface
		import android.view.WindowManagerPolicyConstants
		@@ -140,7 +139,7 @@ class OpenImeWindowTest(private val testSpec: FlickerTestParameter) {
		}
		}

		@Postsubmit
		@Presubmit
		@Test
		fun visibleWindowsShownMoreThanOneConsecutiveEntry() {
		testSpec.assertWm {

tests/FlickerTests/src/com/android/server/wm/flicker/ime/ReOpenImeWindowTest.kt

+4 −6

Original line number	Diff line number	Diff line
		@@ -17,11 +17,9 @@
		package com.android.server.wm.flicker.ime

		import android.app.Instrumentation
		import android.platform.test.annotations.Postsubmit
		import android.platform.test.annotations.Presubmit
		import android.view.Surface
		import android.view.WindowManagerPolicyConstants
		import androidx.test.filters.FlakyTest
		import androidx.test.filters.RequiresDevice
		import androidx.test.platform.app.InstrumentationRegistry
		import com.android.server.wm.flicker.FlickerBuilderProvider
		@@ -100,7 +98,7 @@ class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) {
		@Test
		fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()

		@Postsubmit
		@Presubmit
		@Test
		fun visibleWindowsShownMoreThanOneConsecutiveEntry() {
		testSpec.assertWm {
		@@ -144,19 +142,19 @@ class ReOpenImeWindowTest(private val testSpec: FlickerTestParameter) {
		fun appLayerReplacesLauncher() =
		testSpec.appLayerReplacesLauncher(testAppComponentName.className)

		@FlakyTest
		@Presubmit
		@Test
		fun navBarLayerRotatesAndScales() {
		testSpec.navBarLayerRotatesAndScales(Surface.ROTATION_0, testSpec.config.endRotation)
		}

		@Postsubmit
		@Presubmit
		@Test
		fun statusBarLayerRotatesScales() {
		testSpec.statusBarLayerRotatesScales(Surface.ROTATION_0, testSpec.config.endRotation)
		}

		@Postsubmit
		@Presubmit
		@Test
		fun visibleLayersShownMoreThanOneConsecutiveEntry() {
		testSpec.assertLayers {