Merge "Update rotation tests to new DSL format" into sc-dev (545262b4) · Commits · e / os / android_frameworks_base

tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt

+41 −38

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

		import android.os.Bundle
		import android.platform.test.annotations.Presubmit
		import androidx.test.filters.RequiresDevice
		import androidx.test.platform.app.InstrumentationRegistry
		import com.android.server.wm.flicker.FlickerTestRunner
		@@ -48,7 +47,6 @@ import org.junit.runners.Parameterized
		* Cycle through supported app rotations.
		* To run this test: `atest FlickerTests:ChangeAppRotationTest`
		*/
		@Presubmit
		@RequiresDevice
		@RunWith(Parameterized::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@@ -67,8 +65,9 @@ class ChangeAppRotationTest(
		@JvmStatic
		fun getParams(): Collection<Array<Any>> {
		val testSpec: FlickerBuilder.(Bundle) -> Unit = { configuration ->
		withTestName { buildTestTag("changeAppRotation", configuration) }
		withTestName { buildTestTag(configuration) }
		assertions {
		presubmit {
		windowManagerTrace {
		navBarWindowIsAlwaysVisible()
		statusBarWindowIsAlwaysVisible()
		@@ -76,18 +75,29 @@ class ChangeAppRotationTest(
		}

		layersTrace {
		navBarLayerIsAlwaysVisible(bugId = 140855415)
		statusBarLayerIsAlwaysVisible(bugId = 140855415)
		noUncoveredRegions(configuration.startRotation,
		configuration.endRotation, allStates = false)

		all("screenshotLayerBecomesInvisible") {
		this.showsLayer(testApp.getPackage())
		.then()
		.showsLayer(SCREENSHOT_LAYER)
		.then()
		.showsLayer(testApp.getPackage())
		}
		}
		}

		flaky {
		layersTrace {
		navBarLayerIsAlwaysVisible(bugId = 140855415)
		statusBarLayerIsAlwaysVisible(bugId = 140855415)
		navBarLayerRotatesAndScales(configuration.startRotation,
		configuration.endRotation, bugId = 140855415)
		statusBarLayerRotatesScales(configuration.startRotation,
		configuration.endRotation, bugId = 140855415)
		visibleLayersShownMoreThanOneConsecutiveEntry(bugId = 140855415)
		}

		layersTrace {
		val startingPos = WindowUtils.getDisplayBounds(
		configuration.startRotation)
		val endingPos = WindowUtils.getDisplayBounds(
		@@ -100,14 +110,6 @@ class ChangeAppRotationTest(
		end("appLayerRotates_EndingPos", bugId = 140855415) {
		this.hasVisibleRegion(testApp.getPackage(), endingPos)
		}

		all("screenshotLayerBecomesInvisible") {
		this.showsLayer(testApp.getPackage())
		.then()
		.showsLayer(SCREENSHOT_LAYER)
		.then()
		.showsLayer(testApp.getPackage())
		}
		}

		eventLog {
		@@ -115,6 +117,7 @@ class ChangeAppRotationTest(
		}
		}
		}
		}

		return FlickerTestRunnerFactory.getInstance()
		.buildRotationTest(instrumentation, transition, testSpec, repetitions = 5)

tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt

+51 −49

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

		import android.os.Bundle
		import android.platform.test.annotations.Presubmit
		import androidx.test.filters.RequiresDevice
		import androidx.test.platform.app.InstrumentationRegistry
		import com.android.server.wm.flicker.FlickerTestRunner
		@@ -51,7 +50,6 @@ import org.junit.runners.Parameterized
		* Cycle through supported app rotations using seamless rotations.
		* To run this test: `atest FlickerTests:SeamlessAppRotationTest`
		*/
		@Presubmit
		@RequiresDevice
		@RunWith(Parameterized::class)
		@FixMethodOrder(MethodSorters.NAME_ASCENDING)
		@@ -97,36 +95,39 @@ class SeamlessAppRotationTest(
		} else {
		""
		}
		buildTestTag("seamlessRotation", configuration, extraInfo = extra)
		buildTestTag(configuration, extraInfo = extra)
		}
		assertions {
		val startingBounds = WindowUtils.getDisplayBounds(configuration.startRotation)
		val endingBounds = WindowUtils.getDisplayBounds(configuration.endRotation)

		presubmit {
		windowManagerTrace {
		navBarWindowIsAlwaysVisible(bugId = 140855415)
		statusBarWindowIsAlwaysVisible(bugId = 140855415)
		visibleWindowsShownMoreThanOneConsecutiveEntry()
		appWindowAlwaysVisibleOnTop(testApp.`package`)
		}

		layersTrace {
		layerAlwaysVisible(testApp.`package`)
		}
		}

		flaky {
		windowManagerTrace {
		navBarWindowIsAlwaysVisible(bugId = 140855415)
		statusBarWindowIsAlwaysVisible(bugId = 140855415)
		}

		layersTrace {
		navBarLayerIsAlwaysVisible(bugId = 140855415)
		statusBarLayerIsAlwaysVisible(bugId = 140855415)
		noUncoveredRegions(configuration.startRotation,
		configuration.endRotation, allStates = false, bugId = 147659548)
		navBarLayerRotatesAndScales(configuration.startRotation,
		configuration.endRotation,
		enabled = false)
		configuration.endRotation)
		statusBarLayerRotatesScales(configuration.startRotation,
		configuration.endRotation, enabled = false)
		visibleLayersShownMoreThanOneConsecutiveEntry(
		enabled = configuration.startRotation == configuration.endRotation)
		layerAlwaysVisible(testApp.`package`)
		}

		layersTrace {
		val startingBounds = WindowUtils
		.getDisplayBounds(configuration.startRotation)
		val endingBounds = WindowUtils
		.getDisplayBounds(configuration.endRotation)
		configuration.endRotation)
		visibleLayersShownMoreThanOneConsecutiveEntry()

		all("appLayerRotates", bugId = 147659548) {
		if (startingBounds == endingBounds) {
		@@ -157,6 +158,7 @@ class SeamlessAppRotationTest(
		}
		}
		}
		}

		return testFactory.buildRotationTest(instrumentation, transition, testSpec,
		deviceConfigurations = configurations, repetitions = 2)