Merge "Update Close App tests to new DSL format" into sc-dev (6a7f2d9e) · Commits · e / os / android_frameworks_base

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

+38 −22

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

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

	import android.platform.test.annotations.Presubmit
	import android.view.Surface		import android.view.Surface
	import androidx.test.filters.RequiresDevice		import androidx.test.filters.RequiresDevice
	import androidx.test.platform.app.InstrumentationRegistry		import androidx.test.platform.app.InstrumentationRegistry
	@@ -50,7 +49,6 @@ import org.junit.runners.Parameterized
	* Test app closes by pressing back button		* Test app closes by pressing back button
	* To run this test: `atest FlickerTests:CloseAppBackButtonTest`		* To run this test: `atest FlickerTests:CloseAppBackButtonTest`
	*/		*/
	@Presubmit
	@RequiresDevice		@RequiresDevice
	@RunWith(Parameterized::class)		@RunWith(Parameterized::class)
	@FixMethodOrder(MethodSorters.NAME_ASCENDING)		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
	@@ -65,7 +63,7 @@ class CloseAppBackButtonTest(
	val testApp = SimpleAppHelper(instrumentation)		val testApp = SimpleAppHelper(instrumentation)
	return FlickerTestRunnerFactory.getInstance()		return FlickerTestRunnerFactory.getInstance()
	.buildTest(instrumentation, repetitions = 5) { configuration ->		.buildTest(instrumentation, repetitions = 5) { configuration ->
	withTestName { buildTestTag("closeAppBackButton", configuration) }		withTestName { buildTestTag(configuration) }
	repeat { configuration.repetitions }		repeat { configuration.repetitions }
	setup {		setup {
	test {		test {
	@@ -89,11 +87,12 @@ class CloseAppBackButtonTest(
	}		}
	}		}
	assertions {		assertions {
			val isRotated = configuration.startRotation.isRotated()

			presubmit {
	windowManagerTrace {		windowManagerTrace {
	navBarWindowIsAlwaysVisible()		navBarWindowIsAlwaysVisible()
	statusBarWindowIsAlwaysVisible()		statusBarWindowIsAlwaysVisible()
	visibleWindowsShownMoreThanOneConsecutiveEntry(bugId = 173684672)

	launcherReplacesAppWindowAsTopWindow(testApp)		launcherReplacesAppWindowAsTopWindow(testApp)
	wallpaperWindowBecomesVisible()		wallpaperWindowBecomesVisible()
	}		}
	@@ -101,17 +100,34 @@ class CloseAppBackButtonTest(
	layersTrace {		layersTrace {
	noUncoveredRegions(configuration.startRotation,		noUncoveredRegions(configuration.startRotation,
	Surface.ROTATION_0)		Surface.ROTATION_0)
	navBarLayerRotatesAndScales(configuration.startRotation,
	Surface.ROTATION_0,
	enabled = !configuration.startRotation.isRotated())
	statusBarLayerRotatesScales(configuration.startRotation,
	Surface.ROTATION_0,
	enabled = !configuration.startRotation.isRotated())
	navBarLayerIsAlwaysVisible()		navBarLayerIsAlwaysVisible()
	statusBarLayerIsAlwaysVisible()		statusBarLayerIsAlwaysVisible()
			wallpaperLayerReplacesAppLayer(testApp)

			if (!isRotated) {
			navBarLayerRotatesAndScales(configuration.startRotation,
			Surface.ROTATION_0)
			statusBarLayerRotatesScales(configuration.startRotation,
			Surface.ROTATION_0)
			}
			}
			}

			flaky {
			windowManagerTrace {
			visibleWindowsShownMoreThanOneConsecutiveEntry(bugId = 173684672)
			}

			layersTrace {
	visibleLayersShownMoreThanOneConsecutiveEntry(bugId = 173684672)		visibleLayersShownMoreThanOneConsecutiveEntry(bugId = 173684672)

	wallpaperLayerReplacesAppLayer(testApp)		if (isRotated) {
			navBarLayerRotatesAndScales(configuration.startRotation,
			Surface.ROTATION_0)
			statusBarLayerRotatesScales(configuration.startRotation,
			Surface.ROTATION_0)
			}
			}
	}		}
	}		}
	}		}

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

+38 −19

Original line number	Original line	Diff line number	Diff line
	@@ -37,6 +37,7 @@ import com.android.server.wm.flicker.visibleWindowsShownMoreThanOneConsecutiveEn
	import com.android.server.wm.flicker.visibleLayersShownMoreThanOneConsecutiveEntry		import com.android.server.wm.flicker.visibleLayersShownMoreThanOneConsecutiveEntry
	import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen		import com.android.server.wm.flicker.helpers.wakeUpAndGoToHomeScreen
	import com.android.server.wm.flicker.helpers.buildTestTag		import com.android.server.wm.flicker.helpers.buildTestTag
			import com.android.server.wm.flicker.helpers.isRotated
	import com.android.server.wm.flicker.helpers.setRotation		import com.android.server.wm.flicker.helpers.setRotation
	import com.android.server.wm.flicker.repetitions		import com.android.server.wm.flicker.repetitions
	import com.android.server.wm.flicker.startRotation		import com.android.server.wm.flicker.startRotation
	@@ -64,7 +65,7 @@ class CloseAppHomeButtonTest(
	val testApp = SimpleAppHelper(instrumentation)		val testApp = SimpleAppHelper(instrumentation)
	return FlickerTestRunnerFactory.getInstance()		return FlickerTestRunnerFactory.getInstance()
	.buildTest(instrumentation, repetitions = 5) { configuration ->		.buildTest(instrumentation, repetitions = 5) { configuration ->
	withTestName { buildTestTag("closeAppHomeButton", configuration) }		withTestName { buildTestTag(configuration) }
	repeat { configuration.repetitions }		repeat { configuration.repetitions }
	setup {		setup {
	test {		test {
	@@ -88,28 +89,46 @@ class CloseAppHomeButtonTest(
	}		}
	}		}
	assertions {		assertions {
			val isRotated = configuration.startRotation.isRotated()

			presubmit {
	windowManagerTrace {		windowManagerTrace {
	navBarWindowIsAlwaysVisible()		navBarWindowIsAlwaysVisible()
	statusBarWindowIsAlwaysVisible()		statusBarWindowIsAlwaysVisible()
	visibleWindowsShownMoreThanOneConsecutiveEntry(bugId = 173689015)

	launcherReplacesAppWindowAsTopWindow(testApp)		launcherReplacesAppWindowAsTopWindow(testApp)
	wallpaperWindowBecomesVisible()		wallpaperWindowBecomesVisible()
	}		}

	layersTrace {		layersTrace {
	val isRotation0 = configuration.startRotation == Surface.ROTATION_0
	noUncoveredRegions(configuration.startRotation,		noUncoveredRegions(configuration.startRotation,
	Surface.ROTATION_0)		Surface.ROTATION_0)
	navBarLayerRotatesAndScales(configuration.startRotation,
	Surface.ROTATION_0, enabled = isRotation0)
	statusBarLayerRotatesScales(configuration.startRotation,
	Surface.ROTATION_0, enabled = isRotation0)
	navBarLayerIsAlwaysVisible()		navBarLayerIsAlwaysVisible()
	statusBarLayerIsAlwaysVisible()		statusBarLayerIsAlwaysVisible()
			wallpaperLayerReplacesAppLayer(testApp)

			if (!isRotated) {
			navBarLayerRotatesAndScales(configuration.startRotation,
			Surface.ROTATION_0)
			statusBarLayerRotatesScales(configuration.startRotation,
			Surface.ROTATION_0)
			}
			}
			}

			flaky {
			windowManagerTrace {
			visibleWindowsShownMoreThanOneConsecutiveEntry(bugId = 173689015)
			}
			layersTrace {
	visibleLayersShownMoreThanOneConsecutiveEntry(bugId = 173689015)		visibleLayersShownMoreThanOneConsecutiveEntry(bugId = 173689015)

	wallpaperLayerReplacesAppLayer(testApp)		if (isRotated) {
			navBarLayerRotatesAndScales(configuration.startRotation,
			Surface.ROTATION_0)
			statusBarLayerRotatesScales(configuration.startRotation,
			Surface.ROTATION_0)
			}
			}
	}		}
	}		}
	}		}