Merge "Promote stable flicker tests (ime)" into sc-dev am: a50b03521f (c75d4fc4) · Commits · e / os / android_frameworks_base

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

+4 −5

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

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

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

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

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

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

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

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

+4 −13

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

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

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

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

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

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

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

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

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

+1 −2

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

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

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

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

+1 −2

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

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

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

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

+4 −6

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

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

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

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

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

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