Skip to content
Snippets Groups Projects
Commit 545262b4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update rotation tests to new DSL format" into sc-dev

parents 2390b55c 1fda638b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt
+ 41
− 38
View file @ 545262b4
......@@ -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,51 +65,56 @@ class ChangeAppRotationTest(
@JvmStatic
fun getParams(): Collection<Array<Any>> {
val testSpec: FlickerBuilder.(Bundle) -> Unit = { configuration ->
withTestName { buildTestTag("changeAppRotation", configuration) }
withTestName { buildTestTag(configuration) }
assertions {
windowManagerTrace {
navBarWindowIsAlwaysVisible()
statusBarWindowIsAlwaysVisible()
visibleWindowsShownMoreThanOneConsecutiveEntry()
}
presubmit {
windowManagerTrace {
navBarWindowIsAlwaysVisible()
statusBarWindowIsAlwaysVisible()
visibleWindowsShownMoreThanOneConsecutiveEntry()
}
layersTrace {
navBarLayerIsAlwaysVisible(bugId = 140855415)
statusBarLayerIsAlwaysVisible(bugId = 140855415)
noUncoveredRegions(configuration.startRotation,
configuration.endRotation, allStates = false)
navBarLayerRotatesAndScales(configuration.startRotation,
configuration.endRotation, bugId = 140855415)
statusBarLayerRotatesScales(configuration.startRotation,
configuration.endRotation, bugId = 140855415)
visibleLayersShownMoreThanOneConsecutiveEntry(bugId = 140855415)
layersTrace {
noUncoveredRegions(configuration.startRotation,
configuration.endRotation, allStates = false)
all("screenshotLayerBecomesInvisible") {
this.showsLayer(testApp.getPackage())
.then()
.showsLayer(SCREENSHOT_LAYER)
.then()
.showsLayer(testApp.getPackage())
}
}
}
layersTrace {
val startingPos = WindowUtils.getDisplayBounds(
configuration.startRotation)
val endingPos = WindowUtils.getDisplayBounds(
configuration.endRotation)
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)
start("appLayerRotates_StartingPos", bugId = 140855415) {
this.hasVisibleRegion(testApp.getPackage(), startingPos)
}
val startingPos = WindowUtils.getDisplayBounds(
configuration.startRotation)
val endingPos = WindowUtils.getDisplayBounds(
configuration.endRotation)
end("appLayerRotates_EndingPos", bugId = 140855415) {
this.hasVisibleRegion(testApp.getPackage(), endingPos)
}
start("appLayerRotates_StartingPos", bugId = 140855415) {
this.hasVisibleRegion(testApp.getPackage(), startingPos)
}
all("screenshotLayerBecomesInvisible") {
this.showsLayer(testApp.getPackage())
.then()
.showsLayer(SCREENSHOT_LAYER)
.then()
.showsLayer(testApp.getPackage())
end("appLayerRotates_EndingPos", bugId = 140855415) {
this.hasVisibleRegion(testApp.getPackage(), endingPos)
}
}
}
eventLog {
focusDoesNotChange(bugId = 151179149)
eventLog {
focusDoesNotChange(bugId = 151179149)
}
}
}
}
......
tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt
+ 51
− 49
View file @ 545262b4
......@@ -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,63 +95,67 @@ class SeamlessAppRotationTest(
} else {
""
}
buildTestTag("seamlessRotation", configuration, extraInfo = extra)
buildTestTag(configuration, extraInfo = extra)
}
assertions {
windowManagerTrace {
navBarWindowIsAlwaysVisible(bugId = 140855415)
statusBarWindowIsAlwaysVisible(bugId = 140855415)
visibleWindowsShownMoreThanOneConsecutiveEntry()
appWindowAlwaysVisibleOnTop(testApp.`package`)
}
val startingBounds = WindowUtils.getDisplayBounds(configuration.startRotation)
val endingBounds = WindowUtils.getDisplayBounds(configuration.endRotation)
presubmit {
windowManagerTrace {
visibleWindowsShownMoreThanOneConsecutiveEntry()
appWindowAlwaysVisibleOnTop(testApp.`package`)
}
layersTrace {
navBarLayerIsAlwaysVisible(bugId = 140855415)
statusBarLayerIsAlwaysVisible(bugId = 140855415)
noUncoveredRegions(configuration.startRotation,
configuration.endRotation, allStates = false, bugId = 147659548)
navBarLayerRotatesAndScales(configuration.startRotation,
configuration.endRotation,
enabled = false)
statusBarLayerRotatesScales(configuration.startRotation,
configuration.endRotation, enabled = false)
visibleLayersShownMoreThanOneConsecutiveEntry(
enabled = configuration.startRotation == configuration.endRotation)
layerAlwaysVisible(testApp.`package`)
layersTrace {
layerAlwaysVisible(testApp.`package`)
}
}
layersTrace {
val startingBounds = WindowUtils
.getDisplayBounds(configuration.startRotation)
val endingBounds = WindowUtils
.getDisplayBounds(configuration.endRotation)
all("appLayerRotates", bugId = 147659548) {
if (startingBounds == endingBounds) {
this.hasVisibleRegion(
testApp.`package`, startingBounds)
} else {
this.hasVisibleRegion(testApp.`package`,
startingBounds)
.then()
.hasVisibleRegion(testApp.`package`,
endingBounds)
}
flaky {
windowManagerTrace {
navBarWindowIsAlwaysVisible(bugId = 140855415)
statusBarWindowIsAlwaysVisible(bugId = 140855415)
}
all("noUncoveredRegions", bugId = 147659548) {
if (startingBounds == endingBounds) {
this.coversAtLeastRegion(startingBounds)
} else {
this.coversAtLeastRegion(startingBounds)
.then()
.coversAtLeastRegion(endingBounds)
layersTrace {
navBarLayerIsAlwaysVisible(bugId = 140855415)
statusBarLayerIsAlwaysVisible(bugId = 140855415)
noUncoveredRegions(configuration.startRotation,
configuration.endRotation, allStates = false, bugId = 147659548)
navBarLayerRotatesAndScales(configuration.startRotation,
configuration.endRotation)
statusBarLayerRotatesScales(configuration.startRotation,
configuration.endRotation)
visibleLayersShownMoreThanOneConsecutiveEntry()
all("appLayerRotates", bugId = 147659548) {
if (startingBounds == endingBounds) {
this.hasVisibleRegion(
testApp.`package`, startingBounds)
} else {
this.hasVisibleRegion(testApp.`package`,
startingBounds)
.then()
.hasVisibleRegion(testApp.`package`,
endingBounds)
}
}
all("noUncoveredRegions", bugId = 147659548) {
if (startingBounds == endingBounds) {
this.coversAtLeastRegion(startingBounds)
} else {
this.coversAtLeastRegion(startingBounds)
.then()
.coversAtLeastRegion(endingBounds)
}
}
}
}
eventLog {
focusDoesNotChange(bugId = 151179149)
eventLog {
focusDoesNotChange(bugId = 151179149)
}
}
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment