Merge "Onboard IME and rotation CUJs into ironwood" (58cbaa06) · Commits · e / os / android_frameworks_base

tests/FlickerTests/src/com/android/server/wm/flicker/BaseTest.kt

+13 −0

Original line number	Diff line number	Diff line
		@@ -172,4 +172,17 @@ constructor(
		open fun visibleWindowsShownMoreThanOneConsecutiveEntry() {
		testSpec.assertWm { this.visibleWindowsShownMoreThanOneConsecutiveEntry() }
		}

		open fun cujCompleted() {
		entireScreenCovered()
		navBarLayerIsVisibleAtStartAndEnd()
		navBarWindowIsAlwaysVisible()
		taskBarLayerIsVisibleAtStartAndEnd()
		taskBarWindowIsAlwaysVisible()
		statusBarLayerIsVisibleAtStartAndEnd()
		statusBarLayerPositionAtStartAndEnd()
		statusBarWindowIsAlwaysVisible()
		visibleLayersShownMoreThanOneConsecutiveEntry()
		visibleWindowsShownMoreThanOneConsecutiveEntry()
		}
		}

0 → 100644

+15 −0

Original line number	Diff line number	Diff line
		{
		"ironwood-postsubmit": [
		{
		"name": "FlickerTests",
		"options": [
		{
		"include-annotation": "android.platform.test.annotations.IwTest"
		},
		{
		"exclude-annotation": "org.junit.Ignore"
		}
		]
		}
		]
		}
		No newline at end of file

+11 −0

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

		import android.platform.test.annotations.FlakyTest
		import android.platform.test.annotations.IwTest
		import android.platform.test.annotations.Presubmit
		import androidx.test.filters.RequiresDevice
		import com.android.server.wm.flicker.BaseTest
		@@ -101,6 +102,16 @@ class CloseImeWindowToAppTest(testSpec: FlickerTestParameter) : BaseTest(testSpe
		testSpec.assertWm { this.isAppWindowOnTop(testApp) }
		}

		@Test
		@IwTest(focusArea = "ime")
		override fun cujCompleted() {
		super.cujCompleted()
		navBarLayerPositionAtStartAndEnd()
		imeLayerBecomesInvisible()
		imeAppLayerIsAlwaysVisible()
		imeAppWindowIsAlwaysVisible()
		}

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

+12 −0

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

		package com.android.server.wm.flicker.ime

		import android.platform.test.annotations.IwTest
		import android.platform.test.annotations.Presubmit
		import android.view.Surface
		import android.view.WindowManagerPolicyConstants
		@@ -100,6 +101,17 @@ class CloseImeWindowToHomeTest(testSpec: FlickerTestParameter) : BaseTest(testSp
		testSpec.assertLayers { this.isVisible(testApp).then().isInvisible(testApp) }
		}

		@Test
		@IwTest(focusArea = "ime")
		override fun cujCompleted() {
		super.cujCompleted()
		navBarLayerPositionAtStartAndEnd()
		imeLayerBecomesInvisible()
		imeAppWindowBecomesInvisible()
		imeWindowBecomesInvisible()
		imeLayerBecomesInvisible()
		}

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

+9 −0

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

		import android.platform.test.annotations.FlakyTest
		import android.platform.test.annotations.IwTest
		import android.platform.test.annotations.Presubmit
		import android.view.Surface
		import android.view.WindowManagerPolicyConstants
		@@ -79,6 +80,14 @@ class OpenImeWindowAndCloseTest(testSpec: FlickerTestParameter) : BaseTest(testS
		super.visibleLayersShownMoreThanOneConsecutiveEntry()
		}

		@Test
		@IwTest(focusArea = "ime")
		override fun cujCompleted() {
		super.cujCompleted()
		imeLayerBecomesInvisible()
		imeWindowBecomesInvisible()
		}

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