Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Promote stable postsubmit tests to presubmit"

Browse Source
This commit is contained in:
Nataniel Borges
2021-08-27 14:02:10 +00:00
committed by Android (Google) Code Review
parent a5294fb6f9 2ab6666ae7
commit d8a0e22e1f
7 changed files with 32 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipTest.kt
View File

@@ -16,7 +16,6 @@
package com.android.wm.shell.flicker.pip
import android.platform.test.annotations.Postsubmit
import android.platform.test.annotations.Presubmit
import android.view.Surface
import androidx.test.filters.FlakyTest
@@ -105,7 +104,7 @@ class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) {
* Checks that the pip app layer remains inside the display bounds throughout the whole
* animation
*/
@Postsubmit
@Presubmit
@Test
fun pipLayerRemainInsideVisibleBounds() {
testSpec.assertLayers {
@@ -116,7 +115,7 @@ class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) {
/**
* Checks that the visible region of [pipApp] always reduces during the animation
*/
@Postsubmit
@Presubmit
@Test
fun pipLayerReduces() {
val layerName = pipApp.component.toLayerName()

3
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt
View File

@@ -16,7 +16,6 @@
package com.android.wm.shell.flicker.pip
import android.platform.test.annotations.Postsubmit
import android.platform.test.annotations.Presubmit
import android.view.Surface
import androidx.test.filters.FlakyTest
@@ -119,7 +118,7 @@ class EnterPipToOtherOrientationTest(
* Checks that the [WindowManagerStateHelper.STATUS_BAR_COMPONENT] has the correct position at
* the start and end of the transition
*/
@Postsubmit
@Presubmit
@Test
override fun statusBarLayerRotatesScales() =
testSpec.statusBarLayerRotatesScales(Surface.ROTATION_90, Surface.ROTATION_0)

14
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt
View File

@@ -16,7 +16,6 @@
package com.android.wm.shell.flicker.pip
import android.platform.test.annotations.Postsubmit
import android.view.Surface
import androidx.test.filters.RequiresDevice
import com.android.server.wm.flicker.FlickerParametersRunnerFactory
@@ -26,7 +25,6 @@ import com.android.server.wm.flicker.annotation.Group3
import com.android.server.wm.flicker.dsl.FlickerBuilder
import com.android.server.wm.traces.parser.toWindowName
import org.junit.FixMethodOrder
import org.junit.Test
import org.junit.runner.RunWith
import org.junit.runners.MethodSorters
import org.junit.runners.Parameterized
@@ -78,18 +76,6 @@ class ExitPipViaExpandButtonClickTest(
}
}
@Postsubmit
@Test
override fun pipAppCoversFullScreenAtEnd() = super.pipAppCoversFullScreenAtEnd()
@Postsubmit
@Test
override fun showBothAppLayersThenHidePip() = super.showBothAppLayersThenHidePip()
@Postsubmit
@Test
override fun showBothAppWindowsThenHidePip() = super.showBothAppWindowsThenHidePip()
companion object {
/**
* Creates the test configurations.

7
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExpandPipOnDoubleClickTest.kt
View File

@@ -80,7 +80,7 @@ class ExpandPipOnDoubleClickTest(testSpec: FlickerTestParameter) : PipTransition
* Checks that the pip app layer remains inside the display bounds throughout the whole
* animation
*/
@Postsubmit
@Presubmit
@Test
fun pipLayerRemainInsideVisibleBounds() {
testSpec.assertLayers {
@@ -91,6 +91,7 @@ class ExpandPipOnDoubleClickTest(testSpec: FlickerTestParameter) : PipTransition
/**
* Checks [pipApp] window remains visible throughout the animation
*/
@Postsubmit
@Test
fun pipWindowIsAlwaysVisible() {
testSpec.assertWm {
@@ -101,7 +102,7 @@ class ExpandPipOnDoubleClickTest(testSpec: FlickerTestParameter) : PipTransition
/**
* Checks [pipApp] layer remains visible throughout the animation
*/
@Postsubmit
@Presubmit
@Test
fun pipLayerIsAlwaysVisible() {
testSpec.assertLayers {
@@ -112,7 +113,7 @@ class ExpandPipOnDoubleClickTest(testSpec: FlickerTestParameter) : PipTransition
/**
* Checks that the visible region of [pipApp] always expands during the animation
*/
@Postsubmit
@Presubmit
@Test
fun pipLayerExpands() {
val layerName = pipApp.component.toLayerName()

9
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipShelfHeightTransition.kt
View File

@@ -16,7 +16,6 @@
package com.android.wm.shell.flicker.pip
import android.platform.test.annotations.Postsubmit
import android.platform.test.annotations.Presubmit
import com.android.launcher3.tapl.LauncherInstrumentation
import com.android.server.wm.flicker.FlickerTestParameter
@@ -43,7 +42,7 @@ abstract class MovePipShelfHeightTransition(
/**
* Checks [pipApp] window remains visible throughout the animation
*/
@Postsubmit
@Presubmit
@Test
open fun pipWindowIsAlwaysVisible() {
testSpec.assertWm {
@@ -54,7 +53,7 @@ abstract class MovePipShelfHeightTransition(
/**
* Checks [pipApp] layer remains visible throughout the animation
*/
@Postsubmit
@Presubmit
@Test
open fun pipLayerIsAlwaysVisible() {
testSpec.assertLayers {
@@ -66,7 +65,7 @@ abstract class MovePipShelfHeightTransition(
* Checks that the pip app window remains inside the display bounds throughout the whole
* animation
*/
@Postsubmit
@Presubmit
@Test
open fun pipWindowRemainInsideVisibleBounds() {
testSpec.assertWm {
@@ -78,7 +77,7 @@ abstract class MovePipShelfHeightTransition(
* Checks that the pip app layer remains inside the display bounds throughout the whole
* animation
*/
@Postsubmit
@Presubmit
@Test
open fun pipLayerRemainInsideVisibleBounds() {
testSpec.assertLayers {

16
tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt
View File

@@ -112,22 +112,6 @@ class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) : OpenAppTransiti
@Test
override fun navBarWindowIsVisible() = super.navBarWindowIsVisible()
@Postsubmit
@Test
override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()
@Postsubmit
@Test
override fun statusBarWindowIsVisible() = super.statusBarWindowIsVisible()
@Postsubmit
@Test
override fun statusBarLayerIsVisible() = super.statusBarLayerIsVisible()
@Postsubmit
@Test
override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()
@FlakyTest
@Test
override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

42
tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchFromLauncherTest.kt
View File

@@ -17,7 +17,7 @@
package com.android.server.wm.flicker.quickswitch
import android.app.Instrumentation
import android.platform.test.annotations.Postsubmit
import android.platform.test.annotations.Presubmit
import android.platform.test.annotations.RequiresDevice
import android.view.Surface
import android.view.WindowManagerPolicyConstants
@@ -106,7 +106,7 @@ class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) {
* Checks that [testApp] windows fill the entire screen (i.e. is "fullscreen") at the end of the
* transition once we have fully quick switched from the launcher back to the [testApp].
*/
@Postsubmit
@Presubmit
@Test
fun endsWithAppWindowsCoveringFullScreen() {
testSpec.assertWmEnd {
@@ -118,7 +118,7 @@ class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) {
* Checks that [testApp] layers fill the entire screen (i.e. is "fullscreen") at the end of the
* transition once we have fully quick switched from the launcher back to the [testApp].
*/
@Postsubmit
@Presubmit
@Test
fun endsWithAppLayersCoveringFullScreen() {
testSpec.assertLayersEnd {
@@ -130,7 +130,7 @@ class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) {
* Checks that [testApp] is the top window at the end of the transition once we have fully quick
* switched from the launcher back to the [testApp].
*/
@Postsubmit
@Presubmit
@Test
fun endsWithAppBeingOnTop() {
testSpec.assertWmEnd {
@@ -141,7 +141,7 @@ class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) {
/**
* Checks that the transition starts with the home activity being tagged as visible.
*/
@Postsubmit
@Presubmit
@Test
fun startsWithHomeActivityFlaggedVisible() {
testSpec.assertWmStart {
@@ -153,7 +153,7 @@ class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) {
* Checks that the transition starts with the launcher windows filling/covering exactly the
* entirety of the display.
*/
@Postsubmit
@Presubmit
@Test
fun startsWithLauncherWindowsCoverFullScreen() {
testSpec.assertWmStart {
@@ -165,7 +165,7 @@ class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) {
* Checks that the transition starts with the launcher layers filling/covering exactly the
* entirety of the display.
*/
@Postsubmit
@Presubmit
@Test
fun startsWithLauncherLayersCoverFullScreen() {
testSpec.assertLayersStart {
@@ -176,7 +176,7 @@ class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) {
/**
* Checks that the transition starts with the launcher being the top window.
*/
@Postsubmit
@Presubmit
@Test
fun startsWithLauncherBeingOnTop() {
testSpec.assertWmStart {
@@ -188,7 +188,7 @@ class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) {
* Checks that the transition ends with the home activity being flagged as not visible. By this
* point we should have quick switched away from the launcher back to the [testApp].
*/
@Postsubmit
@Presubmit
@Test
fun endsWithHomeActivityFlaggedInvisible() {
testSpec.assertWmEnd {
@@ -200,7 +200,7 @@ class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) {
* Checks that [testApp]'s window starts off invisible and becomes visible at some point before
* the end of the transition and then stays visible until the end of the transition.
*/
@Postsubmit
@Presubmit
@Test
fun appWindowBecomesAndStaysVisible() {
testSpec.assertWm {
@@ -214,7 +214,7 @@ class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) {
* Checks that [testApp]'s layer starts off invisible and becomes visible at some point before
* the end of the transition and then stays visible until the end of the transition.
*/
@Postsubmit
@Presubmit
@Test
fun appLayerBecomesAndStaysVisible() {
testSpec.assertLayers {
@@ -228,7 +228,7 @@ class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) {
* Checks that the launcher window starts off visible and becomes invisible at some point before
* the end of the transition and then stays invisible until the end of the transition.
*/
@Postsubmit
@Presubmit
@Test
fun launcherWindowBecomesAndStaysInvisible() {
testSpec.assertWm {
@@ -242,7 +242,7 @@ class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) {
* Checks that the launcher layer starts off visible and becomes invisible at some point before
* the end of the transition and then stays invisible until the end of the transition.
*/
@Postsubmit
@Presubmit
@Test
fun launcherLayerBecomesAndStaysInvisible() {
testSpec.assertLayers {
@@ -256,7 +256,7 @@ class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) {
* Checks that the launcher window is visible at least until the app window is visible. Ensures
* that at any point, either the launcher or [testApp] windows are at least partially visible.
*/
@Postsubmit
@Presubmit
@Test
fun appWindowIsVisibleOnceLauncherWindowIsInvisible() {
testSpec.assertWm {
@@ -272,7 +272,7 @@ class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) {
* Checks that the launcher layer is visible at least until the app layer is visible. Ensures
* that at any point, either the launcher or [testApp] layers are at least partially visible.
*/
@Postsubmit
@Presubmit
@Test
fun appLayerIsVisibleOnceLauncherLayerIsInvisible() {
testSpec.assertLayers {
@@ -287,14 +287,14 @@ class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) {
/**
* Checks that the navbar window is visible throughout the entire transition.
*/
@Postsubmit
@Presubmit
@Test
fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsVisible()
/**
* Checks that the navbar layer is visible throughout the entire transition.
*/
@Postsubmit
@Presubmit
@Test
fun navBarLayerAlwaysIsVisible() = testSpec.navBarLayerIsVisible()
@@ -303,7 +303,7 @@ class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) {
*
* NOTE: This doesn't check that the navbar is visible or not.
*/
@Postsubmit
@Presubmit
@Test
fun navbarIsAlwaysInRightPosition() =
testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation)
@@ -311,21 +311,21 @@ class QuickSwitchFromLauncherTest(private val testSpec: FlickerTestParameter) {
/**
* Checks that the status bar window is visible throughout the entire transition.
*/
@Postsubmit
@Presubmit
@Test
fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsVisible()
/**
* Checks that the status bar layer is visible throughout the entire transition.
*/
@Postsubmit
@Presubmit
@Test
fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsVisible()
/**
* Checks that the screen is always fully covered by visible layers throughout the transition.
*/
@Postsubmit
@Presubmit
@Test
fun screenIsAlwaysFilled() = testSpec.entireScreenCovered()